dwolla 0.0.11 → 0.0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,7 +5,7 @@ module Dwolla
5
5
  ENDPOINTS = { :send => 'transactions/send',
6
6
  :request => 'transactions/request' }
7
7
 
8
- attr_accessor :origin, :destination, :type, :amount, :pin, :id
8
+ attr_accessor :origin, :destination, :type, :amount, :pin, :id, :source
9
9
 
10
10
  def initialize(attrs = {})
11
11
  attrs.each do |key, value|
@@ -24,9 +24,14 @@ module Dwolla
24
24
  end
25
25
 
26
26
  def to_payload
27
- { :destinationId => destination,
27
+ payload = {
28
28
  :amount => amount,
29
- :pin => pin }
29
+ :pin => pin
30
+ }
31
+ payload[:destinationId] = destination if destination
32
+ payload[:sourceId] = source if source
33
+
34
+ payload
30
35
  end
31
36
  end
32
37
  end
data/lib/dwolla/user.rb CHANGED
@@ -54,9 +54,9 @@ module Dwolla
54
54
  transaction.execute
55
55
  end
56
56
 
57
- def request_money_from(destination, amount, pin)
57
+ def request_money_from(source, amount, pin)
58
58
  transaction = Transaction.new(:origin => self,
59
- :destination => destination,
59
+ :source => source,
60
60
  :type => :request,
61
61
  :amount => amount,
62
62
  :pin => pin)
@@ -1,3 +1,3 @@
1
1
  module Dwolla
2
- VERSION = "0.0.11"
2
+ VERSION = "0.0.12"
3
3
  end
@@ -6,9 +6,9 @@ describe Dwolla::Transaction do
6
6
  @origin = double(:oauth_token => '1')
7
7
  @destination = '2'
8
8
 
9
- @payload = { :destinationId => '2',
10
- :amount => 200,
9
+ @payload = { :amount => 200,
11
10
  :pin => '1234',
11
+ :destinationId => '2',
12
12
  :oauth_token => '1' }
13
13
 
14
14
  stub_post('/transactions/send').with(:body => MultiJson.encode(@payload)).to_return(
@@ -42,11 +42,11 @@ describe Dwolla::Transaction do
42
42
  describe "request transaction" do
43
43
  before do
44
44
  @origin = double(:oauth_token => '1')
45
- @destination = '2'
45
+ @source = '2'
46
46
 
47
- @payload = { :destinationId => '2',
48
- :amount => 200,
47
+ @payload = { :amount => 200,
49
48
  :pin => '1234',
49
+ :sourceId => '2',
50
50
  :oauth_token => '1' }
51
51
 
52
52
  stub_post('/transactions/request').with(:body => MultiJson.encode(@payload)).to_return(
@@ -55,7 +55,7 @@ describe Dwolla::Transaction do
55
55
 
56
56
  it "should request the correct resource" do
57
57
  transaction = Dwolla::Transaction.new(:origin => @origin,
58
- :destination => @destination,
58
+ :source => @source,
59
59
  :type => :request,
60
60
  :amount => 200,
61
61
  :pin => '1234')
@@ -67,7 +67,7 @@ describe Dwolla::Transaction do
67
67
 
68
68
  it "should fetch the id if transaction succesfull" do
69
69
  transaction = Dwolla::Transaction.new(:origin => @origin,
70
- :destination => @destination,
70
+ :source => @source,
71
71
  :type => :request,
72
72
  :amount => 200,
73
73
  :pin => '1234')
@@ -57,7 +57,7 @@ describe Dwolla::User do
57
57
  describe "requesting money" do
58
58
  it "should make the correct transaction" do
59
59
  user = Dwolla::User.new(:oauth_token => '12345', :id => '1')
60
- destination_user = Dwolla::User.new(:id => '2')
60
+ source_user_id = '2'
61
61
  amount = 10
62
62
  pin = '2222'
63
63
 
@@ -65,14 +65,14 @@ describe Dwolla::User do
65
65
  transaction_id = 123
66
66
 
67
67
  Dwolla::Transaction.should_receive(:new).with(:origin => user,
68
- :destination => destination_user,
68
+ :source => source_user_id,
69
69
  :amount => 10,
70
70
  :type => :request,
71
71
  :pin => '2222').and_return(transaction)
72
72
 
73
73
  transaction.should_receive(:execute).and_return(transaction_id)
74
74
 
75
- user.request_money_from(destination_user, amount, pin).should == 123
75
+ user.request_money_from(source_user_id, amount, pin).should == 123
76
76
  end
77
77
  end
78
78
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dwolla
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.11
4
+ version: 0.0.12
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-01-16 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: jeffersongirao_faraday-stack
16
- requirement: &2152483720 !ruby/object:Gem::Requirement
16
+ requirement: &2152387500 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2152483720
24
+ version_requirements: *2152387500
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: multi_json
27
- requirement: &2152481460 !ruby/object:Gem::Requirement
27
+ requirement: &2152386860 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2152481460
35
+ version_requirements: *2152386860
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &2152479980 !ruby/object:Gem::Requirement
38
+ requirement: &2152386160 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2152479980
46
+ version_requirements: *2152386160
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
- requirement: &2152477360 !ruby/object:Gem::Requirement
49
+ requirement: &2152385500 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *2152477360
57
+ version_requirements: *2152385500
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &2152475720 !ruby/object:Gem::Requirement
60
+ requirement: &2152384920 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *2152475720
68
+ version_requirements: *2152384920
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: webmock
71
- requirement: &2152472640 !ruby/object:Gem::Requirement
71
+ requirement: &2152384260 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2152472640
79
+ version_requirements: *2152384260
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: simplecov
82
- requirement: &2152471360 !ruby/object:Gem::Requirement
82
+ requirement: &2152383520 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2152471360
90
+ version_requirements: *2152383520
91
91
  description: A Ruby wrapper for the Dwolla API.
92
92
  email:
93
93
  - contato@jefferson.eti.br
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
133
133
  version: '0'
134
134
  segments:
135
135
  - 0
136
- hash: 1518156492450519258
136
+ hash: 696074458207333745
137
137
  required_rubygems_version: !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
142
142
  version: '0'
143
143
  segments:
144
144
  - 0
145
- hash: 1518156492450519258
145
+ hash: 696074458207333745
146
146
  requirements: []
147
147
  rubyforge_project: dwolla
148
148
  rubygems_version: 1.8.10