occi-core 4.2.15 → 4.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3409b60570656c2f8e0b3ec71f6d55ae1ecc82
-  data.tar.gz: 6de77b6298980b43be27ee89b727e4ba48149141
+  metadata.gz: 663a8ff9481f04d4d8638876ddedec499a953d0e
+  data.tar.gz: 3a898e3fe675a73c8e7a1570f88faed3e0149a90
 SHA512:
-  metadata.gz: c9f6afb503d3d7f42be2d6630a3ffe2dfb493228072c8afe48a30d70468ace5b0b1ed93869f36ad651a64753e79dae586687afe78e011935385f5ca45b63cd14
-  data.tar.gz: 41456629fbb35cfc23d881a7b132c719466c9991cde17fd94b6ad7ef60f7afc34e49f218bcc601e4f8a6d08510ba94f88d5e555f564376c24b6e822ffbaad20d
+  metadata.gz: c21fd2284cc4192004cc8ddcbd06f84ee9f3620e2b461ed7107720790eb7140496e9b23b9db8d960e82f2254dc4a19d29ae7763a46b6fcb9a9fa320c64c64e76
+  data.tar.gz: 51dd2d1a4a25d1e0bd4f35a5276287e501433c40d431b1242a2e19fef3ad1c29f8a999a1275cb4cd3ff7eede057f15d800850d27f41b328ad019e6cc4fafa447

data/lib/occi/core/kind.rb

@@ -38,6 +38,10 @@ module Occi
 
         if parent.to_s == 'http://schemas.ogf.org/occi/core#entity'
           parent = Occi::Core::Entity.kind
+        elsif parent.to_s == 'http://schemas.ogf.org/occi/core#resource'
+          parent = Occi::Core::Resource.kind
+        elsif parent.to_s == 'http://schemas.ogf.org/occi/core#link'
+          parent = Occi::Core::Link.kind
         elsif parent.kind_of? Occi::Core::Kind
           parent = parent
         else

data/lib/occi/parser/text.rb

@@ -36,7 +36,7 @@ module Occi
               category = category(line)
 
               if category.kind_of? Occi::Core::Kind
-                resource = Occi::Core::Entity.new(category.type_identifier)
+                resource = Occi::Core::Resource.new(category.type_identifier)
                 resource.kind = category
               end
               resource.mixins << category if category.kind_of? Occi::Core::Mixin

data/lib/occi/version.rb

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

data/spec/helpers/to_plain.rb

@@ -0,0 +1,39 @@
+require 'psych'
+
+class ToPlain < Psych::Visitors::Visitor
+
+  # Scalars are just strings.
+  def visit_Psych_Nodes_Scalar o
+    o.value
+  end
+
+  # Sequences are arrays.
+  def visit_Psych_Nodes_Sequence o
+    o.children.each_with_object([]) do |child, list|
+      list << accept(child)
+    end
+  end
+
+  # Mappings are hashes.
+  def visit_Psych_Nodes_Mapping o
+    o.children.each_slice(2).each_with_object({}) do |(k,v), h|
+      h[accept(k)] = accept(v)
+    end
+  end
+
+  # We also need to handle documents...
+  def visit_Psych_Nodes_Document o
+    accept o.root
+  end
+
+  # ... and streams.
+  def visit_Psych_Nodes_Stream o
+    o.children.map { |c| accept c }
+  end
+
+  # Aliases aren't handles here :-(
+  def visit_Psych_Nodes_Alias o
+    # Not implemented!
+  end
+
+end

data/spec/helpers/yaml_hash.rb

@@ -0,0 +1,32 @@
+require 'hashie'
+
+class YAMLHash < Hashie::Mash
+
+  def load_file fs
+    f = File.open(fs, "rt")
+    self.load f.read
+    f.close
+  end
+
+  def load s
+    lin = s.lines
+    stack = Array.new
+    while (true) do
+      begin 
+        line = lin.next
+      rescue
+        break
+      end
+
+      next if /^---/.match(line)
+
+      currentDepth = line.scan(/^\s*/).first.length / 2
+      while (currentDepth) < stack.length
+        stack.pop
+      end
+
+      stack.push(line.lstrip.chomp.gsub(/\s*$/, "").gsub(/[\*\&]\d+/, "Ptr-Emptied").gsub(/[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}/, "ID-Emptied").gsub(/ ! /, " "))
+      self[stack] = nil
+    end
+  end
+end

data/spec/occi/core/categories_spec.rb

@@ -9,7 +9,7 @@ module Occi
         resource = model.get_by_id Occi::Core::Resource.type_identifier
         resource.location = '/new_location/'
         categories.model = model
-        categories.first.location.should == '/new_location/'
+        expect(categories.first.location).to eq '/new_location/'
       end
 
       it "replaces a category string when a model is added with the instance from the model"  do
@@ -20,7 +20,7 @@ module Occi
 
         resource = model.get_by_id Occi::Core::Resource.type_identifier
         resource.location = '/new_location/'
-        categories.first.location.should == '/new_location/'
+        expect(categories.first.location).to eq '/new_location/'
       end
 
     end

data/spec/occi/model_spec.rb

@@ -67,8 +67,8 @@ module Occi
       it "returns all registered categories" do
         model = Occi::Model.new
         collection = model.get
