faraday_middleware 0.8.6 → 0.8.7

data/.gitignore

@@ -1,6 +1,3 @@
-# Mac OS X
-.DS_Store
-
 # TextMate
 *.tmproj
 tmtags
@@ -19,6 +16,7 @@ rdoc
 doc
 log
 .yardoc
+tmp
 
 # Bundler
 *.gem

data/lib/faraday_middleware/response/mashify.rb

@@ -4,6 +4,8 @@ module FaradayMiddleware
   # Public: Converts parsed response bodies to a Hashie::Mash if they were of
   # Hash or Array type.
   class Mashify < Faraday::Response::Middleware
+    attr_accessor :mash_class
+
     class << self
       attr_accessor :mash_class
     end
@@ -13,12 +15,17 @@ module FaradayMiddleware
       self.mash_class = ::Hashie::Mash
     end
 
+    def initialize(app = nil, options = {})
+      super(app)
+      self.mash_class = options[:mash_class] || self.class.mash_class
+    end
+
     def parse(body)
       case body
       when Hash
-        self.class.mash_class.new(body)
+        mash_class.new(body)
       when Array
-        body.map { |item| item.is_a?(Hash) ? self.class.mash_class.new(item) : item }
+        body.map { |item| item.is_a?(Hash) ? mash_class.new(item) : item }
       else
         body
       end

data/lib/faraday_middleware/response/parse_json.rb

@@ -3,10 +3,12 @@ require 'faraday_middleware/response_middleware'
 module FaradayMiddleware
   # Public: Parse response bodies as JSON.
   class ParseJson < ResponseMiddleware
-    dependency 'json'
+    dependency {
+      require 'json' unless defined?(JSON)
+    }
 
     define_parser { |body|
-      JSON.parse body unless body.empty?
+      JSON.parse body unless body.strip.empty?
     }
 
     # Public: Override the content-type of the response with "application/json"

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

data/spec/caching_test.rb

@@ -2,6 +2,7 @@ require 'test/unit'
 require 'forwardable'
 require 'fileutils'
 require 'rack/cache'
+require 'faraday'
 require 'faraday_middleware/response/caching'
 require 'faraday_middleware/rack_compatible'
 
@@ -87,10 +88,22 @@ end
 class HttpCachingTest < Test::Unit::TestCase
   include FileUtils
 
-  CACHE_DIR = File.expand_path('../cache', __FILE__)
+  CACHE_DIR = File.expand_path('../../tmp/cache', __FILE__)
+
+  # middleware to check whether "rack.errors" is free of error reports
+  class RackErrorsComplainer < Struct.new(:app)
+    def call(env)
+      response = app.call(env)
+      error_stream = env['rack.errors'].string
+      raise %(unexpected error in 'rack.errors') if error_stream.include? 'error'
+      response
+    end
+  end
 
   def setup
     rm_r CACHE_DIR if File.exists? CACHE_DIR
+    # force reinitializing cache dirs
+    Rack::Cache::Storage.instance.clear
 
     request_count = 0
     response = lambda { |env|
@@ -101,6 +114,8 @@ class HttpCachingTest < Test::Unit::TestCase
     }
 
     @conn = Faraday.new do |b|
+      b.use RackErrorsComplainer
+
       b.use FaradayMiddleware::RackCompatible, Rack::Cache::Context,
         :metastore   => "file:#{CACHE_DIR}/rack/meta",
         :entitystore => "file:#{CACHE_DIR}/rack/body",

data/spec/mashify_spec.rb

@@ -47,7 +47,7 @@ describe FaradayMiddleware::Mashify do
       values[1].username.should == 'sferik'
     end
 
-    it 'should allow for use of custom Mash subclasses' do
+    it 'should allow for use of custom Mash subclasses at the class level' do
       class MyMash < ::Hashie::Mash; end
       described_class.mash_class = MyMash
 
@@ -56,6 +56,16 @@ describe FaradayMiddleware::Mashify do
 
       me.class.should == MyMash
     end
+
+    it 'should allow for use of custom Mash subclasses at the instance level' do
+      class MyMash < ::Hashie::Mash; end
+      mashify = described_class.new(nil, :mash_class => MyMash)
+
+      env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
+      me  = mashify.on_complete(env)
+
+      me.class.should == MyMash
+    end
   end
 
   context 'integration test' do

data/spec/parse_json_spec.rb

@@ -61,7 +61,7 @@ describe FaradayMiddleware::ParseJson, :type => :response do
   end
 
   it "chokes on invalid json" do
-    ['{!', ' ', '"a"', 'true', 'null', '1'].each do |data|
+    ['{!', '"a"', 'true', 'null', '1'].each do |data|
       expect { process(data) }.to raise_error(Faraday::Error::ParsingError)
     end
   end
@@ -97,4 +97,16 @@ describe FaradayMiddleware::ParseJson, :type => :response do
       response['content-type'].should eql('application/json')
     end
   end
+
+  context "HEAD responses" do
+    it "should nullify the body if it's only one space" do
+      response = process(' ')
+      response.body.should be_nil
+    end
+
+    it "should nullify the body if it's two spaces" do
+      response = process(' ')
+      response.body.should be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70323858414060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,18 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70323858414060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70323858413240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +44,15 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *70323858413240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70323858412680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +60,15 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70323858412680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70323858412120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -58,10 +76,15 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70323858412120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &70323858411460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,10 +92,15 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70323858411460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70323858410680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +108,15 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70323858410680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70323858410200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +124,15 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70323858410200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70323858409700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,7 +140,12 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70323858409700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Various middleware for Faraday
 email:
 - sferik@gmail.com
@@ -171,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Various middleware for Faraday
@@ -188,3 +231,4 @@ test_files:
 - spec/parse_xml_spec.rb
 - spec/parse_yaml_spec.rb
 - spec/rashify_spec.rb
+has_rdoc: