faraday_middleware 0.9.0 → 0.9.1

data/spec/encode_json_spec.rb

@@ -7,7 +7,7 @@ describe FaradayMiddleware::EncodeJson do
   def process(body, content_type = nil)
     env = {:body => body, :request_headers => Faraday::Utils::Headers.new}
     env[:request_headers]['content-type'] = content_type if content_type
-    middleware.call(env)
+    middleware.call(faraday_env(env))
   end
 
   def result_body() result[:body] end

data/spec/follow_redirects_spec.rb

@@ -200,6 +200,9 @@ describe FaradayMiddleware::FollowRedirects do
       if env[:status] or env[:response] or env[:response_headers]
         raise "invalid request: #{env.inspect}"
       end
+      if defined?(Faraday::Env) && !env.is_a?(Faraday::Env)
+        raise "expected Faraday::Env, got #{env.class}"
+      end
       app.call(env)
     end
   end

data/spec/helper.rb

@@ -5,7 +5,7 @@ if ENV['COVERAGE']
     def format(result)
       SimpleCov::Formatter::HTMLFormatter.new.format(result) unless ENV['CI']
       File.open('coverage/covered_percent', 'w') do |f|
-        f.puts result.source_files.covered_percent.to_i
+        f.printf "%.2f", result.source_files.covered_percent
       end
     end
   end
@@ -17,6 +17,17 @@ if ENV['COVERAGE']
 end
 
 require 'rspec'
+require 'faraday'
+
+module EnvCompatibility
+  def faraday_env(env)
+    if defined?(Faraday::Env)
+      Faraday::Env.from(env)
+    else
+      env
+    end
+  end
+end
 
 module ResponseMiddlewareExampleGroup
   def self.included(base)
@@ -35,11 +46,12 @@ module ResponseMiddlewareExampleGroup
       :response_headers => Faraday::Utils::Headers.new(headers)
     }
     env[:response_headers]['content-type'] = content_type if content_type
-    middleware.call(env)
+    middleware.call(faraday_env(env))
   end
 end
 
 RSpec.configure do |config|
+  config.include EnvCompatibility
   config.include ResponseMiddlewareExampleGroup, :type => :response
   config.expect_with :rspec do |c|
     c.syntax = :expect

data/spec/mashify_spec.rb

@@ -2,98 +2,69 @@ require 'helper'
 require 'faraday_middleware/response/mashify'
 
 describe FaradayMiddleware::Mashify do
-  context "during configuration" do
-    it "allows for a custom Mash class to be set" do
-      expect(described_class).to respond_to(:mash_class)
-      expect(described_class).to respond_to(:mash_class=)
-    end
-  end
-
-  context "when used" do
-    before(:each) { described_class.mash_class = ::Hashie::Mash }
-    let(:mashify) { described_class.new }
+  MyMash = Struct.new(:body)
 
+  context "when used", :type => :response do
     it "creates a Hashie::Mash from the body" do
-      env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
-      me  = mashify.on_complete(env)
-      expect(me.class).to eq(Hashie::Mash)
+      body = { "name" => "Erik Michaels-Ober", "username" => "sferik" }
+      me = process(body).body
+      expect(me.name).to eq("Erik Michaels-Ober")
+      expect(me.username).to eq("sferik")
     end
 
     it "handles strings" do
-      env = { :body => "Most amazing string EVER" }
-      me  = mashify.on_complete(env)
+      body = "Most amazing string EVER"
+      me = process(body).body
       expect(me).to eq("Most amazing string EVER")
     end
 
     it "handles arrays" do
-      env = { :body => [123, 456] }
-      values = mashify.on_complete(env)
-      expect(values.first).to eq(123)
-      expect(values.last).to eq(456)
+      body = [123, 456]
+      values = process(body).body
+      expect(values).to eq([123, 456])
     end
 
     it "handles arrays of hashes" do
-      env = { :body => [{ "username" => "sferik" }, { "username" => "pengwynn" }] }
-      us  = mashify.on_complete(env)
+      body = [{ "username" => "sferik" }, { "username" => "pengwynn" }]
+      us = process(body).body
       expect(us.first.username).to eq('sferik')
       expect(us.last.username).to eq('pengwynn')
     end
 
     it "handles nested arrays of hashes" do
