pay 2.5.0 → 2.6.0

data/lib/pay/braintree/charge.rb

@@ -1,26 +1,24 @@
 module Pay
   module Braintree
-    module Charge
-      extend ActiveSupport::Concern
+    class Charge
+      attr_reader :pay_charge
 
-      included do
-        scope :braintree, -> { where(processor: :braintree) }
-      end
+      delegate :processor_id, to: :pay_charge
 
-      def braintree?
-        processor == "braintree"
+      def initialize(pay_charge)
+        @pay_charge = pay_charge
       end
 
-      def braintree_charge
+      def charge
         Pay.braintree_gateway.transaction.find(processor_id)
       rescue ::Braintree::Braintree::Error => e
         raise Pay::Braintree::Error, e
       end
 
-      def braintree_refund!(amount_to_refund)
+      def refund!(amount_to_refund)
         Pay.braintree_gateway.transaction.refund(processor_id, amount_to_refund / 100.0)
 
-        update(amount_refunded: amount_to_refund)
+        pay_charge.update(amount_refunded: amount_to_refund)
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end

data/lib/pay/braintree/error.rb

@@ -0,0 +1,9 @@
+module Pay
+  module Braintree
+    class Error < Pay::Error
+      def message
+        result.message
+      end
+    end
+  end
+end

data/lib/pay/braintree/subscription.rb

@@ -1,44 +1,64 @@
 module Pay
   module Braintree
-    module Subscription
-      extend ActiveSupport::Concern
+    class Subscription
+      attr_reader :pay_subscription
+
+      delegate :active?,
+        :canceled?,
+        :ends_at,
+        :name,
+        :on_trial?,
+        :owner,
+        :processor_subscription,
+        :processor_id,
+        :prorate,
+        :prorate?,
+        :processor_plan,
+        :quantity?,
+        :quantity,
+        :trial_ends_at,
+        to: :pay_subscription
+
+      def initialize(pay_subscription)
+        @pay_subscription = pay_subscription
+      end
 
-      def braintree_cancel
+      def cancel
         subscription = processor_subscription
 
         if on_trial?
           gateway.subscription.cancel(processor_subscription.id)
-          update(status: :canceled, ends_at: trial_ends_at)
+          pay_subscription.update(status: :canceled, ends_at: trial_ends_at)
         else
           gateway.subscription.update(subscription.id, {
             number_of_billing_cycles: subscription.current_billing_cycle
           })
-          update(status: :canceled, ends_at: subscription.billing_period_end_date.to_date)
+          pay_subscription.update(status: :canceled, ends_at: subscription.billing_period_end_date.to_date)
         end
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end
 
-      def braintree_cancel_now!
+      def cancel_now!
         gateway.subscription.cancel(processor_subscription.id)
-        update(status: :canceled, ends_at: Time.zone.now)
+        pay_subscription.update(status: :canceled, ends_at: Time.zone.now)
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end
 
-      def braintree_on_grace_period?
+      def on_grace_period?
         canceled? && Time.zone.now < ends_at
       end
 
-      def braintree_paused?
+      def paused?
         false
       end
 
-      def braintree_pause
+      def pause
         raise NotImplementedError, "Braintree does not support pausing subscriptions"
       end
 
-      def braintree_resume
+      def resume
         unless on_grace_period?
           raise StandardError, "You can only resume subscriptions within their grace period."
         end
@@ -53,7 +73,6 @@ module Pay
             trial_duration: duration.to_i,
             trial_duration_unit: :day
           )
-
         else
           subscription = processor_subscription
 
@@ -63,12 +82,12 @@ module Pay
           })
         end
 
-        update(status: :active)
+        pay_subscription.update(status: :active)
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end
 
-      def braintree_swap(plan)
+      def swap(plan)
         if on_grace_period? && processor_plan == plan
           resume
           return
@@ -99,7 +118,7 @@ module Pay
         })
 
         if result.success?
-          update(status: :active, processor_plan: braintree_plan.id, ends_at: nil)
+          pay_subscription.update(status: :active, processor_plan: braintree_plan.id, ends_at: nil)
         else
           raise Error, "Braintree failed to swap plans: #{result.message}"
         end

data/lib/pay/braintree/webhooks/subscription_charged_successfully.rb

@@ -12,7 +12,7 @@ module Pay
           return unless pay_subscription.present?
 
           billable = pay_subscription.owner
-          charge = billable.save_braintree_transaction(subscription.transactions.first)
+          charge = Pay::Braintree::Billable.new(billable).save_transaction(subscription.transactions.first)
 
           if Pay.send_emails
             Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later

data/lib/pay/braintree/webhooks/subscription_charged_unsuccessfully.rb

@@ -12,7 +12,7 @@ module Pay
           return unless pay_subscription.present?
 
           # billable = pay_subscription.owner
-          # charge = billable.save_braintree_transaction(subscription.transactions.first)
+          # charge = Pay::Braintree::Billable.new(billable).save_transaction(subscription.transactions.first)
 
           # if Pay.send_emails
           #  Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later

