dwolla 0.0.13 → 0.0.14

data/dwolla.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'jeffersongirao_faraday-stack', '0.1.5'
+  s.add_dependency 'faraday', '>= 0.7.6'
   s.add_dependency 'multi_json', '~> 1.0'
 
   s.add_development_dependency 'bundler'

data/lib/dwolla/connection.rb

@@ -11,9 +11,9 @@ module Dwolla
         }
 
         @connection ||= Faraday.new(Dwolla.endpoint, default_options) do |builder|
-          builder.use FaradayStack::FollowRedirects
-
+          builder.use Dwolla::Response::FollowRedirects
           builder.use Dwolla::Response::ParseJson
+
           builder.use Faraday::Request::UrlEncoded
 
           builder.response :logger if Dwolla.debugging?

data/lib/dwolla/response/follow_redirects.rb

@@ -0,0 +1,44 @@
+module Dwolla
+  module Response
+    class RedirectLimitReached < Faraday::Error::ClientError
+      attr_reader :response
+    
+      def initialize(response)
+        super "too many redirects; last one to: #{response['location']}"
+        @response = response
+      end
+    end
+  
+    class FollowRedirects < Faraday::Middleware
+      REDIRECTS = [301, 302, 303, 307]
+      # default value for max redirects followed
+      FOLLOW_LIMIT = 3
+    
+      def initialize(app, options = {})
+        super(app)
+        @options = options
+        @follow_limit = options[:limit] || FOLLOW_LIMIT
+      end
+    
+      def call(env)
+        process_response(@app.call(env), @follow_limit)
+      end
+    
+      def process_response(response, follows)
+        response.on_complete do |env|
+          if redirect? response
+            raise RedirectLimitReached, response if follows.zero?
+            env[:url] += response['location']
+            env[:method] = :get
+            response = process_response(@app.call(env), follows - 1)
+          end
+        end
+        response
+      end
+    
+      def redirect?(response)
+        REDIRECTS.include? response.status
+      end
+    end
+  end
+end

data/lib/dwolla/response/parse_json.rb

@@ -1,6 +1,3 @@
-require 'faraday'
-require 'multi_json'
-
 module Dwolla
   module Response
     class ParseJson < Faraday::Response::Middleware

data/lib/dwolla/version.rb

@@ -1,3 +1,3 @@
 module Dwolla
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/lib/dwolla.rb

@@ -1,5 +1,3 @@
-require 'faraday_stack'
-
 module Dwolla
   def self.endpoint=(endpoint)
     @@endpoint = endpoint
@@ -30,8 +28,12 @@ module Dwolla
   self.endpoint = "https://www.dwolla.com/oauth/rest"
 end
 
+require 'faraday'
+require 'multi_json'
+
 require "dwolla/exceptions"
 require "dwolla/response/parse_json"
+require "dwolla/response/follow_redirects"
 require "dwolla/connection"
 require "dwolla/client"
 require "dwolla/transaction"

data/spec/dwolla/response/follow_redirects_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'forwardable'
+
+describe Dwolla::Response::FollowRedirects do
+
+ before do
+    @conn = Faraday.new do |b|
+      b.use Dwolla::Response::FollowRedirects
+      b.adapter :test do |stub|
+        stub.get('/') { [301, {'Location' => '/found'}, ''] }
+        stub.post('/create') { [302, {'Location' => '/'}, ''] }
+        stub.get('/found') { [200, {'Content-Type' => 'text/plain'}, 'fin'] }
+        stub.get('/loop') { [302, {'Location' => '/loop'}, ''] }
+        stub.get('/temp') { [307, {'Location' => '/found'}, ''] }
+      end
+    end
+  end
+
+  extend Forwardable
+  def_delegators :@conn, :get, :post
+  
+  it 'follow one redirect' do
+    get('/').body.should == 'fin'
+  end
+  
+  it 'follow twice redirect' do
+    post('/create').body.should == 'fin'
+  end
+
+  it 'follows 307 redirects' do
+    get('/temp').body.should == 'fin'
+  end
+  
+  it 'has a redirect limit' do
+    expect { get('/loop') }.to raise_error(Dwolla::Response::RedirectLimitReached)
+  end  
+end
+

data/spec/dwolla_spec.rb

@@ -13,6 +13,7 @@ describe Dwolla do
 
     it 'should be debugging' do
       Dwolla.debug = true
+      Dwolla.should be_debugging
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwolla
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-02-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jeffersongirao_faraday-stack
-  requirement: &2151918840 !ruby/object:Gem::Requirement
+  name: faraday
+  requirement: &2158790800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.7.6
   type: :runtime
   prerelease: false
-  version_requirements: *2151918840
+  version_requirements: *2158790800
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2151910940 !ruby/object:Gem::Requirement
+  requirement: &2158789780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151910940
+  version_requirements: *2158789780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151909320 !ruby/object:Gem::Requirement
+  requirement: &2158789140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151909320
+  version_requirements: *2158789140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151902740 !ruby/object:Gem::Requirement
+  requirement: &2158788300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151902740
+  version_requirements: *2158788300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151901080 !ruby/object:Gem::Requirement
+  requirement: &2158787580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151901080
+  version_requirements: *2158787580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2151900160 !ruby/object:Gem::Requirement
+  requirement: &2158786780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151900160
+  version_requirements: *2158786780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2151899360 !ruby/object:Gem::Requirement
+  requirement: &2158786280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151899360
+  version_requirements: *2158786280
 description: A Ruby wrapper for the Dwolla API.
 email:
 - contato@jefferson.eti.br
@@ -104,11 +104,13 @@ files:
 - lib/dwolla/client.rb
 - lib/dwolla/connection.rb
 - lib/dwolla/exceptions.rb
+- lib/dwolla/response/follow_redirects.rb
 - lib/dwolla/response/parse_json.rb
 - lib/dwolla/transaction.rb
 - lib/dwolla/user.rb
 - lib/dwolla/version.rb
 - spec/dwolla/client_spec.rb
+- spec/dwolla/response/follow_redirects_spec.rb
 - spec/dwolla/transaction_spec.rb
 - spec/dwolla/user_spec.rb
 - spec/dwolla_spec.rb
@@ -135,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1805413943356983281
+      hash: -3740545211785907564
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1805413943356983281
+      hash: -3740545211785907564
 requirements: []
 rubyforge_project: dwolla
 rubygems_version: 1.8.10
@@ -153,6 +155,7 @@ specification_version: 3
 summary: A Ruby wrapper for the Dwolla API.
 test_files:
 - spec/dwolla/client_spec.rb
+- spec/dwolla/response/follow_redirects_spec.rb
 - spec/dwolla/transaction_spec.rb
 - spec/dwolla/user_spec.rb
 - spec/dwolla_spec.rb