pay 2.7.0 → 3.0.1

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

@@ -0,0 +1,12 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentMethodDetached
+        def call(event)
+          object = event.data.object
+          Pay::PaymentMethod.find_by_processor_and_id(:stripe, object.id)&.destroy
+        end
+      end
+    end
+  end
+end

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

@@ -4,12 +4,18 @@ module Pay
       class PaymentMethodUpdated
         def call(event)
           object = event.data.object
-          billable = Pay.find_billable(processor: :stripe, processor_id: object.customer)
 
-          # Couldn't find user, we can skip
-          return unless billable.present?
+          if object.customer
+            pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
 
-          Pay::Stripe::Billable.new(billable).sync_card_from_stripe
+            # Couldn't find user, we can skip
+            return unless pay_customer.present?
+
+            Pay::Stripe::PaymentMethod.sync(object.id, stripe_account: event.try(:account))
+          else
+            # If customer was removed, we should delete the payment method if it exists
+            Pay::PaymentMethod.find_by_processor_and_id(:stripe, object.id)&.destroy
+          end
         end
       end
     end

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

@@ -3,42 +3,7 @@ module Pay
     module Webhooks
       class SubscriptionCreated
         def call(event)
-          object = event.data.object
-
-          # We may already have the subscription in the database, so we can update that record
-          subscription = Pay.subscription_model.find_by(processor: :stripe, processor_id: object.id)
-
-          # Create the subscription in the database if we don't have it already
-          if subscription.nil?
-            # The customer should already be in the database
-            owner = Pay.find_billable(processor: :stripe, processor_id: object.customer)
-
-            if owner.nil?
-              Rails.logger.error("[Pay] Unable to find Pay::Billable with processor: :stripe and processor_id: '#{object.customer}'. Searched these models: #{Pay.billable_models.join(", ")}")
-              return
-            end
-
-            subscription = Pay.subscription_model.new(name: Pay.default_product_name, owner: owner, processor: :stripe, processor_id: object.id)
-          end
-
-          subscription.application_fee_percent = object.application_fee_percent
-          subscription.processor_plan = object.plan.id
-          subscription.quantity = object.quantity
-          subscription.status = object.status
-          subscription.trial_ends_at = Time.at(object.trial_end) if object.trial_end.present?
-
-          # If user was on trial, their subscription ends at the end of the trial
-          subscription.ends_at = if object.cancel_at_period_end && subscription.on_trial?
-            subscription.trial_ends_at
-
-          # User wasn't on trial, so subscription ends at period end
-          elsif object.cancel_at_period_end
-            Time.at(object.current_period_end)
-
-            # Subscription isn't marked to cancel at period end
-          end
-
-          subscription.save!
+          Pay::Stripe::Subscription.sync(event.data.object.id, stripe_account: event.try(:account))
         end
       end
     end

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

@@ -3,15 +3,8 @@ module Pay
     module Webhooks
       class SubscriptionDeleted
         def call(event)
-          object = event.data.object
-          subscription = Pay.subscription_model.find_by(processor: :stripe, processor_id: object.id)
-
-          # We couldn't find the subscription for some reason, maybe it's from another service
-          return if subscription.nil?
-
-          # User canceled subscriptions have an ends_at
-          # Automatically canceled subscriptions need this value set
-          subscription.update!(ends_at: Time.at(object.ended_at)) if subscription.ends_at.blank? && object.ended_at.present?
+          # Canceled subscriptions are still accessible via the API, so we can sync their details
+          Pay::Stripe::Subscription.sync(event.data.object.id, stripe_account: event.try(:account))
         end
       end
     end

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

@@ -2,15 +2,23 @@ module Pay
   module Stripe
     module Webhooks
       class SubscriptionRenewing
+        # Handles `invoice.upcoming` webhook from Stripe
+        # Occurs X number of days before a subscription is scheduled to create an invoice that is automatically charged—where X is determined by your subscriptions settings. Note: The received Invoice object will not have an invoice ID.
+
         def call(event)
           # Event is of type "invoice" see:
           # https://stripe.com/docs/api/invoices/object
