occi-core 4.2.13 → 4.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b13e9998a9a2ccb704efa4c1cbb283ae7aa7d46
-  data.tar.gz: c8e5a5a2dfe2df264cd24c46e86f7ec3d28b10b9
+  metadata.gz: 97bfbcd8727b44c08e826dbbe76a6f7c05034a5c
+  data.tar.gz: b549d11e985dc2ef189b17fe6e51d02b26fdb75b
 SHA512:
-  metadata.gz: 2093cc6c116bf9dc2e281a57ba5cfc2b05528e81da87695bc6a46c4078830c4575e9fde4aff0392edcea820b6c6f20e5c3a9232e83aacb54930f09d9701b9937
-  data.tar.gz: 01acb909e3a5942c83988de6966fb036827d07e7ac481b6862358356b99d06d79c0335de9151d9bdf3ab8f2d6fda5dbb38dba44a22eea40331568358ac069740
+  metadata.gz: b48367de96eccf0689868a85e72fb3eadc0576f2bbc7e9cf3248538aa5a21e943cc66e6aeeb3dd679be635b6613453df410330efb731aa92606e649c52f3ba75
+  data.tar.gz: d735235babe4e5405902d583504957ee15a0235037566f7adb4cc152aa74da33c8525236b92c723687951541da5480031c1787a2e4a6f3d7e70a6336552e3164

data/lib/occi/core/link.rb

@@ -11,7 +11,7 @@ module Occi
       self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/core#',
                                        term='link',
                                        title='link',
-                                       attributes=self.attributes,
+                                       attributes=Occi::Core::Attributes.new(self.attributes),
                                        parent=Occi::Core::Entity.kind
 
       # @param [String] kind
@@ -38,8 +38,8 @@ module Occi
       # set target attribute of link
       # @param [String] target
       def target=(target)
-        self.attributes['occi.core.target'] = target
-        @target = target
+        self.attributes['occi.core.target'] = target.to_s
+        @target = target.to_s
       end
 
       # @return [String] source attribute of the link
@@ -51,13 +51,13 @@ module Occi
       # set source attribute of link
       # @param [String] source
       def source=(source)
-        self.attributes['occi.core.source'] = source
-        @source = source
+        self.attributes['occi.core.source'] = source.to_s
+        @source = source.to_s
       end
 
       # Runs check on attributes
-      def check
-        raise ArgumentError, "Cannot run check on #{self.to_s} without relation (@rel attribute) set" unless @rel
+      def check(set_defaults = false)
+        raise ArgumentError, "Cannot run check on #{self.to_s.inspect} kind #{self.kind.to_s.inspect} without relation (the rel attribute) set!" unless @rel
         super
       end
 

data/lib/occi/version.rb

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

data/spec/occi/core/link_spec.rb

@@ -8,9 +8,11 @@ module Occi
       context '#check' do
         let(:defs){
           defs = Occi::Core::Attributes.new
-          defs['occi.core.id'] = { :type=> 'string', :required => true }
-          defs['stringtype'] =   { :type => 'string', :pattern => '[adefltuv]+',
+          defs['occi.core.id']       = { :type=> 'string', :required => true }
+          defs['stringtype']         = { :type => 'string', :pattern => '[adefltuv]+',
                                            :default => 'defaultforlink', :mutable => true, :required => true }
+          defs['stringtypeoptional'] = { :type => 'string', :pattern => '[adefltuv]+',
+                                           :default => 'defaultforlink', :mutable => true, :required => false }
           defs }
 
         it 'sets default for required attribute' do
@@ -22,6 +24,19 @@ module Occi
 
           link.check
           expect(link.attributes['stringtype']).to eql 'defaultforlink'
+          expect(link.attributes['stringtypeoptional']).to be_nil
+        end
+
+        it 'accepts the set_defaults flag' do
+          link = Occi::Core::Link.new
+          link.kind.attributes.merge!(defs)
+          model = Occi::Model.new
+          model.register(link.kind)
+          link.model = model
+
+          link.check(true)
+          expect(link.attributes['stringtype']).to eql 'defaultforlink'
+          expect(link.attributes['stringtypeoptional']).to eql 'defaultforlink'
         end
 
         it 'raises error if no relationship is set' do

data/spec/occi/core/resource_spec.rb

@@ -17,7 +17,7 @@ module Occi
         end
 
         it 'sets the right target' do
-          expect(resource.links.first.target).to eql target
+          expect(resource.links.first.target).to eql target.to_s
         end
       end
 

data/spec/occi/infrastructure/compute_spec.rb

@@ -27,12 +27,12 @@ module Occi
 
           it "has the correct link as target" do
             compute.storagelink target
-            expect(compute.links.first.target).to be target
+            expect(compute.links.first.target).to eq target.to_s
           end
 
           it "has target with correct ID" do
             compute.storagelink target
-            expect(compute.links.first.target.id).to eq target.id
+            expect(compute.links.first.target.split('/').last).to eq target.id
           end
         end
 
@@ -55,7 +55,7 @@ module Occi
           it 'shows correctly in collections' do
             compute.storagelink target
             compute.model=modl
-            expect(compute.storagelinks[0].target.id).to eq target.id
+            expect(compute.storagelinks[0].target.split('/').last).to eq target.id
           end
         end
       end
@@ -80,7 +80,7 @@ module Occi
 
           it "has the correct interface as target" do
             compute.networkinterface target
-            expect(compute.links.first.target).to be target
+            expect(compute.links.first.target).to eq target.to_s
           end
         end
 
@@ -103,7 +103,7 @@ module Occi
           it 'shows correctly in collections' do
             compute.networkinterface target
             compute.model=modl
-            expect(compute.networkinterfaces[0].target.id).to eq target.id
+            expect(compute.networkinterfaces[0].target.split('/').last).to eq target.id
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.13
+  version: 4.2.14
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OCCI toolkit