-      env = { :body => [[{ "username" => "sferik" }, { "username" => "pengwynn" }]] }
-      us  = mashify.on_complete(env)
-      expect(us.first.first.username).to eq('sferik')
-      expect(us.first.last.username).to eq('pengwynn')
+      body = [[{ "username" => "sferik" }, { "username" => "pengwynn" }]]
+      us = process(body).body.first
+      expect(us.first.username).to eq('sferik')
+      expect(us.last.username).to eq('pengwynn')
     end
 
     it "handles mixed arrays" do
-      env = { :body => [123, { "username" => "sferik" }, 456] }
-      values = mashify.on_complete(env)
+      body = [123, { "username" => "sferik" }, 456]
+      values = process(body).body
       expect(values.first).to eq(123)
       expect(values.last).to eq(456)
       expect(values[1].username).to eq('sferik')
     end
 
     it "allows for use of custom Mash subclasses at the class level" do
-      class MyMash < ::Hashie::Mash; end
+      original_class = described_class.mash_class
       described_class.mash_class = MyMash
 
-      env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
-      me  = mashify.on_complete(env)
-
-      expect(me.class).to eq(MyMash)
-    end
-
-    it "allows 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)
-
-      expect(me.class).to eq(MyMash)
+      begin
+        me = process({}).body
+        expect(me).to be_instance_of(MyMash)
+      ensure
+        described_class.mash_class = original_class
+      end
     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 described_class
-      end
-    end
+  context "custom mash subclass", :type => :response do
+    let(:options) { {:mash_class => MyMash} }
 
-    # 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 "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
-      expect(me.name).to eq('Erik Michaels-Ober')
-      expect(me.username).to eq('sferik')
+    it "instance level" do
+      me = process({}).body
+        expect(me).to be_instance_of(MyMash)
     end
   end
 end

data/spec/method_override_spec.rb

@@ -4,7 +4,7 @@ require 'faraday_middleware/request/method_override'
 describe FaradayMiddleware::MethodOverride do
 
   let(:middleware) { described_class.new(lambda {|env| env }, *options) }
-  let(:env) { middleware.call request_env(request_method) }
+  let(:env) { middleware.call faraday_env(request_env(request_method)) }
 
   def request_env(method)
     { :method => method,
@@ -85,7 +85,7 @@ describe FaradayMiddleware::MethodOverride do
     let(:request_method) { :get }
 
     it "raises key error" do
-      expect{ env }.to raise_error(IndexError, /key not found/)
+      expect{ env }.to raise_error(IndexError, /key [\s\w]*not found/)
     end
   end
 

data/spec/oauth2_spec.rb

@@ -19,7 +19,7 @@ describe FaradayMiddleware::OAuth2 do
       :request_headers => Faraday::Utils::Headers.new.update(headers)
     }
     app = make_app
-    app.call(env)
+    app.call(faraday_env(env))
   end
 
   def make_app
@@ -64,7 +64,7 @@ describe FaradayMiddleware::OAuth2 do
 
     it "clears default with empty explicit token" do
       request = perform(:q => 'hello', :access_token => nil)
-      expect(query_params(request)).to eq('q' => 'hello', 'access_token' => nil)
+      expect(query_params(request).fetch('access_token')).to_not eq('XYZ')
       expect(auth_header(request)).to be_nil
     end
   end

data/spec/oauth_spec.rb

@@ -26,7 +26,7 @@ describe FaradayMiddleware::OAuth do
       env[:request][:oauth] = oauth_options
     end
     app = make_app
-    app.call(env)
+    app.call(faraday_env(env))
   end
 
   def make_app

data/spec/parse_dates_spec.rb

@@ -15,6 +15,11 @@ describe FaradayMiddleware::ParseDates, :type => :response do
     expect(process({"x" => "2012-02-01T13:14:15Z"}).body["x"].to_s).to eq(parsed)
   end
 
+  it "parses dates with milliseconds" do
+    date_str = "2012-02-01T13:14:15.123Z"
+    expect(process({"x" => date_str}).body["x"]).to eq(Time.parse(date_str))
+  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

data/spec/rashify_spec.rb

@@ -2,71 +2,46 @@ require 'helper'
 require 'faraday_middleware/response/rashify'
 
 describe FaradayMiddleware::Rashify do
-
-  context "when used" do
-    let(:rashify) { described_class.new }
-
+  context "when used", :type => :response do
     it "creates a Hashie::Rash from the body" do
-      env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
-      me  = rashify.on_complete(env)
-      expect(me.class).to eq(Hashie::Rash)
+      body = { "name" => "Erik Michaels-Ober", "username" => "sferik" }
+      me = process(body).body
+      expect(me.name).to eq("Erik Michaels-Ober")
+      expect(me.username).to eq("sferik")
     end
 
     it "handles strings" do
-      env = { :body => "Most amazing string EVER" }
-      me  = rashify.on_complete(env)
+      body = "Most amazing string EVER"
+      me = process(body).body
       expect(me).to eq("Most amazing string EVER")
     end
 
     it "handles hashes and decamelcase the keys" do
-      env = { :body => { "name" => "Erik Michaels-Ober", "userName" => "sferik" } }
-      me  = rashify.on_complete(env)
+      body = { "name" => "Erik Michaels-Ober", "userName" => "sferik" }
+      me = process(body).body
       expect(me.name).to eq('Erik Michaels-Ober')
       expect(me.user_name).to eq('sferik')
     end
 
     it "handles arrays" do
-      env = { :body => [123, 456] }
-      values = rashify.on_complete(env)
-      expect(values.first).to eq(123)
-      expect(values.last).to eq(456)
+      body = [123, 456]
+      values = process(body).body
+      expect(values).to eq([123, 456])
     end
 
     it "handles arrays of hashes" do
-      env = { :body => [{ "username" => "sferik" }, { "username" => "pengwynn" }] }
-      us  = rashify.on_complete(env)
+      body = [{ "username" => "sferik" }, { "username" => "pengwynn" }]
+      us = process(body).body
       expect(us.first.username).to eq('sferik')
       expect(us.last.username).to eq('pengwynn')
     end
 
     it "handles mixed arrays" do
-      env = { :body => [123, { "username" => "sferik" }, 456] }
-      values = rashify.on_complete(env)
+      body = [123, { "username" => "sferik" }, 456]
+      values = process(body).body
       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
-    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
-    let(:connection) do
-      Faraday::Connection.new do |builder|
-        builder.adapter :test, stubs
-        builder.use described_class
-      end
-    end
-
-    # 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 "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
-      expect(me.name).to eq('Erik Michaels-Ober')
-      expect(me.username).to eq('sferik')
-    end
-  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.9.1
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -10,142 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: multi_xml
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rash
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: simple_oauth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: rack-cache
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
 description: Various middleware for Faraday
 email:
 - sferik@gmail.com
@@ -154,12 +53,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .rspec
-- .travis.yml
 - CHANGELOG.md
-- Gemfile
+- CONTRIBUTING.md
 - LICENSE.md
 - README.md
 - Rakefile
@@ -185,7 +80,7 @@ files:
 - lib/faraday_middleware/response/rashify.rb
 - lib/faraday_middleware/response_middleware.rb
 - lib/faraday_middleware/version.rb
-- spec/caching_test.rb
+- spec/caching_spec.rb
 - spec/chunked_spec.rb
 - spec/encode_json_spec.rb
 - spec/follow_redirects_spec.rb
@@ -200,32 +95,32 @@ files:
 - spec/parse_xml_spec.rb
 - spec/parse_yaml_spec.rb
 - spec/rashify_spec.rb
-homepage: https://github.com/pengwynn/faraday_middleware
-licenses: []
+homepage: https://github.com/lostisland/faraday_middleware
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Various middleware for Faraday
 test_files:
-- spec/caching_test.rb
+- spec/caching_spec.rb
 - spec/chunked_spec.rb
 - spec/encode_json_spec.rb
 - spec/follow_redirects_spec.rb