occi-core 4.2.5 → 4.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 55c4ffb877bc923ee40bd01f091ba0b124289828
+  data.tar.gz: 4d4586c406eb9002cd5ffb3d73487b43bc86bdcf
+SHA512:
+  metadata.gz: 64d75f1187fb40eaa6fb2b83264c6a1ef9ec18b8d171af3689da6db9e50e0d42be91503c314ddf27d96e008edc1bb3774d9a303709029bacfbaaf80064543b14
+  data.tar.gz: c06ed353a0c359ea1465b91ef0db4b3994bd1a7f168895f4a3ded5543ffb6f9435e6301c32d5c9d402d47bb10e919e92e3b4aeccd2055f959bea3db09e6cef59

data/lib/occi/collection.rb

@@ -64,8 +64,20 @@ module Occi
       @action.model = model if @action
     end
 
-    def check
-      @resources.check && @links.check && (@action ? @action.check : true)
+    # @param incl_categories [Boolean] check every category against the model
+    # @return [Boolean] result
+    def check(incl_categories = false)
+      @resources.check
+      @links.check
+      @action.check if @action
+
+      if incl_categories
+        @kinds.check
+        @mixins.check
+        @actions.check
+      end
+
+      true
     end
 
     # @param [Occi::Collection] other_collection
@@ -118,11 +130,12 @@ module Occi
 
     # Returns the category corresponding to a given id
     #
-    # @param [String] id
+    # @param id [String] identifier
+    # @param cats_only [Boolean] look only for categories
     # @return [Occi::Core::Category]
-    def get_by_id(id)
+    def get_by_id(id, cats_only = false)
       object = self.categories.select { |category| category.type_identifier == id }
-      object = self.entities.select { |entity| entity.id == id } if object.empty?
+      object = self.entities.select { |entity| entity.id == id } if !cats_only && object.empty?
       object.first
     end
 

data/lib/occi/core/action_instance.rb

@@ -72,15 +72,24 @@ module Occi
         header
       end
 
-      # @return [Bool] Indicating whether this action instance is "empty", i.e. required attributes are blank
+      # @return [Boolean] Indicating whether this action instance is "empty", i.e. required attributes are blank
       def empty?
         action.nil? || action.empty?
       end
 
-      # @return [Bool] Result of the validation process
-      def check
-        # TODO: impl check for ActionInstance attributes
-        true
+      # @param [Boolean] set default values for all empty attributes
+      # @return [Boolean] Result of the validation process
+      def check(set_defaults = false)
+        raise ArgumentError, 'No model has been assigned to this action instance' unless @model
+
+        action = @model.get_by_id(@action.type_identifier, true)
+        raise Occi::Errors::CategoryNotDefinedError,
+              "Action not found for action instance #{self.class.name}[#{self.to_s.inspect}]!" unless action
+
+        definitions = Occi::Core::Attributes.new
+        definitions.merge! action.attributes
+
+        @attributes.check!(definitions, set_defaults)
       end
 
     end

data/lib/occi/core/attributes.rb

@@ -137,7 +137,7 @@ module Occi
 
       # @return [String]
       def to_string_short
-        any? ? ";attributes=#{names.keys.join(' ').inspect}" : ""
+        any? ? ";attributes=#{names.keys.collect { |key| name_w_props(key) }.join(' ').inspect}" : ""
       end
 
       # @return [String]
@@ -354,6 +354,25 @@ module Occi
           end
         end
       end
+
+      def name_w_props(attribute_name)
+        return attribute_name if attribute_name.blank?
+
+        parts = attribute_name.split('.')
+        parts[parts.length - 1] = "_#{parts.last}"
+        property_name = parts.join('.')
+
+        return attribute_name unless self[property_name]
+
+        if !self[property_name].mutable
+          "#{attribute_name}{immutable}"
+        elsif self[property_name].required
+          "#{attribute_name}{required}"
+        else
+          attribute_name
+        end
+      end
+
     end
   end
 end

data/lib/occi/core/categories.rb

@@ -13,7 +13,10 @@ module Occi
       end
 
       def <<(category)
-        super convert category
+        category = convert(category)
+        category.model = @model if @model && !category.kind_of?(String)
+
+        super(category)
       end
 
       def join(separator)
@@ -32,7 +35,8 @@ module Occi
       # @return [Occi::Model]
       def model=(model)
         @model = model
-        collect! { |category| model.get_by_id category.to_s or category }
+        each { |category| category.model = model }
+        collect! { |category| model.get_by_id(category.to_s) || category }
       end
 
       # @param [Hash] options
@@ -41,10 +45,18 @@ module Occi
         self.to_a.as_json
       end
 
+      def check
+        each { |category| category.check }
+      end
+
       private
 
       def convert(category)
-        (@model.get_by_id category if @model if category.kind_of? String) or category
+        if category.kind_of?(String) && @model
+          @model.get_by_id(category) || category
+        else
+          category
+        end
       end
 
     end

data/lib/occi/core/category.rb

@@ -79,13 +79,29 @@ module Occi
         self.type_identifier
       end
 
-      # @return [Bool] Indicating whether this category is "empty", i.e. required attributes are blank
+      # @return [Boolean] Indicating whether this category is "empty", i.e. required attributes are blank
       def empty?
         term.blank? || scheme.blank?
       end
 
+      # Checks this category against the model
+      # @param check_attributes [Boolean] attribute definitions must match
+      # @param check_title [Boolean] titles must match
+      # @return [Boolean]
+      def check(check_attributes = false, check_title = false)
+        raise ArgumentError, 'No model has been assigned to this category' unless @model
+
+        cat = @model.get_by_id(type_identifier, true)
+        raise Occi::Errors::CategoryNotDefinedError,
+              "Category #{self.class.name}[#{type_identifier.inspect}] not found in the model!" unless cat
+
+        # TODO: impl. check_attributes and check_title for strict matching
+
+        true
+      end
+
       # @param term [String] Term to check.
-      # @return [Bool] Indicating whether term consists exclusively of valid characters.
+      # @return [Boolean] Indicating whether term consists exclusively of valid characters.
       def self.valid_term?(term)
         term =~ /^[a-z][a-z0-9_-]*$/
       end

data/lib/occi/core/entities.rb

@@ -18,7 +18,7 @@ module Occi
 
       def model=(model)
         @model = model
-        each { |entity| entity.model=model }
+        each { |entity| entity.model = model }
       end
 
       def check

data/lib/occi/core/entity.rb

@@ -159,10 +159,9 @@ module Occi
       # check attributes against their definitions and set defaults
       # @param [true,false] set default values for all empty attributes
       def check(set_defaults = false)
-
         raise ArgumentError, 'No model has been assigned to this entity' unless @model
  
-        kind = @model.get_by_id(@kind.to_s)
+        kind = @model.get_by_id(@kind.to_s, true)
         raise Occi::Errors::KindNotDefinedError,
               "Kind not found for entity #{self.class.name}[#{self.to_s.inspect}]!" unless kind
  

data/lib/occi/errors/category_not_defined_error.rb

@@ -0,0 +1,5 @@
+module Occi
+  module Errors
+    class CategoryNotDefinedError < ArgumentError; end
+  end
+end

data/lib/occi/infrastructure/networkinterface.rb

@@ -13,7 +13,7 @@ module Occi
       self.actions = Occi::Core::Actions.new << up << down
 
       self.attributes = Occi::Core::Attributes.new(Occi::Core::Link.attributes)
