mudbug 0.8.0.1 → 0.8.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWQ5MTgyMDc4ODAxMzZlNGNjODA3Mzk4NmFjYmJmMzU5YWQ3MzY5ZA==
+    ZTFjMWMzMmVmZGQ4NjM1NTI1YzZlNWU4MTVlMzQ5MDFiYzcyNTA4OA==
   data.tar.gz: !binary |-
-    NzM5M2RlZTk4OGRhZGJmZTQwOGQ3Njc0MWVjMTAxZDJkNTQ2YTc2MA==
+    NTliMTVhOTYxMjE0ZTNjM2FiNjQ0ODY4MGU4NTYzNWM2MmZjZDdiMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjRkYmM5NWExY2IwZjA1YzJiN2Y3ZjFlZTFiOTU2NTY5YzE5ZGU0Y2Q3ODI4
-    YzQ0MDExNjZlODExMTAwM2FjOWQyOWU5NDg1YjA0MmYzYTkzYmUxOTQ4MTUw
-    NTVlNjhiOWRmZTliYmEwZjk5OTQzYTBiODc0YTk0YzVlMTAxNDU=
+    OWVjZGMzM2JiZGI1OGQwMzUwYzQ2MDNmN2YyZmVmZTcyY2U0NDdlYTQ5ZDYz
+    OWVkOWM0MjQ0YTA2YTE5MTE1NDVjZDc3NzVhY2Y0ZTY1NDQ2ZmY0MjRjOGY1
+    ODg2M2Q4YzkxNTk0OGZjMmQyYTA2NTAyMmIyYmJjZDQ3YzljY2E=
   data.tar.gz: !binary |-
-    ZmQ0MTVjMTBmMjE0NmMwMjY4OTE2M2MyNzYzZGQ5MzVlZWQ4YWMwOTUwYjY1
-    NzNhMTBmY2ZjMTEwOTljNTBiYThkNGU0MTU4MTUxNjBiNjZiZWJjNjgwNjdj
-    YmRlYmU1N2Q0NjZlMGMwZmU5YTk4MTBiZDgxYzVmZWYyN2Q1MTc=
+    MTU0NGI1ZDc3YzFhM2RhYjM5MTA0YTgxODgxYTlhNzJkYWM3YmY0NTdjYjg4
+    NDliMzNmMDM1MDQ2MjMwNjRmZjMxYzdhMDQzYmMwYWIxNTVhODg2NGJhYWM1
+    YTdlOWZkYzU2MjlmZDU2YTA4MWFlNWE0ZTYzZDE5NGM1MWVhNTk=

data/VERSION

@@ -1 +1 @@
-0.8.0.1
+0.8.1.1

data/lib/mudbug.rb

@@ -49,6 +49,7 @@ class Mudbug
   # accept is e.g. [:json, :html]
   #
   def self.process(resp, accept = nil)
+    @lager.debug { "accept: #{accept}" }
     @lager.debug { "response code: #{resp.code}" }
     @lager.debug { "response headers:\n" << resp.raw_headers.inspect }
 
@@ -107,7 +108,7 @@ class Mudbug
   # handling
   # supports /path/to/res, path/to/res, http://host.com/path/to/res
   #
-  def resource(path, options = {})
+  def resource(path)
     uri = URI.parse(path)
     if uri.host # a full URL was passed in
       @host = uri.host
@@ -116,7 +117,7 @@ class Mudbug
       path = "/#{path}" unless path[0,1] == '/'
       url = "http://#{@host}#{path}"
     end
-    RestClient::Resource.new(url, merge(options))
+    RestClient::Resource.new(url, @options)
   end
 
   # no payload
@@ -136,24 +137,11 @@ class Mudbug
   [:post, :put].each { |meth|
     define_method(meth) { |path, payload, params = {}|
       payload = payload.to_json unless payload.is_a?(String)
-      res = resource(path, content_type: CONTENT[:json][:type])
-      resp = res.send(meth, payload, params: params)
+      res = resource(path)
+      resp = res.send(meth, payload,
+                      content_type: CONTENT[:json][:type],
+                      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,35 +3,8 @@ require 'minitest/autorun'
 
 require_relative '../lib/mudbug'
 
-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
-    }
+describe "Mudbug" do
+  it "has no tests" do
+    skip
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mudbug
 version: !ruby/object:Gem::Version
-  version: 0.8.0.1
+  version: 0.8.1.1
 platform: ruby
 authors:
 - Rick Hull