pay 8.1.1 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b493128b8cda84a754699e14ae59d19c88948998591ba8e52494c201c4af12ad
-  data.tar.gz: 85cdd057383abbd32ae348f0f05951f93a77dabf3221c220bdd6fa415fbf7c9f
+  metadata.gz: 9c203986ec600312090922863e206b2136fc040e68cdab530575aa521501563b
+  data.tar.gz: 9b0f5220d53a014148a3d7a58fc4c2f7fefd5b04fe92ced36c65decfabb4fd34
 SHA512:
-  metadata.gz: 56b5fdcb946e5f951a6169e61f954abcdb8a1f3e56bfbd0627752660305ec6ebe143837d014a8c6113e377a17ad46185232b0d0f18c0e81014b73271caafee36
-  data.tar.gz: 3e3c5a3ae2664590ffa99a09c6e3ffbd9a622a0972509509cb020e78491e0993346801c0918f59978f4ebf241723e743beb99dd273ac29c11b06f6da61c1bfa2
+  metadata.gz: 60caf2d4f344da6c2581636ee8d03991ecf0462fb0a7e7c7c502031b733228499c58da2ff47b746401115798a760e2ca759909b9b33d76379c92fdc5168b3666
+  data.tar.gz: b530d41e9f0b4ff493575c3b3b74e8af07ff27557f2bf090eefee9b175862e4b05c1b6c9f9515bf38291946074841bfdfcd4e1c2cf0e093a467773a74931e7ec

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

@@ -37,7 +37,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
 
         update(status: :active, trial_ends_at: nil, ends_at: nil)

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

@@ -9,7 +9,7 @@ module Pay
 
         attributes = {
           current_period_end: object.renews_at,
-          ends_at: (object.ends_at ? Time.parse(object..ends_at) : nil),
+          ends_at: (object.ends_at ? Time.parse(object.ends_at) : nil),
           pause_starts_at: (object.pause&.resumes_at ? Time.parse(object.pause.resumes_at) : nil),
           status: object.status,
           processor_plan: object.first_subscription_item.price_id,
@@ -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/customer.rb

@@ -24,7 +24,7 @@ module Pay
           pc
         else
           pc = ::Paddle::Customer.create(email: email, name: customer_name)
-          update!(processor_id: sc.id)
+          update!(processor_id: pc.id)
           pc
         end
       rescue ::Paddle::Error => e

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)
@@ -102,7 +110,11 @@ module Pay
           quantity: quantity
         }]
 
-        ::Paddle::Subscription.update(id: processor_id, items: items, proration_billing_mode: "prorated_immediately")
+        ::Paddle::Subscription.update(
+          id: processor_id,
+          items: items,
+          proration_billing_mode: options.delete(:proration_billing_mode) || "prorated_immediately"
+        )
         update(quantity: quantity)
       rescue ::Paddle::Error => e
         raise Pay::PaddleBilling::Error, e
@@ -131,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
@@ -148,12 +160,18 @@ module Pay
       end
 
       def swap(plan, **options)
+        raise ArgumentError, "plan must be a string" unless plan.is_a?(String)
+
         items = [{
           price_id: plan,
           quantity: quantity || 1
         }]
 
-        ::Paddle::Subscription.update(id: processor_id, items: items, proration_billing_mode: "prorated_immediately")
+        ::Paddle::Subscription.update(
+          id: processor_id,
+          items: items,
+          proration_billing_mode: options.delete(:proration_billing_mode) || "prorated_immediately"
+        )
         update(processor_plan: plan, ends_at: nil, status: :active)
       end
 

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.1"
+  VERSION = "8.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.3
 platform: ruby
 authors:
 - Jason Charnes
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails