pay 3.0.24 → 4.0.2

data/lib/pay/stripe/webhooks/subscription_renewing.rb

@@ -8,20 +8,16 @@ module Pay
         def call(event)
           # Event is of type "invoice" see:
           # https://stripe.com/docs/api/invoices/object
-          subscription = Pay::Subscription.find_by_processor_and_id(:stripe, event.data.object.subscription)
-          return unless subscription
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, event.data.object.subscription)
+          return unless pay_subscription
 
           # Stripe subscription items all have the same interval
           price = event.data.object.lines.data.first.price
-          return unless price.type == "recurring"
 
-          interval = price.recurring.interval
-          return unless interval == "year"
-
-          if Pay.send_emails
-            Pay::UserMailer.with(
-              pay_customer: subscription.customer,
-              subscription: subscription,
+          if Pay.send_email?(:subscription_renewing, pay_subscription, price)
+            Pay.mailer.with(
+              pay_customer: pay_subscription.customer,
+              pay_subscription: pay_subscription,
               date: Time.zone.at(event.data.object.next_payment_attempt)
             ).subscription_renewing.deliver_later
           end

data/lib/pay/stripe/webhooks/subscription_updated.rb

@@ -3,7 +3,7 @@ module Pay
     module Webhooks
       class SubscriptionUpdated
         def call(event)
-          Pay::Stripe::Subscription.sync(event.data.object.id)
+          Pay::Stripe::Subscription.sync(event.data.object.id, stripe_account: event.try(:account))
         end
       end
     end

data/lib/pay/stripe.rb

@@ -28,6 +28,12 @@ module Pay
 
     extend Env
 
+    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")
+    end
+
     def self.setup
       ::Stripe.api_key = private_key
       ::Stripe.api_version = "2020-08-27"
@@ -35,7 +41,10 @@ module Pay
       # 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")
 
-      configure_webhooks
+      # Automatically retry requests that fail
+      # This automatically includes idempotency keys in the request to guarantee that retires are safe
+      # https://github.com/stripe/stripe-ruby#configuring-automatic-retries
+      ::Stripe.max_network_retries = 2
     end
 
     def self.public_key

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "3.0.24"
+  VERSION = "4.0.2"
 end

data/lib/pay.rb

@@ -3,6 +3,8 @@ require "pay/engine"
 require "pay/errors"
 require "pay/adapter"
 
+require "active_support/dependencies"
+
 module Pay
   autoload :Attributes, "pay/attributes"
   autoload :Env, "pay/env"
@@ -35,10 +37,6 @@ module Pay
   mattr_accessor :business_logo
   mattr_accessor :support_email
 
-  # Email configuration
-  mattr_accessor :send_emails
-  @@send_emails = true
-
   mattr_accessor :automount_routes
   @@automount_routes = true
 
@@ -51,7 +49,44 @@ module Pay
   mattr_accessor :routes_path
   @@routes_path = "/pay"
 
+  mattr_accessor :enabled_processors
+  @@enabled_processors = [:stripe, :braintree, :paddle]
+
+  mattr_accessor :emails
+  @@emails = ActiveSupport::OrderedOptions.new
+  @@emails.payment_action_required = true
+  @@emails.receipt = true
+  @@emails.refund = true
+  # This only applies to Stripe, therefor we supply the second argument of price
+  @@emails.subscription_renewing = ->(pay_subscription, price) {
+    (price&.type == "recurring") && (price.recurring&.interval == "year")
+  }
+
+  @@mailer = "Pay::UserMailer"
+
+  def self.mailer=(value)
+    @@mailer = value
+    @@mailer_ref = nil
+  end
+
+  def self.mailer
+    @@mailer_ref ||= @@mailer&.constantize
+  end
+
+  mattr_accessor :parent_mailer
+  @@parent_mailer = "Pay::ApplicationMailer"
+
   def self.setup
     yield self
   end
+
+  def self.send_email?(email_option, *remaining_args)
+    config_option = emails.send(email_option)
+
+    if config_option.respond_to?(:call)
+      config_option.call(*remaining_args)
+    else
+      config_option
+    end
+  end
 end

data/lib/tasks/pay.rake

@@ -21,7 +21,7 @@ def sync_default_payment_method(pay_customer, retries: 2)
       payment_method_id = pay_customer.customer.invoice_settings.default_payment_method
       Pay::Stripe::PaymentMethod.sync(payment_method_id) if payment_method_id
     when "paddle"
-      Pay::Paddle::PaymentMethod.sync(pay_customer)
+      Pay::Paddle::PaymentMethod.sync(pay_customer: pay_customer)
     end
   rescue
     sleep 0.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 4.0.2
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,7 +153,6 @@ files:
 - lib/pay/fake_processor/error.rb
 - lib/pay/fake_processor/payment_method.rb
 - lib/pay/fake_processor/subscription.rb
-- lib/pay/merchant.rb
 - lib/pay/nano_id.rb
 - lib/pay/paddle.rb
 - lib/pay/paddle/billable.rb
@@ -217,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails

data/lib/pay/merchant.rb

@@ -1,37 +0,0 @@
-module Pay
-  module Merchant
-    extend ActiveSupport::Concern
-
-    # Keep track of which Merchant models we have
-    class << self
-      attr_reader :includers
-    end
-
-    def self.included(base = nil, &block)
-      @includers ||= []
-      @includers << base if base
-      super
-    end
-
-    included do
-      store_accessor :pay_data, :stripe_connect_account_id
-      store_accessor :pay_data, :onboarding_complete
-    end
-
-    def merchant
-      @merchant ||= merchant_processor_for(merchant_processor).new(self)
-    end
-
-    def merchant_processor_for(name)
-      "Pay::#{name.to_s.classify}::Merchant".constantize
-    end
-
-    def stripe_connect_account_id?
-      !!stripe_connect_account_id
-    end
-
-    def onboarding_complete?
-      !!onboarding_complete
-    end
-  end
-end