ridley 0.8.0 → 0.8.1

data/lib/ridley/connection.rb

@@ -8,9 +8,8 @@ module Ridley
     include Celluloid
 
     VALID_OPTIONS = [
-      :params,
-      :headers,
-      :request,
+      :retries,
+      :retry_interval,
       :ssl,
       :proxy
     ]
@@ -29,16 +28,10 @@ module Ridley
     # @param [String] client_name
     # @param [String] client_key
     #
-    # @option options [Hash] :params
-    #   URI query unencoded key/value pairs
-    # @option options [Hash] :headers
-    #   unencoded HTTP header key/value pairs
     # @option options [Integer] :retries (5)
     #   retry requests on 5XX failures
     # @option options [Float] :retry_interval (0.5)
     #   how often we should pause between retries
-    # @option options [Hash] :request
-    #   request options
     # @option options [Hash] :ssl
     #   * :verify (Boolean) [true] set to false to disable SSL verification
     # @option options [URI, String, Hash] :proxy
@@ -50,23 +43,21 @@ module Ridley
       @retries        = options[:retries]
       @retry_interval = options[:retry_interval]
 
-      options = options.reverse_merge(
-        builder: Faraday::Builder.new { |b|
-          b.response :json
-          b.request :retry,
-            max: @retries,
-            interval: @retry_interval,
-            exceptions: [
-              Ridley::Errors::HTTP5XXError,
-              Errno::ETIMEDOUT,
-              Faraday::Error::TimeoutError
-            ]
-          b.response :chef_response
-          b.request :chef_auth, client_name, client_key
-
-          b.adapter :net_http_persistent
-        }
-      )
+      options[:builder] = Faraday::Builder.new do |b|
+        b.response :json
+        b.request :retry,
+          max: @retries,
+          interval: @retry_interval,
+          exceptions: [
+            Ridley::Errors::HTTP5XXError,
+            Errno::ETIMEDOUT,
+            Faraday::Error::TimeoutError
+          ]
+        b.response :chef_response
+        b.request :chef_auth, client_name, client_key
+
+        b.adapter :net_http_persistent
+      end
 
       uri_hash = Addressable::URI.parse(server_url).to_hash.slice(:scheme, :host, :port)
 

data/lib/ridley/middleware/parse_json.rb

@@ -28,7 +28,8 @@ module Ridley
         #
         # @return [Hash]
         def parse(body)
-          HashWithIndifferentAccess.new MultiJson.decode(body)
+          result = MultiJson.decode(body)
+          result.is_a?(Hash) ? Hashie::Mash.new(result) : result
         end
 
         # Extracts the type of the response from the response headers

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -400,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1703790355388058426
+      hash: -2528594805736736498
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24