recurly 2.18.5 → 2.18.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4baccdf365b116bf67d6881bfcb87895a1528baf6f265514167a7a727d072c88
-  data.tar.gz: 0d67d21fe66bcf7e1a9354d8f90715fe5c1141822600f84057ae9e504b406dca
+  metadata.gz: 9385debc236700bed1b93ee013313ab4c70a7dfdea8c42e7d48a8d0dd755d26e
+  data.tar.gz: f8b0ee42838c58896a4c6c58b86795d75b2b952ba9abcf96424d751c93f24b75
 SHA512:
-  metadata.gz: 5413f8214c2053c4d4b1965dd6c91844f1bb5b1dbf7f7b9da2f730096d37b69dacd1e5dde9292ad950783f17d13c1cb6e7d4505107a5c0e54179dd1587688cd3
-  data.tar.gz: e0cdd2a64396ed0cfeef2fb31f49e181c1dd1a8d5120a8f82e4053f8eadf47df9bd8815c551fc5999584f6dc88c03a12c5c9cc2e65d20efc07f29a898fcfd227
+  metadata.gz: 9ec2b05f194f44f727bd6ad3c553be37559a3a40735d7b1408eb151ee242f79f3e6368418c76dcec8d60156ae7724c2943549031fa4587679b67bcbc3a2c6ec7
+  data.tar.gz: 0b4277c3af336d565b7d2797f22f1897a4827e790dffd6dc6455ebd0f3b383bbc86392e6c6931e2272dc0e434db2fbcd9031f5b619b039b4cd92deeb32d84f24

data/README.md

@@ -14,7 +14,7 @@ Recurly is packaged as a Ruby gem. We recommend you install it with
 [Bundler](http://gembundler.com/) by adding the following line to your Gemfile:
 
 ``` ruby
-gem 'recurly', '~> 2.18.5'
+gem 'recurly', '~> 2.18.10'
 ```
 
 Recurly will automatically use [Nokogiri](http://nokogiri.org/) (for a nice

data/lib/recurly.rb

@@ -40,6 +40,7 @@ module Recurly
   require 'recurly/gift_card'
   require 'recurly/purchase'
   require 'recurly/webhook'
+  require 'recurly/tier'
 
   @subdomain = nil
 

data/lib/recurly/add_on.rb

@@ -2,9 +2,11 @@ module Recurly
   class AddOn < Resource
     # @return [Plan]
     belongs_to :plan
+    has_many :tiers, class_name: :Tier, readonly: false
 
     define_attribute_methods %w(
       add_on_code
+      item_code
       name
       accounting_code
       default_quantity
@@ -19,10 +21,19 @@ module Recurly
       revenue_schedule_type
       created_at
       updated_at
+      tier_type
     )
     alias to_param add_on_code
     alias quantity default_quantity
 
+    def changed_attributes
+      attrs = super
+      if tiers.any?(&:changed?)
+        attrs['tiers'] = tiers.select(&:changed?)
+      end
+      attrs
+    end
+
     # Add-ons are only writeable and readable through {Plan} instances.
     embedded!
     private_class_method :find

data/lib/recurly/adjustment.rb

@@ -37,6 +37,7 @@ module Recurly
       currency
       product_code
       item_code
+      external_sku
       start_date
       end_date
       created_at

data/lib/recurly/api.rb

@@ -18,7 +18,7 @@ module Recurly
     @@base_uri = "https://api.recurly.com/v2/"
     @@valid_domains = [".recurly.com"]
 
-    RECURLY_API_VERSION = '2.24'
+    RECURLY_API_VERSION = '2.27'
 
     FORMATS = Helper.hash_with_indifferent_read_access(
       'pdf' => 'application/pdf',

data/lib/recurly/billing_info.rb

@@ -8,6 +8,8 @@ module Recurly
     AMAZON_ATTRIBUTES = %w(amazon_billing_agreement_id amazon_region).freeze
     PAYPAL_ATTRIBUTES = %w(paypal_billing_agreement_id).freeze
     ROKU_ATTRIBUTES = %w(roku_billing_agreement_id last_four).freeze
+    SEPA_ATTRIBUTES = %w(iban).freeze
+    BACS_ATTRIBUTES = %w(account_number sort_code type).freeze
 
     # @return [Account]
     belongs_to :account
@@ -36,32 +38,41 @@ module Recurly
       fraud_session_id
       three_d_secure_action_result_token_id
       transaction_type
-    ) | CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES | AMAZON_ATTRIBUTES | PAYPAL_ATTRIBUTES | ROKU_ATTRIBUTES
-
-    # @return ["credit_card", "paypal", "amazon", "bank_account", "roku", nil] The type of billing info.
-    attr_reader :type
+      mandate_reference
+    ) | CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES | AMAZON_ATTRIBUTES | PAYPAL_ATTRIBUTES | ROKU_ATTRIBUTES | SEPA_ATTRIBUTES | BACS_ATTRIBUTES
 
     # @return [String]
     def inspect
       attributes = self.class.attribute_names
       case type
       when 'credit_card'
-        attributes -= (AMAZON_ATTRIBUTES + PAYPAL_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES)
+        attributes -= (AMAZON_ATTRIBUTES + PAYPAL_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES)
         attributes |= CREDIT_CARD_ATTRIBUTES
       when 'paypal'
-        attributes -= (CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES + AMAZON_ATTRIBUTES + ROKU_ATTRIBUTES)
+        attributes -= (CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES + AMAZON_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES)
       when 'amazon'
-        attributes -= (CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES + PAYPAL_ATTRIBUTES + ROKU_ATTRIBUTES)
+        attributes -= (CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES + PAYPAL_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES)
       when 'bank_account'
-        attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + ROKU_ATTRIBUTES)
+        attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES)
         attributes |= BANK_ACCOUNT_ATTRIBUTES
       when 'roku'
-        attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES)
+        attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + SEPA_ATTRIBUTES + BACS_ATTRIBUTES)
         attributes |= ROKU_ATTRIBUTES
+      when 'sepa'
+        attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES + BACS_ATTRIBUTES)
+        attributes |= SEPA_ATTRIBUTES
+      when 'bacs'
+        attributes -= (CREDIT_CARD_ATTRIBUTES + PAYPAL_ATTRIBUTES + AMAZON_ATTRIBUTES + BANK_ACCOUNT_ATTRIBUTES + ROKU_ATTRIBUTES + SEPA_ATTRIBUTES)
+        attributes |= BACS_ATTRIBUTES
       end
       super attributes
     end
 
+    # @return ["credit_card", "paypal", "amazon", "bank_account", "roku", "sepa", "bacs", nil] The type of billing info.
+    def type
+      self[:type] || @type
+    end
+
     class << self
       # Overrides the inherited member_path method to allow for billing info's
       # irregular URL structure.

data/lib/recurly/item.rb

@@ -24,12 +24,9 @@ module Recurly
       attrs
     end
 
-    # method should be changed to use a link once it is added to api
-    # example:
-    #   return false unless link? :reactivate
-    #   reload follow_link :reactivate
     def reactivate
-      reload API.put("#{uri}/reactivate")
+      return false unless link? :reactivate
+      reload follow_link :reactivate
       true
     end
 

data/lib/recurly/plan.rb

@@ -32,6 +32,7 @@ module Recurly
       tax_code
       trial_requires_billing_info
       auto_renew
+      allow_any_item_on_subscriptions
       created_at
       updated_at
     )

data/lib/recurly/subscription.rb

@@ -174,6 +174,35 @@ module Recurly
       sub.tap {|e| e.currency = currency} if sub.is_a? Subscription
     end
 
+    # Convert free trial to paid subscription when transaction_type is "moto"
+    # which stands for "Mail Order Telephone Order".
+    # 
+    # @return true
+    def convert_trial_moto()
+      builder = XML.new("<subscription/>")
+      builder.add_element('transaction_type', "moto")
+      reload API.put("#{uri}/convert_trial", builder.to_s)
+      true
+    end
+
+    # Convert free trial to paid subscription. Optionally uses a 3ds token.
+    # 
+    # @param three_d_secure_action_result_token_id [String] three_d_secure_action_result_token_id 
+    #   returned by Recurly.js referencing the result of the 3DS authentication for PSD2
+    # @return true when payment is accepted
+    def convert_trial(three_d_secure_action_result_token_id = nil)
+      body = if three_d_secure_action_result_token_id != nil
+        builder = Recurly::XML.new("<subscription/>")
+        account = builder.add_element('account')
+        billing_info = account.add_element('billing_info')
+        billing_info.add_element('three_d_secure_action_result_token_id', three_d_secure_action_result_token_id)
+        builder.to_s
+      end
+      
+      reload API.put("#{uri}/convert_trial", body) 
+      true
+    end
+
     # Cancel a subscription so that it will not renew.
     #
     # @param [String] optional timeframe. Choose one of "bill_date" or "term_end"

data/lib/recurly/subscription/add_ons.rb

@@ -25,7 +25,12 @@ module Recurly
       def << add_on
         add_on = SubscriptionAddOn.new(add_on, @subscription)
 
-        exist = @add_ons.find { |a| a.add_on_code == add_on.add_on_code }
+        exist = @add_ons.find do |a|
+          source1 = a.add_on_source || "plan_add_on"
+          source2 = add_on.add_on_source || "plan_add_on"
+          a.add_on_code == add_on.add_on_code && source1 == source2
+        end
+
         if exist
           exist.quantity ||= 1
           exist.quantity += add_on.quantity || 1

data/lib/recurly/subscription_add_on.rb

@@ -13,6 +13,7 @@ module Recurly
       add_on_type
       usage_type
       usage_percentage
+      add_on_source
     )
 
     attr_reader :subscription
@@ -28,6 +29,7 @@ module Recurly
         if add_on.unit_amount_in_cents
           self.unit_amount_in_cents = add_on.unit_amount_in_cents.to_i
         end
+        self.add_on_source = add_on.add_on_source
       when Hash
         self.attributes = add_on
       when String, Symbol

data/lib/recurly/tier.rb

@@ -0,0 +1,17 @@
+module Recurly
+  class Tier < Resource
+
+    belongs_to :add_on
+
+    define_attribute_methods %w(
+      ending_quantity
+      unit_amount_in_cents
+    )
+
+    def xml_keys
+      attributes.keys
+    end
+
+    embedded! true
+  end
+end

data/lib/recurly/version.rb

@@ -1,6 +1,6 @@
 module Recurly
   module Version
-    VERSION = "2.18.5"
+    VERSION = "2.18.10"
 
     class << self
       def inspect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recurly
 version: !ruby/object:Gem::Version
-  version: 2.18.5
+  version: 2.18.10
 platform: ruby
 authors:
 - Recurly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -249,6 +249,7 @@ files:
 - lib/recurly/subscription_add_on.rb
 - lib/recurly/tax_detail.rb
 - lib/recurly/tax_type.rb
+- lib/recurly/tier.rb
 - lib/recurly/transaction.rb
 - lib/recurly/transaction/errors.rb
 - lib/recurly/usage.rb