-      self.attributes['occi.networkinterface.interface'] ={:mutable => true}
+      self.attributes['occi.networkinterface.interface'] = {:mutable => false}
       self.attributes['occi.networkinterface.mac'] = {:mutable => true,
                                                       :pattern => '^([0-9a-fA-F]{2}[:-]){5}([0-9a-fA-F]{2})$'}
       self.attributes['occi.networkinterface.state'] = {:pattern => 'active|inactive|error',

data/lib/occi/parser/text.rb

@@ -115,8 +115,8 @@ module Occi
               properties = Occi::Core::Properties.new
 
               if property_string
-                properties.required = true if property_string.include? 'required'
-                properties.mutable = false if property_string.include? 'immutable'
+                properties.required = property_string.include?('{required}')
+                properties.mutable = !property_string.include?('{immutable}')
               end
 
               name = attribute[/#{REGEXP_ATTRIBUTE_DEF}/, 1]

data/lib/occi/version.rb

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

data/spec/occi/collection_spec.rb

@@ -811,7 +811,7 @@ module Occi
         collection.resources << Occi::Core::Resource.new
         collection.links << Occi::Core::Link.new
 
-        expected = "Category: compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";title=\"compute resource\";rel=\"http://schemas.ogf.org/occi/core#resource\";location=\"/compute/\";attributes=\"occi.core.id occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state\";actions=\"http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\"\nCategory: my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\";location=\"/mixin/my_mixin/\"\nCategory: start;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute/action#\";class=\"action\"\nCategory: resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\"\nX-OCCI-Attribute: occi.core.id=\"#{collection.resources.first.id}\"Link: <>;rel=\"http://schemas.ogf.org/occi/core#link\";self=\"/link/#{collection.links.first.id}\";category=\"http://schemas.ogf.org/occi/core#link\";occi.core.id=\"#{collection.links.first.id}\"Category: action_instance;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\""
+        expected = "Category: compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";title=\"compute resource\";rel=\"http://schemas.ogf.org/occi/core#resource\";location=\"/compute/\";attributes=\"occi.core.id{immutable} occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state{immutable}\";actions=\"http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\"\nCategory: my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\";location=\"/mixin/my_mixin/\"\nCategory: start;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute/action#\";class=\"action\"\nCategory: resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\"\nX-OCCI-Attribute: occi.core.id=\"#{collection.resources.first.id}\"Link: <>;rel=\"http://schemas.ogf.org/occi/core#link\";self=\"/link/#{collection.links.first.id}\";category=\"http://schemas.ogf.org/occi/core#link\";occi.core.id=\"#{collection.links.first.id}\"Category: action_instance;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\""
         expect(collection.to_text).to eql(expected)
       end
 
@@ -822,7 +822,7 @@ module Occi
 
       it 'renders text correctly, kinds only' do
         collection.kinds << "http://schemas.ogf.org/occi/infrastructure#compute"
-        expected = "Category: compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";title=\"compute resource\";rel=\"http://schemas.ogf.org/occi/core#resource\";location=\"/compute/\";attributes=\"occi.core.id occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state\";actions=\"http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\"\n"
+        expected = "Category: compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";title=\"compute resource\";rel=\"http://schemas.ogf.org/occi/core#resource\";location=\"/compute/\";attributes=\"occi.core.id{immutable} occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state{immutable}\";actions=\"http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\"\n"
         expect(collection.to_text).to eql(expected)
       end
 

data/spec/occi/core/attributes_spec.rb

@@ -230,8 +230,16 @@ module Occi
         end
 
         context '#to_string_short' do
+          let(:attrs_with_req_immut) {
+            attrs = Occi::Core::Attributes.new
+            attrs['immut_attr'] = { :mutable => false, :required => false }
+            attrs['req_attr'] = { :mutable => true, :required => true }
+            attrs['immut_req_attr'] = { :mutable => false, :required => true }
+            attrs
+          }
+
           it 'renders attributes correctly' do
-            expected = ";attributes=\"numbertype stringtype booleantype booleantypefalse booleantypepattern nest.nested properties category entity\""
+            expected = ";attributes=\"numbertype stringtype booleantype booleantypefalse booleantypepattern nest.nested properties{immutable} category entity\""
             expect(attrs.to_string_short).to eql expected
           end
 
@@ -239,6 +247,11 @@ module Occi
             expected = ""
             expect(empty.to_string_short).to eql expected
           end
+
+          it 'renders attributes with properties correctly' do
+            expected = ";attributes=\"immut_attr{immutable} req_attr{required} immut_req_attr{immutable}\""
+            expect(attrs_with_req_immut.to_string_short).to eql expected
+          end
         end
 
         context '#to_text' do

data/spec/occi/core/categories_spec.rb

@@ -14,11 +14,12 @@ module Occi
 
       it "replaces a category string when a model is added with the instance from the model"  do
         categories = Occi::Core::Categories.new
-        categories << Occi::Core::Resource.type_identifier
         model = Occi::Model.new
+        categories.model = model
+        categories << Occi::Core::Resource.type_identifier
+
         resource = model.get_by_id Occi::Core::Resource.type_identifier
         resource.location = '/new_location/'
-        categories.model = model
         categories.first.location.should == '/new_location/'
       end
 

data/spec/occi/parser/text_spec.rb

@@ -29,6 +29,15 @@ module Occi
           expect(category).to eql expected
         end
 
+        it 'parses a string describing an OCCI Category incl. attributes with properties' do
+          category_string = 'Category: restart;scheme="http://schemas.ogf.org/occi/infrastructure/compute/action#";class="action";title="Restart Compute instance";attributes="method{required} test{immutable}"'
+          category = Occi::Parser::Text.category category_string
+
+          expect(category.attributes['method'].required).to be_true
+          expect(category.attributes['method'].mutable).to be_true
+          expect(category.attributes['test'].required).to be_false
+          expect(category.attributes['test'].mutable).to be_false
+        end
 
         it 'parses attributes correctly' do
           resource_string = File.open("spec/occi/parser/text_samples/occi_resource_w_attributes.text", "rb").read
@@ -110,6 +119,7 @@ module Occi
           Occi::Parser::Text.const_set('REGEXP_CATEGORY', regexp_category)
         end
       end
+
       context '.resource' do
         it 'parses network resource from rOCCI server' do
           resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
@@ -239,6 +249,7 @@ module Occi
 
       context 'compatibility' do
         after(:each) { Occi::Settings.reload! }
+
         context 'terms' do
           it 'parses uppercase term, compatibility on' do
             Occi::Settings['compatibility']=true
@@ -269,6 +280,7 @@ module Occi
           end
 
         end
+
         context 'schemes' do
           it 'parses a Category, compatibility on' do
             Occi::Settings['compatibility']=true

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.5
-  prerelease: 
+  version: 4.2.6
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -11,60 +10,53 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -96,17 +85,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: OCCI is a collection of classes to simplify the implementation of the
@@ -157,6 +144,7 @@ files:
 - lib/occi/errors/attribute_not_defined_error.rb
 - lib/occi/errors/attribute_property_type_error.rb
 - lib/occi/errors/attribute_type_error.rb
+- lib/occi/errors/category_not_defined_error.rb
 - lib/occi/errors/kind_not_defined_error.rb
 - lib/occi/errors/parser_input_error.rb
 - lib/occi/errors/parser_type_error.rb
@@ -258,29 +246,25 @@ files:
 homepage: https://github.com/gwdg/rOCCI-core
 licenses:
 - Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1899763597318893191
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OCCI toolkit
 test_files: []