ridley 0.3.0 → 0.3.1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.sw[op]

data/lib/ridley/resource.rb

@@ -123,7 +123,7 @@ module Ridley
       def create(connection, object)
         resource = new(connection, object.to_hash)
         new_attributes = connection.post(self.resource_path, resource.to_json).body
-        resource.attributes = resource.attributes.merge(new_attributes)
+        resource.attributes = resource.attributes.deep_merge(new_attributes)
         resource
       end
 
@@ -176,7 +176,7 @@ module Ridley
     # @param [Hash] attributes
     def initialize(connection, attributes = {})
       @connection = connection
-      self.attributes = self.class.attribute_defaults.merge(attributes)
+      self.attributes = self.class.attribute_defaults.deep_merge(attributes)
     end
 
     # @param [String, Symbol] key

data/lib/ridley/resources/data_bag_item.rb

@@ -50,7 +50,7 @@ module Ridley
         end
 
         new_attributes = connection.post("#{data_bag.class.resource_path}/#{data_bag.name}", resource.to_json).body
-        resource.from_hash(resource.attributes.merge(new_attributes))
+        resource.from_hash(resource.attributes.deep_merge(new_attributes))
         resource
       end
 

data/lib/ridley/resources/environment.rb

@@ -58,7 +58,7 @@ module Ridley
     # @return [HashWithIndifferentAccess]
     def set_default_attribute(key, value)
       attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
-      self.default_attributes = self.default_attributes.merge(attr_hash)
+      self.default_attributes = self.default_attributes.deep_merge(attr_hash)
     end
 
     # Set an environment level override attribute given the dotted path representation of
@@ -76,7 +76,7 @@ module Ridley
     # @return [HashWithIndifferentAccess]
     def set_override_attribute(key, value)
       attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
-      self.override_attributes = self.override_attributes.merge(attr_hash)
+      self.override_attributes = self.override_attributes.deep_merge(attr_hash)
     end
   end
 

data/lib/ridley/resources/node.rb

@@ -61,7 +61,7 @@ module Ridley
     # @return [HashWithIndifferentAccess]
     def set_attribute(key, value)
       attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
-      self.normal = self.normal.merge(attr_hash)
+      self.normal = self.normal.deep_merge(attr_hash)
     end
 
     def eucalyptus?

data/lib/ridley/resources/role.rb

@@ -42,7 +42,7 @@ module Ridley
     # @return [HashWithIndifferentAccess]
     def set_override_attribute(key, value)
       attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
-      self.override_attributes = self.override_attributes.merge(attr_hash)
+      self.override_attributes = self.override_attributes.deep_merge(attr_hash)
     end
 
     # Set a role level default attribute given the dotted path representation of the Chef
@@ -60,7 +60,7 @@ module Ridley
     # @return [HashWithIndifferentAccess]
     def set_default_attribute(key, value)
       attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
-      self.default_attributes = self.default_attributes.merge(attr_hash)
+      self.default_attributes = self.default_attributes.deep_merge(attr_hash)
     end
   end
 

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/ridley.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'addressable'
   s.add_runtime_dependency 'faraday'
   s.add_runtime_dependency 'multi_json', '>= 1.0.4'
-  s.add_runtime_dependency 'activemodel'
+  s.add_runtime_dependency 'activemodel', '>= 3.2.0'
+  s.add_runtime_dependency 'activesupport', '>= 3.2.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -434,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3213701153565876278
+      hash: 900476655936176139
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23