-          subscription = Pay.subscription_model.find_by(
-            processor: :stripe,
-            processor_id: event.data.object.subscription
-          )
-          date = Time.zone.at(event.data.object.next_payment_attempt)
-          notify_user(subscription.owner, subscription, date) if subscription.present?
+          subscription = Pay::Subscription.find_by_processor_and_id(:stripe, event.data.object.subscription)
+          return unless 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"
+
+          notify_user(subscription.customer.owner, subscription, Time.zone.at(event.data.object.next_payment_attempt))
         end
 
         def notify_user(billable, subscription, date)

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

@@ -3,35 +3,7 @@ module Pay
     module Webhooks
       class SubscriptionUpdated
         def call(event)
-          object = event.data.object
-          subscription = Pay.subscription_model.find_by(processor: :stripe, processor_id: object.id)
-
-          return if subscription.nil?
-
-          # Delete any subscription attempts that have expired
-          if object.status == "incomplete_expired"
-            subscription.destroy
-            return
-          end
-
-          subscription.application_fee_percent = object.application_fee_percent
-          subscription.processor_plan = object.plan.id
-          subscription.quantity = object.quantity
-          subscription.status = object.status
-          subscription.trial_ends_at = Time.at(object.trial_end) if object.trial_end.present?
-
-          # If user was on trial, their subscription ends at the end of the trial
-          subscription.ends_at = if object.cancel_at_period_end && subscription.on_trial?
-            subscription.trial_ends_at
-
-          # User wasn't on trial, so subscription ends at period end
-          elsif object.cancel_at_period_end
-            Time.at(object.current_period_end)
-
-            # Subscription isn't marked to cancel at period end
-          end
-
-          subscription.save!
+          Pay::Stripe::Subscription.sync(event.data.object.id)
         end
       end
     end

data/lib/pay/stripe.rb

@@ -2,18 +2,23 @@ module Pay
   module Stripe
     autoload :Billable, "pay/stripe/billable"
     autoload :Charge, "pay/stripe/charge"
-    autoload :Subscription, "pay/stripe/subscription"
     autoload :Error, "pay/stripe/error"
     autoload :Merchant, "pay/stripe/merchant"
+    autoload :PaymentMethod, "pay/stripe/payment_method"
+    autoload :Subscription, "pay/stripe/subscription"
 
     module Webhooks
       autoload :AccountUpdated, "pay/stripe/webhooks/account_updated"
       autoload :ChargeRefunded, "pay/stripe/webhooks/charge_refunded"
       autoload :ChargeSucceeded, "pay/stripe/webhooks/charge_succeeded"
+      autoload :CheckoutSessionCompleted, "pay/stripe/webhooks/checkout_session_completed"
+      autoload :CheckoutSessionAsyncPaymentSucceeded, "pay/stripe/webhooks/checkout_session_async_payment_succeeded"
       autoload :CustomerDeleted, "pay/stripe/webhooks/customer_deleted"
       autoload :CustomerUpdated, "pay/stripe/webhooks/customer_updated"
       autoload :PaymentActionRequired, "pay/stripe/webhooks/payment_action_required"
       autoload :PaymentIntentSucceeded, "pay/stripe/webhooks/payment_intent_succeeded"
+      autoload :PaymentMethodAttached, "pay/stripe/webhooks/payment_method_attached"
+      autoload :PaymentMethodDetached, "pay/stripe/webhooks/payment_method_detached"
       autoload :PaymentMethodUpdated, "pay/stripe/webhooks/payment_method_updated"
       autoload :SubscriptionCreated, "pay/stripe/webhooks/subscription_created"
       autoload :SubscriptionDeleted, "pay/stripe/webhooks/subscription_deleted"
@@ -79,13 +84,17 @@ module Pay
         events.subscribe "stripe.customer.deleted", Pay::Stripe::Webhooks::CustomerDeleted.new
 
         # If a customer's payment source was deleted in Stripe, we should update as well
-        events.subscribe "stripe.payment_method.attached", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
+        events.subscribe "stripe.payment_method.attached", Pay::Stripe::Webhooks::PaymentMethodAttached.new
         events.subscribe "stripe.payment_method.updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
         events.subscribe "stripe.payment_method.card_automatically_updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
-        events.subscribe "stripe.payment_method.detached", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
+        events.subscribe "stripe.payment_method.detached", Pay::Stripe::Webhooks::PaymentMethodDetached.new
 
         # If an account is updated in stripe, we should update it as well
         events.subscribe "stripe.account.updated", Pay::Stripe::Webhooks::AccountUpdated.new
+
+        # Handle subscriptions in Stripe Checkout Sessions
+        events.subscribe "stripe.checkout.session.completed", Pay::Stripe::Webhooks::CheckoutSessionCompleted.new
+        events.subscribe "stripe.checkout.session.async_payment_succeeded", Pay::Stripe::Webhooks::CheckoutSessionAsyncPaymentSucceeded.new
       end
     end
   end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.7.0"
+  VERSION = "3.0.1"
 end

data/lib/pay/webhooks/delegator.rb

@@ -35,6 +35,10 @@ module Pay
         backend.instrument name_with_namespace(type), event
       end
 
+      def listening?(type)
+        backend.notifier.listening? name_with_namespace(type)
+      end
+
       # Strips down to event data only
       class NotificationAdapter
         def initialize(subscriber)

data/lib/pay/webhooks/process_job.rb

@@ -0,0 +1,9 @@
+module Pay
+  module Webhooks
+    class ProcessJob < ApplicationJob
+      def perform(pay_webhook)
+        pay_webhook.process!
+      end
+    end
+  end
+end

data/lib/pay/webhooks.rb

@@ -1,6 +1,7 @@
 module Pay
   module Webhooks
     autoload :Delegator, "pay/webhooks/delegator"
+    autoload :ProcessJob, "pay/webhooks/process_job"
 
     class << self
       delegate :configure, :instrument, to: :delegator

data/lib/pay.rb

@@ -4,9 +4,9 @@ require "pay/errors"
 require "pay/adapter"
 
 module Pay
-  autoload :Billable, "pay/billable"
+  autoload :Attributes, "pay/attributes"
   autoload :Env, "pay/env"
-  autoload :Merchant, "pay/merchant"
+  autoload :NanoId, "pay/nano_id"
   autoload :Payment, "pay/payment"
   autoload :Receipts, "pay/receipts"
 
@@ -18,27 +18,15 @@ module Pay
 
   autoload :Webhooks, "pay/webhooks"
 
-  # Define who owns the subscription
-  mattr_accessor :billable_class
-  mattr_accessor :billable_table
-  mattr_accessor :braintree_gateway
+  module Billable
+    autoload :SyncCustomer, "pay/billable/sync_customer"
+  end
 
-  @@billable_class = "User"
-  @@billable_table = @@billable_class.tableize
+  mattr_accessor :braintree_gateway
 
   mattr_accessor :model_parent_class
   @@model_parent_class = "ApplicationRecord"
 
-  mattr_accessor :chargeable_class
-  mattr_accessor :chargeable_table
-  @@chargeable_class = "Pay::Charge"
-  @@chargeable_table = "pay_charges"
-
-  mattr_accessor :subscription_class
-  mattr_accessor :subscription_table
-  @@subscription_class = "Pay::Subscription"
-  @@subscription_table = "pay_subscriptions"
-
   # Business details for receipts
   mattr_accessor :application_name
   mattr_accessor :business_address
@@ -54,6 +42,7 @@ module Pay
 
   mattr_accessor :default_product_name
   @@default_product_name = "default"
+
   mattr_accessor :default_plan_name
   @@default_plan_name = "default"
 
@@ -64,66 +53,6 @@ module Pay
     yield self
   end
 
-  def self.billable_models
-    Pay::Billable.includers
-  end
-
-  def self.merchant_models
-    Pay::Merchant.includers
-  end
-
-  def self.find_merchant(account_key, account_value)
-    merchant_models.each do |model|
-      case Pay::Adapter.current_adapter
-      when "postgresql"
-        return model.find_by("pay_data @> ?", {account_key.to_sym => account_value}.to_json)
-      when "mysql2"
-        return model.find_by("JSON_CONTAINS(pay_data, ?)", {account_key.to_sym => account_value}.to_json)
-      when "sqlite3"
-        return model.find_by("json_extract(pay_data, ?) =?", "$.#{account_key}", account_value)
-      else
-        model.find_by(pay_data: {account_key.to_sym => account_value})
-      end
-    end
-    nil
-  end
-
-  def self.find_billable(processor:, processor_id:)
-    billable_models.each do |model|
-      if (record = model.find_by(processor: processor, processor_id: processor_id))
-        return record
-      end
-    end
-
-    nil
-  end
-
-  def self.user_model
-    ActiveSupport::Deprecation.warn("Pay.user_model is deprecated and will be removed in v3. Instead, use `Pay.billable_models` now to support more than one billable model.")
-
-    if Rails.application.config.cache_classes
-      @@user_model ||= billable_class.constantize
-    else
-      billable_class.constantize
-    end
-  end
-
-  def self.charge_model
-    if Rails.application.config.cache_classes
-      @@charge_model ||= chargeable_class.constantize
-    else
-      chargeable_class.constantize
-    end
-  end
-
-  def self.subscription_model
-    if Rails.application.config.cache_classes
-      @@subscription_model ||= subscription_class.constantize
-    else
-      subscription_class.constantize
-    end
-  end
-
   def self.receipts_supported?
     charge_model.respond_to?(:receipt) &&
       application_name.present? &&

data/lib/tasks/pay.rake

@@ -0,0 +1,20 @@
+namespace :pay do
+  namespace :payment_methods do
+    desc "Sync default payment methods for Pay::Customers"
+    task sync_default: :environment do
+      Pay::Customer.find_each do |pay_customer|
+        puts "Syncing Pay::Customer ##{pay_customer.id}: #{pay_customer.processor.titleize} #{pay_customer.processor_id}"
+        case pay_customer.processor
+        when "braintree"
+          payment_method = pay_customer.customer.payment_methods.find(&:default?)
+          Pay::Braintree::PaymentMethod.sync(payment_method.token, object: payment_method) if payment_method
+        when "stripe"
+          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)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,34 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: minitest-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -122,13 +102,16 @@ files:
 - app/controllers/pay/webhooks/stripe_controller.rb
 - app/helpers/pay/application_helper.rb
 - app/jobs/pay/application_job.rb
-- app/jobs/pay/email_sync_job.rb
+- app/jobs/pay/customer_sync_job.rb
 - app/mailers/pay/application_mailer.rb
 - app/mailers/pay/user_mailer.rb
-- app/models/pay.rb
 - app/models/pay/application_record.rb
 - app/models/pay/charge.rb
+- app/models/pay/customer.rb
+- app/models/pay/merchant.rb
+- app/models/pay/payment_method.rb
 - app/models/pay/subscription.rb
+- app/models/pay/webhook.rb
 - app/views/layouts/pay/application.html.erb
 - app/views/pay/payments/show.html.erb
 - app/views/pay/stripe/_checkout_button.html.erb
@@ -138,28 +121,26 @@ files:
 - app/views/pay/user_mailer/subscription_renewing.html.erb
 - config/locales/en.yml
 - config/routes.rb
