occi-core 4.2.2 → 4.2.3

data/lib/occi/core/entity.rb

@@ -201,7 +201,7 @@ module Occi
 
         text << @attributes.to_text
 
-        @actions.each { |action| text << "\nLink: <#{self.location}?action=#{action.term}>;rel=#{action.to_s}" }
+        @actions.each { |action| text << "\nLink: <#{self.location}?action=#{action.term}>;rel=#{action.to_s.inspect}" }
 
         text
       end
@@ -221,7 +221,7 @@ module Occi
         header['X-OCCI-Attribute'] = attributes unless attributes.blank?
 
         links = []
-        @actions.each { |action| links << "<#{self.location}?action=#{action.term}>;rel=#{action.to_s}" }
+        @actions.each { |action| links << "<#{self.location}?action=#{action.term}>;rel=#{action.to_s.inspect}" }
         header['Link'] = links.join(',') if links.any?
 
         header

data/lib/occi/core/link.rb

@@ -77,7 +77,7 @@ module Occi
         string << ";rel=#{@rel.to_s.inspect}"
         string << ";self=#{self.location.inspect}" if self.location
 
-        categories = [@kind] + @mixins.join(',').split(',')
+        categories = [@kind.type_identifier].concat(@mixins.to_a.collect { |m| m.type_identifier })
         string << ";category=#{categories.join(' ').inspect}"
 
         string << @attributes.to_string

data/lib/occi/core/mixin.rb

@@ -32,7 +32,7 @@ module Occi
       # @param kind [Occi::Core::Mixin, String] Mixin or Type Identifier of a Mixin where relation should be checked.
       # @return [true,false]
       def related_to?(mixin)
-        self.to_s == mixin.to_s || self.related.include?(mixin.to_s)
+        self.to_s == mixin.to_s || self.related.any? { |m| m.type_identifier == mixin.to_s }
       end
 
       def location
@@ -40,7 +40,7 @@ module Occi
       end
 
       def related
-        self.depends.to_a.concat(self.applies.to_a).uniq
+        self.depends.to_a
       end
 
       # @param [Hash] options

data/lib/occi/core/resource.rb

@@ -65,7 +65,7 @@ module Occi
       # @return [Hash] hash containing the HTTP headers of the text/occi rendering
       def to_header
         header = super
-        header['Links'] = @links.collect {|link| link.to_string }.join(',') if @links.any?
+        header['Link'] = @links.collect {|link| link.to_string }.join(',') if @links.any?
         header
       end
 

data/lib/occi/parser/text.rb

@@ -106,7 +106,7 @@ module Occi
           term = match[:term].downcase
           scheme = match[:scheme]
           title = match[:title]
-          related = match[:rel].to_s.split
+          related = match[:rel].to_s.split(/\s+/)
 
           attributes = Occi::Core::Attributes.new
           if match[:attributes]

data/lib/occi/parser/text/constants.rb

@@ -20,6 +20,8 @@ module Occi
         REGEXP_TYPE_IDENTIFIER = /#{REGEXP_SCHEME}#{REGEXP_TERM}/
         REGEXP_TYPE_IDENTIFIER_STRICT = /#{REGEXP_SCHEME}#{REGEXP_TERM_STRICT}/
         REGEXP_CLASS = /\b(?<!\|)action(?!\|)\b|\b(?<!\|)mixin(?!\|)\b|\b(?<!\|)kind(?!\|)\b/
+        REGEXP_TYPE_IDENTIFIER_LIST = /#{REGEXP_TYPE_IDENTIFIER}(\s+#{REGEXP_TYPE_IDENTIFIER})*/
+        REGEXP_TYPE_IDENTIFIER_LIST_STRICT = /#{REGEXP_TYPE_IDENTIFIER_STRICT}(\s+#{REGEXP_TYPE_IDENTIFIER_STRICT})*/
 
         REGEXP_ATTR_COMPONENT = /#{REGEXP_LOALPHA}(#{REGEXP_LOALPHA}|#{REGEXP_DIGIT}|-|_)*/
         REGEXP_ATTRIBUTE_NAME = /#{REGEXP_ATTR_COMPONENT}(\.#{REGEXP_ATTR_COMPONENT})*/
