occi-core 4.2.10 → 4.2.11

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 24ac48413195e65ec6847bb7d4c3ebad5a13e910
-  data.tar.gz: 039a79688fea638a32f959e5faa7dbba6e71938a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWU2NmRkOTcxMWYxMjZmNTExZTZmY2MyZTk5NTA0OTZkYTZjYzNhNw==
+  data.tar.gz: !binary |-
+    MWExYTgyNzM0ZjU4NzA4MjhjNjRkNzZiZDBhZjI4N2IwNmY5ZTdkMw==
 SHA512:
-  metadata.gz: aa4eeb03ceadf69c476ace568a61d1517b166043a3e0104a0451b569a91f16882a258144ae48254a2ca2d9e7c4c0ec62be9a1c5b9cc9cf62b6fcebd92ecc92f8
-  data.tar.gz: f601b3b6bde0c77b61da0c2d7c817761060d2556ff4b716d6f787ae9c5f80e25a2b31e3ca4039ac2c698efb10333f37f2aece544b4c5c04878d9d5d7af5ba29c
+  metadata.gz: !binary |-
+    MzE2MDM1N2NmYmNmMTZhMWY0NDg3YmM3M2NhYTM0NzU3MTJhZGYyNTQxOTk1
+    YmVjNGEyMzkxZjM4OTI4MGFmZDg5ZjA5NTFkNGM1ODFiMjg3MmY4N2FhNTVk
+    ZDZlNWY0NDg2YzZhMDdiNjZkNTIyN2NkODA4MjBkNTYyNGMyZTM=
+  data.tar.gz: !binary |-
+    ZDhmN2JjNzFmZTFjYTg2NTRiNjU1MjkwZjkyMDFkNGU5YWY5ZjkzYzQxZWEw
+    OWZlNjAzZDRhZGYyMDk3Njk1MzcwYTgzZmQ1OTEzYmNmODJjODM0ODBjZTc0
+    ZmEzOTUyMmJiNTk5ZTliMjQ1ZmI5YzMyNDcxNzA3ZWRmYzVhMjM=

data/lib/occi/collection.rb

@@ -134,6 +134,7 @@ module Occi
     # @param cats_only [Boolean] look only for categories
     # @return [Occi::Core::Category]
     def get_by_id(id, cats_only = false)
+      raise "Cannot do a look-up with a blank id!" if id.blank?
       object = self.categories.select { |category| category.type_identifier == id }
       object = self.entities.select { |entity| entity.id == id } if !cats_only && object.empty?
       object.first
@@ -141,10 +142,11 @@ module Occi
 
     # Returns the category corresponding to a given location
     #
-    # @param [URI] location
+    # @param [String] location
     # @return [Occi::Core::Category]
     def get_by_location(location)
-      self.categories.select { |category| category.location == location }.first
+      raise "Cannot do a look-up with a blank location!" if location.blank?
+      self.categories.select { |category| category.location == instance2cat(location) }.first
     end
 
     # @return [true,false] true if collection is empty, false otherwise
@@ -154,9 +156,10 @@ module Occi
 
     # Returns a collection with all categories related to the specified category
     #
-    # @param [Occi::Core::Category] category
+    # @param [Occi::Core::Category, String] category
     # @return [Occi::Core::Collection]
     def get_related_to(category)
+      raise "Cannot do a look-up with a blank category!" if category.blank?
       collection = self.class.new
       collection.kinds = @kinds.get_related_to(category)
       collection.mixins = @mixins.get_related_to(category)
@@ -194,14 +197,14 @@ module Occi
       text = ""
 
       if standalone_links?
-        raise "Only one standalone link allowed for rendering to text/plain" if self.links.size > 1
+        raise "Only one standalone link allowed for rendering to text/plain!" if self.links.size > 1
         text << self.links.first.to_text
       elsif standalone_action_instance?
         text << self.action.to_text
       else
         text << self.categories.collect { |category| category.to_text }.join("\n")
         text << "\n" if self.categories.any?
-        raise "Only one resource allowed for rendering to text/plain" if self.resources.size > 1
+        raise "Only one resource allowed for rendering to text/plain!" if self.resources.size > 1
         text << self.resources.first.to_text if self.resources.any?
         text << self.links.collect { |link| link.to_text_link }.join("\n")
         text << self.action.to_text if self.action
@@ -214,13 +217,13 @@ module Occi
       header = Hashie::Mash.new
 
       if standalone_links?
-        raise "Only one standalone link allowed for rendering to text/occi" if self.links.size > 1
+        raise "Only one standalone link allowed for rendering to text/occi!" if self.links.size > 1
         header = self.links.first.to_header
       elsif standalone_action_instance?
         header = self.action.to_header
       else
         header['Category'] = self.categories.collect { |category| category.to_string_short }.join(',') if self.categories.any?
-        raise "Only one resource allowed for rendering to text/occi" if self.resources.size > 1
+        raise "Only one resource allowed for rendering to text/occi!" if self.resources.size > 1
         header = self.class.header_merge(header, self.resources.first.to_header) if self.resources.any?
         header['Link'] = self.links.collect { |link| link.to_string }.join(',') if self.links.any?
         header = self.class.header_merge(header, self.action.to_header) if self.action
@@ -250,5 +253,12 @@ module Occi
       !self.action.blank? && self.categories.blank? && self.entities.blank?
     end
 
+    def instance2cat(location)
+      return location if location.start_with?('/') && location.end_with?('/')
+      cat_relative_uri = "#{File.dirname(URI.parse(location).path)}/"
+      raise "Supplied location is invalid! #{cat_relative_uri.inspect}" unless cat_relative_uri =~ /\/.+\//
+      cat_relative_uri
+    end
+
   end
 end

data/lib/occi/core/entity.rb

@@ -185,9 +185,13 @@ module Occi
         entity = Hashie::Mash.new
         entity.kind = @kind.to_s if @kind
         entity.mixins = @mixins.join(' ').split(' ') if @mixins.any?
-        entity.actions = @actions.as_json if @actions.any?
+
+        action_strings = @actions.collect { |action| action.to_s if action.to_s }.compact
+        entity.actions = action_strings unless action_strings.empty?
+
         entity.attributes = @attributes.as_json if @attributes.as_json.any?
         entity.id = id.to_s if id
+
         entity
       end
 

data/lib/occi/core/links.rb

@@ -15,6 +15,7 @@ module Occi
         link       = Occi::Core::Link.new(*args)
         link.model = @model if @model
         self << link
+
         link
       end
 
@@ -22,10 +23,12 @@ module Occi
 
       def convert(link)
         if link.kind_of? String
-          target      = link
-          link        = Occi::Core::Link.new
-          link.target = target
+          link_location = link
+          link = Occi::Core::Link.new
+          link.id = link_location.split('/').last
+          link.location = link_location
         end
+
         link
       end
 

data/lib/occi/parser/text.rb

@@ -44,8 +44,15 @@ module Occi
               resource.attributes.merge! attribute(line)
             when /^Link:/
               link = link_string(line, resource)
-              resource.links << link
-              links << link
+
+              if link.kind_of? Occi::Core::Link
+                resource.links << link
+                links << link
+              elsif link.kind_of? Occi::Core::Action
+                resource.actions << link
+              else
+                raise Occi::Errors::ParserInputError, "Could not recognize resource link! #{link.inspect}"
+              end
             end
           }
           lines.respond_to?(:each) ? lines.each(&block) : lines.each_line(&block)
@@ -169,8 +176,22 @@ module Occi
 
           raise Occi::Errors::ParserInputError, "Could not match #{string}" unless match
 
+          if match[:uri].include?('?action=')
+            link_string_action match
+          else
+            link_string_link match, source
+          end
+        end
+
+        def link_string_action(match)
+          scheme, term = match[:rel].split('#')
+          Occi::Core::Action.new scheme, term
+        end
+
+        def link_string_link(match, source)
           target = match[:uri]
           rel = match[:rel]
+
           if match[:category].blank?
             kind = Occi::Core::Link.kind
           else
@@ -183,7 +204,7 @@ module Occi
 
           # create an array of the list of attributes
           attributes = []
-          regexp=Regexp.new '(\\s*'+REGEXP_ATTRIBUTE_REPR.to_s+')'
+          regexp = Regexp.new '(\\s*'+REGEXP_ATTRIBUTE_REPR.to_s+')'
           attr_line = match[:attributes].sub(/^\s*;\s*/, ' ')
           attributes = attr_line.scan(regexp).collect {|matches| matches.first}
 
@@ -191,6 +212,7 @@ module Occi
           attributes = attributes.inject(Hashie::Mash.new) { |hsh, attribute|
             hsh.merge!(Occi::Parser::Text.attribute("X-OCCI-Attribute: #{attribute}"))
           }
+
           Occi::Core::Link.new kind, mixins, attributes, actions, rel, target, source, location
         end
 

data/lib/occi/version.rb

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

data/lib/occi-core.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 
 require 'set'
+require 'uri'
 require 'hashie/mash'
 
 require 'active_support/core_ext'

data/spec/occi/collection_spec.rb

@@ -71,14 +71,22 @@ module Occi
       }
       it 'gets Entity as a related kind' do
         expect(collection.get_related_to(Occi::Core::Entity.kind)).to eql collection
+        expect(collection.get_related_to(Occi::Core::Entity.kind.type_identifier)).to eql collection
       end
 
       it 'gets Resource as a related kind' do
         expect(collection.get_related_to(Occi::Core::Resource.kind).kinds.first).to eql Occi::Core::Resource.kind
+        expect(collection.get_related_to(Occi::Core::Resource.kind.type_identifier).kinds.first).to eql Occi::Core::Resource.kind
       end
 
       it 'gets Link as a related kind' do
         expect(collection.get_related_to(Occi::Core::Link.kind).kinds.first).to eql Occi::Core::Link.kind
+        expect(collection.get_related_to(Occi::Core::Link.kind.type_identifier).kinds.first).to eql Occi::Core::Link.kind
+      end
+
+      it 'fails loudly when no category is given' do
+        expect { collection.get_related_to("") } .to raise_error RuntimeError
+        expect { collection.get_related_to(nil) } .to raise_error RuntimeError
       end
     end
 
@@ -716,6 +724,11 @@ module Occi
           expect(collection.get_by_id("ID.notexist")).to eql nil
         end
 
+        it 'fails loudly when no id is given' do
+          expect { collection.get_by_id("") } .to raise_error RuntimeError
+          expect { collection.get_by_id(nil) } .to raise_error RuntimeError
+        end
+
       end
 
       context '#get_by_location' do
@@ -723,9 +736,18 @@ module Occi
           expect(collection.get_by_location("/mixin/my_mixin/")).to eql collection.mixins.first
         end
 
+        it 'finds category by instance location' do
+          expect(collection.get_by_location("/compute/1")).to eql collection.kinds.first
+        end
+
         it 'fails gracefully' do
           expect(collection.get_by_location("/notexist/")).to eql nil
         end
+
+        it 'fails loudly when no location is given' do
+          expect { collection.get_by_location("") } .to raise_error RuntimeError
+          expect { collection.get_by_location(nil) } .to raise_error RuntimeError
+        end
       end
     end
 

data/spec/occi/core/entities_spec.rb

@@ -85,7 +85,7 @@ module Occi
           entities << entity2
           expected = []
           hash=Hashie::Mash.new JSON.parse('{"kind":"http://schemas.ogf.org/occi/core#entity","attributes":{"occi":{"core":{"id":"e1testid"}}},"id":"e1testid"}')
-          hash2= Hashie::Mash.new JSON.parse('{"kind":"http://example.org/test/schema#entity2","actions":[{"scheme":"http://schemas.ogf.org/occi/core/entity/action#","term":"testaction","title":"testaction action","attributes":{}}],"attributes":{"occi":{"core":{"id":"e2testid"}}},"id":"e2testid"}')
+          hash2= Hashie::Mash.new JSON.parse('{"kind":"http://example.org/test/schema#entity2","actions":["http://schemas.ogf.org/occi/core/entity/action#testaction"],"attributes":{"occi":{"core":{"id":"e2testid"}}},"id":"e2testid"}')
           expected << hash
           expected << hash2
           expect(entities.as_json).to eql expected

data/spec/occi/core/entity_spec.rb

@@ -174,6 +174,15 @@ Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entit
         end
       end
 
+      context '#as_json' do
+        it 'renders element as JSON' do
+          entity.actions << testaction
+
+          expected = Hashie::Mash.new JSON.parse('{"kind":"http://schemas.ogf.org/occi/core#entity","actions":["http://schemas.ogf.org/occi/core/entity/action#testaction"],"attributes":{"occi":{"core":{"id":"baf1"}}},"id":"baf1"}')
+          expect(entity.as_json).to eql expected
+        end
+      end
+
       context '#check' do
         let(:defs){
           defs = Occi::Core::Attributes.new

data/spec/occi/core/links_spec.rb

@@ -35,9 +35,11 @@ module Occi
             expect(links.count).to eql 2
           end
 
-          it 'populates target in the link' do
-            links = Occi::Core::Links.new ["target1"]
-            expect(links.first.target).to eql "target1"
+          it 'populates Links with correctly initialized links' do
+            links = Occi::Core::Links.new ["/link/9c3b83bd-2456-45e9-8ce5-91a7d5c7bb85"]
+
+            expect(links.first.id).to eql "9c3b83bd-2456-45e9-8ce5-91a7d5c7bb85"
+            expect(links.first.location).to eql "/link/9c3b83bd-2456-45e9-8ce5-91a7d5c7bb85"
           end
 
           it 'produces the right number of members, string/link combination' do

data/spec/occi/parser/text_spec.rb

@@ -237,12 +237,10 @@ module Occi
           expect(link).to eql expected
         end
 
-        it 'parses string with category unset' do
+        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:\x15Occi::Core::Link\x0E:\n@kindo:\x15Occi::Core::Kind\r:\f@schemeI\"&http://schemas.ogf.org/occi/core#\x06:\x06EF:\n@termI\"\tlink\x06;\tF:\v@titleI\"\tlink\x06;\tF:\x10@attributesC:\eOcci::Core::Attributes{\x06I\"\tocci\x06;\tFC;\r{\x06I\"\tcore\x06;\tFC;\r{\rI\"\aid\x06;\tFo:\eOcci::Core::Properties\v:\r@default0:\n@typeI\"\vstring\x06;\tF:\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;\tF:\x11@description0I\"\b_id\x06;\tFo;\x0E\v;\x0F0;\x10@\x11;\x11F;\x12F;\x13@\x12;\x140I\"\ntitle\x06;\tFo;\x0E\v;\x0F0;\x10I\"\vstring\x06;\tF;\x11F;\x12T;\x13I\"\a.*\x06;\tF;\x140I\"\v_title\x06;\tFo;\x0E\v;\x0F0;\x10@\x17;\x11F;\x12T;\x13@\x18;\x140I\"\vtarget\x06;\tFo;\x0E\v;\x0F0;\x10I\"\vstring\x06;\tF;\x11F;\x12T;\x13I\"\a.*\x06;\tF;\x140I\"\f_target\x06;\tFo;\x0E\v;\x0F0;\x10@\x1D;\x11F;\x12T;\x13@\x1E;\x140I\"\vsource\x06;\tFo;\x0E\v;\x0F0;\x10I\"\vstring\x06;\tF;\x11F;\x12T;\x13I\"\a.*\x06;\tF;\x140I\"\f_source\x06;\tFo;\x0E\v;\x0F0;\x10@#;\x11F;\x12T;\x13@$;\x140:\f@parento;\a\r;\bI\"&http://schemas.ogf.org/occi/core#\x06;\tF;\nI\"\ventity\x06;\tF;\vI\"\ventity\x06;\tF;\fC;\r{\x06@\vC;\r{\x06@\rC;\r{\t@\x0F@\x10@\x13@\x14@\x15@\x16@\x19@\x1A;\x150:\r@actionso:\x18Occi::Core::Actions\x06:\n@hash{\x00:\x0E@entitieso:\x19Occi::Core::Entities\x06;\x18{\x00:\x0E@locationI\"\r/entity/\x06;\tF;\x16o;\x17\x06;\x18{\x00;\x19o;\x1A\x06;\x18{\x00;\eI\"\v/link/\x06;\tF:\f@mixinso:\x17Occi::Core::Mixins\a;\x18{\x00:\f@entity@\x00;\fIC;\r{\x06@\vIC;\r{\x06@\rIC;\r{\r@\x0F0@\x13@\x14@\x150@\x19@\x1A@\e0@\x1F@ @!0@%@&\x06:\x0F@convertedT\x06;\x1FT\x06;\x1FT;\x16o;\x17\x06;\x18{\x00;\e0:\t@relo;\a\r;\bI\"?http://schemas.ogf.org/occi/infrastructure/compute/action#\x06;\tT;\nI\"\frestart\x06;\tT;\v0;\fC;\r{\x00;\x15@';\x16o;\x17\x06;\x18{\x00;\x19o;\x1A\x06;\x18{\x00;\eI\"\x0E/restart/\x06;\tF:\f@sourceI\"\vsource\x06;\tT:\f@targetI\"A/compute/04106bce-87eb-4f8f-a665-2f624e54ba46?action=restart\x06;\tT:\b@id0")
-          expected.id = 'epmtied'
-          link.id = 'epmtied'
+          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
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.10
+  version: 4.2.11
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
@@ -72,14 +72,14 @@ dependencies:
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: OCCI is a collection of classes to simplify the implementation of the
@@ -231,12 +231,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []