agiley-faraday_middleware 0.8.3.2 → 0.9.0

data/spec/parse_dates_spec.rb

@@ -0,0 +1,39 @@
+require 'helper'
+require 'faraday_middleware/response/parse_dates'
+require 'json'
+
+describe FaradayMiddleware::ParseDates, :type => :response do
+  let(:parsed){
+    if RUBY_VERSION > "1.9"
+      "2012-02-01 13:14:15 UTC"
+    else
+      "Wed Feb 01 13:14:15 UTC 2012"
+    end
+  }
+
+  it "parses dates" do
+    expect(process({"x" => "2012-02-01T13:14:15Z"}).body["x"].to_s).to eq(parsed)
+  end
+
+  it "parses nested dates in hash" do
+    expect(process({"x" => {"y" => "2012-02-01T13:14:15Z"}}).body["x"]["y"].to_s).to eq(parsed)
+  end
+
+  it "parses nested dates in arrays" do
+    expect(process({"x" => [{"y" =>"2012-02-01T13:14:15Z"}]}).body["x"][0]["y"].to_s).to eq(parsed)
+  end
+
+  it "returns nil when body is empty" do
+    expect(process(nil).body).to eq(nil)
+  end
+
+  it "leaves arrays with ids alone" do
+    expect(process({"x" => [1,2,3]}).body).to eq({"x" => [1,2,3]})
+  end
+
+  it "does not parse date-like things" do
+    expect(process({"x" => "2012-02-01T13:14:15Z bla"}).body["x"].to_s).to eq "2012-02-01T13:14:15Z bla"
+    expect(process({"x" => "12012-02-01T13:14:15Z"}).body["x"].to_s).to eq "12012-02-01T13:14:15Z"
+    expect(process({"x" => "2012-02-01T13:14:15Z\nfoo"}).body["x"].to_s).to eq "2012-02-01T13:14:15Z\nfoo"
+  end
+end

data/spec/parse_json_spec.rb

@@ -4,17 +4,17 @@ require 'faraday_middleware/response/parse_json'
 describe FaradayMiddleware::ParseJson, :type => :response do
   context "no type matching" do
     it "doesn't change nil body" do
-      process(nil).body.should be_nil
+      expect(process(nil).body).to be_nil
     end
 
     it "nullifies empty body" do
-      process('').body.should be_nil
+      expect(process('').body).to be_nil
     end
 
     it "parses json body" do
       response = process('{"a":1}')
-      response.body.should eql('a' => 1)
-      response.env[:raw_body].should be_nil
+      expect(response.body).to eq('a' => 1)
+      expect(response.env[:raw_body]).to be_nil
     end
   end
 
@@ -23,13 +23,13 @@ describe FaradayMiddleware::ParseJson, :type => :response do
 
     it "parses json body" do
       response = process('{"a":1}')
-      response.body.should eql('a' => 1)
-      response.env[:raw_body].should eql('{"a":1}')
+      expect(response.body).to eq('a' => 1)
+      expect(response.env[:raw_body]).to eq('{"a":1}')
     end
 
     it "can opt out of preserving raw" do
       response = process('{"a":1}', nil, :preserve_raw => false)
-      response.env[:raw_body].should be_nil
+      expect(response.env[:raw_body]).to be_nil
     end
   end
 
@@ -38,12 +38,12 @@ describe FaradayMiddleware::ParseJson, :type => :response do
 
     it "parses json body of correct type" do
       response = process('{"a":1}', 'application/x-json')
-      response.body.should eql('a' => 1)
+      expect(response.body).to eq('a' => 1)
     end
 
     it "ignores json body of incorrect type" do
       response = process('{"a":1}', 'text/json-xml')
-      response.body.should eql('{"a":1}')
+      expect(response.body).to eq('{"a":1}')
     end
   end
 
@@ -51,18 +51,18 @@ describe FaradayMiddleware::ParseJson, :type => :response 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)
+      expect(process('{"a":1}', 'a/b').body).to be_a(Hash)
+      expect(process('{"a":1}', 'c/d').body).to be_a(Hash)
     end
 
     it "ignores json body of incorrect type" do
-      process('{"a":1}', 'a/d').body.should_not be_a(Hash)
+      expect(process('{"a":1}', 'a/d').body).not_to 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)
+    ['{!', '"a"', 'true', 'null', '1'].each do |data|
+      expect{ process(data) }.to raise_error(Faraday::Error::ParsingError)
     end
   end
 
@@ -76,19 +76,37 @@ describe FaradayMiddleware::ParseJson, :type => :response do
 
     it "ignores completely incompatible type" do
       response = process('{"a":1}', 'application/xml')
-      response.body.should eql('{"a":1}')
+      expect(response.body).to eq('{"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')
+      expect(response.body).to eq('var a = 1')
+      expect(response['content-type']).to eq('text/javascript')
     end
 
     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')
+      expect(response.body).to be_a(Hash)
+      expect(response['content-type']).to eq('application/json')
+    end
+
+    it "corrects compatible type even when data starts with whitespace" do
+      response = process(%( \r\n\t{"a":1}), 'text/javascript')
+      expect(response.body).to be_a(Hash)
+      expect(response['content-type']).to eq('application/json')
+    end
+  end
+
+  context "HEAD responses" do
+    it "nullifies the body if it's only one space" do
+      response = process(' ')
+      expect(response.body).to be_nil
+    end
+
+    it "nullifies the body if it's two spaces" do
+      response = process(' ')
+      expect(response.body).to be_nil
     end
   end
 end

data/spec/parse_marshal_spec.rb

@@ -3,14 +3,14 @@ require 'faraday_middleware/response/parse_marshal'
 
 describe FaradayMiddleware::ParseMarshal, :type => :response do
   it "restores a marshaled dump" do
-    process(Marshal.dump(:a => 1)).body.should be_eql(:a => 1)
+    expect(process(Marshal.dump(:a => 1)).body).to be_eql(:a => 1)
   end
 
   it "nulifies blank response" do
-    process('').body.should be_nil
+    expect(process('').body).to be_nil
   end
 
   it "chokes on invalid content" do
-    expect { process('abc') }.to raise_error(Faraday::Error::ParsingError)
+    expect{ process('abc') }.to raise_error(Faraday::Error::ParsingError)
   end
 end

data/spec/parse_xml_spec.rb

@@ -7,17 +7,17 @@ describe FaradayMiddleware::ParseXml, :type => :response do
 
   context "no type matching" do
     it "doesn't change nil body" do
-      process(nil).body.should be_nil
+      expect(process(nil).body).to be_nil
     end
 
     it "turns empty body into empty hash" do
-      process('').body.should be_eql({})
+      expect(process('').body).to be_eql({})
     end
 
     it "parses xml body" do
       response = process(xml)
-      response.body.should eql(user)
-      response.env[:raw_body].should be_nil
+      expect(response.body).to eq(user)
+      expect(response.env[:raw_body]).to be_nil
     end
   end
 
@@ -26,13 +26,13 @@ describe FaradayMiddleware::ParseXml, :type => :response do
 
     it "parses xml body" do
       response = process(xml)
-      response.body.should eql(user)
-      response.env[:raw_body].should eql(xml)
+      expect(response.body).to eq(user)
+      expect(response.env[:raw_body]).to eq(xml)
     end
 
     it "can opt out of preserving raw" do
       response = process(xml, nil, :preserve_raw => false)
-      response.env[:raw_body].should be_nil
+      expect(response.env[:raw_body]).to be_nil
     end
   end
 
@@ -41,12 +41,12 @@ describe FaradayMiddleware::ParseXml, :type => :response do
 
     it "parses xml body of correct type" do
       response = process(xml, 'application/xml')
-      response.body.should eql(user)
+      expect(response.body).to eq(user)
     end
 
     it "ignores xml body of incorrect type" do
       response = process(xml, 'text/html')
-      response.body.should eql(xml)
+      expect(response.body).to eq(xml)
     end
   end
 
@@ -54,18 +54,18 @@ describe FaradayMiddleware::ParseXml, :type => :response 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)
+      expect(process(xml, 'a/b').body).to be_a(Hash)
+      expect(process(xml, 'c/d').body).to be_a(Hash)
     end
 
     it "ignores xml body of incorrect type" do
-      process(xml, 'a/d').body.should_not be_a(Hash)
+      expect(process(xml, 'a/d').body).not_to be_a(Hash)
     end
   end
 
   it "chokes on invalid xml" do
     ['{!', '"a"', 'true', 'null', '1'].each do |data|
