faraday_middleware 0.7.0 → 0.8.0

data/spec/parse_json_spec.rb

@@ -1,69 +1,94 @@
 require 'helper'
+require 'faraday_middleware/response/parse_json'
 
-describe Faraday::Response::ParseJson do
-  context 'when used' do
-    let(:parse_json) { Faraday::Response::ParseJson.new }
+describe FaradayMiddleware::ParseJson, :type => :response do
+  context "no type matching" do
+    it "doesn't change nil body" do
+      process(nil).body.should be_nil
+    end
 
-    it 'should handle a blank response' do
-      empty = parse_json.on_complete(:body => '')
-      empty.should be_nil
+    it "nullifies empty body" do
+      process('').body.should be_nil
     end
 
-    it 'should handle a true response' do
-      response = parse_json.on_complete(:body => 'true')
-      response.should be_true
+    it "parses json body" do
+      response = process('{"a":1}')
+      response.body.should eql('a' => 1)
+      response.env[:raw_body].should be_nil
     end
+  end
 
-    it 'should handle a false response' do
-      response = parse_json.on_complete(:body => 'false')
-      response.should be_false
+  context "with preserving raw" do
+    let(:options) { {:preserve_raw => true} }
+
+    it "parses json body" do
+      response = process('{"a":1}')
+      response.body.should eql('a' => 1)
+      response.env[:raw_body].should eql('{"a":1}')
     end
 
-    it 'should handle hashes' do
-      me = parse_json.on_complete(:body => '{"name":"Erik Michaels-Ober","screen_name":"sferik"}')
-      me.class.should == Hash
-      me['name'].should == 'Erik Michaels-Ober'
-      me['screen_name'].should == 'sferik'
+    it "can opt out of preserving raw" do
+      response = process('{"a":1}', nil, :preserve_raw => false)
+      response.env[:raw_body].should be_nil
     end
+  end
 
-    it 'should handle arrays' do
-      values = parse_json.on_complete(:body => '[123, 456]')
-      values.class.should == Array
-      values.first.should == 123
-      values.last.should == 456
+  context "with regexp type matching" do
+    let(:options) { {:content_type => /\bjson$/} }
+
+    it "parses json body of correct type" do
+      response = process('{"a":1}', 'application/x-json')
+      response.body.should eql('a' => 1)
     end
 
-    it 'should handle arrays of hashes' do
-      us = parse_json.on_complete(:body => '[{"screen_name":"sferik"},{"screen_name":"pengwynn"}]')
-      us.class.should == Array
-      us.first['screen_name'].should == 'sferik'
-      us.last['screen_name'].should  == 'pengwynn'
+    it "ignores json body of incorrect type" do
+      response = process('{"a":1}', 'text/json-xml')
+      response.body.should eql('{"a":1}')
     end
+  end
 
-    it 'should handle mixed arrays' do
-      values = parse_json.on_complete(:body => '[123, {"screen_name":"sferik"}, 456]')
-      values.class.should == Array
-      values.first.should == 123
-      values.last.should == 456
-      values[1]['screen_name'].should == 'sferik'
+  context "with array type matching" do
+    let(:options) { {:content_type => %w[a/b c/d]} }
+
+    it "parses json body of correct type" do
+      process('{"a":1}', 'a/b').body.should be_a(Hash)
+      process('{"a":1}', 'c/d').body.should be_a(Hash)
+    end
+
+    it "ignores json body of incorrect type" do
+      process('{"a":1}', 'a/d').body.should_not be_a(Hash)
+    end
+  end
+
+  it "chokes on invalid json" do
+    ['{!', ' ', '"a"', 'true', 'null', '1'].each do |data|
+      expect { process(data) }.to raise_error(Faraday::Error::ParsingError)
     end
   end
 
