occi-core 4.2.14 → 4.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97bfbcd8727b44c08e826dbbe76a6f7c05034a5c
-  data.tar.gz: b549d11e985dc2ef189b17fe6e51d02b26fdb75b
+  metadata.gz: 3e3409b60570656c2f8e0b3ec71f6d55ae1ecc82
+  data.tar.gz: 6de77b6298980b43be27ee89b727e4ba48149141
 SHA512:
-  metadata.gz: b48367de96eccf0689868a85e72fb3eadc0576f2bbc7e9cf3248538aa5a21e943cc66e6aeeb3dd679be635b6613453df410330efb731aa92606e649c52f3ba75
-  data.tar.gz: d735235babe4e5405902d583504957ee15a0235037566f7adb4cc152aa74da33c8525236b92c723687951541da5480031c1787a2e4a6f3d7e70a6336552e3164
+  metadata.gz: c9f6afb503d3d7f42be2d6630a3ffe2dfb493228072c8afe48a30d70468ace5b0b1ed93869f36ad651a64753e79dae586687afe78e011935385f5ca45b63cd14
+  data.tar.gz: 41456629fbb35cfc23d881a7b132c719466c9991cde17fd94b6ad7ef60f7afc34e49f218bcc601e4f8a6d08510ba94f88d5e555f564376c24b6e822ffbaad20d

data/lib/occi/core/attributes.rb

@@ -130,7 +130,7 @@ module Occi
       # @return [String]
       def to_string
         attributes = ';'
-        attributes << to_header.gsub(',', ';')
+        attributes << to_array.join(';')
 
         attributes == ';' ? '' : attributes
       end
@@ -159,9 +159,10 @@ module Occi
         text
       end
 
-      # @return [String] of attributes put in an array and then concatenated into a string
-      def to_header
+      # @return [Array] of attributes put in an array
+      def to_array
         attributes = []
+
         names.each_pair do |name, value|
           # TODO: find a better way to skip properties
           next if name.include? '._'
@@ -175,7 +176,12 @@ module Occi
           end
         end
 
-        attributes.join(',')
+        attributes
+      end
+
+      # @return [String] of attributes put in an array and then concatenated into a string
+      def to_header
+        to_array.join(',')
       end
 
       def to_json(*a)

data/lib/occi/parser.rb

@@ -114,9 +114,19 @@ module Occi
       def headers_to_arys(header)
         # remove the HTTP_ prefix if present and capitalize keys
         header = Hash[header.map { |k, v| [k.gsub('HTTP_', '').capitalize, v] }]
-        header['X-OCCI-Location'] = header['X-occi-location'] if header['X-occi-location']
-        header['X-OCCI-Attribute'] = header['X-occi-attribute'] if header['X-occi-attribute']
 
+        # normalize different header-passing mechanisms and representations
+        if header['X-OCCI-Location'].blank?
+          header['X-OCCI-Location'] = header['X_occi_location'] unless header['X_occi_location'].blank?
+          header['X-OCCI-Location'] = header['X-occi-location'] unless header['X-occi-location'].blank?
+        end
+
+        if header['X-OCCI-Attribute'].blank?
+          header['X-OCCI-Attribute'] = header['X_occi_attribute'] unless header['X_occi_attribute'].blank?
+          header['X-OCCI-Attribute'] = header['X-occi-attribute'] unless header['X-occi-attribute'].blank?
+        end
+
+        # clean-up
         header.delete_if { |k, v| v.blank? || !OCCI_HEADERS.include?(k) }
 
         header = header.map do |k, v|
@@ -125,7 +135,7 @@ module Occi
           v.to_s.split(',').collect { |w| "#{k}: #{w}".strip }
         end
 
-        header.flatten
+        header.flatten.sort
       end
 
     end

data/lib/occi/version.rb

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

data/spec/occi/core/action_instance_spec.rb

@@ -41,7 +41,7 @@ module Occi
         end
 
         it 'does not fail without attributes' do
-          expect { Occi::Core::ActionInstance.new action, nil }.not_to raise_error(ArgumentError)
+          expect { Occi::Core::ActionInstance.new action, nil }.not_to raise_error
         end
 
         it 'does not fail with an Occi::Core::Action instance' do
@@ -61,7 +61,7 @@ module Occi
         end
 
         it 'does not fail with un-convertable attribute values' do
-          expect { Occi::Core::ActionInstance.new action, attributes_unconvertable}.not_to raise_error(ArgumentError)
+          expect { Occi::Core::ActionInstance.new action, attributes_unconvertable}.not_to raise_error
         end
       end
 