data/lib/pay/engine.rb

@@ -1,32 +1,10 @@
 # frozen_string_literal: true
 
-# rubocop:disable Lint/HandleExceptions
-begin
-  require "braintree"
-rescue LoadError
-end
-
-begin
-  require "stripe"
-rescue LoadError
-end
-
-begin
-  require "paddle_pay"
-rescue LoadError
-end
-# rubocop:enable Lint/HandleExceptions
-
 module Pay
   class Engine < ::Rails::Engine
     engine_name "pay"
 
     initializer "pay.processors" do |app|
-      # Include processor backends
-      require "pay/stripe" if defined? ::Stripe
-      require "pay/braintree" if defined? ::Braintree
-      require "pay/paddle" if defined? ::PaddlePay
-
       if Pay.automount_routes
         app.routes.append do
           mount Pay::Engine, at: Pay.routes_path, as: "pay"

data/lib/pay/errors.rb

@@ -26,48 +26,4 @@ module Pay
       I18n.t("errors.invalid_payment")
     end
   end
-
-  module Braintree
-    class Error < Error
-      def message
-        result.message
-      end
-    end
-
-    class AuthorizationError < Braintree::Error
-      def message
-        I18n.t("errors.braintree.authorization")
-      end
-    end
-  end
-
-  module Stripe
-    class Error < Error
-      def message
-        I18n.t("errors.stripe.#{result.code}", default: result.message)
-      end
-    end
-  end
-
-  module Paddle
-    class Error < Error
-      def message
-        I18n.t("errors.paddle.#{result.code}", default: result.message)
-      end
-    end
-  end
-
-  class BraintreeError < Braintree::Error
-    def message
-      ActiveSupport::Deprecation.warn("Pay::BraintreeError is deprecated. Instead, use `Pay::Braintree::Error`.")
-      super
-    end
-  end
-
-  class BraintreeAuthorizationError < BraintreeError
-    def message
-      ActiveSupport::Deprecation.warn("Pay::BraintreeAuthorizationError is deprecated. Instead, use `Pay::Braintree::AuthorizationError`.")
-      I18n.t("errors.braintree.authorization")
-    end
-  end
 end

data/lib/pay/paddle.rb

@@ -1,38 +1,52 @@
-require "pay/env"
-require "pay/paddle/billable"
-require "pay/paddle/charge"
-require "pay/paddle/subscription"
-require "pay/paddle/webhooks"
-
 module Pay
   module Paddle
-    include Env
+    autoload :Billable, "pay/paddle/billable"
+    autoload :Charge, "pay/paddle/charge"
+    autoload :Subscription, "pay/paddle/subscription"
+    autoload :Error, "pay/paddle/error"
+
+    module Webhooks
+      autoload :SignatureVerifier, "pay/paddle/webhooks/signature_verifier"
+      autoload :SubscriptionCreated, "pay/paddle/webhooks/subscription_created"
+      autoload :SubscriptionCancelled, "pay/paddle/webhooks/subscription_cancelled"
+      autoload :SubscriptionPaymentRefunded, "pay/paddle/webhooks/subscription_payment_refunded"
+      autoload :SubscriptionPaymentSucceeded, "pay/paddle/webhooks/subscription_payment_succeeded"
+      autoload :SubscriptionUpdated, "pay/paddle/webhooks/subscription_updated"
+    end
 
-    extend self
+    extend Env
 
-    def setup
+    def self.setup
       ::PaddlePay.config.vendor_id = vendor_id
       ::PaddlePay.config.vendor_auth_code = vendor_auth_code
 
-      Pay.charge_model.include Pay::Paddle::Charge
-      Pay.subscription_model.include Pay::Paddle::Subscription
-      Pay.billable_models.each { |model| model.include Pay::Paddle::Billable }
+      configure_webhooks
     end
 
-    def vendor_id
+    def self.vendor_id
       find_value_by_name(:paddle, :vendor_id)
     end
 
-    def vendor_auth_code
+    def self.vendor_auth_code
       find_value_by_name(:paddle, :vendor_auth_code)
     end
 
-    def public_key_base64
+    def self.public_key_base64
       find_value_by_name(:paddle, :public_key_base64)
     end
 
-    def passthrough(owner:, **options)
+    def self.passthrough(owner:, **options)
       options.merge(owner_sgid: owner.to_sgid.to_s).to_json
     end
+
+    def self.configure_webhooks
+      Pay::Webhooks.configure do |events|
+        events.subscribe "paddle.subscription_created", Pay::Paddle::Webhooks::SubscriptionCreated.new
+        events.subscribe "paddle.subscription_updated", Pay::Paddle::Webhooks::SubscriptionUpdated.new
+        events.subscribe "paddle.subscription_cancelled", Pay::Paddle::Webhooks::SubscriptionCancelled.new
+        events.subscribe "paddle.subscription_payment_succeeded", Pay::Paddle::Webhooks::SubscriptionPaymentSucceeded.new
+        events.subscribe "paddle.subscription_payment_refunded", Pay::Paddle::Webhooks::SubscriptionPaymentRefunded.new
+      end
+    end
   end
 end

data/lib/pay/paddle/billable.rb

@@ -1,27 +1,32 @@
 module Pay
   module Paddle
-    module Billable
-      extend ActiveSupport::Concern
+    class Billable
+      attr_reader :billable
 
-      included do
-        scope :paddle, -> { where(processor: :paddle) }
+      delegate :processor_id,
+        :processor_id?,
+        :email,
+        :customer_name,
+        :card_token,
+        to: :billable
+
+      def initialize(billable)
+        @billable = billable
       end
 
-      def paddle_customer
+      def customer
         # pass
       end
 
-      def create_paddle_charge(amount, options = {})
+      def charge(amount, options = {})
+        subscription = billable.subscription
         return unless subscription.processor_id
         raise Pay::Error, "A charge_name is required to create a one-time charge" if options[:charge_name].nil?
         response = PaddlePay::Subscription::Charge.create(subscription.processor_id, amount.to_f / 100, options[:charge_name], options)
-        charge = charges.find_or_initialize_by(
-          processor: :paddle,
-          processor_id: response[:invoice_id]
-        )
+        charge = billable.charges.find_or_initialize_by(processor: :paddle, processor_id: response[:invoice_id])
         charge.update(
           amount: Integer(response[:amount].to_f * 100),
-          card_type: subscription.processor_subscription.payment_information[:payment_method],
+          card_type: processor_subscription(subscription.processor_id).payment_information[:payment_method],
           paddle_receipt_url: response[:receipt_url],
           created_at: Time.zone.parse(response[:payment_date])
         )
@@ -30,46 +35,45 @@ module Pay
         raise Pay::Paddle::Error, e
       end
 
-      def create_paddle_subscription(name, plan, options = {})
+      def subscribe(name: Pay.default_product_name, plan: Pay.default_plan_name, **options)
         # pass
       end
 
-      def update_paddle_card(token)
+      def update_card(token)
         sync_payment_information_from_paddle
       end
 
-      def update_paddle_email!
+      def update_email!
         # pass
       end
 
-      def paddle_trial_end_date(subscription)
+      def trial_end_date(subscription)
         return unless subscription.state == "trialing"
         Time.zone.parse(subscription.next_payment[:date]).end_of_day
       end
 
-      def paddle_subscription(subscription_id, options = {})
+      def processor_subscription(subscription_id, options = {})
         hash = PaddlePay::Subscription::User.list({subscription_id: subscription_id}, options).try(:first)
         OpenStruct.new(hash)
       rescue ::PaddlePay::PaddlePayError => e
         raise Pay::Paddle::Error, e
       end
 
-      def paddle_invoice!(options = {})
+      def invoice!(options = {})
         # pass
       end
 
-      def paddle_upcoming_invoice
+      def upcoming_invoice
         # pass
       end
 
-      def sync_payment_information_from_paddle
-        payment_information = paddle_payment_information(subscription.processor_id)
-        update!(payment_information) unless payment_information.empty?
+      def sync_payment_information
+        billable.update!(payment_information(billable.subscription.processor_id))
       rescue ::PaddlePay::PaddlePayError => e
         raise Pay::Paddle::Error, e
       end
 
-      def paddle_payment_information(subscription_id)
+      def payment_information(subscription_id)
         subscription_user = PaddlePay::Subscription::User.list({subscription_id: subscription_id}).try(:first)
         payment_information = subscription_user ? subscription_user[:payment_information] : nil
         return {} if payment_information.nil?

data/lib/pay/paddle/charge.rb

@@ -1,19 +1,15 @@
 module Pay
   module Paddle
-    module Charge
-      extend ActiveSupport::Concern
+    class Charge
+      attr_reader :pay_charge
 
-      included do
-        scope :paddle, -> { where(processor: :paddle) }
+      delegate :processor_id, :owner, to: :pay_charge
 
-        store_accessor :data, :paddle_receipt_url
+      def initialize(pay_charge)
+        @pay_charge = pay_charge
       end
 
-      def paddle?
-        processor == "paddle"
-      end
-
-      def paddle_charge
+      def charge
         return unless owner.subscription
         payments = PaddlePay::Subscription::Payment.list({subscription_id: owner.subscription.processor_id})
         charges = payments.select { |p| p[:id].to_s == processor_id }
@@ -22,12 +18,12 @@ module Pay
         raise Pay::Paddle::Error, e
       end
 
-      def paddle_refund!(amount_to_refund)
+      def refund!(amount_to_refund)
         return unless owner.subscription
         payments = PaddlePay::Subscription::Payment.list({subscription_id: owner.subscription.processor_id, is_paid: 1})
         if payments.count > 0
           PaddlePay::Subscription::Payment.refund(payments.last[:id], {amount: amount_to_refund})
-          update(amount_refunded: amount_to_refund)
+          pay_charge.update(amount_refunded: amount_to_refund)
         else
           raise Error, "Payment not found"
         end