-      expect { process(data) }.to raise_error(Faraday::Error::ParsingError)
+      expect{ process(data) }.to raise_error(Faraday::Error::ParsingError)
     end
   end
 end

data/spec/parse_yaml_spec.rb

@@ -4,17 +4,17 @@ require 'faraday_middleware/response/parse_yaml'
 describe FaradayMiddleware::ParseYaml, :type => :response do
   context "no type matching" do
     it "doesn't change nil body" do
-      process(nil).body.should be_nil
+      expect(process(nil).body).to be_nil
     end
 
     it "returns false for empty body" do
-      process('').body.should be_false
+      expect(process('').body).to 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
+      expect(response.body).to eq('a' => 1)
+      expect(response.env[:raw_body]).to be_nil
     end
   end
 
@@ -23,13 +23,13 @@ describe FaradayMiddleware::ParseYaml, :type => :response do
 
     it "parses yaml body" do
       response = process('a: 1')
-      response.body.should eql('a' => 1)
-      response.env[:raw_body].should eql('a: 1')
+      expect(response.body).to eq('a' => 1)
+      expect(response.env[:raw_body]).to eq('a: 1')
     end
 
     it "can opt out of preserving raw" do
       response = process('a: 1', nil, :preserve_raw => false)
-      response.env[:raw_body].should be_nil
+      expect(response.env[:raw_body]).to be_nil
     end
   end
 
@@ -38,16 +38,16 @@ describe FaradayMiddleware::ParseYaml, :type => :response do
 
     it "parses json body of correct type" do
       response = process('a: 1', 'application/x-yaml')
-      response.body.should eql('a' => 1)
+      expect(response.body).to eq('a' => 1)
     end
 
     it "ignores json body of incorrect type" do
       response = process('a: 1', 'text/yaml-xml')
-      response.body.should eql('a: 1')
+      expect(response.body).to eq('a: 1')
     end
   end
 
   it "chokes on invalid yaml" do
-    expect { process('{!') }.to raise_error(Faraday::Error::ParsingError)
+    expect{ process('{!') }.to raise_error(Faraday::Error::ParsingError)
   end
 end

data/spec/rashify_spec.rb

@@ -3,52 +3,52 @@ require 'faraday_middleware/response/rashify'
 
 describe FaradayMiddleware::Rashify do
 
-  context 'when used' do
+  context "when used" do
     let(:rashify) { described_class.new }
 
-    it 'should create a Hashie::Rash from the body' do
+    it "creates a Hashie::Rash from the body" do
       env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
       me  = rashify.on_complete(env)
-      me.class.should == Hashie::Rash
+      expect(me.class).to eq(Hashie::Rash)
     end
 
-    it 'should handle strings' do
+    it "handles strings" do
       env = { :body => "Most amazing string EVER" }
       me  = rashify.on_complete(env)
-      me.should == "Most amazing string EVER"
+      expect(me).to eq("Most amazing string EVER")
     end
 
-    it 'should handle hashes and decamelcase the keys' do
+    it "handles hashes and decamelcase the keys" do
       env = { :body => { "name" => "Erik Michaels-Ober", "userName" => "sferik" } }
       me  = rashify.on_complete(env)
-      me.name.should == 'Erik Michaels-Ober'
-      me.user_name.should == 'sferik'
+      expect(me.name).to eq('Erik Michaels-Ober')
+      expect(me.user_name).to eq('sferik')
     end
 
-    it 'should handle arrays' do
+    it "handles arrays" do
       env = { :body => [123, 456] }
       values = rashify.on_complete(env)
-      values.first.should == 123
-      values.last.should == 456
+      expect(values.first).to eq(123)
+      expect(values.last).to eq(456)
     end
 
-    it 'should handle arrays of hashes' do
+    it "handles arrays of hashes" do
       env = { :body => [{ "username" => "sferik" }, { "username" => "pengwynn" }] }
       us  = rashify.on_complete(env)
-      us.first.username.should == 'sferik'
-      us.last.username.should == 'pengwynn'
+      expect(us.first.username).to eq('sferik')
+      expect(us.last.username).to eq('pengwynn')
     end
 
-    it 'should handle mixed arrays' do
+    it "handles mixed arrays" do
       env = { :body => [123, { "username" => "sferik" }, 456] }
       values = rashify.on_complete(env)
-      values.first.should == 123
-      values.last.should == 456
-      values[1].username.should == 'sferik'
+      expect(values.first).to eq(123)
+      expect(values.last).to eq(456)
+      expect(values[1].username).to eq('sferik')
     end
   end
 
-  context 'integration test' do
+  context "integration test" do
     let(:stubs) { Faraday::Adapter::Test::Stubs.new }
     let(:connection) do
       Faraday::Connection.new do |builder|
@@ -59,11 +59,14 @@ describe FaradayMiddleware::Rashify do
 
     # although it is not good practice to pass a hash as the body, if we add ParseJson
     # to the middleware stack we end up testing two middlewares instead of one
-    it 'should create a Hash from the body' do
-      stubs.get('/hash') {[200, {'content-type' => 'application/json; charset=utf-8'}, { "name" => "Erik Michaels-Ober", "username" => "sferik" }]}
+    it "creates a Hash from the body" do
+      stubs.get('/hash') {
+        data = { 'name' => 'Erik Michaels-Ober', 'username' => 'sferik' }
+        [200, {'content-type' => 'application/json; charset=utf-8'}, data]
+      }
       me = connection.get('/hash').body
-      me.name.should == 'Erik Michaels-Ober'
-      me.username.should == 'sferik'
+      expect(me.name).to eq('Erik Michaels-Ober')
+      expect(me.username).to eq('sferik')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agiley-faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.8.3.2
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70137784874120 !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: *70137784874120
+  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: &70137784873220 !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: *70137784873220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70137784872720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +60,15 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *70137784872720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70137784872140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -58,10 +76,15 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70137784872140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70137784871640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,10 +92,15 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70137784871640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &70137784871060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +108,15 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70137784871060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70137784870460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +124,15 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70137784870460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70137784869900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,10 +140,15 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70137784869900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70137784869360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -113,7 +156,12 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70137784869360
+  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
@@ -138,12 +186,15 @@ files:
 - lib/faraday_middleware/instrumentation.rb
 - lib/faraday_middleware/rack_compatible.rb
 - lib/faraday_middleware/request/encode_json.rb
+- lib/faraday_middleware/request/method_override.rb
 - lib/faraday_middleware/request/oauth.rb
 - lib/faraday_middleware/request/oauth2.rb
 - lib/faraday_middleware/response/caching.rb
+- lib/faraday_middleware/response/chunked.rb
 - lib/faraday_middleware/response/follow_redirects.rb
 - lib/faraday_middleware/response/force_utf.rb
 - lib/faraday_middleware/response/mashify.rb
+- lib/faraday_middleware/response/parse_dates.rb
 - lib/faraday_middleware/response/parse_json.rb
 - lib/faraday_middleware/response/parse_marshal.rb
 - lib/faraday_middleware/response/parse_nokogiri_html.rb
@@ -154,12 +205,15 @@ files:
 - lib/faraday_middleware/response_middleware.rb
 - lib/faraday_middleware/version.rb
 - spec/caching_test.rb
+- spec/chunked_spec.rb
 - spec/encode_json_spec.rb
 - spec/follow_redirects_spec.rb
 - spec/helper.rb
 - spec/mashify_spec.rb
+- spec/method_override_spec.rb
 - spec/oauth2_spec.rb
 - spec/oauth_spec.rb
+- spec/parse_dates_spec.rb
 - spec/parse_json_spec.rb
 - spec/parse_marshal_spec.rb
 - spec/parse_xml_spec.rb
@@ -185,18 +239,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Various middleware for Faraday
 test_files:
 - spec/caching_test.rb
+- spec/chunked_spec.rb
 - spec/encode_json_spec.rb
 - spec/follow_redirects_spec.rb
 - spec/helper.rb
 - spec/mashify_spec.rb
+- spec/method_override_spec.rb
 - spec/oauth2_spec.rb
 - spec/oauth_spec.rb
+- spec/parse_dates_spec.rb
 - spec/parse_json_spec.rb
 - spec/parse_marshal_spec.rb
 - spec/parse_xml_spec.rb