pay 2.7.1 → 3.0.2

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

@@ -8,7 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
           pay_subscription.update!(ends_at: Time.current, status: :canceled)

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

@@ -8,14 +8,14 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
-          billable = pay_subscription.owner
-          charge = Pay::Braintree::Billable.new(billable).save_transaction(subscription.transactions.first)
+          pay_customer = pay_subscription.customer
+          charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)
 
           if Pay.send_emails
-            Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
+            Pay::UserMailer.with(billable: pay_customer.owner, charge: charge).receipt.deliver_later
           end
         end
       end

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

@@ -8,7 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
           # billable = pay_subscription.owner

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

@@ -8,7 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
           pay_subscription.update!(ends_at: Time.current, status: :canceled)

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

@@ -8,10 +8,10 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
-          pay_subscription.update(trial_ends_at: Time.zone.now)
+          pay_subscription.update(trial_ends_at: Time.current)
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
           pay_subscription.update!(status: :active)

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

@@ -8,7 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
           pay_subscription.update!(status: :past_due)

data/lib/pay/braintree.rb

@@ -1,10 +1,11 @@
 module Pay
   module Braintree
+    autoload :AuthorizationError, "pay/braintree/authorization_error"
     autoload :Billable, "pay/braintree/billable"
     autoload :Charge, "pay/braintree/charge"
-    autoload :Subscription, "pay/braintree/subscription"
     autoload :Error, "pay/braintree/error"
-    autoload :AuthorizationError, "pay/braintree/authorization_error"
+    autoload :PaymentMethod, "pay/braintree/payment_method"
+    autoload :Subscription, "pay/braintree/subscription"
 
     module Webhooks
       autoload :SubscriptionCanceled, "pay/braintree/webhooks/subscription_canceled"

data/lib/pay/engine.rb

@@ -10,6 +10,11 @@ module Pay
           mount Pay::Engine, at: Pay.routes_path, as: "pay"
         end
       end
+
+      # Include the pay attributes for ActiveRecord models
+      ActiveSupport.on_load(:active_record) do
+        include Pay::Attributes
+      end
     end
 
     config.to_prepare do
@@ -17,7 +22,7 @@ module Pay
       Pay::Braintree.setup if defined? ::Braintree
       Pay::Paddle.setup if defined? ::PaddlePay
 
-      Pay.charge_model.include Pay::Receipts if defined? ::Receipts::Receipt
+      Pay::Charge.include Pay::Receipts if defined? ::Receipts::Receipt
     end
   end
 end

data/lib/pay/fake_processor/billable.rb

@@ -1,46 +1,70 @@
 module Pay
   module FakeProcessor
     class Billable
-      attr_reader :billable
+      attr_reader :pay_customer
 
       delegate :processor_id,
         :processor_id?,
         :email,
         :customer_name,
         :card_token,
-        to: :billable
+        to: :pay_customer
 
-      def initialize(billable)
-        @billable = billable
+      def initialize(pay_customer)
+        @pay_customer = pay_customer
       end
 
       def customer
-        billable
+        pay_customer.update!(processor_id: NanoId.generate) unless processor_id?
+        pay_customer
       end
 
       def charge(amount, options = {})
-        billable.charges.create(
-          processor: :fake_processor,
-          processor_id: rand(100_000_000),
+        # Make to generate a processor_id
+        customer
+
+        attributes = options.merge(
+          processor_id: NanoId.generate,
           amount: amount,
-          card_type: :fake,
-          card_last4: 1234,
-          card_exp_month: Date.today.month,
-          card_exp_year: Date.today.year
+          data: {
+            kind: :card,
+            type: :fake,
+            last4: 1234,
+            exp_month: Date.today.month,
+            exp_year: Date.today.year
+          }
         )
+        pay_customer.charges.create!(attributes)
       end
 
       def subscribe(name: Pay.default_product_name, plan: Pay.default_plan_name, **options)
-        subscription = OpenStruct.new id: rand(1_000_000)
-        billable.create_pay_subscription(subscription, :fake_processor, name, plan, status: :active, quantity: options.fetch(:quantity, 1))
+        # Make to generate a processor_id
+        customer
+
+        attributes = options.merge(
+          processor_id: NanoId.generate,
+          name: name,
+          processor_plan: plan,
+          status: :active,
+          quantity: options.fetch(:quantity, 1)
+        )
+        pay_customer.subscriptions.create!(attributes)
       end
 
-      def update_card(payment_method_id)
-        billable.update(
-          card_type: :fake,
-          card_last4: 1234,
-          card_exp_month: Date.today.month,
-          card_exp_year: Date.today.year
+      def add_payment_method(payment_method_id, default: false)
+        # Make to generate a processor_id
+        customer
+
+        pay_customer.payment_methods.create!(
+          processor_id: NanoId.generate,
+          default: default,
+          type: :fake,
+          data: {
+            brand: "Fake",
+            last4: 1234,
+            exp_month: Date.today.month,
+            exp_year: Date.today.year
+          }
         )
       end
 
@@ -49,7 +73,7 @@ module Pay
       end
 
       def processor_subscription(subscription_id, options = {})
-        billable.subscriptions.find_by(processor: :fake_processor, processor_id: subscription_id)
+        pay_customer.subscriptions.find_by(processor_id: subscription_id)
       end
 
       def trial_end_date(subscription)

data/lib/pay/fake_processor/payment_method.rb

@@ -0,0 +1,21 @@
+module Pay
+  module FakeProcessor
+    class PaymentMethod
+      attr_reader :pay_payment_method
+
+      delegate :customer, :processor_id, to: :pay_payment_method
+
+      def initialize(pay_payment_method)
+        @pay_payment_method = pay_payment_method
+      end
+
+      # Sets payment method as default on Stripe
+      def make_default!
+      end
+
+      # Remove payment method
+      def detach
+      end
+    end
+  end
+end

data/lib/pay/fake_processor/subscription.rb

@@ -23,8 +23,14 @@ module Pay
         pay_subscription
       end
 
+      # With trial, sets end to trial end (mimicing Stripe)
+      # Without trial, sets can ends_at to end of month
       def cancel
-        pay_subscription.update(ends_at: Time.current.end_of_month)
+        if pay_subscription.on_trial?
+          pay_subscription.update(ends_at: pay_subscription.trial_ends_at)
+        else
+          pay_subscription.update(ends_at: Time.current.end_of_month)
+        end
       end
 
       def cancel_now!
@@ -32,27 +38,24 @@ module Pay
       end
 
       def on_grace_period?
-        canceled? && Time.zone.now < ends_at
+        canceled? && Time.current < ends_at
       end
 
       def paused?
-        false
+        pay_subscription.status == "paused"
       end
 
       def pause
-        raise NotImplementedError, "FakeProcessor does not support pausing subscriptions"
+        pay_subscription.update(status: :paused, trial_ends_at: Time.current)
       end
 
       def resume
-        unless on_grace_period?
+        unless on_grace_period? || paused?
           raise StandardError, "You can only resume subscriptions within their grace period."
         end
-
-        pay_subscription.update(ends_at: nil, status: :active)
       end
 
       def swap(plan)
-        pay_subscription.update(processor_plan: plan)
       end
     end
   end

data/lib/pay/fake_processor.rb

@@ -2,7 +2,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"
+    autoload :PaymentMethod, "pay/fake_processor/payment_method"
+    autoload :Subscription, "pay/fake_processor/subscription"
   end
 end

data/lib/pay/nano_id.rb

@@ -0,0 +1,13 @@
+module Pay
+  module NanoId
+    # Generates unique IDs - faster than UUID
+    ALPHABET = "_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".freeze
+    ALPHABET_SIZE = ALPHABET.size
+
+    def self.generate(size: 21)
+      id = ""
+      size.times { id << ALPHABET[(Random.rand * ALPHABET_SIZE).floor] }
+      id
+    end
+  end
+end

data/lib/pay/paddle/billable.rb

@@ -1,17 +1,17 @@
 module Pay
   module Paddle
     class Billable
-      attr_reader :billable
+      attr_reader :pay_customer
 
       delegate :processor_id,
         :processor_id?,
         :email,
         :customer_name,
         :card_token,
-        to: :billable
+        to: :pay_customer
 
-      def initialize(billable)
-        @billable = billable
+      def initialize(pay_customer)
+        @pay_customer = pay_customer
       end
 
       def customer
@@ -19,17 +19,23 @@ module Pay
       end
 
       def charge(amount, options = {})
-        subscription = billable.subscription
+        subscription = pay_customer.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 = billable.charges.find_or_initialize_by(processor: :paddle, processor_id: response[:invoice_id])
-        charge.update(
-          amount: Integer(response[:amount].to_f * 100),
-          card_type: processor_subscription(subscription.processor_id).payment_information[:payment_method],
+
+        attributes = {
+          amount: (response[:amount].to_f * 100).to_i,
           paddle_receipt_url: response[:receipt_url],
           created_at: Time.zone.parse(response[:payment_date])
-        )
+        }
+
+        # Lookup subscription payment method details
+        attributes.merge! Pay::Paddle::PaymentMethod.payment_method_details_for(subscription_id: subscription.processor_id)
+
+        charge = pay_customer.charges.find_or_initialize_by(processor_id: response[:invoice_id])
+        charge.update(attributes)
         charge
       rescue ::PaddlePay::PaddlePayError => e
         raise Pay::Paddle::Error, e
@@ -39,8 +45,8 @@ module Pay
         # pass
       end
 
-      def update_card(token)
-        sync_payment_information_from_paddle
+      def add_payment_method(token, default: true)
+        Pay::Paddle::PaymentMethod.sync(self)
       end
 
       def update_email!
@@ -58,42 +64,6 @@ module Pay
       rescue ::PaddlePay::PaddlePayError => e
         raise Pay::Paddle::Error, e
       end
-
-      def invoice!(options = {})
-        # pass
-      end
-
-      def upcoming_invoice
-        # pass
-      end
-
-      def sync_payment_information
-        billable.update!(payment_information(billable.subscription.processor_id))
-      rescue ::PaddlePay::PaddlePayError => e
-        raise Pay::Paddle::Error, e
-      end
-
-      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?
-
-        case payment_information[:payment_method]
-        when "card"
-          {
-            card_type: payment_information[:card_type],
-            card_last4: payment_information[:last_four_digits],
-            card_exp_month: payment_information[:expiry_date].split("/").first,
-            card_exp_year: payment_information[:expiry_date].split("/").last
-          }
-        when "paypal"
-          {
-            card_type: "PayPal"
-          }
-        else
-          {}
-        end
-      end
     end
   end
 end

data/lib/pay/paddle/charge.rb

@@ -3,15 +3,15 @@ module Pay
     class Charge
       attr_reader :pay_charge
 
-      delegate :processor_id, :owner, to: :pay_charge
+      delegate :processor_id, :customer, to: :pay_charge
 
       def initialize(pay_charge)
         @pay_charge = pay_charge
       end
 
       def charge
-        return unless owner.subscription
-        payments = PaddlePay::Subscription::Payment.list({subscription_id: owner.subscription.processor_id})
+        return unless customer.subscription
+        payments = PaddlePay::Subscription::Payment.list({subscription_id: customer.subscription.processor_id})
         charges = payments.select { |p| p[:id].to_s == processor_id }
         charges.try(:first)
       rescue ::PaddlePay::PaddlePayError => e
@@ -19,8 +19,8 @@ module Pay
       end
 
       def refund!(amount_to_refund)
-        return unless owner.subscription
-        payments = PaddlePay::Subscription::Payment.list({subscription_id: owner.subscription.processor_id, is_paid: 1})
+        return unless customer.subscription
+        payments = PaddlePay::Subscription::Payment.list({subscription_id: customer.subscription.processor_id, is_paid: 1})
         if payments.count > 0
           PaddlePay::Subscription::Payment.refund(payments.last[:id], {amount: amount_to_refund})
           pay_charge.update(amount_refunded: amount_to_refund)