ridley 0.6.2 → 0.6.3

data/lib/ridley/middleware/parse_json.rb

@@ -2,6 +2,8 @@ module Ridley
   module Middleware
     # @author Jamie Winsor <jamie@vialstudios.com>
     class ParseJson < Faraday::Response::Middleware
+      include Ridley::Logging
+
       JSON_TYPE  = 'application/json'.freeze
       
       BRACKETS   = [ 
@@ -17,6 +19,8 @@ module Ridley
       ].freeze
       
       class << self
+        include Ridley::Logging
+        
         # Takes a string containing JSON and converts it to a Ruby hash
         # symbols for keys
         #
@@ -47,7 +51,7 @@ module Ridley
         # @return [String]
         def response_type(env)
           if env[:response_headers][CONTENT_TYPE].nil?
-            Ridley.log.debug "Response did not specify a content type."
+            log.debug "Response did not specify a content type."
             return "text/html"
           end
 
@@ -62,7 +66,7 @@ module Ridley
         #
         # @return [Boolean]
         def json_response?(env)
-          response_type(env) == JSON_TYPE || looks_like_json?(env)
+          response_type(env) == JSON_TYPE && looks_like_json?(env)
         end
 
         # Examines the body of a request env and returns true if it appears
@@ -91,14 +95,13 @@ module Ridley
       end
 
       def on_complete(env)
-        if self.class.json_response?(env)
-          Ridley.log.debug("Parsing JSON Chef Response")
-          Ridley.log.debug(env)
+        log.debug(env)
 
+        if self.class.json_response?(env)
+          log.debug("Parsing Chef Response body as JSON")
           env[:body] = self.class.parse(env[:body])
         else
-          Ridley.log.debug("Chef Response was not JSON")
-          Ridley.log.debug(env)
+          log.debug("Chef Response did not contain a JSON body")
         end
       end
     end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/unit/ridley/middleware/parse_json_spec.rb

@@ -18,31 +18,31 @@ describe Ridley::Middleware::ParseJson do
     end
 
     describe "::json_response?" do
-      it "returns true if the value of content-type includes 'application/json'" do
+      it "returns true if the value of content-type includes 'application/json' and the body looks like JSON" do
         env = double('env')
         env.stub(:[]).with(:response_headers).and_return(
           'content-type' => 'application/json; charset=utf8'
         )
+        subject.should_receive(:looks_like_json?).with(env).and_return(true)
 
         subject.json_response?(env).should be_true
       end
 
-      it "returns true if the value of content-type does not include 'application/json' and the body contains JSON" do
+      it "returns false if the value of content-type includes 'application/json' but the body does not look like JSON" do
         env = double('env')
         env.stub(:[]).with(:response_headers).and_return(
-          'content-type' => 'text/plain'
+          'content-type' => 'application/json; charset=utf8'
         )
-        subject.should_receive(:looks_like_json?).with(env).and_return(true)
+        subject.should_receive(:looks_like_json?).with(env).and_return(false)
 
-        subject.json_response?(env).should be_true
+        subject.json_response?(env).should be_false
       end
 
-      it "returns false if the value of content-type does not include 'application/json' and the body does not contain JSON" do
+      it "returns false if the value of content-type does not include 'application/json'" do
         env = double('env')
         env.stub(:[]).with(:response_headers).and_return(
           'content-type' => 'text/plain'
         )
-        subject.should_receive(:looks_like_json?).with(env).and_return(false)
 
         subject.json_response?(env).should be_false
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -325,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2477295223740290227
+      hash: -3636346058198245509
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23