-        expected=Marshal.restore("\x04\bo:\x10Occi::Model\n:\v@kindso:\x16Occi::Core::Kinds\x06:\n@hash{\bo:\x15Occi::Core::Kind\x0E:\f@schemeI\"&http://schemas.ogf.org/occi/core#\x06:\x06EF:\n@termI\"\ventity\x06;\vF:\v@titleI\"\ventity\x06;\vF:\x10@attributesC:\eOcci::Core::Attributes{\x06I\"\tocci\x06;\vFC;\x0F{\x06I\"\tcore\x06;\vFC;\x0F{\tI\"\aid\x06;\vFo:\eOcci::Core::Properties\v:\r@default0:\n@typeI\"\vstring\x06;\vF:\x0E@requiredF:\r@mutableF:\r@patternI\"A[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}\x06;\vF:\x11@description0I\"\b_id\x06;\vFo;\x10\v;\x110;\x12@\x13;\x13F;\x14F;\x15@\x14;\x160I\"\ntitle\x06;\vFo;\x10\v;\x110;\x12I\"\vstring\x06;\vF;\x13F;\x14T;\x15I\"\a.*\x06;\vF;\x160I\"\v_title\x06;\vFo;\x10\v;\x110;\x12@\x19;\x13F;\x14T;\x15@\x1A;\x160:\f@parent0:\r@actionso:\x18Occi::Core::Actions\x06;\b{\x00:\x0E@entitieso:\x19Occi::Core::Entities\x06;\b{\x00:\x0E@locationI\"\r/entity/\x06;\vF:\v@model@\x00To;\t\x0E;\nI\"&http://schemas.ogf.org/occi/core#\x06;\vF;\fI\"\rresource\x06;\vF;\rI\"\rresource\x06;\vF;\x0EC;\x0F{\x06@\rC;\x0F{\x06@\x0FC;\x0F{\v@\x11@\x12@\x15@\x16@\x17@\x18@\e@\x1CI\"\fsummary\x06;\vFo;\x10\v;\x110;\x12I\"\vstring\x06;\vF;\x13F;\x14T;\x15I\"\a.*\x06;\vF;\x160I\"\r_summary\x06;\vFo;\x10\v;\x110;\x12@+;\x13F;\x14T;\x15@,;\x160;\x17@\b;\x18o;\x19\x06;\b{\x00;\x1Ao;\e\x06;\b{\x06o:\x19Occi::Core::Resource\r:\n@kind@\":\f@mixinso:\x17Occi::Core::Mixins\b;\b{\x00;\x1Do;\x00\n;\x06o;\a\x06;\b{\b@\bT@\"To;\t\x0E;\nI\"&http://schemas.ogf.org/occi/core#\x06;\vF;\fI\"\tlink\x06;\vF;\rI\"\tlink\x06;\vF;\x0EC;\x0F{\x06@\rC;\x0F{\x06@\x0FC;\x0F{\r@\x11@\x12@\x15@\x16@\x17@\x18@\e@\x1CI\"\vtarget\x06;\vFo;\x10\v;\x110;\x12I\"\vstring\x06;\vF;\x13F;\x14T;\x15I\"\a.*\x06;\vF;\x160I\"\f_target\x06;\vFo;\x10\v;\x110;\x12@B;\x13F;\x14T;\x15@C;\x160I\"\vsource\x06;\vFo;\x10\v;\x110;\x12I\"\vstring\x06;\vF;\x13F;\x14T;\x15I\"\a.*\x06;\vF;\x160I\"\f_source\x06;\vFo;\x10\v;\x110;\x12@H;\x13F;\x14T;\x15@I;\x160;\x17@\b;\x18o;\x19\x06;\b{\x00;\x1Ao;\e\x06;\b{\x06o:\x15Occi::Core::Link\x0F;\x1F@9; o;!\b;\b{\x00;\x1D@6:\f@entity@P;\x0EIC;\x0F{\x06@\rIC;\x0F{\x06@\x0FIC;\x0F{\r@\x11I\")45284ebc-3397-468b-9d3b-863a24075ea2\x06;\vT@\x15@\x16@\x170@\e@\x1C@@0@D@E@F0@J@K\x06:\x0F@convertedT\x06;$T\x06;$T;\x18o;\x19\a;\b{\x00;\x1D@6;\x1C0:\t@rel@9:\f@target0;\x1D@6:\b@id@V:\f@source0T;\x1CI\"\v/link/\x06;\vF;\x1D@\x00T; o;!\x06;\b{\x00;\x18o;\x19\x06;\b{\x00:\x0F@resourceso:\x1AOcci::Core::Resources\x06;\b{\x00:\v@linkso:\x16Occi::Core::Links\x06;\b{\x00;\#@3;\x0EIC;\x0F{\x06@\rIC;\x0F{\x06@\x0FIC;\x0F{\v@\x11I\")aa7baa55-23dc-42fe-aa2d-45fba74d1a4e\x06;\vT@\x15@\x16@\x170@\e@\x1C@)0@-@.\x06;$T\x06;$T\x06;$T;\x18o;\x19\a;\b{\x00;\x1D@6;\x1C0;+o;,\a;\b{\x00;\x1D@6;\x1D@6;'@eT;\x1CI\"\x0F/resource/\x06;\vF;\x1D@\x00T@9T; o;!\x06;\b{\x00;\x18o;\x19\x06;\b{\x00;)o;*\x06;\b{\x00;+o;,\x06;\b{\x00")
-        expect(collection).to eql expected
+        expected = File.open("spec/occi/parser/text_samples/occi_model_categories.expected", "rt").read
+        expect(collection.to_text).to eql expected
       end
 
       context "for categories with filter" do

data/spec/occi/parser/text_samples/occi_categories.body_plain.expected

@@ -0,0 +1,2 @@
+Category: a_a1-_;scheme="http://a.a/a#";class="kind";title="aA1!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"
+Category: a_a2-_;scheme="http://a.a/a#";class="kind";title="aA2!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a2-A/";attributes="a_2-_.a2-_a a-2.a.b";actions="http://a.a/a2#a2 http://a.b2/b2#b2"

data/spec/occi/parser/text_samples/occi_categories.expected

@@ -0,0 +1,2 @@
+Category: a_a1-_;scheme="http://a.a/a#";class="kind";title="aA1!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"
+Category: a_a2-_;scheme="http://a.a/a#";class="kind";title="aA2!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a2-A/";attributes="a_2-_.a2-_a a-2.a.b";actions="http://a.a/a2#a2 http://a.b2/b2#b2"

data/spec/occi/parser/text_samples/occi_categories.parse_headers.expected

@@ -0,0 +1,2 @@
+Category: a_a1-_;scheme="http://a.a/a#";class="kind";title="aA1!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"
+Category: a_a2-_;scheme="http://a.a/a#";class="kind";title="aA2!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a2-A/";attributes="a_2-_.a2-_a a-2.a.b";actions="http://a.a/a2#a2 http://a.b2/b2#b2"

data/spec/occi/parser/text_samples/occi_categories.text

@@ -1,2 +1,2 @@
-Category: a_a1-_;scheme="http://a.a/a#";class="kind";title="aA1!\"§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"
-Category: a_a2-_;scheme="http://a.a/a#";class="kind";title="aA2!\"§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a2-A/";attributes="a_2-_.a2-_a a-2.a.b";actions="http://a.a/a2#a2 http://a.b2/b2#b2"
+Category: a_a1-_;scheme="http://a.a/a#";class="kind";title="aA1!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"
+Category: a_a2-_;scheme="http://a.a/a#";class="kind";title="aA2!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a2-A/";attributes="a_2-_.a2-_a a-2.a.b";actions="http://a.a/a2#a2 http://a.b2/b2#b2"

data/spec/occi/parser/text_samples/occi_compute_rocci_server.expected

@@ -0,0 +1,11 @@
+Category: compute;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/compute/";title=nil
+Category: compute;scheme="http://opennebula.org/occi/infrastructure#";class="mixin";location="/mixin/compute/";title=""
+X-OCCI-Attribute: occi.core.id="4ddbfeae-22d7-5e50-8f85-ba18589e876b"
+X-OCCI-Attribute: occi.core.title="MonTest1"
+X-OCCI-Attribute: occi.compute.cores=1
+X-OCCI-Attribute: occi.compute.memory=0.256
+X-OCCI-Attribute: occi.compute.state="active"
+X-OCCI-Attribute: org.opennebula.compute.cpu=1.0
+Link: </storage/e60aa2b8-0c86-5973-b93e-30c5c46d6eac>;rel="http://schemas.ogf.org/occi/infrastructure#storage";self="/storagelink/b2f7f1de-c60c-5b08-879c-81f52429c4ef";category="http://schemas.ogf.org/occi/infrastructure#storagelink";occi.core.id="b2f7f1de-c60c-5b08-879c-81f52429c4ef";occi.core.title="monitoring";occi.storagelink.deviceid="xvda";occi.storagelink.state="inactive";org.opennebula.storagelink.bus="ide";org.opennebula.storagelink.driver="tap2:tapdisk:aio:"
+Link: </network/e4bd81c4-adda-5626-840d-39bb7959db97>;rel="http://schemas.ogf.org/occi/infrastructure#network";self="/networkinterface/e75ab249-9325-511c-82b8-a7e4430381e3";category="http://schemas.ogf.org/occi/infrastructure#networkinterface";occi.core.id="e75ab249-9325-511c-82b8-a7e4430381e3";occi.core.title="monitoring";occi.networkinterface.address="192.168.254.1";occi.networkinterface.mac="02:00:c0:a8:fe:01";occi.networkinterface.state="inactive";org.opennebula.networkinterface.bridge="xenbr0"Link: </storage/e60aa2b8-0c86-5973-b93e-30c5c46d6eac>;rel="http://schemas.ogf.org/occi/infrastructure#storage";self="/storagelink/b2f7f1de-c60c-5b08-879c-81f52429c4ef";category="http://schemas.ogf.org/occi/infrastructure#storagelink";occi.core.id="b2f7f1de-c60c-5b08-879c-81f52429c4ef";occi.core.title="monitoring";occi.storagelink.deviceid="xvda";occi.storagelink.state="inactive";org.opennebula.storagelink.bus="ide";org.opennebula.storagelink.driver="tap2:tapdisk:aio:"
+Link: </network/e4bd81c4-adda-5626-840d-39bb7959db97>;rel="http://schemas.ogf.org/occi/infrastructure#network";self="/networkinterface/e75ab249-9325-511c-82b8-a7e4430381e3";category="http://schemas.ogf.org/occi/infrastructure#networkinterface";occi.core.id="e75ab249-9325-511c-82b8-a7e4430381e3";occi.core.title="monitoring";occi.networkinterface.address="192.168.254.1";occi.networkinterface.mac="02:00:c0:a8:fe:01";occi.networkinterface.state="inactive";org.opennebula.networkinterface.bridge="xenbr0"

data/spec/occi/parser/text_samples/occi_link_resource_instance.body_plain.expected

@@ -0,0 +1,7 @@
+Category: networkinterface;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/networkinterface/";title=nil
+X-OCCI-Attribute: occi.core.id="b2f7f1de-c60c-5b08-879c-81f52429c4ef"
+X-OCCI-Attribute: occi.core.target="/network/123"
+X-OCCI-Attribute: occi.core.source="/vms/foo/vm1"
+X-OCCI-Attribute: occi.networkinterface.interface="eth0"
+X-OCCI-Attribute: occi.networkinterface.mac="00:11:22:33:44:55"
+X-OCCI-Attribute: occi.networkinterface.state="active"

data/spec/occi/parser/text_samples/occi_link_resource_instance.expected

@@ -0,0 +1,7 @@
+Category: networkinterface;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/networkinterface/";title=nil
+X-OCCI-Attribute: occi.core.id="b2f7f1de-c60c-5b08-879c-81f52429c4ef"
+X-OCCI-Attribute: occi.core.target="/network/123"
+X-OCCI-Attribute: occi.core.source="/vms/foo/vm1"
+X-OCCI-Attribute: occi.networkinterface.interface="eth0"
+X-OCCI-Attribute: occi.networkinterface.mac="00:11:22:33:44:55"
+X-OCCI-Attribute: occi.networkinterface.state="active"

data/spec/occi/parser/text_samples/occi_link_resource_instance.parse.expected

@@ -0,0 +1,7 @@
+Category: networkinterface;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/networkinterface/";title=nil
+X-OCCI-Attribute: occi.core.id="b2f7f1de-c60c-5b08-879c-81f52429c4ef"
+X-OCCI-Attribute: occi.core.target="/network/123"
+X-OCCI-Attribute: occi.core.source="/vms/foo/vm1"
+X-OCCI-Attribute: occi.networkinterface.interface="eth0"
+X-OCCI-Attribute: occi.networkinterface.mac="00:11:22:33:44:55"
+X-OCCI-Attribute: occi.networkinterface.state="active"

data/spec/occi/parser/text_samples/occi_link_simple.expected

@@ -0,0 +1,7 @@
+Category: storagelink;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/link/storagelink/";title="storage link"
+X-OCCI-Attribute: occi.core.id="b2f7f1de-c60c-5b08-879c-81f52429c4ef"
+X-OCCI-Attribute: occi.core.title="monitoring"
+X-OCCI-Attribute: occi.storagelink.deviceid="xvda"
+X-OCCI-Attribute: occi.storagelink.state="inactive"
+X-OCCI-Attribute: org.opennebula.storagelink.bus="ide"
+X-OCCI-Attribute: org.opennebula.storagelink.driver="tap2:tapdisk:aio:"

data/spec/occi/parser/text_samples/occi_link_w_attributes.expected

@@ -0,0 +1,7 @@
+Category: storagelink;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/link/storagelink/";title="storage link"
+X-OCCI-Attribute: occi.core.id="b2f7f1de-c60c-5b08-879c-81f52429c4ef"
+X-OCCI-Attribute: occi.core.title="monitoring"
+X-OCCI-Attribute: occi.storagelink.deviceid="xvda"
+X-OCCI-Attribute: occi.storagelink.state="inactive"
+X-OCCI-Attribute: org.opennebula.storagelink.bus="ide"
+X-OCCI-Attribute: org.opennebula.storagelink.driver="tap2:tapdisk:aio:"

data/spec/occi/parser/text_samples/occi_link_w_category.expected

@@ -0,0 +1,7 @@
+Category: storagelink;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/link/storagelink/";title="storage link"
+X-OCCI-Attribute: occi.core.id="b2f7f1de-c60c-5b08-879c-81f52429c4ef"
+X-OCCI-Attribute: occi.core.title="monitoring"
+X-OCCI-Attribute: occi.storagelink.deviceid="xvda"
+X-OCCI-Attribute: occi.storagelink.state="inactive"
+X-OCCI-Attribute: org.opennebula.storagelink.bus="ide"
+X-OCCI-Attribute: org.opennebula.storagelink.driver="tap2:tapdisk:aio:"

data/spec/occi/parser/text_samples/occi_model_categories.expected

@@ -0,0 +1,3 @@
+Category: entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";title="entity";location="/entity/";attributes="occi.core.id{immutable} occi.core.title string_attribute"
+Category: resource;scheme="http://schemas.ogf.org/occi/core#";class="kind";title="resource";rel="http://schemas.ogf.org/occi/core#entity";location="/new_location/";attributes="occi.core.id{immutable} occi.core.title occi.core.summary"
+Category: link;scheme="http://schemas.ogf.org/occi/core#";class="kind";title="link";rel="http://schemas.ogf.org/occi/core#entity";location="/link/";attributes="occi.core.id{immutable} occi.core.title occi.core.target occi.core.source stringtype{required} stringtypeoptional"

data/spec/occi/parser/text_samples/occi_network_rocci_server.body_plain.expected

@@ -0,0 +1,11 @@
+Category: network;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/network/";title=nil
+Category: network;scheme="http://opennebula.org/occi/infrastructure#";class="mixin";location="/mixin/network/";title=""
+Category: ipnetwork;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";location="/mixin/ipnetwork/";title=""
+X-OCCI-Attribute: occi.core.id="e4bd81c4-adda-5626-840d-39bb7959db97"
+X-OCCI-Attribute: occi.core.title="monitoring"
+X-OCCI-Attribute: occi.network.state="active"
+X-OCCI-Attribute: occi.network.address="192.168.254.0"
+X-OCCI-Attribute: occi.network.allocation="dynamic"
+X-OCCI-Attribute: org.opennebula.network.id="6"
+X-OCCI-Attribute: org.opennebula.network.bridge="xenbr0"
+X-OCCI-Attribute: org.opennebula.network.vlan="NO"

data/spec/occi/parser/text_samples/occi_network_rocci_server.expected

@@ -0,0 +1,11 @@
+Category: network;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/network/";title=nil
+Category: network;scheme="http://opennebula.org/occi/infrastructure#";class="mixin";location="/mixin/network/";title=""
+Category: ipnetwork;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";location="/mixin/ipnetwork/";title=""
+X-OCCI-Attribute: occi.core.id="e4bd81c4-adda-5626-840d-39bb7959db97"
+X-OCCI-Attribute: occi.core.title="monitoring"
+X-OCCI-Attribute: occi.network.state="active"
+X-OCCI-Attribute: occi.network.address="192.168.254.0"
+X-OCCI-Attribute: occi.network.allocation="dynamic"
+X-OCCI-Attribute: org.opennebula.network.id="6"
+X-OCCI-Attribute: org.opennebula.network.bridge="xenbr0"
+X-OCCI-Attribute: org.opennebula.network.vlan="NO"

data/spec/occi/parser/text_samples/occi_network_rocci_server.resource.header.expected

@@ -0,0 +1,9 @@
+Category: network;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/network/";title=nil
+X-OCCI-Attribute: occi.core.id="e4bd81c4-adda-5626-840d-39bb7959db97"
+X-OCCI-Attribute: occi.core.title="monitoring"
+X-OCCI-Attribute: occi.network.state="active"
+X-OCCI-Attribute: occi.network.address="192.168.254.0"
+X-OCCI-Attribute: occi.network.allocation="dynamic"
+X-OCCI-Attribute: org.opennebula.network.bridge="xenbr0"
+X-OCCI-Attribute: org.opennebula.network.id="6"
+X-OCCI-Attribute: org.opennebula.network.vlan="NO"

data/spec/occi/parser/text_samples/occi_network_rocci_server.resource.rack.expected

@@ -0,0 +1,9 @@
+Category: network;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/network/";title=nil
+X-OCCI-Attribute: occi.core.id="e4bd81c4-adda-5626-840d-39bb7959db97"
+X-OCCI-Attribute: occi.core.title="monitoring"
+X-OCCI-Attribute: occi.network.state="active"
+X-OCCI-Attribute: occi.network.address="192.168.254.0"
+X-OCCI-Attribute: occi.network.allocation="dynamic"
+X-OCCI-Attribute: org.opennebula.network.bridge="xenbr0"
+X-OCCI-Attribute: org.opennebula.network.id="6"
+X-OCCI-Attribute: org.opennebula.network.vlan="NO"

data/spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.parse.expected

@@ -0,0 +1,15 @@
+Category: fogbow_request;scheme="http://schemas.fogbowcloud.org/request#";class="kind";location="/fogbow_request/";title="Request new Instances"
+Category: fogbow_small;scheme="http://schemas.fogbowcloud.org/template/resource#";class="mixin";location="/fogbow_small/";title="Small Flavor"
+Category: fogbow-linux-x86;scheme="http://schemas.fogbowcloud.org/template/os#";class="mixin";location="/fogbow-linux-x86/";title="fogbow-linux-x86 image"
+Category: fogbow_userdata;scheme="http://schemas.fogbowcloud.org/request#";class="mixin";location="/fogbow_userdata/";title=""
+X-OCCI-Attribute: occi.core.id="e076376a-a0d3-448b-b065-d1b63e729f6a"
+X-OCCI-Attribute: occi.core.title="my test"
+X-OCCI-Attribute: org.fogbowcloud.request.ssh-public-address="150.165.15.81:40000"
+X-OCCI-Attribute: org.fogbowcloud.request.user-data="IyEvYmluL3NoCi91c3IvYmluL3NzaCAteSAtTiAtZiAtUiAwLjAuMC4wOjQwMDAwOmxvY2FsaG9zdDoyMiBmb2d0ZXN0QDEwLjEuMC40MyAtcCAyMgo"
+X-OCCI-Attribute: org.fogbowcloud.request.type="one-time"
+X-OCCI-Attribute: org.fogbowcloud.request.ssh-address="10.1.0.43:40000"
+X-OCCI-Attribute: org.fogbowcloud.request.instance-count="1"
+X-OCCI-Attribute: org.fogbowcloud.request.valid-from="Not defined"
+X-OCCI-Attribute: org.fogbowcloud.request.valid-until="Not defined"
+X-OCCI-Attribute: org.fogbowcloud.request.state="failed"
+X-OCCI-Attribute: org.fogbowcloud.request.instance-id="null"

data/spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.text

@@ -0,0 +1,15 @@
+Category: fogbow_request; scheme="http://schemas.fogbowcloud.org/request#"; class="kind"; title="Request new Instances"; rel="http://schemas.ogf.org/occi/core#resource"; location="http://localhost:8182/fogbow_request/"; attributes="org.fogbowcloud.request.instance-count org.fogbowcloud.request.type org.fogbowcloud.request.valid-until org.fogbowcloud.request.valid-from org.fogbowcloud.request.state org.fogbowcloud.request.instance-id"
+Category: fogbow_small; scheme="http://schemas.fogbowcloud.org/template/resource#"; class="mixin"; title="Small Flavor"; rel="http://schemas.ogf.org/occi/infrastructure#resource_tpl"; location="http://localhost:8182/fogbow_small/"
+Category: fogbow-linux-x86; scheme="http://schemas.fogbowcloud.org/template/os#"; class="mixin"; title="fogbow-linux-x86 image"; rel="http://schemas.ogf.org/occi/infrastructure#os_tpl"; location="http://localhost:8182/fogbow-linux-x86/"
+Category: fogbow_userdata; scheme="http://schemas.fogbowcloud.org/request#"; class="mixin"; location="http://localhost:8182/fogbow_userdata/"
+X-OCCI-Attribute: occi.core.id="e076376a-a0d3-448b-b065-d1b63e729f6a"
+X-OCCI-Attribute: occi.core.title="my test"
+X-OCCI-Attribute: org.fogbowcloud.request.ssh-public-address="150.165.15.81:40000"
+X-OCCI-Attribute: org.fogbowcloud.request.user-data="IyEvYmluL3NoCi91c3IvYmluL3NzaCAteSAtTiAtZiAtUiAwLjAuMC4wOjQwMDAwOmxvY2FsaG9zdDoyMiBmb2d0ZXN0QDEwLjEuMC40MyAtcCAyMgo"
+X-OCCI-Attribute: org.fogbowcloud.request.type="one-time"
+X-OCCI-Attribute: org.fogbowcloud.request.ssh-address="10.1.0.43:40000"
+X-OCCI-Attribute: org.fogbowcloud.request.instance-count="1"
+X-OCCI-Attribute: org.fogbowcloud.request.valid-from="Not defined"
+X-OCCI-Attribute: org.fogbowcloud.request.valid-until="Not defined"
+X-OCCI-Attribute: org.fogbowcloud.request.state="failed"
+X-OCCI-Attribute: org.fogbowcloud.request.instance-id="null"

data/spec/occi/parser/text_samples/occi_resource_w_inline_links.expected

@@ -0,0 +1 @@
+Category: compute;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="Compute Resource";rel="http://schemas.ogf.org/occi/core#resource";location="/compute/";attributes="occi.compute.architecture occi.compute.state occi.compute.speed occi.compute.memory occi.compute.cores occi.compute.hostname";actions="http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend"

data/spec/occi/parser/text_samples/occi_storage_rocci_server.expected

@@ -0,0 +1,9 @@
+Category: storage;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";location="/storage/";title=nil
+Category: storage;scheme="http://opennebula.org/occi/infrastructure#";class="mixin";location="/mixin/storage/";title=""
+X-OCCI-Attribute: occi.core.id="33601efd-1c81-5547-8e65-6f8ef3dcb8c6"
+X-OCCI-Attribute: occi.core.title="EGI-COMPSs-CESNET_NFS_3"
+X-OCCI-Attribute: occi.storage.state="online"
+X-OCCI-Attribute: org.opennebula.storage.id="116"
+X-OCCI-Attribute: org.opennebula.storage.dev_prefix="xvd"
+X-OCCI-Attribute: org.opennebula.storage.driver="tap2:tapdisk:aio:"
+X-OCCI-Attribute: org.opennebula.storage.persistent="NO"

data/spec/occi/parser/text_spec.rb

@@ -5,28 +5,28 @@ module Occi
     describe Text do
 
       context '.category' do
-
         it 'parses a string describing an OCCI Category' do
