occi-core 4.3.4 → 4.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb6afc31ced89763f478fa32dfd83e557b3835f4
-  data.tar.gz: 85b839737d393b1ba49a8ce5dbd233410548bdf6
+  metadata.gz: d538f5cdea3d97838599cb47ec683aa741511fb6
+  data.tar.gz: c67bbd9ec02ca318d34107f9e424a11b3a2525da
 SHA512:
-  metadata.gz: 9d6a180a9df2c866181bbeb10d9990308b072a56034b2b51bd80aa279ae4d122bd9460aa67d412500d91d92a66c328235f02d9d981f763e527639f464a6e0271
-  data.tar.gz: cde5935763b8a68231350c57f7e3e30056bf21a4c551a2bdb2af8f951cbda31ad4f94e33fa0c1871c1465afde5d890e4b9f80685a2319b5b8e9ecadb12df78f1
+  metadata.gz: e3906c64af02d6dce2a806d86e21779c92842a159b67c35eb1a29d92ca57bfb853180fa2bb55333b2482407433114cbfdd94520f1cc3b0018cbde20d3ff0070d
+  data.tar.gz: e30e89e7765a35b16981a001b8711cfea3544392ce4e4a06e227a05a612384b50e60d7f161f2bcc74b44e35ac2e0762ce9def7ff962acb874e5530c52c790930

data/lib/occi/core/attributes.rb

@@ -325,22 +325,24 @@ module Occi
       end
 
       def add_missing_attributes(attributes, definitions, set_defaults)
-        attributes ||= Occi::Core::Attributes.new
-
         definitions.each_key do |key|
           next if key =~ /^_/
 
           if definitions[key].kind_of? Occi::Core::Attributes
+            attributes[key] = Occi::Core::Attributes.new if attributes[key].nil?
             add_missing_attributes(attributes[key], definitions[key], set_defaults)
           elsif attributes[key].nil?
-
             if definitions[key].default.nil?
               raise Occi::Errors::AttributeMissingError,
                     "Required attribute #{key} not specified" if definitions[key].required
-            else
-              attributes[key] = definitions[key].default if definitions[key].required || set_defaults
+            elsif definitions[key].required || set_defaults
+              attributes[key] = definitions[key]
+              attributes[key] = definitions[key].default
             end
-
+          else
+            old_val = attributes[key]
+            attributes[key] = definitions[key]
+            attributes[key] = old_val
           end
         end
       end

data/lib/occi/version.rb

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

data/occi-core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'json', '>= 1.8.1', '< 3'
-  gem.add_dependency 'hashie', '>= 3.3.1', '< 4'
+  gem.add_dependency 'hashie', '>= 3.3.1', '< 3.5'
   gem.add_dependency 'uuidtools', '>= 2.1.3', '< 3'
   gem.add_dependency 'activesupport', '>= 4.0.0', '< 6'
   gem.add_dependency 'settingslogic', '>= 2.0.9', '< 3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.5
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -41,7 +41,7 @@ dependencies:
         version: 3.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: 3.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement