pay 8.1.2 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9bcfe2386dfbf2f1aef6f5f531dfee84f79e7e46e8a50bfa1189d65cf968e9
-  data.tar.gz: 95d4b7d998ac2439ddcd8e3c174c0349aa4cb131b1477fc166948d1997ae67e5
+  metadata.gz: 508c9227734d74f5b2bc54796fa176fb712d7028ac6a81eeeff6c3366b271190
+  data.tar.gz: f21dc281d1ab89d2bb11c77b41ebefeed886b193d98551b751a881faaf6b8733
 SHA512:
-  metadata.gz: e6f8ac8309e3d664980c0a6991440197b01de09d8de04c352bd20d6b3a97127fed7dad70f4511056fee585fd45c8014d1af796b75f9da21b2b8a1ef500162856
-  data.tar.gz: 41b2c842364d6517c4fe40c253424d4a7c45f47aa0fa35dd3dfe7c5ef3f4c79cdcc2fefef53294689986264b09ad3310f3079e3dd63736dc6bf9ab7533154deb
+  metadata.gz: 1ab54cc78bb095352008d705439e86081e2f8348e253ec610e04d39cbefb305a8e93999fc112379ad8ef0c614e3fe7e658532510bae92b6b405c195ddd65d154
+  data.tar.gz: 9908d0317fda0cd3c0f849fb43ef529c57b742442faa1278ac0ea9bd1c1aa326845acb009f87269ecaa3841c1ef53e686de1052b3909e55b98b379aa8a264eab

data/app/models/pay/braintree/subscription.rb

@@ -95,7 +95,7 @@ module Pay
 
       def resume
         unless resumable?
-          raise StandardError, "You can only resume subscriptions within their grace period."
+          raise Error, "You can only resume subscriptions within their grace period."
         end
 
         if canceled? && on_trial?

data/app/models/pay/fake_processor/subscription.rb

@@ -32,12 +32,16 @@ module Pay
       end
 
       def resumable?
-        on_grace_period? || paused?
+        if data&.has_key?("resumable")
+          data["resumable"]
+        else
+          on_grace_period? || paused?
+        end
       end
 
       def resume
         unless resumable?
-          raise StandardError, "You can only resume subscriptions within their grace period."
+          raise Error, "You can only resume subscriptions within their grace period."
         end
 
         update(status: :active, trial_ends_at: nil, ends_at: nil)

data/app/models/pay/lemon_squeezy/subscription.rb

@@ -100,7 +100,7 @@ module Pay
 
       def resume
         unless resumable?
-          raise StandardError, "You can only resume paused or cancelled subscriptions"
+          raise Error, "You can only resume paused or cancelled subscriptions"
         end
 
         if paused? && pause_starts_at? && Time.current < pause_starts_at
@@ -117,8 +117,8 @@ module Pay
       # Lemon Squeezy requires both the Product ID and Variant ID.
       # The Variant ID will be saved as the processor_plan
       def swap(plan, **options)
-        raise StandardError, "A plan_id is required to swap a subscription" unless plan
-        raise StandardError, "A variant_id is required to swap a subscription" unless options[:variant_id]
+        raise Error, "A plan_id is required to swap a subscription" unless plan
+        raise Error, "A variant_id is required to swap a subscription" unless options[:variant_id]
 
         ::LemonSqueezy::Subscription.change_plan id: processor_id, plan_id: plan, variant_id: options[:variant_id]
 

data/app/models/pay/paddle_billing/charge.rb

@@ -56,6 +56,14 @@ module Pay
         else
           pay_customer.charges.create!(attrs.merge(processor_id: object.id))
         end
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+        try += 1
+        if try <= retries
+          sleep 0.1
+          retry
+        else
+          raise
+        end
       end
     end
   end

data/app/models/pay/paddle_billing/payment_method.rb

@@ -8,7 +8,7 @@ module Pay
         sync(pay_customer: pay_customer, attributes: transaction.payments.first)
       end
 
-      def self.sync(pay_customer:, attributes:)
+      def self.sync(pay_customer:, attributes:, try: 0, retries: 1)
         details = attributes.method_details
         attrs = {
           payment_method_type: details.type.downcase
@@ -25,6 +25,14 @@ module Pay
         payment_method = pay_customer.payment_methods.find_or_initialize_by(processor_id: attributes.payment_method_id)
         payment_method.update!(attrs)
         payment_method
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+        try += 1
+        if try <= retries
+          sleep 0.1
+          retry
+        else
+          raise
+        end
       end
 
       def make_default!

data/app/models/pay/paddle_billing/subscription.rb

@@ -6,7 +6,7 @@ module Pay
         sync(transaction.subscription_id) if transaction.subscription_id
       end
 
-      def self.sync(subscription_id, object: nil, name: Pay.default_product_name)
+      def self.sync(subscription_id, object: nil, name: Pay.default_product_name, try: 0, retries: 1)
         # Passthrough is not return from this API, so we can't use that
         object ||= ::Paddle::Subscription.retrieve(id: subscription_id)
 
@@ -62,6 +62,14 @@ module Pay
         else
           pay_customer.subscriptions.create!(attributes.merge(name: name, processor_id: subscription_id))
         end
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+        try += 1
+        if try <= retries
+          sleep 0.1
+          retry
+        else
+          raise
+        end
       end
 
       def api_record(**options)
@@ -91,7 +99,7 @@ module Pay
       end
 
       def cancel_now!(**options)
-        cancel(options.merge(effective_from: "immediately"))
+        cancel(**options.merge(effective_from: "immediately"))
       rescue ::Paddle::Error => e
         raise Pay::PaddleBilling::Error, e
       end
@@ -135,7 +143,7 @@ module Pay
 
       def resume
         unless resumable?
-          raise StandardError, "You can only resume paused subscriptions."
+          raise Error, "You can only resume paused subscriptions."
         end
 
         # Paddle Billing API only allows "resuming" subscriptions when they are paused

data/app/models/pay/paddle_classic/subscription.rb

@@ -116,7 +116,7 @@ module Pay
 
       def resume
         unless resumable?
-          raise StandardError, "You can only resume paused subscriptions."
+          raise Error, "You can only resume paused subscriptions."
         end
 
         PaddleClassic.client.users.unpause(subscription_id: processor_id)

data/app/models/pay/stripe/subscription.rb

@@ -256,7 +256,7 @@ module Pay
 
       def resume
         unless resumable?
-          raise StandardError, "You can only resume subscriptions within their grace period."
+          raise Error, "You can only resume subscriptions within their grace period."
         end
 
         if paused?

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "8.1.2"
+  VERSION = "8.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 8.1.2
+  version: 8.2.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails