occi 2.5.2 → 2.5.3

data/examples/x509auth_example.rb

@@ -83,8 +83,12 @@ else
   pp os = client.get_os_templates.select { |template| template.term.include? OS_TEMPLATE }
   pp size = client.get_resource_templates.select { |template| template.term.include? 'medium' }
   
+  puts "\nGetting identifiers"
+  pp os_id = os.first.type_identifier
+  pp size_id = size.first.type_identifier
+
   ## attach chosen resources to the compute resource
-  cmpt.mixins << os << size
+  cmpt.mixins << os_id << size_id
   ## we can change some of the values manually
   cmpt.attributes.occi!.core!.title = "My rOCCI VM"
 end
@@ -101,7 +105,7 @@ pp client.list compute
 ## using Hashie simplifies access to its attributes
 puts "\n\nPrinting information about compute resource #{cmpt_loc}"
 cmpt_data = client.get cmpt_loc.to_s.split('/')[3] + '/' + cmpt_loc.to_s.split('/')[4]
-cmpt_hashie = Hashie::Mash.new(JSON.parse(cmpt_data.to_json))
+pp cmpt_hashie = Hashie::Mash.new(JSON.parse(cmpt_data.to_json))
 
 ## wait until the resource is "active"
 while cmpt_hashie.resources.first.attributes.occi.compute.state == "inactive"

data/lib/occi/core/resource.rb

@@ -59,7 +59,7 @@ module OCCI
       # @return [Hashie::Mash] link as Hashie::Mash to be parsed into a JSON object
       def as_json(options={ })
         resource = Hashie::Mash.new
-        resource.links = @links if @links.any?
+        resource.links = @links.collect { |link| link.as_json } if @links.any?
         resource.merge! super
         resource
       end

data/lib/occi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json