@@ -292,14 +292,14 @@ X-OCCI-Attribute: org.opennebula.network.id=1|
       context '#empty?' do
 
         it 'returns false for a new instance with defaults' do
-          expect(ai.empty?).to be_false
+          expect(ai.empty?).to be false
         end
 
         it 'returns true for an instance without an action' do
           ai_changed = ai.clone
           ai_changed.action = nil
 
-          expect(ai_changed.empty?).to be_true
+          expect(ai_changed.empty?).to be true
         end
 
         it 'returns true for an instance with an empty action' do
@@ -307,7 +307,7 @@ X-OCCI-Attribute: org.opennebula.network.id=1|
           ai_changed.action = Occi::Core::Action.new
           ai_changed.action.term = nil
 
-          expect(ai_changed.empty?).to be_true
+          expect(ai_changed.empty?).to be true
         end
 
       end

data/spec/occi/core/attributes_spec.rb

@@ -19,7 +19,7 @@ module Occi
         end
 
         it 'accepts keys with underscores in other positions' do
-          expect{ attributes['t_est']={} }.to_not raise_error(Occi::Errors::AttributeNameInvalidError)
+          expect{ attributes['t_est']={} }.to_not raise_error
         end
       end
 
@@ -90,7 +90,7 @@ module Occi
           it 'matches a clone' do
             expect(attrs==clone).to eql true
           end
-    
+
           it 'matches a new instance with the same content' do
             expect(attrs==newattrs).to eql true
           end
@@ -112,7 +112,7 @@ module Occi
           it 'matches a clone' do
             expect(attrs.eql?(clone)).to eql true
           end
-    
+
           it 'matches a new instance with the same content' do
             expect(attrs.eql?(newattrs)).to eql true
           end
@@ -171,7 +171,7 @@ module Occi
 
 
       context 'rendering' do
-        let(:attrs){ attrs = Occi::Core::Attributes.new 
+        let(:attrs){ attrs = Occi::Core::Attributes.new
           attrs['numbertype'] = { :type => 'number', :default => 42, :mutable => true, :pattern => '^[0-9]+' }
           attrs['stringtype'] = { :type => 'string', :pattern => '[adefltuv]+', :default => 'defaultvalue', :mutable => true }
           attrs['booleantype'] = { :type => 'boolean', :default => true, :mutable => true}
@@ -227,6 +227,12 @@ module Occi
             expected = ""
             expect(empty.to_string).to eql expected
           end
+
+          it 'copes with attribute values containing commas' do
+            attrs['stringtype'] = "flute,magic"
+            expected = ";numbertype=42;stringtype=\"flute,magic\";booleantype=true;booleantypefalse=false;booleantypepattern=true;nest.nested=11;properties=\"prop\";category=\"http://schemas.ogf.org/occi/core#category\";entity=\"/entity/testid\""
+            expect(attrs.to_string).to eql expected
+          end
         end
 
         context '#to_string_short' do
@@ -278,6 +284,17 @@ module Occi
           end
         end
 
+        context '#to_array' do
+          it 'renders attributes correctly' do
+            expected = ["numbertype=42","stringtype=\"flute\"","booleantype=true","booleantypefalse=false","booleantypepattern=true","nest.nested=11","properties=\"prop\"","category=\"http://schemas.ogf.org/occi/core#category\"","entity=\"/entity/testid\""]
+            expect(attrs.to_array).to eql expected
+          end
+
+          it 'copes with empty attributes' do
+            expect(empty.to_array).to be_empty
+          end
+        end
+
         context '#to_json' do
           it 'renders attributes correctly' do
             expected = '{"numbertype":42,"stringtype":"flute","booleantype":true,"booleantypefalse":false,"booleantypepattern":true,"nest":{"nested":11},"properties":"prop","category":"http://schemas.ogf.org/occi/core#category","entity":"/entity/testid"}'
@@ -301,7 +318,7 @@ module Occi
             expected.nest!.nested = 11
             expected["category"] = "http://schemas.ogf.org/occi/core#category"
             expected["properties"] = "prop"
-            expected["entity"] = "/entity/testid"            
+            expected["entity"] = "/entity/testid"
 
             expect(attrs.as_json).to eql expected
           end
@@ -324,16 +341,16 @@ module Occi
                                            :pattern => '^[0-9]+'  }
           defs['stringtype'] =           { :type => 'string',
                                            :pattern => '[adefltuv]+',
-                                           :default => 'defaultvalue', 
+                                           :default => 'defaultvalue',
                                            :mutable => true }
           defs['booleantype'] =          { :type => 'boolean',
-                                           :default => true, 
+                                           :default => true,
                                            :mutable => true}
           defs['booleantypefalse'] =     { :type => 'boolean', #Regression test
-                                           :default => false, 
+                                           :default => false,
                                            :mutable => true }
           defs['booleantypepattern'] =   { :type => 'boolean',
-                                           :default => true, 
+                                           :default => true,
                                            :mutable => true,
                                            :pattern => true }
           defs['nonmandatory'] = {         :type => 'string',
@@ -342,7 +359,7 @@ module Occi
           defs }
 
         context 'unsupported types and attributes' do
-          before(:each){ Occi::Settings['compatibility']=false 
+          before(:each){ Occi::Settings['compatibility']=false
                          Occi::Settings['verify_attribute_pattern']=true }
           after(:each) { Occi::Settings.reload! }
           it 'refuses undefined attribute' do
@@ -405,7 +422,7 @@ module Occi
         end
 
         context 'defaults' do
-          before(:each){ Occi::Settings['compatibility']=false 
+          before(:each){ Occi::Settings['compatibility']=false
                          Occi::Settings['verify_attribute_pattern']=true }
           after(:each) { Occi::Settings.reload! }
 
@@ -540,7 +557,7 @@ module Occi
           attrs['numbertype'] = inattrs['numbertype']
           expect(attrs).to eql inattrs
         end
-  
+
         it 'correctly accepts Occi::Core::Properties' do
           attrs['properties'] = Occi::Core::Properties.new
 
@@ -550,7 +567,7 @@ module Occi
 
           expect(attrs).to eql expected
         end
-          
+
         it 'correctly accepts Hash' do
           attrs['hash'] = { :type => 'string', :pattern => '.*', :mutable => false, :required => false }
 

data/spec/occi/core/category_spec.rb

@@ -190,21 +190,21 @@ module Occi
       context '#empty?' do
 
         it 'returns false for a new instance with defaults' do
-          expect(category.empty?).to be_false
+          expect(category.empty?).to be false
         end
 
         it 'returns true for an instance without a term' do
           cat = category.clone
           cat.term = nil
 
-          expect(cat.empty?).to be_true
+          expect(cat.empty?).to be true
         end
 
         it 'returns true for an instance without a scheme' do
           cat = category.clone
           cat.scheme = nil
 
-          expect(cat.empty?).to be_true
+          expect(cat.empty?).to be true
         end
 
       end

data/spec/occi/core/entity_spec.rb

@@ -350,21 +350,21 @@ Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entit
       context '#empty?' do
 
         it 'returns false for a new instance with defaults' do
-          expect(entity.empty?).to be_false
+          expect(entity.empty?).to be false
         end
 
         it 'returns true for an instance without a kind' do
           ent = entity.clone
           ent.kind = nil
 
-          expect(ent.empty?).to be_true
+          expect(ent.empty?).to be true
         end
 
         it 'returns true for an instance without an identifier' do
           ent = entity.clone
           ent.id = nil
 
-          expect(ent.empty?).to be_true
+          expect(ent.empty?).to be true
         end
 
       end

data/spec/occi/core/resource_spec.rb

@@ -9,7 +9,7 @@ module Occi
       
       context '#link' do
         it "creates the appropriate No. of links" do
-          expect(resource.links).to have(1).link
+          expect(resource.links.count).to eq 1
         end
 
         it "has the correct kind" do

data/spec/occi/infrastructure/compute_spec.rb

@@ -17,7 +17,7 @@ module Occi
         context '#storagelink' do
           it "creates a single storagelink" do
             compute.storagelink target
-            expect(compute.links).to have(1).link
+            expect(compute.links.count).to eq 1
           end
 
           it "creates a storagelink to a storage resource" do
@@ -70,7 +70,7 @@ module Occi
         context '#networkinterface' do
           it "creates a single networkinterface" do
             compute.networkinterface target
-            expect(compute.links).to have(1).link
+            expect(compute.links.count).to eq 1
           end
 
           it "creates a networkinterface to a storage resource" do

data/spec/occi/parser/text_spec.rb

@@ -33,10 +33,10 @@ module Occi
           category_string = 'Category: restart;scheme="http://schemas.ogf.org/occi/infrastructure/compute/action#";class="action";title="Restart Compute instance";attributes="method{required} test{immutable}"'
           category = Occi::Parser::Text.category category_string
 
-          expect(category.attributes['method'].required).to be_true
-          expect(category.attributes['method'].mutable).to be_true
-          expect(category.attributes['test'].required).to be_false
-          expect(category.attributes['test'].mutable).to be_false
+          expect(category.attributes['method'].required).to be true
+          expect(category.attributes['method'].mutable).to be true
+          expect(category.attributes['test'].required).to be false
+          expect(category.attributes['test'].mutable).to be false
         end
 
         it 'parses attributes correctly' do

data/spec/occi/parser_spec.rb

@@ -40,7 +40,7 @@ module Occi
         context 'resources from OCCI messages with text/occi MIME type' do
           let(:rendered_collection){ collection.to_header }
           let(:real_world_example_model) {
-            {"category"=>["entity;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/entity/\",resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\",link;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/link/\",compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/compute/\",storage;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/storage/\",network;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/network/\",networkinterface;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/networkinterface/\",storagelink;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/storagelink/\",console;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute#\";class=\"kind\";location=\"/console/\",resource_tpl;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/resource_tpl/\",os_tpl;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/os_tpl/\",ipnetwork;scheme=\"http://schemas.ogf.org/occi/infrastructure/network#\";class=\"mixin\";location=\"/mixin/ipnetwork/\",ipnetworkinterface;scheme=\"http://schemas.ogf.org/occi/infrastructure/networkinterface#\";class=\"mixin\";location=\"/mixin/ipnetworkinterface/\",networkinterface;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/networkinterface/\",compute;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/compute/\",storage;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/storage/\",public_key;scheme=\"http://schemas.openstack.org/instance/credentials#\";class=\"mixin\";location=\"/mixin/public_key/\",user_data;scheme=\"http://schemas.openstack.org/compute/instance#\";class=\"mixin\";location=\"/mixin/user_data/\",network;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/network/\",storagelink;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/storagelink/\",uuid_monitoring_20;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_monitoring_20/\",uuid_egi_sl6goldenimage_cesnet_50;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_sl6goldenimage_cesnet_50/\",uuid_generic_vm_54;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_generic_vm_54/\",uuid_octave_55;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_octave_55/\",uuid_r_56;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_r_56/\",uuid_egi_compss_cesnet_57;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_compss_cesnet_57/\",uuid_esa_sl64_cesnet_58;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_esa_sl64_cesnet_58/\",uuid_generic_www_60;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_generic_www_60/\",uuid_egi_compss_62;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_compss_62/\",uuid_egi_test_compss_69;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_test_compss_69/\",uuid_genericcloud_debian_7_0_x86_64_0001_cloud_dukan_71;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_genericcloud_debian_7_0_x86_64_0001_cloud_dukan_71/\",uuid_genericcloud_ubuntu_12_04_lts_x86_64_0001_cloud_dukan_72;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_genericcloud_ubuntu_12_04_lts_x86_64_0001_cloud_dukan_72/\",uuid_genericcloud_scilinux_6_5_x86_64_0001_cloud_dukan_73;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_genericcloud_scilinux_6_5_x86_64_0001_cloud_dukan_73/\",uuid_egi_compss_debian_7_0_x86_64_0001_cloud_dukan_74;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_compss_debian_7_0_x86_64_0001_cloud_dukan_74/\",extra_large;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/extra_large/\",medium;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/medium/\",small;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/small/\",large;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/large/\""]}
+            {"Category" => "compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/compute/\",console;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute#\";class=\"kind\";location=\"/console/\",entity;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/entity/\",link;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/link/\",network;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/network/\",networkinterface;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/networkinterface/\",resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\",storage;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/storage/\",storagelink;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/storagelink/\",compute;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/compute/\",extra_large;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/extra_large/\",ipnetwork;scheme=\"http://schemas.ogf.org/occi/infrastructure/network#\";class=\"mixin\";location=\"/mixin/ipnetwork/\",ipnetworkinterface;scheme=\"http://schemas.ogf.org/occi/infrastructure/networkinterface#\";class=\"mixin\";location=\"/mixin/ipnetworkinterface/\",large;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/large/\",medium;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/medium/\",network;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/network/\",networkinterface;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/networkinterface/\",os_tpl;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/os_tpl/\",public_key;scheme=\"http://schemas.openstack.org/instance/credentials#\";class=\"mixin\";location=\"/mixin/public_key/\",resource_tpl;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/resource_tpl/\",small;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/small/\",storage;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/storage/\",storagelink;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/storagelink/\",user_data;scheme=\"http://schemas.openstack.org/compute/instance#\";class=\"mixin\";location=\"/mixin/user_data/\",uuid_egi_compss_62;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_compss_62/\",uuid_egi_compss_cesnet_57;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_compss_cesnet_57/\",uuid_egi_compss_debian_7_0_x86_64_0001_cloud_dukan_74;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_compss_debian_7_0_x86_64_0001_cloud_dukan_74/\",uuid_egi_sl6goldenimage_cesnet_50;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_sl6goldenimage_cesnet_50/\",uuid_egi_test_compss_69;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_test_compss_69/\",uuid_esa_sl64_cesnet_58;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_esa_sl64_cesnet_58/\",uuid_generic_vm_54;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_generic_vm_54/\",uuid_generic_www_60;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_generic_www_60/\",uuid_genericcloud_debian_7_0_x86_64_0001_cloud_dukan_71;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_genericcloud_debian_7_0_x86_64_0001_cloud_dukan_71/\",uuid_genericcloud_scilinux_6_5_x86_64_0001_cloud_dukan_73;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_genericcloud_scilinux_6_5_x86_64_0001_cloud_dukan_73/\",uuid_genericcloud_ubuntu_12_04_lts_x86_64_0001_cloud_dukan_72;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_genericcloud_ubuntu_12_04_lts_x86_64_0001_cloud_dukan_72/\",uuid_monitoring_20;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_monitoring_20/\",uuid_octave_55;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_octave_55/\",uuid_r_56;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_r_56/\""}
           }
 
           it 'parses self-generated collection with resources' do
@@ -54,17 +54,19 @@ module Occi
           end
 
           it 'parses self-generated collection with added mixin' do
-            resource.mixins << Occi::Core::Mixin.new
+            resource.mixins << Occi::Core::Mixin.new('http://schemas.ogf.org/occi/mymixins#', 'test')
             expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql rendered_collection
           end
 
           it 'parses self-generated collection with added link' do
             collection << link
-            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql rendered_collection
+            parsed = Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection)
+            expect(parsed.to_header).to eql rendered_collection
+            expect(parsed.resources.first.links).not_to be_empty
           end
 
           it 'parses a real-world example of the OCCI model' do
-            expect(Occi::Parser.parse('text/occi', '', true, Occi::Core::Resource, real_world_example_model).to_header.to_hash).to eql({ 'Category' => real_world_example_model['category'].first })
+            expect(Occi::Parser.parse('text/occi', '', true, Occi::Core::Resource, real_world_example_model).to_header.to_hash).to eql(real_world_example_model)
           end
         end
 
@@ -110,6 +112,20 @@ module Occi
     end
 
     context '.parse_headers' do
+      let(:resource_in_headers) do
+        resource = {}
+        resource['Category'] = "network;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\",network;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\",ipnetwork;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"mixin\""
+        resource['X-OCCI-Attribute'] = "occi.core.id=\"e4bd81c4-adda-5626-840d-39bb7959db97\",occi.core.title=\"monitoring\",occi.network.address=\"192.168.254.0\",occi.network.allocation=\"dynamic\",occi.network.state=\"active\",org.opennebula.network.id=\"6\",org.opennebula.network.bridge=\"xenbr0\",org.opennebula.network.vlan=\"NO\""
+        resource
+      end
+
+      let(:rack_resource_in_headers) do
+        resource = {}
+        resource['HTTP_CATEGORY'] = resource_in_headers['Category']
+        resource['HTTP_X_OCCI_ATTRIBUTE'] = resource_in_headers['X-OCCI-Attribute']
+        resource
+      end
+
       it 'parses categories' do
         categories_string = File.open("spec/occi/parser/text_samples/occi_categories.text", "rb").read
         expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_categories.dump", "rb"))
@@ -117,10 +133,15 @@ module Occi
         expect(categories).to eql expected
       end
 
-      it 'parses resources' do
-        resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
+      it 'parses resources from headers' do
         expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_network_rocci_server.resource.dump", "rb"))
-        resource = Occi::Parser.parse('text/plain', resource_string, false, Occi::Core::Resource)
+        resource = Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, resource_in_headers)
+        expect(resource).to eql expected
+      end
+
+      it 'parses resources from rack-compliant headers' do
+        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_network_rocci_server.resource.dump", "rb"))
+        resource = Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rack_resource_in_headers)
         expect(resource).to eql expected
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.14
+  version: 4.2.15
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json