occi 2.4.0 → 2.5.0

data/lib/occi/parser.rb

@@ -57,11 +57,15 @@ module OCCI
 
     private
 
+    # @param [Hash] header
+    # @return [Array] list of URIs
     def self.header_locations(header)
       x_occi_location_strings = header['HTTP_X_OCCI_LOCATION'].to_s.split(',')
       x_occi_location_strings.collect { |loc| OCCIANTLR::Parser.new('X-OCCI-Location: ' + loc).x_occi_location }
     end
 
+    # @param [Hash] header
+    # @return [OCCI::Collection]
     def self.header_categories(header)
       collection       = OCCI::Collection.new
       category_strings = header['HTTP_CATEGORY'].to_s.split(',')
@@ -74,6 +78,9 @@ module OCCI
       collection
     end
 
+    # @param [Hash] header
+    # @param [Class] entity_type
+    # @return [OCCI::Collection]
     def self.header_entity(header, entity_type)
       collection       = OCCI::Collection.new
       entity           = Hashie::Mash.new
@@ -92,16 +99,23 @@ module OCCI
         collection.links << OCCI::Core::Link.new(entity.kind, entity.mixins, entity.attributes)
       elsif entity_type == OCCI::Core::Resource
         link_strings = header['HTTP_LINK'].to_s.split(',')
-        link_strings.each { |link| entity.links << OCCIANTLR::Parser.new('Link: ' + link).link }
+        link_strings.each do |link_string|
+          link = OCCIANTLR::Parser.new('Link: ' + link_string).link
+          entity.links << OCCI::Core::Link.new(link.kind, link.mixins, link.attributes, link.actions, link.rel)
+        end
         collection.resources << OCCI::Core::Resource.new(entity.kind, entity.mixins, entity.attributes, entity.links)
       end
       collection
     end
 
+    # @param [String] text
+    # @return [Array] list of URIs
     def self.text_locations(text)
       text.lines.collect { |line| OCCIANTLR::Parser.new(line).x_occi_location if line.include? 'X-OCCI-Location' }.compact
     end
 
+    # @param [String] text
+    # @return [OCCI::Collection]
     def self.text_categories(text)
       collection = OCCI::Collection.new
       text.each_line do |line|
@@ -114,6 +128,9 @@ module OCCI
       collection
     end
 
+    # @param [String] text
+    # @param [Class] entity_type
+    # @return [OCCI::Collection]
     def self.text_entity(text, entity_type)
       collection = OCCI::Collection.new
       entity     = Hashie::Mash.new
@@ -131,12 +148,14 @@ module OCCI
         entity.source = links.first.attributes!.occi!.core!.source
         collection.links << OCCI::Core::Link.new(entity.kind, entity.mixins, entity.attributes)
       elsif entity_type == OCCI::Core::Resource
-        entity.links = links
+        entity.links = links.collect { |link| OCCI::Core::Link.new(link.kind, link.mixins, link.attributes, link.actions, link.rel) }
         collection.resources << OCCI::Core::Resource.new(entity.kind, entity.mixins, entity.attributes, entity.links)
       end unless entity.kind.nil?
       collection
     end
 
+    # @param [String] json
+    # @return [OCCI::Collection]
     def self.json(json)
       collection = OCCI::Collection.new
       hash       = Hashie::Mash.new(JSON.parse(json))
@@ -147,6 +166,8 @@ module OCCI
       collection
     end
 
+    # @param [String] xml
+    # @return [OCCI::Collection]
     def self.xml(xml)
       collection = OCCI::Collection.new
       hash       = Hashie::Mash.new(Hash.from_xml(Nokogiri::XML(xml)))
@@ -159,6 +180,7 @@ module OCCI
 
 
     ####################Helper method for calculation of storage size based on allocation units configured###########
+
     def self.calculate_capacity_bytes(capacity, alloc_units_bytes)
       total_capacity_bytes = alloc_units_bytes * capacity.to_i
       total_capacity_bytes
@@ -182,6 +204,8 @@ module OCCI
 
     ###############End of Helper methods for OVF Parsing ##################################################################
 
+    # @param [String] ova
+    # @return [OCCI::Collection]
     def self.ova(ova)
       tar   = Gem::Package::TarReader.new(StringIO.new(ova))
       ovf   = mf = cert = nil
@@ -208,6 +232,8 @@ module OCCI
       self.ovf(File.read(ovf), files)
     end
 
+    # @param [String] ovf
+    # @param [Hash] files key value pairs of file names and paths to the file
     def self.ovf(ovf, files={ })
       collection = OCCI::Collection.new
       doc        = Nokogiri::XML(ovf)

data/lib/occi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -152,6 +152,7 @@ files:
 - etc/model/infrastructure/resource_template.json
 - etc/model/infrastructure/storage.json
 - etc/model/infrastructure/storagelink.json
+- examples/x509auth_example.rb
 - lib/occi.rb
 - lib/occi/client.rb
 - lib/occi/collection.rb
@@ -205,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OCCI toolkit