saddle 0.0.33 → 0.0.34

data/lib/saddle.rb

@@ -17,7 +17,7 @@ module Saddle
     extend Options
 
     class << self
-      attr_accessor :additional_middlewares, :parent_module
+      attr_accessor :additional_middlewares
 
       # Once your implementation is written, this is the magic you need to
       # create a client instance.
@@ -39,8 +39,6 @@ module Saddle
         end
         # Add additional client attributes
         obj.send(:include, Saddle::ClientAttributes)
-        # Store the parent module in case we need it later
-        @parent_module = Module.nesting.last
       end
 
     end

data/lib/saddle/middleware/request/user_agent.rb

@@ -10,15 +10,19 @@ module Saddle
 
       class UserAgent < Faraday::Middleware
         def call(env)
+          user_agent = nil
           # Build a user agent that looks like 'SaddleExample 0.0.1'
-          user_agent = env[:request][:saddle][:client].name
-          if env[:request][:saddle][:client].parent_module
-            if defined?(env[:request][:saddle][:client].parent_module::VERSION)
-              user_agent += " #{env[:request][:saddle][:client].parent_module::VERSION}"
+          begin
+            user_agent = client_name = env[:request][:saddle][:client].name
+            parent_module = client_name.split('::')[0..-2].join('::').constantize
+            if parent_module
+              if defined?(parent_module::VERSION)
+                user_agent += " #{parent_module::VERSION}"
+              end
             end
+          rescue StandardError
           end
-
-          env[:request_headers]['User-Agent'] = user_agent
+          env[:request_headers]['User-Agent'] = user_agent if user_agent
 
           @app.call env
         end

data/lib/saddle/middleware/response/parse_json.rb

@@ -6,8 +6,9 @@ module Saddle
   module Middleware
     module Response
 
-    # Public: Parse response bodies as JSON.
+      # Public: Parse response bodies as JSON.
       class ParseJson < Faraday::Middleware
+
         CONTENT_TYPE = 'Content-Type'.freeze
         MIME_TYPE    = 'application/json'.freeze
 
@@ -16,31 +17,34 @@ module Saddle
         end
 
         def call(env)
-          result = @app.call env
-          if parse_response?(env)
-            # Make sure we're working with a valid body that's not a String
-            if env[:body] && env[:body].respond_to?(:to_str)
-              env[:request_headers][CONTENT_TYPE] ||= MIME_TYPE
-              env[:body] = ::JSON.parse env[:body]
-            end
+          result = @app.call(env)
+
+          if parse_response?(result)
+            result.env[:body] = ::JSON.parse(result.env[:body])
           end
           result
         end
 
-        def parse_response?(env)
-          has_body?(env) and (response_type(env) == MIME_TYPE)
+
+        private
+
+        def parse_response?(result)
+          has_body?(result) && (response_type(result) == MIME_TYPE)
         end
 
-        def has_body?(env)
-          body = env[:body] and !(body.respond_to?(:to_str) and body.empty?)
+        def has_body?(result)
+          result.env[:body] &&
+            (!result.env[:body].respond_to?(:to_str) || # must already be in string format
+             !result.env[:body].empty?) # or must be non-empty
         end
 
-        def response_type(env)
-          return nil unless env[:response_headers]
-          type = env[:response_headers][CONTENT_TYPE].to_s
+        def response_type(result)
+          return nil unless result.headers
+          type = result.headers[CONTENT_TYPE].to_s
           type = type.split(';', 2).first if type.index(';')
           type
         end
+
       end
 
     end

data/lib/saddle/requester.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash'
+
 require 'faraday'
 require 'faraday_middleware'
 
@@ -65,7 +67,7 @@ module Saddle
     # Make a GET request
     def get(url, params={}, options={})
       response = connection.get do |req|
-        req.options.merge!(options)
+        req.options.deep_merge!(options)
         req.url(url, params)
       end
       response.body
@@ -74,7 +76,7 @@ module Saddle
     # Make a POST request
     def post(url, data={}, options={})
       response = connection.post do |req|
-        req.options.merge!(options)
+        req.options.deep_merge!(options)
         req.url(url)
         req.body = data
       end
@@ -84,7 +86,7 @@ module Saddle
     # Make a PUT request
     def put(url, data={}, options={})
       response = connection.put do |req|
-        req.options.merge!(options)
+        req.options.deep_merge!(options)
         req.url(url)
         req.body = data
       end
@@ -94,7 +96,7 @@ module Saddle
     # Make a DELETE request
     def delete(url, params={}, options={})
       response = connection.delete do |req|
-        req.options.merge!(options)
+        req.options.deep_merge!(options)
         req.url(url, params)
       end
       response.body

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.33'
+  VERSION = '0.0.34'
 end

data/spec/requester/get_spec.rb

@@ -30,7 +30,7 @@ describe Saddle::Client do
           [
             200,
             {'Content-Type' => 'application/json'},
-            {'success' => true},
+            {'success' => true}.to_json,
           ]
         }
         @default_client.requester.get('/test.json')['success'].should == true

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'faraday' # for test stubs
+require 'saddle'
+
+require 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -100,6 +100,7 @@ files:
 - spec/multiple_spec.rb
 - spec/requester/get_spec.rb
 - spec/requester/post_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/mLewisLogic/saddle
 licenses:
 - MIT
@@ -136,3 +137,4 @@ test_files:
 - spec/multiple_spec.rb
 - spec/requester/get_spec.rb
 - spec/requester/post_spec.rb
+- spec/spec_helper.rb