Doa 0.1.2 → 0.1.3

data/Doa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Doa}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nolan Eakins <sneakin@semanticgap.com>"]
-  s.date = %q{2009-10-21}
+  s.date = %q{2010-08-04}
   s.description = %q{rSpec controller macros}
   s.email = %q{suppert@semanticgap.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/sneakin/Doa}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{The Tester}
   s.test_files = [
     "spec/application.rb",
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/doa.rb

@@ -21,7 +21,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-require 'facets/hash'
 require 'doa/class_methods'
 require 'doa/instance_methods'
 

data/lib/doa/instance_methods.rb

@@ -33,10 +33,10 @@ module Doa
       p = Doa.default_params.try(:clone) ||
         HashWithIndifferentAccess.new
 
-      p.recursive_merge!(super_params)
-      p.recursive_merge!(action_params)
-      p.recursive_merge!(self.instance_eval(&default_params)) if default_params
-      p.recursive_merge!(shared_params)
+      p.deep_merge!(super_params)
+      p.deep_merge!(action_params)
+      p.deep_merge!(self.instance_eval(&default_params)) if default_params
+      p.deep_merge!(shared_params)
 
       @_params = HashWithIndifferentAccess.new(p)
     end
@@ -46,7 +46,7 @@ module Doa
     # passed as an argument.
     def doa(per_call_params = Hash.new)
       send(action_method, action_name,
-           self.params.recursive_merge(per_call_params))
+           self.params.deep_merge(per_call_params))
     end
 
     # Alias for #doa
@@ -62,7 +62,7 @@ module Doa
         next acc unless klass.respond_to?(:default_params)
 
         dp = klass.default_params
-        acc.recursive_merge!(self.instance_eval(&dp) || Hash.new) if dp
+        acc.deep_merge!(self.instance_eval(&dp) || Hash.new) if dp
         acc
       end
     end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Doa
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  hash: 29
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nolan Eakins <sneakin@semanticgap.com>
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 -04:00
+date: 2010-08-04 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -44,21 +50,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The Tester