dwolla-ruby 1.0.0 → 1.1.0

data/.gitignore

@@ -5,3 +5,4 @@
 Gemfile.lock
 pkg/*
 coverage/
+examples/_keys.rb

data/README.md

@@ -8,15 +8,15 @@
 - [Ruby](http://www.ruby-lang.org/)
 
 ## Installation
+The easiest way to install the dwolla-ruby gem for now is to use bundler and add the following line to your Gemfile:
 
-The recommended way to install dwolla-php is through RubyGems:
+  gem 'dwolla-ruby'
 
-    gem install dwolla-ruby
+The recommended way to install dwolla-ruby is through RubyGems:
 
-## Usage
-```ruby
+  gem install dwolla-ruby
 
-```
+## Usage
 
 ## Examples / Quickstart
 
@@ -92,8 +92,8 @@ Helper Methods:
 
 This wrapper is a forked extension of Jefferson Girao's <@jeffersongirao> 'dwolla' module.
 
-- Jefferson Gir�o <contato@jefferson.eti.br>
 - Michael Schonfeld <michael@dwolla.com>
+- Jefferson Gir�o <contato@jefferson.eti.br>
 
 ## Support
 
@@ -108,7 +108,7 @@ http://developers.dwolla.com/dev
 
 (The MIT License)
 
-Copyright (c) 2012 Dwolla <michael@dwolla.com>
+Copyright (c) 2013 Dwolla <michael@dwolla.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -127,4 +127,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{dwolla.gemspec → dwolla-ruby.gemspec}

@@ -5,13 +5,13 @@ require "dwolla/version"
 Gem::Specification.new do |s|
   s.name        = "dwolla-ruby"
   s.version     = Dwolla::VERSION
-  s.authors     = ["Jefferson Girao", "Michael Schonfeld"]
-  s.email       = ["contato@jefferson.eti.br", "michael@dwolla.com"]
+  s.authors     = ["Michael Schonfeld"]
+  s.email       = ["michael@dwolla.com"]
   s.homepage    = "https://github.com/dwolla/dwolla-ruby"
   s.summary     = %q{Official Ruby Wrapper for Dwolla's API}
   s.description = %q{Official Ruby Wrapper for Dwolla's API}
 
-  s.rubyforge_project = "dwolla"
+  s.rubyforge_project = "dwolla-ruby"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'faraday', '= 0.7.6'
-  s.add_dependency 'multi_json', '= 1.3.6'
+  s.add_dependency 'multi_json', '~> 1.3'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

data/examples/balance.rb

@@ -0,0 +1,17 @@
+# Include the Dwolla gem
+require 'rubygems'
+require 'pp'
+require '../lib/dwolla'
+
+# Include any required keys
+require_relative '_keys.rb'
+
+# Instantiate a new Dwolla User client
+# And, seed a previously generated access token
+DwollaUser = Dwolla::User.me($token)
+
+
+# EXAMPLE 1: 
+#   Get the balance of the authenticated user
+balance = DwollaUser.balance
+pp balance

data/lib/dwolla.rb

@@ -1,3 +1,27 @@
+# Dwolla Ruby API Wrapper
+# API spec at http://developers.dwolla.com
+require 'rubygems'
+require 'faraday'
+require 'multi_json'
+
+# Version
+require "dwolla/version"
+
+# API operations
+require "dwolla/client"
+require "dwolla/transaction"
+require "dwolla/funding_source"
+require "dwolla/user"
+
+# Resources
+require "dwolla/connection"
+require "dwolla/response/parse_json"
+require "dwolla/response/follow_redirects"
+require "dwolla/response/guard_server_error"
+
+# Errors
+require "dwolla/exceptions"
+
 module Dwolla
   def self.endpoint=(endpoint)
     @@endpoint = endpoint
@@ -28,16 +52,3 @@ module Dwolla
   self.endpoint = "https://www.dwolla.com/oauth/rest"
 end
 
-require 'faraday'
-require 'multi_json'
-
-require "#{File.dirname(__FILE__)}/dwolla/exceptions"
-require "#{File.dirname(__FILE__)}/dwolla/response/parse_json"
-require "#{File.dirname(__FILE__)}/dwolla/response/follow_redirects"
-require "#{File.dirname(__FILE__)}/dwolla/response/guard_server_error"
-require "#{File.dirname(__FILE__)}/dwolla/connection"
-require "#{File.dirname(__FILE__)}/dwolla/client"
-require "#{File.dirname(__FILE__)}/dwolla/transaction"
-require "#{File.dirname(__FILE__)}/dwolla/funding_source"
-require "#{File.dirname(__FILE__)}/dwolla/user"
-require "#{File.dirname(__FILE__)}/dwolla/version"

data/lib/dwolla/client.rb

@@ -10,6 +10,13 @@ module Dwolla
       user_attributes_hash = get("users/#{id}")
       User.new(user_attributes_hash)
     end
+    
+    def register_user(user_attributes_hash)
+      params = auth_params.merge(user_attributes_hash)
+      
+      returned_user_hash = post("register/", params)
+      User.new(returned_user_hash)
+    end
 
     def auth_url(redirect_uri=nil, scope='send|transactions|balance|request|contacts|accountinfofull|funding')
         params = {
@@ -42,9 +49,8 @@ module Dwolla
     end
 
     private
-
       def auth_params
         { :client_id => @client, :client_secret => @secret }
       end
-   end
+    end
 end

data/lib/dwolla/transaction.rb

@@ -14,7 +14,7 @@ module Dwolla
     TEST_ENDPOINTS = { :send => 'testapi/send',
                   :request => 'testapi/request' }
 
-    attr_accessor :origin, :destination, :destination_type, :type, :amount, :pin, :id, :source, :source_type, :description, :funds_source
+    attr_accessor :origin, :destination, :destination_type, :type, :amount, :pin, :id, :source, :source_type, :description, :funds_source, :assume_costs
 
     def initialize(attrs = {})
       attrs.each do |key, value|
@@ -48,6 +48,7 @@ module Dwolla
         payload[:sourceType] = source_type if source_type
         payload[:notes] = description if description
         payload[:fundsSource] = funds_source if funds_source
+        payload[:assumeCosts] = assume_costs if assume_costs
 
         payload
       end

data/lib/dwolla/user.rb

@@ -47,6 +47,28 @@ module Dwolla
       sources = get('fundingsources?fundingid=' + funding_id)
       sources.map{|s| FundingSource.from_json(s)}
     end
+    
+    def add_funding_source(funding_source_hash)
+      params = auth_params.merge(funding_source_hash)
+      
+      returned_source_hash = post("fundingsources/", params)
+      FundingSource.from_json(returned_source_hash)
+    end
+
+    def deposit_funds(funding_id, pin, amount)
+      params = auth_params.merge(:pin => pin, :amount => amount, :funding_id => funding_id)
+      
+      returned_hash = post("fundingsources/#{funding_id}/deposit", params)
+      returned_hash
+    end
+
+    def withdraw_funds(funding_id, pin, amount)
+      params = auth_params.merge(:pin => pin, :amount => amount, :funding_id => funding_id)
+      
+      returned_hash = post("fundingsources/#{funding_id}/withdraw", params)
+      returned_hash
+    end
+
 
     def contacts(options = {})
       contacts_url = 'contacts'
@@ -55,7 +77,7 @@ module Dwolla
       instances_from_contacts(contacts)
     end
 
-    def send_money_to(destination, amount, pin, type='dwolla', description='', funds_source=nil)
+    def send_money_to(destination, amount, pin, type='dwolla', description='', funds_source=nil, assume_costs=nil)
       transaction = Transaction.new(:origin => self,
                                     :destination => destination,
                                     :destination_type => type,
@@ -63,7 +85,8 @@ module Dwolla
                                     :type => :send,
                                     :amount => amount,
                                     :pin => pin,
-                                    :funds_source => funds_source)
+                                    :funds_source => funds_source,
+                                    :assume_costs => assume_costs)
 
       transaction.execute
     end

data/lib/dwolla/version.rb

@@ -1,3 +1,3 @@
 module Dwolla
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/dwolla/client_spec.rb

@@ -24,4 +24,28 @@ describe Dwolla::Client do
       user.longitude.should == -93.634167
     end
   end
+  
+  describe "registering a user" do
+    it 'should register a user and return a user object' do
+      stub_post('/register/').
+        to_return(:body => fixture("register.json"))
+    
+      userhash = {"email" => "test@test.com",
+        "password" => "Asdfasdf43434",
+        "pin" => "4343",
+        "firstName" => "Test",
+        "lastName" => "User",
+        "address" => "204 W. Test St.",
+        "city" => "Lansing",
+        "state" => "MI",
+        "zip" => "48906",
+        "phone" => "5175557621",
+        "dateOfBirth" => "07-12-1983",
+        "type" => "Personal",
+        "acceptTerms" => "true"}
+      
+      user = subject.register_user(userhash)
+      user.name.should eq 'Test User'
+    end
+  end
 end

data/spec/dwolla/funding_source_spec.rb

@@ -0,0 +1,59 @@
+describe "Funding sources" do
+  let(:oauth_token) { 'valid_token' }
+  
+  describe "Getting a list of funding sources" do
+    before :each do
+      user = Dwolla::User.me(oauth_token)
+      stub_request(:get, "https://www.dwolla.com/oauth/rest/fundingsources?oauth_token=valid_token").
+               with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/json', 'User-Agent'=>'Dwolla Ruby Wrapper'}).
+               to_return(:body => fixture("sources.json"))
+      @account = user.funding_sources.first
+    end
+    it "should be a FundingSource object" do
+      @account.should be_kind_of(Dwolla::FundingSource)
+    end
+    it "should get the correct id" do
+      @account.id.should == "mE06khgHy9K/Ii9n5fbUEg=="
+    end
+    it "should get the right name" do
+      @account.name.should == "Checking - My Bank"
+    end
+    it "should get the right type" do
+      @account.type.should == "Checking"
+    end
+    it "should get whether the account is verified" do
+      @account.should be_verified
+    end
+  end
+
+  describe "adding a funding source" do
+    it "should create a funding source" do
+      user = Dwolla::User.new(:oauth_token => '12345', :id => '1')
+    
+      stub_post('/fundingsources/').
+        to_return(:body => fixture("add_funding_source.json"))
+  
+      sourcehash = {
+        "account_number" => "4434343434",
+        "routing_number" => "343434343434",
+        "account_type" => "checking",
+        "name" => "My Checking Account - Checking"
+      }
+    
+      funding_source = user.add_funding_source(sourcehash)
+      funding_source.name.should eq 'My Checking Account - Checking'
+    end
+  end
+  
+  # "oauth_token": "",
+  # "funding_id": "",
+  # "pin": "",
+  # "amount": ""
+  
+  pending "Depositing funds to dwolla from funding source" do  
+  end
+  
+  pending "Withdrawing funds from dwolla to funding source" do
+  end
+  
+end

data/spec/dwolla/transaction_spec.rb

@@ -88,6 +88,37 @@ describe Dwolla::Transaction do
       end
     end
 
+    context "and assume costs" do
+      before do
+        @origin = double(:oauth_token => '1')
+        @destination = "user@example.com"
+        @destination_type = "email"
+        @payload = { :amount => 200,
+                     :pin => '1234',
+                     :destinationId => 'user@example.com',
+                     :destinationType => 'email',
+                     :assumeCosts => true,
+                     :oauth_token => '1' }
+        stub_post('/transactions/send').with(:body => MultiJson.dump(@payload)).to_return(
+                       :body => fixture('send_transaction.json'))
+      end
+
+      it "should request the correct resource" do
+        transaction = Dwolla::Transaction.new(:origin => @origin,
+                                              :destination => @destination,
+                                              :destination_type => @destination_type,
+                                              :type => :send,
+                                              :amount => 200,
+                                              :pin => '1234',
+                                              :assume_costs => true )
+                                              
+        transaction.execute
+
+        a_post('/transactions/send').
+          with(:body => MultiJson.dump(@payload)).should have_been_made
+      end
+    end
+
   end
 
   describe "request transaction" do

data/spec/dwolla/user_spec.rb

@@ -58,7 +58,9 @@ describe Dwolla::User do
                                               :description => description,
                                               :amount => 10,
                                               :type => :send,
-                                              :pin => '2222').and_return(transaction)
+                                              :pin => '2222',
+                                              :funds_source=>nil,
+                                              :assume_costs=>nil).and_return(transaction)
 
         transaction.should_receive(:execute).and_return(transaction_id)
 
@@ -83,13 +85,67 @@ describe Dwolla::User do
                                               :description => description,
                                               :amount => 10,
                                               :type => :send,
-                                              :pin => '2222').and_return(transaction)
+                                              :pin => '2222',
+                                              :funds_source=>nil,
+                                              :assume_costs=>nil).and_return(transaction)
 
         transaction.should_receive(:execute).and_return(transaction_id)
 
         user.send_money_to(destination_user, amount, pin, 'email', description).should == 123
       end
     end
+    context "assume costs" do
+      it "should make the correct transaction and assume costs if set to true" do
+        user = Dwolla::User.new(:oauth_token => '12345', :id => '1')
+        destination_user = 'user@example.com'
+        description = "sending a transaction"
+        amount = 10
+        pin = '2222'
+
+
+        transaction = double('transaction')
+        transaction_id = 123
+
+        Dwolla::Transaction.should_receive(:new).with(:origin => user,
+                                              :destination => destination_user,
+                                              :destination_type => 'email',
+                                              :description => description,
+                                              :amount => 10,
+                                              :type => :send,
+                                              :pin => '2222',
+                                              :funds_source=>nil,
+                                              :assume_costs=>true).and_return(transaction)
+
+        transaction.should_receive(:execute).and_return(transaction_id)
+
+        user.send_money_to(destination_user, amount, pin, 'email', description, nil, true).should == 123
+      end
+      it "should make the correct transaction and assume costs if set to false" do
+        user = Dwolla::User.new(:oauth_token => '12345', :id => '1')
+        destination_user = 'user@example.com'
+        description = "sending a transaction"
+        amount = 10
+        pin = '2222'
+
+
+        transaction = double('transaction')
+        transaction_id = 123
+
+        Dwolla::Transaction.should_receive(:new).with(:origin => user,
+                                              :destination => destination_user,
+                                              :destination_type => 'email',
+                                              :description => description,
+                                              :amount => 10,
+                                              :type => :send,
+                                              :pin => '2222',
+                                              :funds_source=>nil,
+                                              :assume_costs=>false).and_return(transaction)
+
+        transaction.should_receive(:execute).and_return(transaction_id)
+
+        user.send_money_to(destination_user, amount, pin, 'email', description, nil, false).should == 123
+      end
+    end
   end
 
   describe "requesting money" do
@@ -151,30 +207,6 @@ describe Dwolla::User do
     user.balance.should == 55.76
   end
   
-  describe "Getting a list of funding sources" do
-    before :each do
-      user = Dwolla::User.me(oauth_token)
-      stub_request(:get, "https://www.dwolla.com/oauth/rest/fundingsources?oauth_token=valid_token").
-               with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/json', 'User-Agent'=>'Dwolla Ruby Wrapper'}).
-               to_return(:body => fixture("sources.json"))
-      @account = user.funding_sources.first
-    end
-    it "should be a FundingSource object" do
-      @account.should be_kind_of(Dwolla::FundingSource)
-    end
-    it "should get the correct id" do
-      @account.id.should == "mE06khgHy9K/Ii9n5fbUEg=="
-    end
-    it "should get the right name" do
-      @account.name.should == "Checking - My Bank"
-    end
-    it "should get the right type" do
-      @account.type.should == "Checking"
-    end
-    it "should get whether the account is verified" do
-      @account.should be_verified
-    end
-  end
 
   describe "contacts" do
     it "should request the correct resource when unfiltered" do

data/spec/fixtures/add_funding_source.json

@@ -0,0 +1,11 @@
+{
+    "Success": true,
+    "Message": "Success",
+    "Response": {
+        "Id": "34da835f235cd25302ef0c5c1cb1d4b9",
+        "Name": "My Checking Account - Checking",
+        "Type": "Checking",
+        "Verified": false,
+        "ProcessingType": "ACH"
+    }
+}

data/spec/fixtures/register.json

@@ -0,0 +1,9 @@
+{
+   "City":"Lansing",
+   "State":"MI",
+   "Type":"Personal",
+   "Id":"812-111-1111",
+   "Name":"Test User",
+   "Latitude":0,
+   "Longitude":0
+}

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ SimpleCov.start
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-require 'dwolla'
+require 'dwolla-ruby'
 require 'rspec'
 require 'webmock/rspec'
 require 'support/helpers'

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dwolla-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
-- Jefferson Girao
 - Michael Schonfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -33,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +125,6 @@ dependencies:
         version: '0'
 description: Official Ruby Wrapper for Dwolla's API
 email:
-- contato@jefferson.eti.br
 - michael@dwolla.com
 executables: []
 extensions: []
@@ -136,9 +134,10 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- dwolla.gemspec
+- dwolla-ruby.gemspec
 - examples/_keys.rb
 - examples/accountInfo.rb
+- examples/balance.rb
 - examples/contacts.rb
 - examples/fundingSources.rb
 - examples/oauth.rb
@@ -156,15 +155,18 @@ files:
 - lib/dwolla/user.rb
 - lib/dwolla/version.rb
 - spec/dwolla/client_spec.rb
+- spec/dwolla/funding_source_spec.rb
 - spec/dwolla/response/follow_redirects_spec.rb
 - spec/dwolla/transaction_spec.rb
 - spec/dwolla/user_spec.rb
 - spec/dwolla_spec.rb
 - spec/fixtures/account_information.json
+- spec/fixtures/add_funding_source.json
 - spec/fixtures/balance.json
 - spec/fixtures/basic_information.json
 - spec/fixtures/contacts.json
 - spec/fixtures/error.json
+- spec/fixtures/register.json
 - spec/fixtures/request_transaction.json
 - spec/fixtures/send_transaction.json
 - spec/fixtures/sources.json
@@ -189,22 +191,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: dwolla
+rubyforge_project: dwolla-ruby
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Official Ruby Wrapper for Dwolla's API
 test_files:
 - spec/dwolla/client_spec.rb
+- spec/dwolla/funding_source_spec.rb
 - spec/dwolla/response/follow_redirects_spec.rb
 - spec/dwolla/transaction_spec.rb
 - spec/dwolla/user_spec.rb
 - spec/dwolla_spec.rb
 - spec/fixtures/account_information.json
+- spec/fixtures/add_funding_source.json
 - spec/fixtures/balance.json
 - spec/fixtures/basic_information.json
 - spec/fixtures/contacts.json
 - spec/fixtures/error.json
+- spec/fixtures/register.json
 - spec/fixtures/request_transaction.json
 - spec/fixtures/send_transaction.json
 - spec/fixtures/sources.json