mudbug 0.7.3.1 → 0.8.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzczZGM4MGZkMWIxMjI3NDg5Y2ZiYzVjM2UyNmRlM2FhM2E5OTQxYw==
+    MWQ5MTgyMDc4ODAxMzZlNGNjODA3Mzk4NmFjYmJmMzU5YWQ3MzY5ZA==
   data.tar.gz: !binary |-
-    MGVjNzE3MTBiMmU3MzA3YTJmOWRkNjJiYTkxYmEwNWE0OTMyMGVkMg==
+    NzM5M2RlZTk4OGRhZGJmZTQwOGQ3Njc0MWVjMTAxZDJkNTQ2YTc2MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2M2OTBjMDVjODE1OTIwMmQ3ZjcwOGM1YmUxYzlmYzBjOTRhY2I1MWIwZTQ5
-    MzI5MWY3YWI1ZjRiOTBiNTJmMGE4MDM0NDNhMmRlMjc1MjMzZDMyMzg1ZmM5
-    MjUyZDIxMzQ2NTk5ZGFmYTkxZjQ3MWU2N2IwOTk0ZDU1YzA3NDU=
+    ZjRkYmM5NWExY2IwZjA1YzJiN2Y3ZjFlZTFiOTU2NTY5YzE5ZGU0Y2Q3ODI4
+    YzQ0MDExNjZlODExMTAwM2FjOWQyOWU5NDg1YjA0MmYzYTkzYmUxOTQ4MTUw
+    NTVlNjhiOWRmZTliYmEwZjk5OTQzYTBiODc0YTk0YzVlMTAxNDU=
   data.tar.gz: !binary |-
-    YjcxOWU0OWIyZjZjNzEwN2JiNjhiMDdhZTQ2NThkN2ViOTFlOWIzMjY4ODlj
-    YzQ0MmU2Yjg1NGYwZDRiNWIwZDQ3NTdmMmQ1M2QzMzNiZWFjMmZkZmYwNmNk
-    ZjBjYTY5YTRmMjQ0ZDg2YjNiOTc0MmM5MjI4ODIyZjFhYzBmNGM=
+    ZmQ0MTVjMTBmMjE0NmMwMjY4OTE2M2MyNzYzZGQ5MzVlZWQ4YWMwOTUwYjY1
+    NzNhMTBmY2ZjMTEwOTljNTBiYThkNGU0MTU4MTUxNjBiNjZiZWJjNjgwNjdj
+    YmRlYmU1N2Q0NjZlMGMwZmU5YTk4MTBiZDgxYzVmZWYyN2Q1MTc=

data/VERSION

@@ -1 +1 @@
-0.7.3.1
+0.8.0.1

data/lib/mudbug.rb

@@ -116,15 +116,16 @@ class Mudbug
       path = "/#{path}" unless path[0,1] == '/'
       url = "http://#{@host}#{path}"
     end
-    RestClient::Resource.new url, @options.merge(options)
+    RestClient::Resource.new(url, merge(options))
   end
 
   # no payload
   #
   [:get, :delete].each { |meth|
-    define_method(meth) { |path, options = {}|
-      res = resource(path, options)
-      self.class.process(res.send(meth), res.headers[:accept])
+    define_method(meth) { |path, params = {}|
+      res = resource(path)
+      resp = res.send(meth, params: params)
+      self.class.process(resp, res.headers[:accept])
     }
   }
 
@@ -133,11 +134,26 @@ class Mudbug
   # otherwise apply #to_json to payload automatically.  Quack.
   #
   [:post, :put].each { |meth|
-    define_method(meth) { |path, payload, options={}|
-      options[:content_type] ||= CONTENT[:json][:type]
+    define_method(meth) { |path, payload, params = {}|
       payload = payload.to_json unless payload.is_a?(String)
-      res = resource(path, options)
-      self.class.process(res.send(meth, payload), res.headers[:accept])
+      res = resource(path, content_type: CONTENT[:json][:type])
+      resp = res.send(meth, payload, params: params)
+      self.class.process(resp, res.headers[:accept])
     }
   }
+
+  # a standard merge would throw away @options[:headers][:accept], if
+  # options[:headers] is provided.  Handle nested hashes while still allowing
+  # @options to be overridden
+  #
+  def merge(options)
+    # gah, let's go ahead and do this for all nested hashes we maintain
+    result = options.merge({})   # work on a copy, TODO: better way (not dup)
+    @options.each { |key, hsh|
+      if result[key] and result[key].is_a?(Hash) and hsh.is_a?(Hash)
+        result[key] = hsh.merge(result[key])
+      end
+    }
+    result
+  end
 end

data/test/mudbug.rb

@@ -3,9 +3,35 @@ require 'minitest/autorun'
 
 require_relative '../lib/mudbug'
 
-describe "Rick" do
-  it "should be embarassed" do
-    # flunk
-    skip # for now, since testing is on the critical path   :/
+describe "Mudbug#merge" do
+  it "should maintain 2nd-level nested hash keys" do
+    m = Mudbug.new
+    m.options[:headers].must_be_instance_of Hash
+    m.options[:headers][:accept].must_be_instance_of String
+    default_accept = m.options[:headers][:accept]
+
+    options = m.merge(headers: {})
+    options[:headers].must_be_instance_of Hash
+    options[:headers][:accept].must_equal default_accept
+
+    options = m.merge(headers: { accept: '12345' })
+    options[:headers].must_be_instance_of Hash
+    options[:headers][:accept].must_equal '12345'
+
+    distinct = { headers: { xmadeup: '12345' }, max_redirects: 5 }
+    options = m.merge(distinct)
+    options[:headers].must_be_instance_of Hash
+    options[:headers][:accept].must_equal default_accept
+
+    # make sure the outside hash takes precedence
+    distinct.each { |key, val|
+      if val.is_a?(Hash)
+        val.each { |key2, val2|
+          options[key][key2].must_equal val2
+        }
+      else
+        options[key].must_equal val
+      end
+    }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mudbug
 version: !ruby/object:Gem::Version
-  version: 0.7.3.1
+  version: 0.8.0.1
 platform: ruby
 authors:
 - Rick Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client