@@ -44,7 +46,7 @@ module Occi
             ";\\s*scheme=\"(?<scheme>#{REGEXP_SCHEME})#{REGEXP_TERM}?\"" << # scheme (mandatory)
             ";\\s*class=\"?(?<class>#{REGEXP_CLASS})\"?" << # class (mandatory)
             "(;\\s*title=\"(?<title>#{REGEXP_QUOTED_STRING})\")?" << # title (optional)
-            "(;\\s*rel=\"(?<rel>#{REGEXP_TYPE_IDENTIFIER})\")?"<< # rel (optional)
+            "(;\\s*rel=\"(?<rel>#{REGEXP_TYPE_IDENTIFIER_LIST})\")?"<< # rel (optional)
             "(;\\s*location=\"(?<location>#{URI::URI_REF})\")?" << # location (optional)
             "(;\\s*attributes=\"(?<attributes>#{REGEXP_ATTRIBUTE_LIST})\")?" << # attributes (optional)
             "(;\\s*actions=\"(?<actions>#{REGEXP_ACTION_LIST})\")?" << # actions (optional)
@@ -53,7 +55,7 @@ module Occi
             ";\\s*scheme=\"(?<scheme>#{REGEXP_SCHEME})\"" << # scheme (mandatory)
             ";\\s*class=\"(?<class>#{REGEXP_CLASS})\"" << # class (mandatory)
             "(;\\s*title=\"(?<title>#{REGEXP_QUOTED_STRING})\")?" << # title (optional)
-            "(;\\s*rel=\"(?<rel>#{REGEXP_TYPE_IDENTIFIER_STRICT})\")?"<< # rel (optional)
+            "(;\\s*rel=\"(?<rel>#{REGEXP_TYPE_IDENTIFIER_LIST_STRICT})\")?"<< # rel (optional)
             "(;\\s*location=\"(?<location>#{URI::URI_REF})\")?" << # location (optional)
             "(;\\s*attributes=\"(?<attributes>#{REGEXP_ATTRIBUTE_LIST})\")?" << # attributes (optional)
             "(;\\s*actions=\"(?<actions>#{REGEXP_ACTION_LIST_STRICT})\")?" << # actions (optional)

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module Occi
-  VERSION = "4.2.2" unless defined?(::Occi::VERSION)
+  VERSION = "4.2.3" unless defined?(::Occi::VERSION)
 end

data/spec/occi/core/entity_spec.rb

@@ -145,7 +145,7 @@ X-OCCI-Attribute: occi.core.id="baf1"|
 Category: mymixin;scheme="http://example.com/mynamespace#";class="mixin"
 X-OCCI-Attribute: occi.core.id="baf1"
 X-OCCI-Attribute: occi.core.title="TestTitle"
-Link: </TestLoc/1?action=testaction>;rel=http://schemas.ogf.org/occi/core/entity/action#testaction|
+Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entity/action#testaction"|
           expect(entity.to_text).to eq(expected)
         end
       end
@@ -168,7 +168,7 @@ Link: </TestLoc/1?action=testaction>;rel=http://schemas.ogf.org/occi/core/entity
           expected = Hashie::Mash.new
           expected['Category'] = 'entity;scheme="http://schemas.ogf.org/occi/core#";class="kind",mymixin;scheme="http://example.com/mynamespace#";class="mixin"'
           expected['X-OCCI-Attribute'] = 'occi.core.id="baf1",occi.core.title="TestTitle"'
-          expected['Link'] = '</TestLoc/1?action=testaction>;rel=http://schemas.ogf.org/occi/core/entity/action#testaction'
+          expected['Link'] = '</TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entity/action#testaction"'
 
           expect(entity.to_header).to eql(expected)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 118686830744215401
+      hash: 3508725164324827292
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25