-- db/migrate/20170205020145_create_pay_subscriptions.rb
-- db/migrate/20170727235816_create_pay_charges.rb
-- db/migrate/20190816015720_add_status_to_pay_subscriptions.rb
-- db/migrate/20200603134434_add_data_to_pay_models.rb
-- db/migrate/20210309004259_add_data_to_pay_billable.rb
-- db/migrate/20210406215234_add_currency_to_pay_charges.rb
-- db/migrate/20210406215506_add_application_fee_to_pay_models.rb
-- lib/generators/active_record/pay_generator.rb
-- lib/generators/active_record/templates/migration.rb
+- db/migrate/1_create_pay_tables.rb
+- lib/generators/active_record/billable_generator.rb
+- lib/generators/active_record/merchant_generator.rb
+- lib/generators/active_record/templates/billable_migration.rb
+- lib/generators/active_record/templates/merchant_migration.rb
+- lib/generators/pay/billable_generator.rb
 - lib/generators/pay/email_views_generator.rb
+- lib/generators/pay/merchant_generator.rb
 - lib/generators/pay/orm_helpers.rb
-- lib/generators/pay/pay_generator.rb
 - lib/generators/pay/views_generator.rb
 - lib/pay.rb
 - lib/pay/adapter.rb
-- lib/pay/billable.rb
-- lib/pay/billable/sync_email.rb
+- lib/pay/attributes.rb
+- lib/pay/billable/sync_customer.rb
 - lib/pay/braintree.rb
 - lib/pay/braintree/authorization_error.rb
 - lib/pay/braintree/billable.rb
 - lib/pay/braintree/charge.rb
 - lib/pay/braintree/error.rb
+- lib/pay/braintree/payment_method.rb
 - lib/pay/braintree/subscription.rb
 - lib/pay/braintree/webhooks/subscription_canceled.rb
 - lib/pay/braintree/webhooks/subscription_charged_successfully.rb
@@ -175,12 +156,16 @@ files:
 - lib/pay/fake_processor/billable.rb
 - lib/pay/fake_processor/charge.rb
 - 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
 - lib/pay/paddle/charge.rb
 - lib/pay/paddle/error.rb
+- lib/pay/paddle/payment_method.rb
+- lib/pay/paddle/response.rb
 - lib/pay/paddle/subscription.rb
 - lib/pay/paddle/webhooks/signature_verifier.rb
 - lib/pay/paddle/webhooks/subscription_cancelled.rb
@@ -195,14 +180,19 @@ files:
 - lib/pay/stripe/charge.rb
 - lib/pay/stripe/error.rb
 - lib/pay/stripe/merchant.rb
+- lib/pay/stripe/payment_method.rb
 - lib/pay/stripe/subscription.rb
 - lib/pay/stripe/webhooks/account_updated.rb
 - lib/pay/stripe/webhooks/charge_refunded.rb
 - lib/pay/stripe/webhooks/charge_succeeded.rb
+- lib/pay/stripe/webhooks/checkout_session_async_payment_succeeded.rb
+- lib/pay/stripe/webhooks/checkout_session_completed.rb
 - lib/pay/stripe/webhooks/customer_deleted.rb
 - lib/pay/stripe/webhooks/customer_updated.rb
 - lib/pay/stripe/webhooks/payment_action_required.rb
 - lib/pay/stripe/webhooks/payment_intent_succeeded.rb
+- lib/pay/stripe/webhooks/payment_method_attached.rb
+- lib/pay/stripe/webhooks/payment_method_detached.rb
 - lib/pay/stripe/webhooks/payment_method_updated.rb
 - lib/pay/stripe/webhooks/subscription_created.rb
 - lib/pay/stripe/webhooks/subscription_deleted.rb
@@ -211,6 +201,8 @@ files:
 - lib/pay/version.rb
 - lib/pay/webhooks.rb
 - lib/pay/webhooks/delegator.rb
+- lib/pay/webhooks/process_job.rb
+- lib/tasks/pay.rake
 homepage: https://github.com/pay-rails/pay
 licenses:
 - MIT
@@ -230,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails