omniauth-dwolla 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c00ae2287f00a14d363b7a42f88dbbd93d49861
-  data.tar.gz: 58feebf016218b3162393c2047caf3631bf92464
+  metadata.gz: 708c6cb6598b5c0b6afac46100b0a106a900dba8
+  data.tar.gz: 0f5438fa8c45ab1870fc8738d34a523ba0f7f9a8
 SHA512:
-  metadata.gz: 60ec1dc3bf0d5a3f8a728564d55cc3a9134b18f114c8f886fa897b661707b0ecc8ecc2154a4901257ad816cb6a4174512ca91a4f63b0a5ac60657c9e7a9efa08
-  data.tar.gz: d3e8bbed83d5e012f7f2e171672e84bcab417bb1080c2ff619ac5b4f18a9bf8f11a2ce64cd8896aad083417c713a9e7d266023b7b890941f533b83fcc6fd76c4
+  metadata.gz: 02a0fc43bc3e182127f0f84969b83942c2f672ea871fef9e54d3453a9e968a58c3f82a73f4f2f0d917660fc03a48aae957ae0ed718cbcf8a8227cb976e293943
+  data.tar.gz: f39e3f4fa250c93ab67ee0ed98639b23d76d700cf6ed1551ac123e2626819e00cbe03be3512dc0682e5b2e87eca7cc4d8edc93a76608fc9f63ccf3ba7c3d6f87

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## 0.0.16 - 2014-10-11
+### Added
+* A Changelog
+* A maintainer's note with contact info
+
+### Changed
+* merged in [LeadDyno](https://github.com/LeadDyno)'s work to support new 
+	[dwolla-ruby](https://github.com/Dwolla/dwolla-ruby) gem.
+

data/README.md

@@ -14,18 +14,26 @@ Then `bundle install`.
 
 ## Usage
 
-`OmniAuth::Strategies::Dwolla` is simply a Rack middleware. Read the OmniAuth 1.0 docs for detailed instructions: https://github.com/intridea/omniauth.
+`OmniAuth::Strategies::Dwolla` is simply a Rack middleware.
+Read the OmniAuth 1.0 docs for detailed instructions: 
+<https://github.com/intridea/omniauth>.
 
-Here's a quick example, adding the middleware to a Rails app in `config/initializers/omniauth.rb` and getting a token with scope permissions for full user info, send and request transactions:
+Here's a quick example, adding the middleware to a Rails app
+in `config/initializers/omniauth.rb` and getting a token with
+scope permissions for full user info, send and request transactions:
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :dwolla, ENV['DWOLLA_KEY'], ENV['DWOLLA_SECRET'], :scope => 'accountinfofull|send|request', :provider_ignores_state => true
+  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 `: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
@@ -42,6 +50,22 @@ The extra hash will include:
 
 ## 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.
+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.
+
+## Maintainer's Note
+
+The [omniauth-dwolla gem](https://github.com/masukomi/omniauth-dwolla)
+is currently maintained by masukomi ([GitHub](https://github.com/masukomi/), [web](http://masukomi.org/)). PRs will be happily accepted but 
+the tests must still pass (and be updated if necessary). We're dealing 
+with money here folks. We can't be careless. 
 
-Note that the `Devise::OmniauthCallbacksController` provides a good example of handling this scenario.
+I'm [@masukomi on Twitter](https://twitter.com/masukomi) and that's the best 
+way to contact me if you have any questions or ideas about this gem. My GitHub
+notifications page is typically overflowing with stuff from work. ;)

data/lib/omniauth-dwolla/version.rb

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

data/lib/omniauth/strategies/dwolla.rb

@@ -16,17 +16,17 @@ module OmniAuth
       # If anyone can figure a way to make it work
       # PLEASE issue a pull request. -masukomi
 
-      uid { user.id }
+      uid { user['Id'] }
 
       info do
         prune!({
-          'name'      => user.name,
-          'latitude'  => user.latitude,
-          'longitude' => user.longitude,
-          'city'      => user.city,
-          'state'     => user.state,
-          'type'      => user.type
-        })
+         'name'      => user['Name'],
+         'latitude'  => user['Latitude'],
+         'longitude' => user['Longitude'],
+         'city'      => user['City'],
+         'state'     => user['State'],
+         'type'      => user['Type']
+     })
       end
 
       def authorize_params
@@ -37,8 +37,8 @@ module OmniAuth
 
       private
         def user
-          @user ||= ::Dwolla::User.me(access_token.token).fetch
-        rescue ::Dwolla::RequestException => e
+          @user ||= ::Dwolla::Users.me(access_token.token)
+        rescue ::Dwolla::DwollaError => e
           raise CallbackError.new(e, e.message)
         end
 

data/omniauth-dwolla.gemspec

@@ -25,10 +25,9 @@ END
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  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_dependency 'omniauth', '~> 1.2'
+  s.add_dependency 'omniauth-oauth2', '~> 1.2'
+  s.add_dependency 'dwolla-ruby', '~> 2.5'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.13.0'

data/spec/omniauth/strategies/dwolla_spec.rb

@@ -27,31 +27,31 @@ describe OmniAuth::Strategies::Dwolla do
   describe 'getting info' do
     before do
       @access_token = double(:token => 'test_token')
-      @dwolla_user  = double( :id => '12345',
-                              :name => 'Test Name',
-                              :latitude => '123',
-                              :longitude => '321',
-                              :city => 'Sample City',
-                              :state => 'TT',
-                              :type => 'Personal' )
+      @dwolla_user  = {       'Id' => '12345',
+                              'Name' => 'Test Name',
+                              'Latitude' => '123',
+                              'Longitude' => '321',
+                              'City' => 'Sample City',
+                              'State' => 'TT',
+                              'Type' => 'Personal' }
 
       subject.stub(:access_token) { @access_token }
-
-      ::Dwolla::User.should_receive(:me).with(@access_token.token).and_return(@dwolla_user)
     end
 
     context 'when successful' do
       before do
-        @dwolla_user.should_receive(:fetch).and_return(@dwolla_user)
+        ::Dwolla::Users.should_receive(:me).with(@access_token.token).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' }
+        # note that the keys are all lowercase 
+        # unlike the response that came back from Dwolla
+        expect(subject.info).to eq({ 'name'      => 'Test Name',
+                                     'latitude'  => '123',
+                                     'longitude' => '321',
+                                     'city'      => 'Sample City',
+                                     'state'     => 'TT',
+                                     'type'      => 'Personal' })
       end
 
       it 'sets the correct uid based on user' do
@@ -59,11 +59,11 @@ describe OmniAuth::Strategies::Dwolla do
       end
     end
 
-    context 'when a Dwolla::RequestException is raised' do
-      let(:request_exception) { ::Dwolla::RequestException.new('Dwolla Error Message') }
+    context 'when a Dwolla::AuthenticationError is raised' do
+      let(:auth_error) { ::Dwolla::AuthenticationError.new('Dwolla Error Message') }
 
       before do
-        @dwolla_user.should_receive(:fetch).and_raise(request_exception)
+        ::Dwolla::Users.should_receive(:me).with(@access_token.token).and_raise(auth_error)
       end
 
       it 're-raises the appropriate OAuth error' do
@@ -79,8 +79,8 @@ describe OmniAuth::Strategies::Dwolla do
           subject.uid
         rescue OmniAuth::Strategies::OAuth2::CallbackError => e
           exception = e
-          exception.error.should eq(request_exception)
-          exception.error_reason.should eq(request_exception.message)
+          exception.error.should eq(auth_error)
+          exception.error_reason.should eq(auth_error.message)
         end
 
         exception.should be

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-dwolla
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - masukomi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: dwolla
+  name: dwolla-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.14
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.14
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile