nestful 1.0.3 → 1.0.4

data/lib/nestful/helpers.rb

@@ -10,6 +10,14 @@ module Nestful
       value.to_s.split('_').map {|w| w.capitalize }.join
     end
 
+    def deep_merge(hash, other_hash)
+      hash.merge(other_hash) do |key, oldval, newval|
+        oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
+        newval = newval.to_hash if newval.respond_to?(:to_hash)
+        oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? deep_merge(oldval, newval) : newval
+      end
+    end
+
     # Stolen from Rack:
 
     DEFAULT_SEP = /[&;] */n

data/lib/nestful/resource.rb

@@ -14,10 +14,18 @@ module Nestful
       superclass.respond_to?(:path) ? superclass.path : nil
     end
 
-    def self.options(value = nil)
-      @options = value if value
-      return @options if @options
-      superclass.respond_to?(:options) ? superclass.options : {}
+    def self.defaults(value = nil)
+      @defaults = value if value
+      return @defaults if @defaults
+      superclass.respond_to?(:defaults) ? superclass.defaults : {}
+    end
+
+    class << self
+      alias_method :endpoint=, :endpoint
+      alias_method :path=, :path
+      alias_method :defaults=, :defaults
+      alias_method :options, :defaults
+      alias_method :options=, :defaults
     end
 
     def self.url
@@ -45,7 +53,7 @@ module Nestful
     end
 
     def self.request(url, options = {})
-      Request.new(url, self.options.merge(options)).execute
+      Request.new(url, Helpers.deep_merge(self.options, options)).execute
     end
 
     def self.all(*args)

data/lib/nestful/version.rb

@@ -1,3 +1,3 @@
 module Nestful
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/nestful/test_resource.rb

@@ -10,6 +10,12 @@ class TestResource < MiniTest::Unit::TestCase
     path '/v1/charges'
   end
 
+  class Token < Nestful::Resource
+    endpoint 'http://example.com'
+    path '/v1/tokens'
+    defaults :params => {:one => 1}
+  end
+
   def setup
   end
 
@@ -42,4 +48,11 @@ class TestResource < MiniTest::Unit::TestCase
     charge.put(:capture)
     assert_requested(:put, 'http://example.com/v1/charges/1/capture')
   end
+
+  def test_defaults
+    stub_request(:any, 'http://example.com/v1/tokens/1/capture?one=1')
+    charge = Token.new({:id => 1})
+    charge.get(:capture)
+    assert_requested(:get, 'http://example.com/v1/tokens/1/capture?one=1')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nestful
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -556066746735068730
+      hash: -3312569918476156670
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -556066746735068730
+      hash: -3312569918476156670
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24