dwolla 0.0.11 → 0.0.12

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
+    attr_accessor :origin, :destination, :type, :amount, :pin, :id, :source
 
     def initialize(attrs = {})
       attrs.each do |key, value|
@@ -24,9 +24,14 @@ module Dwolla
       end
 
       def to_payload
-        { :destinationId => destination,
+        payload = {
           :amount => amount,
-          :pin => pin }
+          :pin => pin
+        }
+        payload[:destinationId] = destination if destination
+        payload[:sourceId] = source if source
+
+        payload
       end
   end
 end

data/lib/dwolla/user.rb

@@ -54,9 +54,9 @@ module Dwolla
       transaction.execute
     end
 
-    def request_money_from(destination, amount, pin)
+    def request_money_from(source, amount, pin)
       transaction = Transaction.new(:origin => self,
-                                    :destination => destination,
+                                    :source => source,
                                     :type => :request,
                                     :amount => amount,
                                     :pin => pin)

data/lib/dwolla/version.rb

@@ -1,3 +1,3 @@
 module Dwolla
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/dwolla/transaction_spec.rb

@@ -6,9 +6,9 @@ describe Dwolla::Transaction do
       @origin = double(:oauth_token => '1')
       @destination = '2'
 
-      @payload = { :destinationId => '2',
-                   :amount => 200,
+      @payload = { :amount => 200,
                    :pin => '1234',
+                   :destinationId => '2',
                    :oauth_token => '1' }
 
       stub_post('/transactions/send').with(:body => MultiJson.encode(@payload)).to_return(
@@ -42,11 +42,11 @@ describe Dwolla::Transaction do
   describe "request transaction" do
     before do
       @origin = double(:oauth_token => '1')
-      @destination = '2'
+      @source = '2'
 
-      @payload = { :destinationId => '2',
-                   :amount => 200,
+      @payload = { :amount => 200,
                    :pin => '1234',
+                   :sourceId => '2',
                    :oauth_token => '1' }
 
       stub_post('/transactions/request').with(:body => MultiJson.encode(@payload)).to_return(
@@ -55,7 +55,7 @@ describe Dwolla::Transaction do
 
     it "should request the correct resource" do
       transaction = Dwolla::Transaction.new(:origin => @origin,
-                                            :destination => @destination,
+                                            :source => @source,
                                             :type => :request,
                                             :amount => 200,
                                             :pin => '1234')
@@ -67,7 +67,7 @@ describe Dwolla::Transaction do
 
     it "should fetch the id if transaction succesfull" do
       transaction = Dwolla::Transaction.new(:origin => @origin,
-                                            :destination => @destination,
+                                            :source => @source,
                                             :type => :request,
                                             :amount => 200,
                                             :pin => '1234')

data/spec/dwolla/user_spec.rb

@@ -57,7 +57,7 @@ describe Dwolla::User do
   describe "requesting 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')
+      source_user_id = '2'
       amount = 10
       pin = '2222'
 
@@ -65,14 +65,14 @@ describe Dwolla::User do
       transaction_id = 123
 
       Dwolla::Transaction.should_receive(:new).with(:origin => user,
-                                                    :destination => destination_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(destination_user, amount, pin).should == 123
+      user.request_money_from(source_user_id, amount, pin).should == 123
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwolla
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeffersongirao_faraday-stack
-  requirement: &2152483720 !ruby/object:Gem::Requirement
+  requirement: &2152387500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152483720
+  version_requirements: *2152387500
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2152481460 !ruby/object:Gem::Requirement
+  requirement: &2152386860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152481460
+  version_requirements: *2152386860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152479980 !ruby/object:Gem::Requirement
+  requirement: &2152386160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152479980
+  version_requirements: *2152386160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152477360 !ruby/object:Gem::Requirement
+  requirement: &2152385500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152477360
+  version_requirements: *2152385500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152475720 !ruby/object:Gem::Requirement
+  requirement: &2152384920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152475720
+  version_requirements: *2152384920
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2152472640 !ruby/object:Gem::Requirement
+  requirement: &2152384260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152472640
+  version_requirements: *2152384260
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152471360 !ruby/object:Gem::Requirement
+  requirement: &2152383520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152471360
+  version_requirements: *2152383520
 description: A Ruby wrapper for the Dwolla API.
 email:
 - contato@jefferson.eti.br
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1518156492450519258
+      hash: 696074458207333745
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1518156492450519258
+      hash: 696074458207333745
 requirements: []
 rubyforge_project: dwolla
 rubygems_version: 1.8.10