occi 2.5.16 → 2.5.17

data/lib/occi/parser.rb

@@ -142,10 +142,11 @@ module OCCI
     # @param [Class] entity_type
     # @return [OCCI::Collection]
     def self.text_entity(text, entity_type)
-      collection = OCCI::Collection.new
-      entity     = Hashie::Mash.new
-      links      = []
-      categories = Hashie::Mash.new({ :kinds => [], :mixins => [], :actions => [] })
+      collection   = OCCI::Collection.new
+      entity       = Hashie::Mash.new
+      links        = []
+      entity.links = []
+      categories   = Hashie::Mash.new({ :kinds => [], :mixins => [], :actions => [] })
       text.each_line do |line|
         if line.include? 'Category'
           cat = (OCCIANTLR::Parser.new(line.chomp).category)
@@ -164,7 +165,8 @@ module OCCI
         cats          = entity.categories.split(' ')
         kind          = cats.reverse!.pop
         mixins        = cats.categories
-        collection.links << OCCI::Core::Link.new(entity.kind, entity.mixins, entity.attributes)
+
+        collection.links << OCCI::Core::Link.new(kind, mixins, entity.attributes)
       elsif entity_type == OCCI::Core::Resource
         links.each do |link|
           if link.rel.include? 'action#'
@@ -178,7 +180,7 @@ module OCCI
 
             link = OCCI::Core::Link.new(kind, mixins, link.attributes, link.actions, link.rel, link.target, link.source)
             collection.links << link
-            entity.links = [link.id] + entity.links.to_a
+            entity.links << link
           end
         end
         collection.resources << OCCI::Core::Resource.new(entity.kind, entity.mixins, entity.attributes, entity.actions, entity.links)

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module OCCI
-  VERSION = "2.5.16" unless defined?(::OCCI::VERSION)
+  VERSION = "2.5.17" unless defined?(::OCCI::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 2.5.16
+  version: 2.5.17
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -244,19 +244,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: OCCI toolkit
-test_files:
-- spec/occi/client_spec.rb
-- spec/occi/collection_spec.rb
-- spec/occi/log_spec.rb
-- spec/occi/model_spec.rb
-- spec/occi/parser_spec.rb
-- spec/occi/test.json
-- spec/occi/test.ova
-- spec/occi/test.ovf
-- spec/occiantlr/parser_spec.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: