omniauth-dwolla 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6c00ae2287f00a14d363b7a42f88dbbd93d49861
+  data.tar.gz: 58feebf016218b3162393c2047caf3631bf92464
+SHA512:
+  metadata.gz: 60ec1dc3bf0d5a3f8a728564d55cc3a9134b18f114c8f886fa897b661707b0ecc8ecc2154a4901257ad816cb6a4174512ca91a4f63b0a5ac60657c9e7a9efa08
+  data.tar.gz: d3e8bbed83d5e012f7f2e171672e84bcab417bb1080c2ff619ac5b4f18a9bf8f11a2ce64cd8896aad083417c713a9e7d266023b7b890941f533b83fcc6fd76c4

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in omniauth-dwolla.gemspec
 gemspec

data/README.md

@@ -20,9 +20,28 @@ Here's a quick example, adding the middleware to a Rails app in `config/initiali
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :dwolla, ENV['DWOLLA_KEY'], ENV['DWOLLA_SECRET'], :scope => 'accountinfofull|send|request'
+  provider :dwolla, ENV['DWOLLA_KEY'], ENV['DWOLLA_SECRET'], :scope => 'accountinfofull|send|request', :provider_ignores_state => true
 end
 ```
 The :scope param is optional.
 
 The default :scope is 'accountinfofull'. It is necessary in order to grab the uid and detailed info for user.
+
+The extra hash will include:
+```json
+    "raw_info": {
+        "City": "Des Moines",
+        "Id": "812-111-1111",
+        "Latitude": 41.584546,
+        "Longitude": -93.634167,
+        "Name": "Test User",
+        "State": "IA",
+        "Type": "Personal"
+    }
+```
+
+## Exception Handling
+
+If the Dwolla library raises a `Dwolla::RequestException`, that will be wrapped and re-raised as a `OmniAuth::Strategies::OAuth2::CallbackError`.  The OmniAuth OAuth2 library will, in turn, treat that as a failure due to invalid credentials, passing the `CallbackError` through Rack's middleware chain.
+
+Note that the `Devise::OmniauthCallbacksController` provides a good example of handling this scenario.

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test    => :spec

data/lib/omniauth-dwolla/version.rb

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

data/lib/omniauth/strategies/dwolla.rb

@@ -5,12 +5,16 @@ module OmniAuth
   module Strategies
     class Dwolla < OmniAuth::Strategies::OAuth2
       DEFAULT_SCOPE = 'accountinfofull'
-
+      option :name, 'dwolla'
       option :client_options, {
         :site => 'https://www.dwolla.com',
         :authorize_url => '/oauth/v2/authenticate',
         :token_url => '/oauth/v2/token'
       }
+      #option :provider_ignores_state, true
+      # setting that has NO effect. 
+      # If anyone can figure a way to make it work
+      # PLEASE issue a pull request. -masukomi
 
       uid { user.id }
 
@@ -34,6 +38,8 @@ module OmniAuth
       private
         def user
           @user ||= ::Dwolla::User.me(access_token.token).fetch
+        rescue ::Dwolla::RequestException => e
+          raise CallbackError.new(e, e.message)
         end
 
         def prune!(hash)

data/omniauth-dwolla.gemspec

@@ -5,11 +5,18 @@ require "omniauth-dwolla/version"
 Gem::Specification.new do |s|
   s.name        = "omniauth-dwolla"
   s.version     = Omniauth::Dwolla::VERSION
-  s.authors     = ["Jefferson Girao"]
-  s.email       = ["contato@jefferson.eti.br"]
-  s.homepage    = "https://github.com/jeffersongirao/omniauth-dwolla"
+  s.authors     = ["masukomi"]
+  s.email       = ["masukomi@masukomi.org"]
+  s.homepage    = "https://github.com/masukomi/omniauth-dwolla"
   s.summary     = %q{OmniAuth strategy for Dwolla.}
   s.description = %q{OmniAuth strategy for Dwolla.}
+  s.license     = 'MIT'
+  post_install_string =<<END
+Remember to specify 
+    :provider_ignores_state => true
+When you set up your Dwolla OmniAuth provider.
+END
+  s.post_install_message = post_install_string
 
   s.rubyforge_project = "omniauth-dwolla"
 
@@ -18,12 +25,14 @@ 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 'omniauth', '~> 1.0'
-  s.add_dependency 'omniauth-oauth2', '~> 1.0'
-  s.add_dependency 'dwolla', '>= 0.0.13'
+  s.add_dependency 'omniauth', '~> 1.1.4'
+  s.add_dependency 'omniauth-oauth2', '~> 1.1.1'
+  s.add_dependency 'dwolla', '>= 0.0.14' 
+    #using >=0.0.15 results in a variety of dependency conflicts
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 2.7'
+  s.add_development_dependency 'rspec', '~> 2.13.0'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'debugger'
 end

data/spec/omniauth/strategies/dwolla_spec.rb

@@ -9,16 +9,19 @@ describe OmniAuth::Strategies::Dwolla do
 
   describe '#client' do
     it 'should have the correct dwolla site' do
-      subject.client.site.should eq("https://www.dwolla.com")
+      expect(subject.client.site).to eq("https://www.dwolla.com")
     end
 
     it 'should have the correct authorization url' do
-      subject.client.options[:authorize_url].should eq("/oauth/v2/authenticate")
+      expect(subject.client.options[:authorize_url]).to eq("/oauth/v2/authenticate")
     end
 
     it 'should have the correct token url' do
-      subject.client.options[:token_url].should eq('/oauth/v2/token')
+      expect(subject.client.options[:token_url]).to eq('/oauth/v2/token')
     end
+
+    #TODO find a way to set :provider_ignores_state to true by default
+    # and add a test for it. -masukomi
   end
 
   describe 'getting info' do
@@ -34,21 +37,54 @@ describe OmniAuth::Strategies::Dwolla do
 
       subject.stub(:access_token) { @access_token }
 
-      @dwolla_user.should_receive(:fetch).and_return(@dwolla_user)
       ::Dwolla::User.should_receive(:me).with(@access_token.token).and_return(@dwolla_user)
     end
 
-    it 'set the correct info based on user' do
-      subject.info.should == { 'name'      => 'Test Name',
-                               'latitude'  => '123',
-                               'longitude' => '321',
-                               'city'      => 'Sample City',
-                               'state'     => 'TT',
-                               'type'      => 'Personal' }
+    context 'when successful' do
+      before do
+        @dwolla_user.should_receive(:fetch).and_return(@dwolla_user)
+      end
+
+      it 'sets the correct info based on user' do
+        subject.info.should == { 'name'      => 'Test Name',
+                                 'latitude'  => '123',
+                                 'longitude' => '321',
+                                 'city'      => 'Sample City',
+                                 'state'     => 'TT',
+                                 'type'      => 'Personal' }
+      end
+
+      it 'sets the correct uid based on user' do
+        subject.uid.should == '12345'
+      end
     end
 
-    it 'set the correct uid based on user' do
-      subject.uid.should == '12345'
+    context 'when a Dwolla::RequestException is raised' do
+      let(:request_exception) { ::Dwolla::RequestException.new('Dwolla Error Message') }
+
+      before do
+        @dwolla_user.should_receive(:fetch).and_raise(request_exception)
+      end
+
+      it 're-raises the appropriate OAuth error' do
+        expect {
+          subject.uid
+        }.to raise_error(OmniAuth::Strategies::OAuth2::CallbackError)
+      end
+
+      it 'passes along the original exception' do
+        exception = nil
+
+        begin
+          subject.uid
+        rescue OmniAuth::Strategies::OAuth2::CallbackError => e
+          exception = e
+          exception.error.should eq(request_exception)
+          exception.error_reason.should eq(request_exception.message)
+        end
+
+        exception.should be
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -12,4 +12,5 @@ Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+  OmniAuth.config.test_mode = true
 end

metadata

@@ -1,96 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-dwolla
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
-- Jefferson Girao
+- masukomi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &2156793600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156793600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &2156774460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156774460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: dwolla
-  requirement: &2156773420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *2156773420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156772920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156772920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156772140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *2156772140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2156771500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156771500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156770720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156770720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OmniAuth strategy for Dwolla.
 email:
-- contato@jefferson.eti.br
+- masukomi@masukomi.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -106,35 +140,30 @@ files:
 - spec/omniauth/strategies/dwolla_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
-homepage: https://github.com/jeffersongirao/omniauth-dwolla
-licenses: []
-post_install_message: 
+homepage: https://github.com/masukomi/omniauth-dwolla
+licenses:
+- MIT
+metadata: {}
+post_install_message: "Remember to specify \n    :provider_ignores_state => true\nWhen
+  you set up your Dwolla OmniAuth provider.\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 402301085936081604
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 402301085936081604
 requirements: []
 rubyforge_project: omniauth-dwolla
-rubygems_version: 1.8.10
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OmniAuth strategy for Dwolla.
 test_files:
 - spec/omniauth/strategies/dwolla_spec.rb