dwolla 0.0.14 → 0.0.15

data/.gitignore

@@ -1,6 +1,7 @@
 *.swp
 *.gem
 .bundle
+.rvmrc
 Gemfile.lock
 pkg/*
 coverage/

data/README.md

@@ -2,6 +2,11 @@
 
 A Dwolla API wrapper in Ruby.
 
+## Thanks
+
+This gem was created based on my work at split(able) (http://www.splitable.com) team when integrating with Dwolla. 
+Thanks for all your support guys!
+
 ## Installation
 
 gem install dwolla
@@ -17,7 +22,7 @@ gem install dwolla
 * Transactions Listing
 * Transactions Details by ID
 * Transactions Stats
-* Send and Request Transactions with Other Id types (Facebook, Twitter, Email, or Phone.)
+* Send and Request Transactions with Other Id types (Facebook, Twitter, or Phone.)
 
 ## Usage
 
@@ -73,24 +78,58 @@ gem install dwolla
 
 ( Auth Scope Required: send )
 
+###### To a Dwolla Account
+
 ```ruby
   user = Dwolla::User.me(ACCESS_TOKEN)
   other_user_id = '812-111-1111'
   pin = '1234'
   amount = 200
+	type = 'dwolla'
+	description = "For that lovely dinner"
+
+  user.send_money_to(other_user_id, amount, pin, type, description)
+```
+
+###### To an Email Address
+
+```ruby
+  user = Dwolla::User.me(ACCESS_TOKEN)
+  other_user_email = 'user@example.com'
+  pin = '1234'
+  amount = 200
+	type = 'email'
+	description = "Just to say thanks"
 
-  user.send_money_to(other_user_id, amount, pin)
+  user.send_money_to(other_user_email, amount, pin, type, description)
 ```
 
 ##### Requesting Money 
 
 ( Auth Scope Required: request )
 
+###### From a Dwolla Account
+
 ```ruby
   user = Dwolla::User.me(ACCESS_TOKEN)
   other_user_id = '812-111-1111'
   pin = '1234'
   amount = 200
+	type = 'dwolla'
+	description = "Gotta make rent"
+
+  user.request_money_from(other_user_id, amount, pin, type, description)
+```
+
+###### From an email address
+
+```ruby
+  user = Dwolla::User.me(ACCESS_TOKEN)
+  other_user_email = 'user@example.com'
+  pin = '1234'
+  amount = 200
+	type = 'email'
+	description = "Awesome pizza party"
 
-  user.request_money_from(other_user_id, amount, pin)
+  user.request_money_from(other_user_email, amount, pin, type, description)
 ```

data/dwolla.gemspec

@@ -18,8 +18,8 @@ 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 'faraday', '>= 0.7.6'
-  s.add_dependency 'multi_json', '~> 1.0'
+  s.add_dependency 'faraday', '= 0.7.6'
+  s.add_dependency 'multi_json', '= 1.3.6'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

data/lib/dwolla/connection.rb

@@ -37,7 +37,7 @@ module Dwolla
           when :post
             request.path = path
             params.merge!(auth_params) if auth_params
-            request.body = MultiJson.encode(params) unless params.empty?
+            request.body = MultiJson.dump(params) unless params.empty?
           end
         end
         response.body

data/lib/dwolla/response/parse_json.rb

@@ -12,7 +12,7 @@ module Dwolla
         when ''
           nil
         else
-          response_hash = ::MultiJson.decode(body)
+          response_hash = ::MultiJson.load(body)
 
           raise Dwolla::RequestException, response_hash["Message"] if response_hash["Success"] == false
 

data/lib/dwolla/transaction.rb

@@ -5,7 +5,7 @@ module Dwolla
     ENDPOINTS = { :send => 'transactions/send',
                   :request => 'transactions/request' }
 
-    attr_accessor :origin, :destination, :type, :amount, :pin, :id, :source
+    attr_accessor :origin, :destination, :destination_type, :type, :amount, :pin, :id, :source, :source_type, :description
 
     def initialize(attrs = {})
       attrs.each do |key, value|
@@ -29,7 +29,10 @@ module Dwolla
           :pin => pin
         }
         payload[:destinationId] = destination if destination
+        payload[:destinationType] = destination_type if destination_type
         payload[:sourceId] = source if source
+        payload[:sourceType] = source_type if source_type
+        payload[:notes] = description if description
 
         payload
       end

data/lib/dwolla/user.rb

@@ -45,9 +45,11 @@ module Dwolla
       instances_from_contacts(contacts)
     end
 
-    def send_money_to(destination, amount, pin)
+    def send_money_to(destination, amount, pin, type='dwolla', description='')
       transaction = Transaction.new(:origin => self,
                                     :destination => destination,
+                                    :destination_type => type,
+                                    :description => description,
                                     :type => :send,
                                     :amount => amount,
                                     :pin => pin)
@@ -55,9 +57,11 @@ module Dwolla
       transaction.execute
     end
 
-    def request_money_from(source, amount, pin)
+    def request_money_from(source, amount, pin, source_type='dwolla', description='')
       transaction = Transaction.new(:origin => self,
                                     :source => source,
+                                    :source_type => source_type,
+                                    :description => description,
                                     :type => :request,
                                     :amount => amount,
                                     :pin => pin)

data/lib/dwolla/version.rb

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

data/spec/dwolla/transaction_spec.rb

@@ -2,78 +2,180 @@ require 'spec_helper'
 
 describe Dwolla::Transaction do
   describe "send transaction" do
-    before do
-      @origin = double(:oauth_token => '1')
-      @destination = '2'
+    context "to a dwolla account" do
+      before do
+        @origin = double(:oauth_token => '1')
+        @destination = '2'
+        @destination_type = "dwolla"
+        @payload = { :amount => 200,
+                     :pin => '1234',
+                     :destinationId => '2',
+                     :destinationType => 'dwolla',
+                     :notes => "Sending a transaction",
+                     :oauth_token => '1' }
 
-      @payload = { :amount => 200,
-                   :pin => '1234',
-                   :destinationId => '2',
-                   :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,
+                                              :description => "Sending a transaction", 
+                                              :type => :send,
+                                              :amount => 200,
+                                              :pin => '1234')
+        transaction.execute
 
-      stub_post('/transactions/send').with(:body => MultiJson.encode(@payload)).to_return(
-        :body => fixture('send_transaction.json'))
-    end
+        a_post('/transactions/send').
+          with(:body => MultiJson.dump(@payload)).should have_been_made
+      end
 
-    it "should request the correct resource" do
-      transaction = Dwolla::Transaction.new(:origin => @origin,
-                                            :destination => @destination,
-                                            :type => :send,
-                                            :amount => 200,
-                                            :pin => '1234')
-      transaction.execute
+      it "should fetch the id if transaction succesfull" do
+        transaction = Dwolla::Transaction.new(:origin => @origin,
+                                              :destination => @destination,
+                                              :destination_type => @destination_type,
+                                              :description => "Sending a transaction",
+                                              :type => :send,
+                                              :amount => 200,
+                                              :pin => '1234')
 
-      a_post('/transactions/send').
-        with(:body => MultiJson.encode(@payload)).should have_been_made
+        transaction.execute.should == 12345
+        transaction.id.should == 12345
+      end 
     end
+    
+    context "to an email address" 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',
+                     :notes => "Sending a transaction",
+                     :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,
+                                              :description => "Sending a transaction",
+                                              :type => :send,
+                                              :amount => 200,
+                                              :pin => '1234')
+                                              
+        transaction.execute
+
+        a_post('/transactions/send').
+          with(:body => MultiJson.dump(@payload)).should have_been_made
+      end
 
-    it "should fetch the id if transaction succesfull" do
-      transaction = Dwolla::Transaction.new(:origin => @origin,
-                                            :destination => @destination,
-                                            :type => :send,
-                                            :amount => 200,
-                                            :pin => '1234')
+      it "should fetch the id if transaction succesfull" do
+        transaction = Dwolla::Transaction.new(:origin => @origin,
+                                              :destination => @destination,
+                                              :destination_type => @destination_type,
+                                              :description => "Sending a transaction",
+                                              :type => :send,
+                                              :amount => 200,
+                                              :pin => '1234')
 
-      transaction.execute.should == 12345
-      transaction.id.should == 12345
+        transaction.execute.should == 12345
+        transaction.id.should == 12345
+      end
     end
+
   end
 
   describe "request transaction" do
-    before do
-      @origin = double(:oauth_token => '1')
-      @source = '2'
+    context "from a dwolla account" do
+      before do
+        @origin = double(:oauth_token => '1')
+        @source = '2'
+        @source_type = 'dwolla'
+        @payload = { :amount => 200,
+                     :pin => '1234',
+                     :sourceId => '2',
+                     :sourceType => 'dwolla',
+                     :notes => "Sending a transaction",
+                     :oauth_token => '1' }
 
-      @payload = { :amount => 200,
-                   :pin => '1234',
-                   :sourceId => '2',
-                   :oauth_token => '1' }
+        stub_post('/transactions/request').with(:body => MultiJson.dump(@payload)).to_return(
+          :body => fixture('request_transaction.json'))
+      end
 
-      stub_post('/transactions/request').with(:body => MultiJson.encode(@payload)).to_return(
-        :body => fixture('request_transaction.json'))
-    end
+      it "should request the correct resource" do
+        transaction = Dwolla::Transaction.new(:origin => @origin,
+                                              :source => @source,
+                                              :source_type => @source_type,
+                                              :description => "Sending a transaction",
+                                              :type => :request,
+                                              :amount => 200,
+                                              :pin => '1234')
+        transaction.execute
 
-    it "should request the correct resource" do
-      transaction = Dwolla::Transaction.new(:origin => @origin,
-                                            :source => @source,
-                                            :type => :request,
-                                            :amount => 200,
-                                            :pin => '1234')
-      transaction.execute
+        a_post('/transactions/request').
+          with(:body => MultiJson.dump(@payload)).should have_been_made
+      end
 
-      a_post('/transactions/request').
-        with(:body => MultiJson.encode(@payload)).should have_been_made
+      it "should fetch the id if transaction succesfull" do
+        transaction = Dwolla::Transaction.new(:origin => @origin,
+                                              :source => @source,
+                                              :source_type => @source_type,
+                                              :description => "Sending a transaction",
+                                              :type => :request,
+                                              :amount => 200,
+                                              :pin => '1234')
+
+        transaction.execute.should == 12345
+        transaction.id.should == 12345
+      end
     end
+    context "from an email address" do
+      before do
+        @origin = double(:oauth_token => '1')
+        @source = 'user@example.com'
+        @source_type = "email"
+        @payload = { :amount => 200,
+                     :pin => '1234',
+                     :sourceId => 'user@example.com',
+                     :sourceType => 'email',
+                     :notes => "Sending a transaction",
+                     :oauth_token => '1' }
+
+        stub_post('/transactions/request').with(:body => MultiJson.dump(@payload)).to_return(
+          :body => fixture('request_transaction.json'))
+      end
+
+      it "should request the correct resource" do
+        transaction = Dwolla::Transaction.new(:origin => @origin,
+                                              :source => @source,
+                                              :source_type => @source_type,
+                                              :description => "Sending a transaction",
+                                              :type => :request,
+                                              :amount => 200,
+                                              :pin => '1234')
+        transaction.execute
+
+        a_post('/transactions/request').
+          with(:body => MultiJson.dump(@payload)).should have_been_made
+      end
 
-    it "should fetch the id if transaction succesfull" do
-      transaction = Dwolla::Transaction.new(:origin => @origin,
-                                            :source => @source,
-                                            :type => :request,
-                                            :amount => 200,
-                                            :pin => '1234')
+      it "should fetch the id if transaction succesfull" do
+        transaction = Dwolla::Transaction.new(:origin => @origin,
+                                              :source => @source,
+                                              :source_type => @source_type,
+                                              :description => "Sending a transaction",
+                                              :type => :request,
+                                              :amount => 200,
+                                              :pin => '1234')
 
-      transaction.execute.should == 12345
-      transaction.id.should == 12345
+        transaction.execute.should == 12345
+        transaction.id.should == 12345
+      end      
     end
   end
 end

data/spec/dwolla/user_spec.rb

@@ -40,47 +40,106 @@ describe Dwolla::User do
   end
 
   describe "sending money" do
-    it "should make the correct transaction" do
-      user = Dwolla::User.new(:oauth_token => '12345', :id => '1')
-      destination_user = Dwolla::User.new(:id => '2')
-      amount = 10
-      pin = '2222'
-
-
-      transaction = double('transaction')
-      transaction_id = 123
-
-      Dwolla::Transaction.should_receive(:new).with(:origin => user,
-                                            :destination => destination_user,
-                                            :amount => 10,
-                                            :type => :send,
-                                            :pin => '2222').and_return(transaction)
-
-      transaction.should_receive(:execute).and_return(transaction_id)
-
-      user.send_money_to(destination_user, amount, pin).should == 123
+    context "to a dwolla account" do
+      it "should make the correct transaction" do
+        user = Dwolla::User.new(:oauth_token => '12345', :id => '1')
+        destination_user = Dwolla::User.new(:id => '2')
+        amount = 10
+        pin = '2222'
+        description = "Sending a transaction"
+
+
+        transaction = double('transaction')
+        transaction_id = 123
+
+        Dwolla::Transaction.should_receive(:new).with(:origin => user,
+                                              :destination => destination_user,
+                                              :destination_type => 'dwolla',
+                                              :description => description,
+                                              :amount => 10,
+                                              :type => :send,
+                                              :pin => '2222').and_return(transaction)
+
+        transaction.should_receive(:execute).and_return(transaction_id)
+
+        user.send_money_to(destination_user, amount, pin, 'dwolla', description).should == 123
+      end
+    end
+    context "to an email address" do
+      it "should make the correct transaction" 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').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
   end
 
   describe "requesting money" do
-    it "should make the correct transaction" do
-      user = Dwolla::User.new(:oauth_token => '12345', :id => '1')
-      source_user_id = '2'
-      amount = 10
-      pin = '2222'
-
-      transaction = double('transaction')
-      transaction_id = 123
-
-      Dwolla::Transaction.should_receive(:new).with(:origin => user,
-                                                    :source => source_user_id,
-                                                    :amount => 10,
-                                                    :type => :request,
-                                                    :pin => '2222').and_return(transaction)
-
-      transaction.should_receive(:execute).and_return(transaction_id)
-
-      user.request_money_from(source_user_id, amount, pin).should == 123
+    context "from a dwolla account" do
+      it "should make the correct transaction" do
+        user = Dwolla::User.new(:oauth_token => '12345', :id => '1')
+        source_user_id = '2'
+        amount = 10
+        pin = '2222'
+        description = "Sending a transaction"
+
+        transaction = double('transaction')
+        transaction_id = 123
+
+        Dwolla::Transaction.should_receive(:new).with(:origin => user,
+                                                      :source => source_user_id,
+                                                      :source_type => 'dwolla',
+                                                      :description => description,
+                                                      :amount => 10,
+                                                      :type => :request,
+                                                      :pin => '2222').and_return(transaction)
+
+        transaction.should_receive(:execute).and_return(transaction_id)
+
+        user.request_money_from(source_user_id, amount, pin, 'dwolla', description).should == 123
+      end
+    end
+    context "from an email address" do
+      it "should make the correct transaction" do
+        user = Dwolla::User.new(:oauth_token => '12345', :id => '1')
+        source_user_id = 'user@example.com'
+        amount = 10
+        pin = '2222'
+        description = "Sending a transaction"
+         
+        transaction = double('transaction')
+        transaction_id = 123
+
+        Dwolla::Transaction.should_receive(:new).with(:origin => user,
+                                                      :source => source_user_id,
+                                                      :source_type => 'email',
+                                                      :description => description,
+                                                      :amount => 10,
+                                                      :type => :request,
+                                                      :pin => '2222').and_return(transaction)
+
+        transaction.should_receive(:execute).and_return(transaction_id)
+
+        user.request_money_from(source_user_id, amount, pin, 'email', description).should == 123
+      end    
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwolla
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000Z
+date: 2012-06-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2158790800 !ruby/object:Gem::Requirement
+  requirement: &2151861720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.7.6
   type: :runtime
   prerelease: false
-  version_requirements: *2158790800
+  version_requirements: *2151861720
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2158789780 !ruby/object:Gem::Requirement
+  requirement: &2151860280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *2158789780
+  version_requirements: *2151860280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158789140 !ruby/object:Gem::Requirement
+  requirement: &2151859060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158789140
+  version_requirements: *2151859060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158788300 !ruby/object:Gem::Requirement
+  requirement: &2151858220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158788300
+  version_requirements: *2151858220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158787580 !ruby/object:Gem::Requirement
+  requirement: &2151856900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158787580
+  version_requirements: *2151856900
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2158786780 !ruby/object:Gem::Requirement
+  requirement: &2151853620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158786780
+  version_requirements: *2151853620
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2158786280 !ruby/object:Gem::Requirement
+  requirement: &2151852520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158786280
+  version_requirements: *2151852520
 description: A Ruby wrapper for the Dwolla API.
 email:
 - contato@jefferson.eti.br
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3740545211785907564
+      hash: 3194194454049487369
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3740545211785907564
+      hash: 3194194454049487369
 requirements: []
 rubyforge_project: dwolla
 rubygems_version: 1.8.10