pay 4.1.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9178fdc2803ccfa6b8552a26e34a3849702c5f0ea7143a00773dc8d51b7f373
-  data.tar.gz: c8da4c71a2317213e3e23b4be9651eafc4ce3df5848b4ac918d89fab916d731e
+  metadata.gz: ac230e5bd9211a9ee883dad0d578c7aa26aed37d2ce09ad0dacccda4c7f544d1
+  data.tar.gz: eee27e8d56e29b7ad262b4fd12451f47e91778825f5359ae8d7b0ad39f03ebff
 SHA512:
-  metadata.gz: fff2d403ce33d8fe02b869b4387d164a8f50ec5b2bdfdb7d747e11987ba586e14958dc220e77379e5649340b44a12352b61e2862395ccf0991c4b3597b7261f0
-  data.tar.gz: 9a98e720f18f9e2572410c52d86ea3b46c08490a1a7749ea627bc7cb4ee8fe717ac7d45c90e58c8799a92d602d8b91712d08eea7ccfec7d0ec1a93b7c20af004
+  metadata.gz: edffe8234d27e0d99b618a564ec46eaa3df44e8d8745b99c82506610f0786d916b6856afb4ba57c0d410d8c19c83b023b73c02ad7782f9d4f8f384554b8356ca
+  data.tar.gz: 6d19b7b841de05eaacfc616ab0d9ab197ccf0c0a251afeebdeecd183bcbade5e7ffb8344bc17e7379f5bc6bea14f4d370bcb39744a5b476498c4ad70dc29f7ec

data/README.md

@@ -20,7 +20,7 @@ Want to see how Pay works? Check out our video getting started guide.
 
 Our supported payment processors are:
 
-- Stripe ([SCA Compatible](https://stripe.com/docs/strong-customer-authentication) using API version `2020-08-27`)
+- Stripe ([SCA Compatible](https://stripe.com/docs/strong-customer-authentication) using API version `2022-08-01`)
 - Paddle (SCA Compatible & supports PayPal)
 - Braintree (supports PayPal)
 - [Fake Processor](docs/fake_processor/1_overview.md) (used for generic trials without cards, free subscriptions, testing, etc)

data/app/models/pay/subscription.rb

@@ -11,7 +11,9 @@ module Pay
     scope :on_trial, -> { where.not(trial_ends_at: nil).where("#{table_name}.trial_ends_at > ?", Time.zone.now) }
     scope :cancelled, -> { where.not(ends_at: nil) }
     scope :on_grace_period, -> { cancelled.where("#{table_name}.ends_at > ?", Time.zone.now) }
-    scope :active, -> { where(status: ["trialing", "active"], ends_at: nil).or(on_grace_period).or(on_trial) }
+    # Stripe considers paused subscriptions to be active, therefore we reflect that in this scope and
+    # make it consistent across all processors
+    scope :active, -> { where(status: ["trialing", "active", "paused"], ends_at: nil).or(on_grace_period).or(on_trial) }
     scope :incomplete, -> { where(status: :incomplete) }
     scope :past_due, -> { where(status: :past_due) }
     scope :with_active_customer, -> { joins(:customer).merge(Customer.active) }
@@ -49,6 +51,18 @@ module Pay
       scope processor_name, -> { joins(:customer).where(pay_customers: {processor: processor_name}) }
     end
 
+    def self.active_without_paused
+      case Pay::Adapter.current_adapter
+      when "postgresql", "postgis"
+        active.where("data->>'pause_behavior' IS NULL AND status != 'paused'")
+      when "mysql2"
+        active.where("data->>'$.pause_behavior' IS NULL AND status != 'paused'")
+      when "sqlite3"
+        # sqlite 3.38 supports ->> syntax, however, sqlite 3.37 is what ships with Ubuntu 22.04.
+        active.where("json_extract(data, '$.pause_behavior') IS NULL AND status != 'paused'")
+      end
+    end
+
     def self.with_metered_items
       case Pay::Adapter.current_adapter
       when "sqlite3"
@@ -108,7 +122,7 @@ module Pay
     end
 
     def active?
-      ["trialing", "active"].include?(status) && (ends_at.nil? || on_grace_period? || on_trial?)
+      ["trialing", "active", "paused"].include?(status) && (ends_at.nil? || on_grace_period? || on_trial?)
     end
 
     def past_due?

data/lib/pay/paddle/subscription.rb

@@ -107,13 +107,13 @@ module Pay
       end
 
       def paused?
-        paddle_paused_from.present?
+        pay_subscription.status == "paused"
       end
 
       def pause
         attributes = {pause: true}
         response = PaddlePay::Subscription::User.update(processor_id, attributes)
-        pay_subscription.update(paddle_paused_from: Time.zone.parse(response.dig(:next_payment, :date)))
+        pay_subscription.update(status: :paused, paddle_paused_from: Time.zone.parse(response.dig(:next_payment, :date)))
       rescue ::PaddlePay::PaddlePayError => e
         raise Pay::Paddle::Error, e
       end

data/lib/pay/stripe/billable.rb

@@ -178,6 +178,7 @@ module Pay
       end
 
       def create_setup_intent(options = {})
+        customer unless processor_id?
         ::Stripe::SetupIntent.create({
           customer: processor_id,
           usage: :off_session

data/lib/pay/stripe/subscription.rb

@@ -142,7 +142,7 @@ module Pay
       # cancel_now!(prorate: true)
       # cancel_now!(invoice_now: true)
       def cancel_now!(**options)
-        @stripe_subscription = ::Stripe::Subscription.delete(processor_id, options.merge(expand_options), stripe_options)
+        @stripe_subscription = ::Stripe::Subscription.cancel(processor_id, options.merge(expand_options), stripe_options)
         pay_subscription.update(ends_at: Time.current, status: :canceled)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e

data/lib/pay/stripe.rb

@@ -31,12 +31,12 @@ module Pay
     def self.enabled?
       return false unless Pay.enabled_processors.include?(:stripe) && defined?(::Stripe)
 
-      Pay::Engine.version_matches?(required: "~> 6", current: ::Stripe::VERSION) || (raise "[Pay] stripe gem must be version ~> 6")
+      Pay::Engine.version_matches?(required: "~> 7", current: ::Stripe::VERSION) || (raise "[Pay] stripe gem must be version ~> 7")
     end
 
     def self.setup
       ::Stripe.api_key = private_key
-      ::Stripe.api_version = "2020-08-27"
+      ::Stripe.api_version = "2022-08-02"
 
       # Used by Stripe to identify Pay for support
       ::Stripe.set_app_info("PayRails", partner_id: "pp_partner_IqhY0UExnJYLxg", version: Pay::VERSION, url: "https://github.com/pay-rails/pay")

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "4.1.1"
+  VERSION = "5.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails