Merge branch 'master' into 5.0.x

CHANGELOG.md

@@ -1,4 +1,9 @@
 
+5.0.4 / 2017-11-10
+==================
+
+  * Forcing attribute type on occi.core.{source,target} to URI
+
 5.0.3 / 2017-10-19
 ==================
   * Added missing support for legacy context mixins

lib/occi/core/parsers/json/category.rb

@@ -82,7 +82,8 @@ def attribute_definitions(raw)
                 unless def_hsh[:type]
                   raise Occi::Core::Errors::ParsingError, "Attribute #{k.to_s.inspect} has no type"
                 end
-                attr_defs[k.to_s] = Occi::Core::AttributeDefinition.new def_hsh
+                fix_links!(k, def_hsh)
+                attr_defs[k.to_s] = Occi::Core::AttributeDefinition.new(def_hsh)
               end
 
               attr_defs
@@ -113,7 +114,14 @@ def lookup_depends_references!(mixin, derefd, parsed_rel)
               parsed_rel.each { |mxn| mixin.depends << first_or_die(derefd, mxn) }
             end
 
-            private :lookup_applies_references!, :lookup_depends_references!
+            # :nodoc:
+            def fix_links!(name, definition_hash)
+              return unless %w[occi.core.source occi.core.target].include?(name.to_s)
+              logger.debug { "Forcing attribute type on #{name.to_s.inspect} from #{definition_hash[:type]} to URI" }
+              definition_hash[:type] = URI # forcing 'string' to URI for validation purposes
+            end
+
+            private :lookup_applies_references!, :lookup_depends_references!, :fix_links!
           end
         end
       end

lib/occi/core/version.rb

@@ -2,7 +2,7 @@ module Occi
   module Core
     MAJOR_VERSION = 5                # Major update constant
     MINOR_VERSION = 0                # Minor update constant
-    PATCH_VERSION = 3                # Patch/Fix version constant
+    PATCH_VERSION = 4                # Patch/Fix version constant
     STAGE_VERSION = nil              # use `nil` for production releases
 
     unless defined?(::Occi::Core::VERSION)