-          category_string = 'Category: a_a1-_;scheme="http://a.a/a#";class="kind";title="aA1!\"§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"'
-
+          category_string = 'Category: a_a1-_;scheme="http://a.a/a#";class="kind";title="aA1!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"'
           category = Occi::Parser::Text.category category_string
-          expected = Marshal.restore("\x04\bo:\x15Occi::Core::Kind\r:\f@schemeI\"\x12http://a.a/a#\x06:\x06ET:\n@termI\"\va_a1-_\x06;\aT:\v@titleI\"%aA1!\\\"\xC2\xA7$%&/()=?`\xC2\xB4\xC3\x9F+*#-_.:,;<>\x06;\aT:\x10@attributesC:\eOcci::Core::Attributes{\aI\"\na_1-_\x06;\aTC;\v{\x06I\"\na1-_a\x06;\aTo:\eOcci::Core::Properties\v:\r@default0:\n@typeI\"\vstring\x06;\aF:\x0E@requiredF:\r@mutableF:\r@patternI\"\a.*\x06;\aF:\x11@description0I\"\ba-1\x06;\aTC;\v{\x06I\"\x06a\x06;\aTC;\v{\x06I\"\x06b\x06;\aTo;\f\v;\r0;\x0EI\"\vstring\x06;\aF;\x0FF;\x10F;\x11I\"\a.*\x06;\aF;\x120:\f@parentI\"\x13http://a.a/b#a\x06;\aT:\r@actionso:\x18Occi::Core::Actions\x06:\n@hash{\ao:\x17Occi::Core::Action\t;\x06I\"\x13http://a.a/a1#\x06;\aT;\bI\"\aa1\x06;\aT;\t0;\nC;\v{\x00To;\x17\t;\x06I\"\x14http://a.b1/b1#\x06;\aT;\bI\"\ab2\x06;\aT;\t0;\nC;\v{\x00T:\x0E@entitieso:\x19Occi::Core::Entities\x06;\x16{\x00:\x0E@locationI\"\v/a1-A/\x06;\aT")
-
-          expect(category).to eql expected
+          expect(category.to_text).to eql category_string
         end
 
         it 'parses a string describing an OCCI Category with unquoted class value' do
-          category_string = 'Category: a_a1-_;scheme="http://a.a/a#";class=kind'
-          expected = Marshal.restore("\x04\bo:\x15Occi::Core::Kind\r:\f@schemeI\"\x12http://a.a/a#\x06:\x06ET:\n@termI\"\va_a1-_\x06;\aT:\v@title0:\x10@attributesC:\eOcci::Core::Attributes{\x00:\f@parent0:\r@actionso:\x18Occi::Core::Actions\x06:\n@hash{\x00:\x0E@entitieso:\x19Occi::Core::Entities\x06;\x0F{\x00:\x0E@locationI\"\r/a_a1-_/\x06;\aF")
+          category_string = 'Category: a_a1-_;scheme="http://a.a/a#";class="kind"'
+          category = Occi::Parser::Text.category category_string
+          expect(category.to_text).to eql "#{category_string};location=\"/a_a1-_/\""
+        end
+
+        it 'parses a string describing an OCCI Category with unquoted class value and explicit location' do
+          category_string = 'Category: a_a1-_;scheme="http://a.a/a#";class="kind";location="/a_a1-_/"'
           category = Occi::Parser::Text.category category_string
-          expect(category).to eql expected
+          expect(category.to_text).to eql category_string
         end
 
         it 'parses a string describing an OCCI Category with uppercase term' do
-          category_string = 'Category: TERM;scheme="http://a.a/a#";class=kind'
-          expected = Marshal.restore("\x04\bo:\x15Occi::Core::Kind\r:\f@schemeI\"\x12http://a.a/a#\x06:\x06ET:\n@termI\"\tterm\x06;\aT:\v@title0:\x10@attributesC:\eOcci::Core::Attributes{\x00:\f@parent0:\r@actionso:\x18Occi::Core::Actions\x06:\n@hash{\x00:\x0E@entitieso:\x19Occi::Core::Entities\x06;\x0F{\x00:\x0E@locationI\"\v/term/\x06;\aF")
+          category_string = 'Category: TERM;scheme="http://a.a/a#";class="kind"'
           category = Occi::Parser::Text.category category_string
-          expect(category).to eql expected
+          expect(category.to_text).to eql 'Category: term;scheme="http://a.a/a#";class="kind";location="/term/"'
         end
 
         it 'parses a string describing an OCCI Category incl. attributes with properties' do
@@ -40,62 +40,54 @@ module Occi
         end
 
         it 'parses attributes correctly' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_resource_w_attributes.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_resource_w_attributes.dump", "rb"))
-          collection = Occi::Parser::Text.category resource_string
-          expect(collection).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_resource_w_attributes.text", "rt").read
+          category = Occi::Parser::Text.category resource_string
+          expect(category.to_text).to eql "Category: compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/compute/\""
         end
 
         it 'parses inline links correctly' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_resource_w_inline_links_only.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_resource_w_inline_links_only.dump", "rb"))
-          collection = Occi::Parser::Text.category resource_string
-          expect(collection).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_resource_w_inline_links_only.text", "rt").read
+          category = Occi::Parser::Text.category resource_string
+          expect(category.to_text).to eql "Category: compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/compute/\""
         end
 
         it 'parses inline Links and Mixins correctly' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_resource_w_inline_links.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_resource_w_inline_links.dump", "rb"))
-          collection = Occi::Parser::Text.category resource_string
-          expect(collection).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_resource_w_inline_links.text", "rt").read
+          category = Occi::Parser::Text.category resource_string
+          expected = File.open("spec/occi/parser/text_samples/occi_resource_w_inline_links.expected", "rt").read.chomp
+          expect(category.to_text).to eql expected
         end
 
         it 'parses action correctly' do
           category_string = 'Category: restart;scheme="http://schemas.ogf.org/occi/infrastructure/compute/action#";class="action";title="Restart Compute instance";attributes="method"'
           category = Occi::Parser::Text.category category_string
-          expected = Marshal.restore("\x04\bo:\x17Occi::Core::Action\t:\f@schemeI\"?http://schemas.ogf.org/occi/infrastructure/compute/action#\x06:\x06ET:\n@termI\"\frestart\x06;\aT:\v@titleI\"\x1DRestart Compute instance\x06;\aT:\x10@attributesC:\eOcci::Core::Attributes{\x06I\"\vmethod\x06;\aTo:\eOcci::Core::Properties\v:\r@default0:\n@typeI\"\vstring\x06;\aF:\x0E@requiredF:\r@mutableF:\r@patternI\"\a.*\x06;\aF:\x11@description0")
-
-          expect(category).to eql expected
+          expect(category.to_text).to eql category_string
         end
 
         it 'parses network resource from rOCCI server' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_network_rocci_server.dump", "rb"))
-          collection =  Occi::Parser::Text.category resource_string
-          expect(collection).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rt").read
+          category = Occi::Parser::Text.category resource_string
+          expect(category.to_text).to eql "Category: network;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/network/\""
         end
-        
+
         it 'parses storage resource from rOCCI server' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_storage_rocci_server.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_storage_rocci_server.dump", "rb"))
-          collection =  Occi::Parser::Text.category resource_string
-          expect(collection).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_storage_rocci_server.text", "rt").read
+          category = Occi::Parser::Text.category resource_string
+          expect(category.to_text).to eql "Category: storage;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/storage/\""
         end
-        
+
         it 'parses compute resource from rOCCI server' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_compute_rocci_server.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_compute_rocci_server.dump", "rb"))
-          collection =  Occi::Parser::Text.category resource_string
-          expect(collection).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_compute_rocci_server.text", "rt").read
+          category = Occi::Parser::Text.category resource_string
+          expect(category.to_text).to eql "Category: compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/compute/\""
         end
-        
+
         it 'parses model from rOCCI server' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_model_rocci_server.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_model_rocci_server.dump", "rb"))
-          collection =  Occi::Parser::Text.category resource_string
-          expect(collection).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_model_rocci_server.text", "rt").read
+          category = Occi::Parser::Text.category resource_string
+
         end
-        
+
         it 'raises error for obviously nonsensical class' do
           category_string = 'Category: restart;scheme="http://schemas.ogf.org/occi/infrastructure/compute/action#";class="actions";title="Restart Compute instance";attributes="method"'
           expect{ category = Occi::Parser::Text.category category_string }.to raise_error(Occi::Errors::ParserInputError)
@@ -122,53 +114,62 @@ module Occi
 
       context '.resource' do
         it 'parses network resource from rOCCI server' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_network_rocci_server.resource.dump", "rb"))
-          resource =  Occi::Parser::Text.resource resource_string
-          expect(resource).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rt").read
+          resource = Occi::Parser::Text.resource resource_string
+          expected = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.expected", "rt").read.chomp
+          expect(resource.to_text).to eql expected
         end
 
         it 'parses storage resource from rOCCI server' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_storage_rocci_server.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_storage_rocci_server.resource.dump", "rb"))
-          resource =  Occi::Parser::Text.resource resource_string
-          expect(resource).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_storage_rocci_server.text", "rt").read
+          resource = Occi::Parser::Text.resource resource_string
+          expected = File.open("spec/occi/parser/text_samples/occi_storage_rocci_server.expected", "rt").read.chomp
+          expect(resource.to_text).to eql expected
         end
-        
+
         it 'parses compute resource from rOCCI server' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_compute_rocci_server.text", "rb").read
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_compute_rocci_server.resource.dump", "rb"))
-          resource =  Occi::Parser::Text.resource resource_string
-          expect(resource).to eql expected
+          resource_string = File.open("spec/occi/parser/text_samples/occi_compute_rocci_server.text", "rt").read
+          resource = Occi::Parser::Text.resource resource_string
+          expected = File.open("spec/occi/parser/text_samples/occi_compute_rocci_server.expected", "rt").read.chomp
+          expect(resource.to_text).to eql expected
         end
 
         it 'types parsed compute resource from rOCCI server as Occi::Infrastructure::Compute' do
-          resource_string = File.open("spec/occi/parser/text_samples/occi_compute_rocci_server.text", "rb").read
+          resource_string = File.open("spec/occi/parser/text_samples/occi_compute_rocci_server.text", "rt").read
           expected_class = Occi::Infrastructure::Compute
-          resource_class =  Occi::Parser::Text.resource(resource_string).resources.first.class
+          resource_class = Occi::Parser::Text.resource(resource_string).resources.first.class
           expect(resource_class).to eql expected_class
         end
+
+        it 'types parsed custom resource as related to Occi::Core::Resource' do
+          resource_string = File.open("spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.text", "rt").read
+          expected_class = "Org::Fogbowcloud::Schemas::Request::FogbowRequest"
+
+          resource_instance = Occi::Parser::Text.resource(resource_string).resources.first
+          resource_class = resource_instance.class.to_s
+          expect(resource_class).to eql expected_class
+          expect(resource_instance).to be_kind_of Occi::Core::Resource
+        end
       end
 
       context '.categories' do
         it 'parses strings describing OCCI 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"))
+          categories_string = File.open("spec/occi/parser/text_samples/occi_categories.text", "rt").read
           categories = Occi::Parser::Text.categories categories_string
-          expect(categories).to eql expected
+          expected = File.open("spec/occi/parser/text_samples/occi_categories.expected", "rt").read
+          expect(categories.to_text).to eql expected
         end
 
         it 'parses strings describing OCCI Categories, skipping unparseable additions' do
-          categories_string = File.open("spec/occi/parser/text_samples/occi_categories.text", "rb").read
+          categories_string = File.open("spec/occi/parser/text_samples/occi_categories.text", "rt").read
           categories_string["\n"] = "\n\n&*$this won't parse\n"
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_categories.dump", "rb"))
           categories = Occi::Parser::Text.categories categories_string
-          expect(categories).to eql expected
+          expected = File.open("spec/occi/parser/text_samples/occi_categories.expected", "rt").read
+          expect(categories.to_text).to eql expected
         end
 
         it 'does not fail on unparseable input' do
           categories_string = "\n\n&*$this won't parse\n"
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_categories.dump", "rb"))
           categories = Occi::Parser::Text.categories categories_string
           expect(categories.blank?).to eql true
         end
@@ -177,12 +178,10 @@ module Occi
 
       context '.link' do
         it 'parses link resource instance' do
-          link_string = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.text", "rb").read
+          link_string = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.text", "rt").read
           link = Occi::Parser::Text.link link_string
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_link_resource_instance.dump", "rb"))
-          expected.links.each { |exp| exp.id = 'emptied' }
-          link.links.each { |lnk| lnk.id = 'emptied' }
-          expect(link).to eql expected
+          expected = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.expected", "rt").read.chomp
+          expect(link.to_text).to eql expected
         end
 
       end
@@ -217,58 +216,54 @@ module Occi
 
       context '.link_string' do
         it 'parses string with category set' do
-          link_string = File.open("spec/occi/parser/text_samples/occi_link_simple.text", "rb").read
+          link_string = File.open("spec/occi/parser/text_samples/occi_link_simple.text", "rt").read
           link = Occi::Parser::Text.link_string link_string, nil
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_link_simple.link_string.dump", "rb"))
-          expect(link).to eql expected
+          expected = File.open("spec/occi/parser/text_samples/occi_link_simple.expected", "rt").read.chomp
+          expect(link.to_text).to eql expected
         end
 
         it 'parses link with category' do
-          link_string = File.open("spec/occi/parser/text_samples/occi_link_w_category.text", "rb").read
+          link_string = File.open("spec/occi/parser/text_samples/occi_link_w_category.text", "rt").read
           link = Occi::Parser::Text.link_string link_string, nil
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_link_w_category.dump", "rb"))
-          expect(link).to eql expected
+          expected = File.open("spec/occi/parser/text_samples/occi_link_w_category.expected", "rt").read.chomp
+          expect(link.to_text).to eql expected
         end
 
         it 'parses link with attributes' do
-          link_string = File.open("spec/occi/parser/text_samples/occi_link_w_attributes.text", "rb").read
+          link_string = File.open("spec/occi/parser/text_samples/occi_link_w_attributes.text", "rt").read
           link = Occi::Parser::Text.link_string link_string, nil
-          expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_link_w_attributes.dump", "rb"))
-          expect(link).to eql expected
+          expected = File.open("spec/occi/parser/text_samples/occi_link_w_attributes.expected", "rt").read.chomp
+          expect(link.to_text).to eql expected
         end
 
         it 'parses string with action link' do
           link_string = 'Link: </compute/04106bce-87eb-4f8f-a665-2f624e54ba46?action=restart>; rel="http://schemas.ogf.org/occi/infrastructure/compute/action#restart"'
           link = Occi::Parser::Text.link_string(link_string, "source")
-          expected = Marshal.restore("\x04\bo:\x17Occi::Core::Action\t:\f@schemeI\"?http://schemas.ogf.org/occi/infrastructure/compute/action#\x06:\x06ET:\n@termI\"\frestart\x06;\aT:\v@title0:\x10@attributesC:\eOcci::Core::Attributes{\x00")
-          expect(link).to eql expected
+          expect(link.to_text).to eql "Category: restart;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute/action#\";class=\"action\""
         end
       end
 
       context 'compatibility' do
         after(:each) { Occi::Settings.reload! }
-
         context 'terms' do
           it 'parses uppercase term, compatibility on' do
             Occi::Settings['compatibility']=true
-            category_string = 'Category: TERM;scheme="http://a.a/a#";class=kind'
-            expected = Marshal.restore("\x04\bo:\x15Occi::Core::Kind\r:\f@schemeI\"\x12http://a.a/a#\x06:\x06ET:\n@termI\"\tterm\x06;\aT:\v@title0:\x10@attributesC:\eOcci::Core::Attributes{\x00:\f@parent0:\r@actionso:\x18Occi::Core::Actions\x06:\n@hash{\x00:\x0E@entitieso:\x19Occi::Core::Entities\x06;\x0F{\x00:\x0E@locationI\"\v/term/\x06;\aF")
+            category_string = 'Category: TERM;scheme="http://a.a/a#";class="kind"'
             category = Occi::Parser::Text.category category_string
-            expect(category).to eql expected
+            expect(category.to_text).to eql "Category: term;scheme=\"http://a.a/a#\";class=\"kind\";location=\"/term/\""
           end
 
           it 'refuses uppercase term, compatibility off' do
             Occi::Settings['compatibility']=false
-            category_string = 'Category: TERM;scheme="http://a.a/a#";class=kind'
+            category_string = 'Category: TERM;scheme="http://a.a/a#";class="kind"'
             expect{ category = Occi::Parser::Text.category category_string }.to raise_error(Occi::Errors::ParserInputError)
           end
 
           it 'parses term starting with number, compatibility on' do
             Occi::Settings['compatibility']=true
-            category_string = 'Category: 1TERM;scheme="http://a.a/a#";class=kind'
-            expected = Marshal.restore("\x04\bo:\x15Occi::Core::Kind\r:\f@schemeI\"\x12http://a.a/a#\x06:\x06ET:\n@termI\"\n1term\x06;\aT:\v@title0:\x10@attributesC:\eOcci::Core::Attributes{\x00:\f@parent0:\r@actionso:\x18Occi::Core::Actions\x06:\n@hash{\x00:\x0E@entitieso:\x19Occi::Core::Entities\x06;\x0F{\x00:\x0E@locationI\"\f/1term/\x06;\aF")
+            category_string = 'Category: 1TERM;scheme="http://a.a/a#";class="kind"'
             category = Occi::Parser::Text.category category_string
-            expect(category).to eql expected
+            expect(category.to_text).to eql "Category: 1term;scheme=\"http://a.a/a#\";class=\"kind\";location=\"/1term/\""
           end
 
           it 'refuses term starting with number, compatibility off' do
@@ -277,15 +272,27 @@ module Occi
             expect{ category = Occi::Parser::Text.category category_string }.to raise_error(Occi::Errors::ParserInputError)
           end
 
+
+          it 'parses upper case Category with compatibility mode on' do
+            Occi::Settings['compatibility']=true
+            category_string = 'Category: A_A1-_;scheme="http://a.a/a#";class="kind"'
+            expect{ category = Occi::Parser::Text.category category_string }.to_not raise_error
+          end
+
+          it 'refuses upper case Category with compatibility mode off' do
+            Occi::Settings['compatibility']=false
+            category_string = 'Category: A_A1-_;scheme="http://a.a/a#";class="kind"'
+            expect{ category = Occi::Parser::Text.category category_string }.to raise_error(Occi::Errors::ParserInputError)
+          end
+
         end
 
         context 'schemes' do
           it 'parses a Category, compatibility on' do
             Occi::Settings['compatibility']=true
-            category_string = 'Category: a_a1-_;scheme="http://a.a/a#a_a1-_";class="kind";title="aA1!\"§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"'
+            category_string = 'Category: a_a1-_;scheme="http://a.a/a#a_a1-_";class="kind";title="aA1!§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"'
             category = Occi::Parser::Text.category category_string
-            expected = Marshal.restore("\x04\bo:\x15Occi::Core::Kind\r:\f@schemeI\"\x12http://a.a/a#\x06:\x06ET:\n@termI\"\va_a1-_\x06;\aT:\v@titleI\"%aA1!\\\"\xC2\xA7$%&/()=?`\xC2\xB4\xC3\x9F+*#-_.:,;<>\x06;\aT:\x10@attributesC:\eOcci::Core::Attributes{\aI\"\na_1-_\x06;\aTC;\v{\x06I\"\na1-_a\x06;\aTo:\eOcci::Core::Properties\v:\r@default0:\n@typeI\"\vstring\x06;\aF:\x0E@requiredF:\r@mutableF:\r@patternI\"\a.*\x06;\aF:\x11@description0I\"\ba-1\x06;\aTC;\v{\x06I\"\x06a\x06;\aTC;\v{\x06I\"\x06b\x06;\aTo;\f\v;\r0;\x0EI\"\vstring\x06;\aF;\x0FF;\x10F;\x11I\"\a.*\x06;\aF;\x120:\f@parentI\"\x13http://a.a/b#a\x06;\aT:\r@actionso:\x18Occi::Core::Actions\x06:\n@hash{\ao:\x17Occi::Core::Action\t;\x06I\"\x13http://a.a/a1#\x06;\aT;\bI\"\aa1\x06;\aT;\t0;\nC;\v{\x00To;\x17\t;\x06I\"\x14http://a.b1/b1#\x06;\aT;\bI\"\ab2\x06;\aT;\t0;\nC;\v{\x00T:\x0E@entitieso:\x19Occi::Core::Entities\x06;\x16{\x00:\x0E@locationI\"\v/a1-A/\x06;\aT")
-            expect(category).to eql expected
+            expect(category.to_text).to eql "Category: a_a1-_;scheme=\"http://a.a/a#\";class=\"kind\";title=\"aA1!§$%&/()=?`´ß+*#-_.:,;<>\";rel=\"http://a.a/b#a\";location=\"/a1-A/\";attributes=\"a_1-_.a1-_a a-1.a.b\";actions=\"http://a.a/a1#a1 http://a.b1/b1#b2\""
           end
 
           it 'parses a Category, compatibility off' do
@@ -296,7 +303,15 @@ module Occi
         end
       end
 
-      context 'other OCCI implementations' do
+      context 'with other OCCI implementations' do
+
+        it 'correctly parses input from FogBow Cloud' do
+          category_string = File.open("spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.text", "rt").read
+          category = Occi::Parser::Text.category category_string
+          expected = "Category: fogbow_request;scheme=\"http://schemas.fogbowcloud.org/request#\";class=\"kind\";title=\"Request new Instances\";rel=\"http://schemas.ogf.org/occi/core#resource\";location=\"/fogbow_request/\";attributes=\"org.fogbowcloud.request.instance-count org.fogbowcloud.request.type org.fogbowcloud.request.valid-until org.fogbowcloud.request.valid-from org.fogbowcloud.request.state org.fogbowcloud.request.instance-id\""
+          expect(category.to_text).to eql expected
+        end 
+
         it 'renders correctly OCCI from other sources'
       end
 

data/spec/occi/parser_spec.rb

@@ -127,35 +127,33 @@ module Occi
       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"))
+        categories_string = File.open("spec/occi/parser/text_samples/occi_categories.text", "rt").read
         categories = Occi::Parser.parse('text/plain', categories_string, true)
-        expect(categories).to eql expected
+        expected = File.open("spec/occi/parser/text_samples/occi_categories.parse_headers.expected", "rt").read
+        expect(categories.to_text).to eql expected
       end
 
       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/occi', '', false, Occi::Core::Resource, resource_in_headers)
-        expect(resource).to eql expected
+        expected = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.resource.header.expected", "rt").read.chomp
+        expect(resource.to_text).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
+        expected = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.resource.rack.expected", "rt").read.chomp
+        expect(resource.to_text).to eql expected
       end
 
       it 'parses link' do
-        link_string = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.text", "rb").read
+        link_string = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.text", "rt").read
         link = Occi::Parser.parse('text/plain', link_string, false, Occi::Core::Link)
-        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_link_resource_instance.dump", "rb"))
-        expected.links.each { |exp| exp.id = 'emptied' }
-        link.links.each { |lnk| lnk.id = 'emptied' }
-        expect(link).to eql expected
+        expected = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.parse.expected", "rt").read.chomp
+        expect(link.to_text).to eql expected
       end
 
       it 'fails gracefully for unknown entity type' do
-        resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
+        resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rt").read
         expect{ Occi::Parser.parse('text/plain', resource_string, false, Occi::Core::Action) }.to raise_error(Occi::Errors::ParserTypeError)
       end
     end
@@ -221,26 +219,24 @@ module Occi
 
     context '.parse_body_plain' do
       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"))
+        categories_string = File.open("spec/occi/parser/text_samples/occi_categories.text", "rt").read
         categories = Occi::Parser.parse('text/plain', categories_string, true)
-        expect(categories).to eql expected
+        expected = File.open("spec/occi/parser/text_samples/occi_categories.body_plain.expected", "rt").read
+        expect(categories.to_text).to eql expected
       end
 
       it 'parses resources' do
-        resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
-        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_network_rocci_server.resource.dump", "rb"))
+        resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rt").read
         resource = Occi::Parser.parse('text/plain', resource_string, false, Occi::Core::Resource)
-        expect(resource).to eql expected
+        expected = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.body_plain.expected", "rt").read.chomp
+        expect(resource.to_text).to eql expected
       end
 
       it 'parses links' do
-        link_string = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.text", "rb").read
+        link_string = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.text", "rt").read
         link = Occi::Parser.parse('text/plain', link_string, false, Occi::Core::Link)
-        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_link_resource_instance.dump", "rb"))
-        expected.links.each { |exp| exp.id = 'emptied' }
-        link.links.each { |lnk| lnk.id = 'emptied' }
-        expect(link).to eql expected
+        expected = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.body_plain.expected", "rt").read.chomp
+        expect(link.to_text).to eql expected
       end
 
       it 'copes with unknown entity type' do
@@ -249,5 +245,15 @@ module Occi
       end
     end
 
+    context 'output from other producers' do
+      it 'parses input from FogBow Cloud' do
+        category_string = File.open("spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.text", "rt").read
+        collection = Occi::Parser.parse('text/plain', category_string)
+        expected = File.open("spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.parse.expected", "rt").read.chomp
+        expect(collection.to_text).to eql expected
+      end
+
+    end
+
   end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ end
 require 'occi-core'
 require 'json_spec'
 
+Dir["#{File.dirname(__FILE__)}/helpers/*.rb"].each {|file| require file }
+
 # simplify the usage of VCR; this will allow us to use
 #
 #   it "does something", :vcr do
@@ -23,7 +25,5 @@ require 'json_spec'
 #     ...
 #   end
 RSpec.configure do |c|
-  # in RSpec 3 this will no longer be necessary.
-  c.treat_symbols_as_metadata_keys_with_true_values = true
   c.include JsonSpec::Helpers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.15
+  version: 4.2.16
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -164,6 +164,8 @@ files:
 - lib/occi/settings.rb
 - lib/occi/version.rb
 - occi-core.gemspec
+- spec/helpers/to_plain.rb
+- spec/helpers/yaml_hash.rb
 - spec/occi-core_spec.rb
 - spec/occi/collection_samples/collection1.json
 - spec/occi/collection_samples/directory2/collection2.json
@@ -191,33 +193,36 @@ files:
 - spec/occi/log_spec.rb
 - spec/occi/model_spec.rb
 - spec/occi/parser/json_samples/test.json
-- spec/occi/parser/text_samples/occi_categories.dump
+- spec/occi/parser/text_samples/occi_categories.body_plain.expected
+- spec/occi/parser/text_samples/occi_categories.expected
+- spec/occi/parser/text_samples/occi_categories.parse_headers.expected
 - spec/occi/parser/text_samples/occi_categories.text
-- spec/occi/parser/text_samples/occi_compute_rocci_server.dump
-- spec/occi/parser/text_samples/occi_compute_rocci_server.resource.dump
+- spec/occi/parser/text_samples/occi_compute_rocci_server.expected
 - spec/occi/parser/text_samples/occi_compute_rocci_server.text
-- spec/occi/parser/text_samples/occi_link_resource_instance.dump
+- spec/occi/parser/text_samples/occi_link_resource_instance.body_plain.expected
+- spec/occi/parser/text_samples/occi_link_resource_instance.expected
+- spec/occi/parser/text_samples/occi_link_resource_instance.parse.expected
 - spec/occi/parser/text_samples/occi_link_resource_instance.text
-- spec/occi/parser/text_samples/occi_link_simple.dump
-- spec/occi/parser/text_samples/occi_link_simple.link_string.dump
+- spec/occi/parser/text_samples/occi_link_simple.expected
 - spec/occi/parser/text_samples/occi_link_simple.text
-- spec/occi/parser/text_samples/occi_link_w_attributes.dump
+- spec/occi/parser/text_samples/occi_link_w_attributes.expected
 - spec/occi/parser/text_samples/occi_link_w_attributes.text
-- spec/occi/parser/text_samples/occi_link_w_category.dump
+- spec/occi/parser/text_samples/occi_link_w_category.expected
 - spec/occi/parser/text_samples/occi_link_w_category.text
-- spec/occi/parser/text_samples/occi_model_rocci_server.dump
+- spec/occi/parser/text_samples/occi_model_categories.expected
 - spec/occi/parser/text_samples/occi_model_rocci_server.text
-- spec/occi/parser/text_samples/occi_network_rocci_server.dump
-- spec/occi/parser/text_samples/occi_network_rocci_server.resource.dump
+- spec/occi/parser/text_samples/occi_network_rocci_server.body_plain.expected
+- spec/occi/parser/text_samples/occi_network_rocci_server.expected
+- spec/occi/parser/text_samples/occi_network_rocci_server.resource.header.expected
+- spec/occi/parser/text_samples/occi_network_rocci_server.resource.rack.expected
 - spec/occi/parser/text_samples/occi_network_rocci_server.text
-- spec/occi/parser/text_samples/occi_resource_w_attributes.dump
+- spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.parse.expected
+- spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.text
 - spec/occi/parser/text_samples/occi_resource_w_attributes.text
-- spec/occi/parser/text_samples/occi_resource_w_inline_links.dump
+- spec/occi/parser/text_samples/occi_resource_w_inline_links.expected
 - spec/occi/parser/text_samples/occi_resource_w_inline_links.text
-- spec/occi/parser/text_samples/occi_resource_w_inline_links_only.dump
 - spec/occi/parser/text_samples/occi_resource_w_inline_links_only.text
-- spec/occi/parser/text_samples/occi_storage_rocci_server.dump
-- spec/occi/parser/text_samples/occi_storage_rocci_server.resource.dump
+- spec/occi/parser/text_samples/occi_storage_rocci_server.expected
 - spec/occi/parser/text_samples/occi_storage_rocci_server.text
 - spec/occi/parser/text_spec.rb
 - spec/occi/parser_spec.rb