-  context 'integration test' do
-    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
-    let(:connection) do
-      Faraday::Connection.new do |builder|
-        builder.adapter :test, stubs
-        builder.use Faraday::Response::ParseJson
-      end
+  context "with mime type fix" do
+    let(:middleware) {
+      app = described_class::MimeTypeFix.new(lambda {|env|
+        Faraday::Response.new(env)
+      }, :content_type => /^text\//)
+      described_class.new(app, :content_type => 'application/json')
+    }
+
+    it "ignores completely incompatible type" do
+      response = process('{"a":1}', 'application/xml')
+      response.body.should eql('{"a":1}')
+    end
+
+    it "ignores compatible type with bad data" do
+      response = process('var a = 1', 'text/javascript')
+      response.body.should eql('var a = 1')
+      response['content-type'].should eql('text/javascript')
     end
 
-    it 'should create a Hash from the body' do
-      stubs.get('/hash') {[200, {'content-type' => 'application/json; charset=utf-8'}, '{"name":"Erik Michaels-Ober","screen_name":"sferik"}']}
-      me = connection.get('/hash').body
-      me.class.should == Hash
-      me['name'].should == 'Erik Michaels-Ober'
-      me['screen_name'].should == 'sferik'
+    it "corrects compatible type and data" do
+      response = process('{"a":1}', 'text/javascript')
+      response.body.should be_a(Hash)
+      response['content-type'].should eql('application/json')
     end
   end
 end

data/spec/parse_marshal_spec.rb

@@ -1,33 +1,16 @@
 require 'helper'
+require 'faraday_middleware/response/parse_marshal'
 
-describe Faraday::Response::ParseMarshal do
-  context 'when used' do
-    let(:parse_marshal) { Faraday::Response::ParseMarshal.new }
-
-    it 'should load a marshalled hash' do
-      me = parse_marshal.on_complete(:body => "\x04\b{\x06I\"\tname\x06:\x06ETI\"\x17Erik Michaels-Ober\x06;\x00T")
-      me.class.should == Hash
-    end
-
-    it 'should handle hashes' do
-      me = parse_marshal.on_complete(:body => "\x04\b{\x06I\"\tname\x06:\x06ETI\"\x17Erik Michaels-Ober\x06;\x00T")
-      me['name'].should == 'Erik Michaels-Ober'
-    end
+describe FaradayMiddleware::ParseMarshal, :type => :response do
+  it "restores a marshaled dump" do
+    process(Marshal.dump(:a => 1)).body.should be_eql(:a => 1)
   end
 
-  context 'integration test' do
-    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
-    let(:connection) do
-      Faraday::Connection.new do |builder|
-        builder.adapter :test, stubs
-        builder.use Faraday::Response::ParseMarshal
-      end
-    end
+  it "nulifies blank response" do
+    process('').body.should be_nil
+  end
 
-    it 'should create a Hash from the body' do
-      stubs.get('/hash') {[200, {'content-type' => 'application/xml; charset=utf-8'}, "\x04\b{\x06I\"\tname\x06:\x06ETI\"\x17Erik Michaels-Ober\x06;\x00T"]}
-      me = connection.get('/hash').body
-      me.class.should == Hash
-    end
+  it "chokes on invalid content" do
+    expect { process('abc') }.to raise_error(Faraday::Error::ParsingError)
   end
 end

data/spec/parse_xml_spec.rb

@@ -1,39 +1,71 @@
 require 'helper'
+require 'faraday_middleware/response/parse_xml'
 
-describe Faraday::Response::ParseXml do
-  context 'when used' do
-    let(:parse_xml) { Faraday::Response::ParseXml.new }
+describe FaradayMiddleware::ParseXml, :type => :response do
+  let(:xml)  { '<user><name>Erik Michaels-Ober</name><screen_name>sferik</screen_name></user>' }
+  let(:user) { {'user' => {'name' => 'Erik Michaels-Ober', 'screen_name' => 'sferik'} } }
 
-    it 'should handle an empty response' do
-      empty = parse_xml.on_complete(:body => '')
-      empty.should == Hash.new
+  context "no type matching" do
+    it "doesn't change nil body" do
+      process(nil).body.should be_nil
     end
 
-    it 'should create a Hash from the body' do
-      me = parse_xml.on_complete(:body => '<user><name>Erik Michaels-Ober</name><screen_name>sferik</screen_name></user>')
-      me.class.should == Hash
+    it "turns empty body into empty hash" do
+      process('').body.should be_eql({})
     end
 
-    it 'should handle hashes' do
-      me = parse_xml.on_complete(:body => '<user><name>Erik Michaels-Ober</name><screen_name>sferik</screen_name></user>')
-      me['user']['name'].should == 'Erik Michaels-Ober'
-      me['user']['screen_name'].should == 'sferik'
+    it "parses xml body" do
+      response = process(xml)
+      response.body.should eql(user)
+      response.env[:raw_body].should be_nil
     end
   end
 
-  context 'integration test' do
-    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
-    let(:connection) do
-      Faraday::Connection.new do |builder|
-        builder.adapter :test, stubs
-        builder.use Faraday::Response::ParseXml
-      end
+  context "with preserving raw" do
+    let(:options) { {:preserve_raw => true} }
+
+    it "parses xml body" do
+      response = process(xml)
+      response.body.should eql(user)
+      response.env[:raw_body].should eql(xml)
+    end
+
+    it "can opt out of preserving raw" do
+      response = process(xml, nil, :preserve_raw => false)
+      response.env[:raw_body].should be_nil
+    end
+  end
+
+  context "with regexp type matching" do
+    let(:options) { {:content_type => /\bxml$/} }
+
+    it "parses xml body of correct type" do
+      response = process(xml, 'application/xml')
+      response.body.should eql(user)
+    end
+
+    it "ignores xml body of incorrect type" do
+      response = process(xml, 'text/html')
+      response.body.should eql(xml)
+    end
+  end
+
+  context "with array type matching" do
+    let(:options) { {:content_type => %w[a/b c/d]} }
+
+    it "parses xml body of correct type" do
+      process(xml, 'a/b').body.should be_a(Hash)
+      process(xml, 'c/d').body.should be_a(Hash)
+    end
+
+    it "ignores xml body of incorrect type" do
+      process(xml, 'a/d').body.should_not be_a(Hash)
     end
+  end
 
-    it 'should create a Hash from the body' do
-      stubs.get('/hash') {[200, {'content-type' => 'application/xml; charset=utf-8'}, '<user><name>Erik Michaels-Ober</name><screen_name>sferik</screen_name></user>']}
-      me = connection.get('/hash').body
-      me.class.should == Hash
+  it "chokes on invalid xml" do
+    ['{!', '"a"', 'true', 'null', '1'].each do |data|
+      expect { process(data) }.to raise_error(Faraday::Error::ParsingError)
     end
   end
 end

data/spec/parse_yaml_spec.rb

@@ -1,33 +1,53 @@
 require 'helper'
+require 'faraday_middleware/response/parse_yaml'
 
-describe Faraday::Response::ParseYaml do
-  context 'when used' do
-    let(:parse_yaml) { Faraday::Response::ParseYaml.new }
+describe FaradayMiddleware::ParseYaml, :type => :response do
+  context "no type matching" do
+    it "doesn't change nil body" do
+      process(nil).body.should be_nil
+    end
+
+    it "returns false for empty body" do
+      process('').body.should be_false
+    end
+
+    it "parses yaml body" do
+      response = process('a: 1')
+      response.body.should eql('a' => 1)
+      response.env[:raw_body].should be_nil
+    end
+  end
+
+  context "with preserving raw" do
+    let(:options) { {:preserve_raw => true} }
 
-    it 'should load a marshalled hash' do
-      me = parse_yaml.on_complete(:body => "--- \nname: Erik Michaels-Ober\n")
-      me.class.should == Hash
+    it "parses yaml body" do
+      response = process('a: 1')
+      response.body.should eql('a' => 1)
+      response.env[:raw_body].should eql('a: 1')
     end
 
-    it 'should handle hashes' do
-      me = parse_yaml.on_complete(:body => "--- \nname: Erik Michaels-Ober\n")
-      me['name'].should == 'Erik Michaels-Ober'
+    it "can opt out of preserving raw" do
+      response = process('a: 1', nil, :preserve_raw => false)
+      response.env[:raw_body].should be_nil
     end
   end
 
-  context 'integration test' do
-    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
-    let(:connection) do
-      Faraday::Connection.new do |builder|
-        builder.adapter :test, stubs
-        builder.use Faraday::Response::ParseYaml
-      end
+  context "with regexp type matching" do
+    let(:options) { {:content_type => /\byaml$/} }
+
+    it "parses json body of correct type" do
+      response = process('a: 1', 'application/x-yaml')
+      response.body.should eql('a' => 1)
     end
 
-    it 'should create a Hash from the body' do
-      stubs.get('/hash') {[200, {'content-type' => 'application/xml; charset=utf-8'}, "--- \nname: Erik Michaels-Ober\n"]}
-      me = connection.get('/hash').body
-      me.class.should == Hash
+    it "ignores json body of incorrect type" do
+      response = process('a: 1', 'text/yaml-xml')
+      response.body.should eql('a: 1')
     end
   end
+
+  it "chokes on invalid yaml" do
+    expect { process('{!') }.to raise_error(Faraday::Error::ParsingError)
+  end
 end

data/spec/rashify_spec.rb

@@ -1,9 +1,10 @@
 require 'helper'
+require 'faraday_middleware/response/rashify'
 
-describe Faraday::Response::Rashify do
+describe FaradayMiddleware::Rashify do
 
   context 'when used' do
-    let(:rashify) { Faraday::Response::Rashify.new }
+    let(:rashify) { described_class.new }
 
     it 'should create a Hashie::Rash from the body' do
       env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
@@ -52,7 +53,7 @@ describe Faraday::Response::Rashify do
     let(:connection) do
       Faraday::Connection.new do |builder|
         builder.adapter :test, stubs
-        builder.use Faraday::Response::Rashify
+        builder.use described_class
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,56 +10,58 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-30 00:00:00.000000000 -07:00
-default_executable: 
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70235434354460 !ruby/object:Gem::Requirement
+  requirement: &70328307940220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70235434354460
+  version_requirements: *70328307940220
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70235434353680 !ruby/object:Gem::Requirement
+  name: multi_xml
+  requirement: &70328307938460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *70235434353680
+  version_requirements: *70328307938460
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70235434353060 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70328307937560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70235434353060
+  version_requirements: *70328307937560
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70235434352020 !ruby/object:Gem::Requirement
+  name: hashie
+  requirement: &70328307936700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70235434352020
+  version_requirements: *70328307936700
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &70235434351140 !ruby/object:Gem::Requirement
+  requirement: &70328307935660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,51 +69,40 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70235434351140
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: &70235434350360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: *70235434350360
+  version_requirements: *70328307935660
 - !ruby/object:Gem::Dependency
-  name: multi_xml
-  requirement: &70235434349540 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70328307934840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70235434349540
+  version_requirements: *70328307934840
 - !ruby/object:Gem::Dependency
-  name: oauth2
-  requirement: &70235434349080 !ruby/object:Gem::Requirement
+  name: simple_oauth
+  requirement: &70328307953240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70235434349080
+  version_requirements: *70328307953240
 - !ruby/object:Gem::Dependency
-  name: simple_oauth
-  requirement: &70235434348460 !ruby/object:Gem::Requirement
+  name: rack-cache
+  requirement: &70328307951820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70235434348460
+  version_requirements: *70328307951820
 description: Various middleware for Faraday
 email:
 - sferik@gmail.com
@@ -130,16 +121,27 @@ files:
 - README.md
 - Rakefile
 - faraday_middleware.gemspec
-- lib/faraday/request/oauth.rb
-- lib/faraday/request/oauth2.rb
-- lib/faraday/response/mashify.rb
-- lib/faraday/response/parse_json.rb
-- lib/faraday/response/parse_marshal.rb
-- lib/faraday/response/parse_xml.rb
-- lib/faraday/response/parse_yaml.rb
-- lib/faraday/response/rashify.rb
 - lib/faraday_middleware.rb
+- lib/faraday_middleware/addressable_patch.rb
+- lib/faraday_middleware/backwards_compatibility.rb
+- lib/faraday_middleware/instrumentation.rb
+- lib/faraday_middleware/rack_compatible.rb
+- lib/faraday_middleware/request/encode_json.rb
+- lib/faraday_middleware/request/oauth.rb
+- lib/faraday_middleware/request/oauth2.rb
+- lib/faraday_middleware/response/caching.rb
+- lib/faraday_middleware/response/follow_redirects.rb
+- lib/faraday_middleware/response/mashify.rb
+- lib/faraday_middleware/response/parse_json.rb
+- lib/faraday_middleware/response/parse_marshal.rb
+- lib/faraday_middleware/response/parse_xml.rb
+- lib/faraday_middleware/response/parse_yaml.rb
+- lib/faraday_middleware/response/rashify.rb
+- lib/faraday_middleware/response_middleware.rb
 - lib/faraday_middleware/version.rb
+- spec/caching_test.rb
+- spec/encode_json_spec.rb
+- spec/follow_redirects_spec.rb
 - spec/helper.rb
 - spec/mashify_spec.rb
 - spec/oauth2_spec.rb
@@ -149,7 +151,6 @@ files:
 - spec/parse_xml_spec.rb
 - spec/parse_yaml_spec.rb
 - spec/rashify_spec.rb
-has_rdoc: true
 homepage: https://github.com/pengwynn/faraday_middleware
 licenses: []
 post_install_message: 
@@ -162,9 +163,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4358588271321679399
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,11 +171,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Various middleware for Faraday
 test_files:
+- spec/caching_test.rb
+- spec/encode_json_spec.rb
+- spec/follow_redirects_spec.rb
 - spec/helper.rb
 - spec/mashify_spec.rb
 - spec/oauth2_spec.rb
@@ -187,3 +188,4 @@ test_files:
 - spec/parse_xml_spec.rb
 - spec/parse_yaml_spec.rb
 - spec/rashify_spec.rb
+has_rdoc: