recurly 2.18.8 → 2.18.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/recurly/add_on.rb +12 -1
- data/lib/recurly/adjustment.rb +2 -0
- data/lib/recurly/api.rb +1 -1
- data/lib/recurly/billing_info.rb +20 -11
- data/lib/recurly/invoice.rb +1 -0
- data/lib/recurly/item.rb +2 -0
- data/lib/recurly/plan.rb +3 -0
- data/lib/recurly/resource.rb +2 -2
- data/lib/recurly/subscription/add_ons.rb +6 -1
- data/lib/recurly/subscription_add_on.rb +8 -0
- data/lib/recurly/tax_detail.rb +2 -0
- data/lib/recurly/tier.rb +5 -0
- data/lib/recurly/transaction.rb +2 -0
- data/lib/recurly/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3082ab34c9230a6e05cde1c4ec775ed0282ef33dda4e40b71c0b8390f871b649
|
4
|
+
data.tar.gz: f813d757a646978eb1c53f2264f01cc32ce368ec783a615786d3888a3a052505
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1876031b13b2459bb6477ef5970b59c84fa4476b7359dcf494fe95f2cce546fe1e71f2851dae7af2d94c6f4b701e11c5a34a630aba7b6f07458f926c36084cb4
|
7
|
+
data.tar.gz: 183b86f9f909569637630f278c94cf7c98f9b185fb08f7568c534c0f8b0bb1b6e4b73a9e0a15254bc06f17e56f38a3721395890ea952cede9cfc207be12dd1a3
|
data/README.md
CHANGED
@@ -14,7 +14,7 @@ Recurly is packaged as a Ruby gem. We recommend you install it with
|
|
14
14
|
[Bundler](http://gembundler.com/) by adding the following line to your Gemfile:
|
15
15
|
|
16
16
|
``` ruby
|
17
|
-
gem 'recurly', '~> 2.18.
|
17
|
+
gem 'recurly', '~> 2.18.13'
|
18
18
|
```
|
19
19
|
|
20
20
|
Recurly will automatically use [Nokogiri](http://nokogiri.org/) (for a nice
|
data/lib/recurly/add_on.rb
CHANGED
@@ -2,6 +2,8 @@ module Recurly
|
|
2
2
|
class AddOn < Resource
|
3
3
|
# @return [Plan]
|
4
4
|
belongs_to :plan
|
5
|
+
# @return [[Tier], []]
|
6
|
+
has_many :tiers, class_name: :Tier, readonly: false
|
5
7
|
|
6
8
|
define_attribute_methods %w(
|
7
9
|
add_on_code
|
@@ -21,11 +23,20 @@ module Recurly
|
|
21
23
|
created_at
|
22
24
|
updated_at
|
23
25
|
tier_type
|
24
|
-
|
26
|
+
avalara_service_type
|
27
|
+
avalara_transaction_type
|
25
28
|
)
|
26
29
|
alias to_param add_on_code
|
27
30
|
alias quantity default_quantity
|
28
31
|
|
32
|
+
def changed_attributes
|
33
|
+
attrs = super
|
34
|
+
if tiers.any?(&:changed?)
|
35
|
+
attrs['tiers'] = tiers.select(&:changed?)
|
36
|
+
end
|
37
|
+
attrs
|
38
|
+
end
|
39
|
+
|
29
40
|
# Add-ons are only writeable and readable through {Plan} instances.
|
30
41
|
embedded!
|
31
42
|
private_class_method :find
|
data/lib/recurly/adjustment.rb
CHANGED
data/lib/recurly/api.rb
CHANGED
data/lib/recurly/billing_info.rb
CHANGED
@@ -9,6 +9,8 @@ module Recurly
|
|
9
9
|
PAYPAL_ATTRIBUTES = %w(paypal_billing_agreement_id).freeze
|
10
10
|
ROKU_ATTRIBUTES = %w(roku_billing_agreement_id last_four).freeze
|
11
11
|
SEPA_ATTRIBUTES = %w(iban).freeze
|
12
|
+
BACS_ATTRIBUTES = %w(account_number sort_code type).freeze
|
13
|
+
BECS_ATTRIBUTES = %w(account_number bsb_code type).freeze
|
12
14
|
|
13
15
|
# @return [Account]
|
14
16
|
belongs_to :account
|
@@ -37,37 +39,44 @@ module Recurly
|
|
37
39
|
fraud_session_id
|
38
40
|
three_d_secure_action_result_token_id
|
39
41
|
transaction_type
|
40
|
-
iban
|
41
42
|
mandate_reference
|
42
|
-
) | CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES | AMAZON_ATTRIBUTES | PAYPAL_ATTRIBUTES | ROKU_ATTRIBUTES | SEPA_ATTRIBUTES
|
43
|
-
|
44
|
-
# @return ["credit_card", "paypal", "amazon", "bank_account", "roku", "sepa", nil] The type of billing info.
|
45
|
-
attr_reader :type
|
43
|
+
) | CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES | AMAZON_ATTRIBUTES | PAYPAL_ATTRIBUTES | ROKU_ATTRIBUTES | SEPA_ATTRIBUTES | BACS_ATTRIBUTES | BECS_ATTRIBUTES
|
46
44
|
|
47
45
|
# @return [String]
|
48
46
|
def inspect
|
49
47
|
attributes = self.class.attribute_names
|
50
48
|
case type
|
51
49
|
when 'credit_card'
|
52
|
-
attributes -= (AMAZON_ATTRIBUTES + PAYPAL_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES)
|
50
|
+
attributes -= (AMAZON_ATTRIBUTES + PAYPAL_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES + BECS_ATTRIBUTES)
|
53
51
|
attributes |= CREDIT_CARD_ATTRIBUTES
|
54
52
|
when 'paypal'
|
55
|
-
attributes -= (CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES + AMAZON_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES)
|
53
|
+
attributes -= (CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES + AMAZON_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES + BECS_ATTRIBUTES)
|
56
54
|
when 'amazon'
|
57
|
-
attributes -= (CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES + PAYPAL_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES)
|
55
|
+
attributes -= (CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES + PAYPAL_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES + BECS_ATTRIBUTES)
|
58
56
|
when 'bank_account'
|
59
|
-
attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES)
|
57
|
+
attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES + BECS_ATTRIBUTES)
|
60
58
|
attributes |= BANK_ACCOUNT_ATTRIBUTES
|
61
59
|
when 'roku'
|
62
|
-
attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + SEPA_ATTRIBUTES)
|
60
|
+
attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES + BECS_ATTRIBUTES)
|
63
61
|
attributes |= ROKU_ATTRIBUTES
|
64
62
|
when 'sepa'
|
65
|
-
attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES)
|
63
|
+
attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES + BACS_ATTRIBUTES + BECS_ATTRIBUTES)
|
66
64
|
attributes |= SEPA_ATTRIBUTES
|
65
|
+
when 'bacs'
|
66
|
+
attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BECS_ATTRIBUTES)
|
67
|
+
attributes |= BACS_ATTRIBUTES
|
68
|
+
when 'becs'
|
69
|
+
attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES)
|
70
|
+
attributes |= BECS_ATTRIBUTES
|
67
71
|
end
|
68
72
|
super attributes
|
69
73
|
end
|
70
74
|
|
75
|
+
# @return ["credit_card", "paypal", "amazon", "bank_account", "roku", "sepa", "bacs", "becs", nil] The type of billing info.
|
76
|
+
def type
|
77
|
+
self[:type] || @type
|
78
|
+
end
|
79
|
+
|
71
80
|
class << self
|
72
81
|
# Overrides the inherited member_path method to allow for billing info's
|
73
82
|
# irregular URL structure.
|
data/lib/recurly/invoice.rb
CHANGED
data/lib/recurly/item.rb
CHANGED
data/lib/recurly/plan.rb
CHANGED
data/lib/recurly/resource.rb
CHANGED
@@ -824,9 +824,9 @@ module Recurly
|
|
824
824
|
|
825
825
|
# Duck-typing here is problematic because of ActiveSupport's #to_xml.
|
826
826
|
case value
|
827
|
-
when Resource
|
827
|
+
when Resource
|
828
828
|
value.to_xml options.merge(:builder => node)
|
829
|
-
when Array
|
829
|
+
when Array, Subscription::AddOns
|
830
830
|
value.each do |e|
|
831
831
|
if e.is_a? Recurly::Resource
|
832
832
|
# create a node to hold this resource
|
@@ -25,7 +25,12 @@ module Recurly
|
|
25
25
|
def << add_on
|
26
26
|
add_on = SubscriptionAddOn.new(add_on, @subscription)
|
27
27
|
|
28
|
-
exist = @add_ons.find
|
28
|
+
exist = @add_ons.find do |a|
|
29
|
+
source1 = a.add_on_source || "plan_add_on"
|
30
|
+
source2 = add_on.add_on_source || "plan_add_on"
|
31
|
+
a.add_on_code == add_on.add_on_code && source1 == source2
|
32
|
+
end
|
33
|
+
|
29
34
|
if exist
|
30
35
|
exist.quantity ||= 1
|
31
36
|
exist.quantity += add_on.quantity || 1
|
@@ -6,6 +6,9 @@ module Recurly
|
|
6
6
|
# @return [Pager<Usage>, []]
|
7
7
|
has_many :usage
|
8
8
|
|
9
|
+
# @return [[Tier], []]
|
10
|
+
has_many :tiers, class_name: :Tier, readonly: false
|
11
|
+
|
9
12
|
define_attribute_methods %w(
|
10
13
|
add_on_code
|
11
14
|
quantity
|
@@ -13,6 +16,7 @@ module Recurly
|
|
13
16
|
add_on_type
|
14
17
|
usage_type
|
15
18
|
usage_percentage
|
19
|
+
add_on_source
|
16
20
|
)
|
17
21
|
|
18
22
|
attr_reader :subscription
|
@@ -28,6 +32,10 @@ module Recurly
|
|
28
32
|
if add_on.unit_amount_in_cents
|
29
33
|
self.unit_amount_in_cents = add_on.unit_amount_in_cents.to_i
|
30
34
|
end
|
35
|
+
if add_on.respond_to? :add_on_source
|
36
|
+
self.add_on_source = add_on.add_on_source
|
37
|
+
end
|
38
|
+
self.tiers = add_on.tiers if add_on.tiers.any?
|
31
39
|
when Hash
|
32
40
|
self.attributes = add_on
|
33
41
|
when String, Symbol
|
data/lib/recurly/tax_detail.rb
CHANGED
data/lib/recurly/tier.rb
CHANGED
@@ -2,12 +2,17 @@ module Recurly
|
|
2
2
|
class Tier < Resource
|
3
3
|
|
4
4
|
belongs_to :add_on
|
5
|
+
belongs_to :subscription_add_on
|
5
6
|
|
6
7
|
define_attribute_methods %w(
|
7
8
|
ending_quantity
|
8
9
|
unit_amount_in_cents
|
9
10
|
)
|
10
11
|
|
12
|
+
def xml_keys
|
13
|
+
attributes.keys
|
14
|
+
end
|
15
|
+
|
11
16
|
embedded! true
|
12
17
|
end
|
13
18
|
end
|
data/lib/recurly/transaction.rb
CHANGED
data/lib/recurly/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: recurly
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.18.
|
4
|
+
version: 2.18.13
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Recurly
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-08-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: nokogiri
|