pay 2.5.0 → 2.6.4

data/lib/pay/braintree/authorization_error.rb

@@ -0,0 +1,9 @@
+module Pay
+  module Braintree
+    class AuthorizationError < Braintree::Error
+      def message
+        I18n.t("errors.braintree.authorization")
+      end
+    end
+  end
+end

data/lib/pay/braintree/billable.rb

@@ -1,16 +1,23 @@
 module Pay
   module Braintree
-    module Billable
-      extend ActiveSupport::Concern
-
-      included do
-        scope :braintree, -> { where(processor: :braintree) }
+    class Billable
+      attr_reader :billable
+
+      delegate :processor_id,
+        :processor_id?,
+        :email,
+        :customer_name,
+        :card_token,
+        to: :billable
+
+      def initialize(billable)
+        @billable = billable
       end
 
       # Handles Billable#customer
       #
       # Returns Braintree::Customer
-      def braintree_customer
+      def customer
         if processor_id?
           gateway.customer.find(processor_id)
         else
@@ -22,16 +29,16 @@ module Pay
           )
           raise Pay::Braintree::Error, result unless result.success?
 
-          update(processor: "braintree", processor_id: result.customer.id)
+          billable.update(processor: "braintree", processor_id: result.customer.id)
 
           if card_token.present?
-            update_braintree_card_on_file result.customer.payment_methods.last
+            update_card_on_file result.customer.payment_methods.last
           end
 
           result.customer
         end
       rescue ::Braintree::AuthorizationError
-        raise BraintreeAuthorizationError
+        raise Pay::Braintree::AuthorizationError
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end
@@ -39,7 +46,7 @@ module Pay
       # Handles Billable#charge
       #
       # Returns a Pay::Charge
-      def create_braintree_charge(amount, options = {})
+      def charge(amount, options = {})
         args = {
           amount: amount.to_i / 100.0,
           customer_id: customer.id,
@@ -49,7 +56,7 @@ module Pay
         result = gateway.transaction.sale(args)
         raise Pay::Braintree::Error, result unless result.success?
 
-        save_braintree_transaction(result.transaction)
+        save_transaction(result.transaction)
       rescue ::Braintree::AuthorizationError
         raise Pay::Braintree::AuthorizationError
       rescue ::Braintree::BraintreeError => e
@@ -59,7 +66,7 @@ module Pay
       # Handles Billable#subscribe
       #
       # Returns Pay::Subscription
-      def create_braintree_subscription(name, plan, options = {})
+      def subscribe(name: Pay.default_product_name, plan: Pay.default_plan_name, **options)
         token = customer.payment_methods.find(&:default?).try(:token)
         raise Pay::Error, "Customer has no default payment method" if token.nil?
 
@@ -76,7 +83,7 @@ module Pay
         result = gateway.subscription.create(subscription_options)
         raise Pay::Braintree::Error, result unless result.success?
 
-        create_subscription(result.subscription, "braintree", name, plan, status: :active)
+        billable.create_pay_subscription(result.subscription, "braintree", name, plan, status: :active)
       rescue ::Braintree::AuthorizationError
         raise Pay::Braintree::AuthorizationError
       rescue ::Braintree::BraintreeError => e
@@ -86,7 +93,7 @@ module Pay
       # Handles Billable#update_card
       #
       # Returns true if successful
-      def update_braintree_card(token)
+      def update_card(token)
         result = gateway.payment_method.create(
           customer_id: processor_id,
           payment_method_nonce: token,
@@ -97,7 +104,7 @@ module Pay
         )
         raise Pay::Braintree::Error, result unless result.success?
 
-        update_braintree_card_on_file result.payment_method
+        update_card_on_file result.payment_method
         update_subscriptions_to_payment_method(result.payment_method.token)
         true
       rescue ::Braintree::AuthorizationError
@@ -106,29 +113,25 @@ module Pay
         raise Pay::Braintree::Error, e
       end
 
-      def update_braintree_email!
-        braintree_customer.update(
-          email: email,
-          first_name: try(:first_name),
-          last_name: try(:last_name)
-        )
+      def update_email!
+        gateway.customer.update(processor_id, email: email, first_name: try(:first_name), last_name: try(:last_name))
       end
 
-      def braintree_trial_end_date(subscription)
+      def trial_end_date(subscription)
         return unless subscription.trial_period
         # Braintree returns dates without time zones, so we'll assume they're UTC
         subscription.first_billing_date.end_of_day
       end
 
       def update_subscriptions_to_payment_method(token)
-        subscriptions.braintree.each do |subscription|
+        billable.subscriptions.braintree.each do |subscription|
           if subscription.active?
             gateway.subscription.update(subscription.processor_id, {payment_method_token: token})
           end
         end
       end
 
-      def braintree_subscription(subscription_id, options = {})
+      def processor_subscription(subscription_id, options = {})
         gateway.subscription.find(subscription_id)
       end
 
@@ -140,11 +143,11 @@ module Pay
         # pass
       end
 
-      def save_braintree_transaction(transaction)
+      def save_transaction(transaction)
         attrs = card_details_for_braintree_transaction(transaction)
         attrs[:amount] = transaction.amount.to_f * 100
 
-        charge = charges.find_or_initialize_by(
+        charge = billable.charges.find_or_initialize_by(
           processor: :braintree,
           processor_id: transaction.id
         )
@@ -158,10 +161,10 @@ module Pay
         Pay.braintree_gateway
       end
 
-      def update_braintree_card_on_file(payment_method)
+      def update_card_on_file(payment_method)
         case payment_method
         when ::Braintree::CreditCard
-          update!(
+          billable.update!(
             card_type: payment_method.card_type,
             card_last4: payment_method.last_4,
             card_exp_month: payment_method.expiration_month,
@@ -169,14 +172,14 @@ module Pay
           )
 
         when ::Braintree::PayPalAccount
-          update!(
+          billable.update!(
             card_type: "PayPal",
             card_last4: payment_method.email
           )
         end
 
         # Clear the card token so we don't accidentally update twice
-        self.card_token = nil
+        billable.card_token = nil
       end
 
       def card_details_for_braintree_transaction(transaction)

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_id,
+        :processor_plan,
+        :processor_subscription,
+        :prorate,
+        :prorate?,
+        :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/fake_processor.rb

@@ -0,0 +1,8 @@
+module Pay
+  module FakeProcessor
+    autoload :Billable, "pay/fake_processor/billable"
+    autoload :Charge, "pay/fake_processor/charge"
+    autoload :Subscription, "pay/fake_processor/subscription"
+    autoload :Error, "pay/fake_processor/error"
+  end
+end