occi 2.5.12 → 2.5.13

data/lib/occi/core/entity.rb

@@ -190,6 +190,10 @@ module OCCI
         header
       end
 
+      def to_s
+        self.location
+      end
+
       def inspect
         JSON.pretty_generate(JSON.parse(to_json))
       end

data/lib/occi/core/link.rb

@@ -77,7 +77,7 @@ module OCCI
       def as_json(options={ })
         link = super
         link.rel = @rel if @rel
-        link.source = self.source.to_s if self.source.kind_of? String if self.source
+        link.source = self.source.to_s if self.source.to_s
         link.target = self.target.to_s if self.target
         link
       end

data/lib/occi/parser.rb

@@ -190,11 +190,28 @@ module OCCI
     # @return [OCCI::Collection]
     def self.json(json)
       collection = OCCI::Collection.new
-      hash       = Hashie::Mash.new(JSON.parse(json))
+      hash = Hashie::Mash.new(JSON.parse(json))
       collection.kinds.concat hash.kinds.collect { |kind| OCCI::Core::Kind.new(kind.scheme, kind.term, kind.title, kind.attributes, kind.related, kind.actions) } if hash.kinds
       collection.mixins.concat hash.mixins.collect { |mixin| OCCI::Core::Mixin.new(mixin.scheme, mixin.term, mixin.title, mixin.attributes, mixin.related, mixin.actions) } if hash.mixins
+      collection.actions.concat hash.actions.collect { |action| OCCI::Core::Action.new(action.scheme, action.term, action.title, action.attributes) } if hash.actions
       collection.resources.concat hash.resources.collect { |resource| OCCI::Core::Resource.new(resource.kind, resource.mixins, resource.attributes, resource.actions, resource.links) } if hash.resources
-      collection.links.concat hash.links.collect { |link| OCCI::Core::Link.new(link.kind, link.mixins, link.attributes) } if hash.links
+      collection.links.concat hash.links.collect { |link| OCCI::Core::Link.new(link.kind, link.mixins, link.attributes, [], nil, link.target) } if hash.links
+
+      if collection.resources.size == 1 && collection.links.size > 0
+        if collection.resources.first.links.empty?
+          collection.links.each { |link| link.source = collection.resources.first }
+          collection.resources.first.links = collection.links
+        end
+      end
+
+      # TODO: replace the following mechanism with one in the Links class
+      # replace link locations with link objects in all resources
+      collection.resources.each do |resource|
+        resource.links.collect! do |resource_link|
+          lnk = collection.links.select { |link| resource_link == link.to_s }.first
+          lnk ||= resource_link
+        end
+      end
       collection
     end
 

data/lib/occi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 2.5.12
+  version: 2.5.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json