pay 2.4.2 → 2.6.1

data/lib/pay/stripe/charge.rb

@@ -1,29 +1,23 @@
 module Pay
   module Stripe
-    module Charge
-      extend ActiveSupport::Concern
+    class Charge
+      attr_reader :pay_charge
 
-      included do
-        scope :stripe, -> { where(processor: :stripe) }
-      end
+      delegate :processor_id, :owner, to: :pay_charge
 
-      def stripe?
-        processor == "stripe"
+      def initialize(pay_charge)
+        @pay_charge = pay_charge
       end
 
-      def stripe_charge
+      def charge
         ::Stripe::Charge.retrieve(processor_id)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
-      def stripe_refund!(amount_to_refund)
-        ::Stripe::Refund.create(
-          charge: processor_id,
-          amount: amount_to_refund
-        )
-
-        update(amount_refunded: amount_to_refund)
+      def refund!(amount_to_refund)
+        ::Stripe::Refund.create(charge: processor_id, amount: amount_to_refund)
+        pay_charge.update(amount_refunded: amount_to_refund)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end

data/lib/pay/stripe/error.rb

@@ -0,0 +1,9 @@
+module Pay
+  module Stripe
+    class Error < Pay::Error
+      def message
+        I18n.t("errors.stripe.#{result.code}", default: result.message)
+      end
+    end
+  end
+end

data/lib/pay/stripe/subscription.rb

@@ -1,39 +1,55 @@
 module Pay
   module Stripe
-    module Subscription
-      extend ActiveSupport::Concern
+    class Subscription
+      attr_reader :pay_subscription
 
-      def stripe_cancel
+      delegate :canceled?,
+        :ends_at,
+        :on_trial?,
+        :owner,
+        :processor_subscription,
+        :processor_id,
+        :prorate,
+        :processor_plan,
+        :quantity?,
+        :quantity,
+        to: :pay_subscription
+
+      def initialize(pay_subscription)
+        @pay_subscription = pay_subscription
+      end
+
+      def cancel
         subscription = processor_subscription
         subscription.cancel_at_period_end = true
         subscription.save
 
         new_ends_at = on_trial? ? trial_ends_at : Time.at(subscription.current_period_end)
-        update(ends_at: new_ends_at)
+        pay_subscription.update(ends_at: new_ends_at)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
-      def stripe_cancel_now!
+      def cancel_now!
         processor_subscription.delete
-        update(ends_at: Time.zone.now, status: :canceled)
+        pay_subscription.update(ends_at: Time.zone.now, status: :canceled)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
-      def stripe_on_grace_period?
+      def on_grace_period?
         canceled? && Time.zone.now < ends_at
       end
 
-      def stripe_paused?
+      def paused?
         false
       end
 
-      def stripe_pause
+      def pause
         raise NotImplementedError, "Stripe does not support pausing subscriptions"
       end
 
-      def stripe_resume
+      def resume
         unless on_grace_period?
           raise StandardError, "You can only resume subscriptions within their grace period."
         end
@@ -47,7 +63,7 @@ module Pay
         raise Pay::Stripe::Error, e
       end
 
-      def stripe_swap(plan)
+      def swap(plan)
         subscription = processor_subscription
         subscription.cancel_at_period_end = false
         subscription.plan = plan

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

@@ -9,27 +9,8 @@ module Pay
           return unless billable.present?
           return if billable.charges.where(processor_id: object.id).any?
 
-          create_charge(billable, object)
-        end
-
-        def create_charge(billable, object)
-          charge = billable.charges.find_or_initialize_by(
-            processor: :stripe,
-            processor_id: object.id
-          )
-
-          charge.update(
-            amount: object.amount,
-            card_last4: object.payment_method_details.card.last4,
-            card_type: object.payment_method_details.card.brand,
-            card_exp_month: object.payment_method_details.card.exp_month,
-            card_exp_year: object.payment_method_details.card.exp_year,
-            created_at: Time.zone.at(object.created)
-          )
-
+          charge = Pay::Stripe::Billable.new(billable).save_pay_charge(object)
           notify_user(billable, charge)
-
-          charge
         end
 
         def notify_user(billable, charge)

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

@@ -22,6 +22,7 @@ module Pay
           end
 
           subscription.quantity = object.quantity
+          subscription.status = object.status
           subscription.processor_plan = object.plan.id
           subscription.trial_ends_at = Time.at(object.trial_end) if object.trial_end.present?
 

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.4.2"
+  VERSION = "2.6.1"
 end

data/lib/pay/webhooks.rb

@@ -0,0 +1,13 @@
+module Pay
+  module Webhooks
+    autoload :Delegator, "pay/webhooks/delegator"
+
+    class << self
+      delegate :configure, :instrument, to: :delegator
+
+      def delegator
+        @delegator ||= Delegator.new
+      end
+    end
+  end
+end

data/lib/pay/webhooks/delegator.rb

@@ -0,0 +1,61 @@
+module Pay
+  module Webhooks
+    class Delegator
+      attr_reader :backend
+
+      def initialize
+        @backend = ActiveSupport::Notifications
+      end
+
+      # Configure DSL
+      def configure(&block)
+        raise ArgumentError, "must provide a block" unless block
+        block.arity.zero? ? instance_eval(&block) : yield(self)
+      end
+
+      # Subscribe to specific events
+      def subscribe(name, callable = nil, &block)
+        callable ||= block
+        backend.subscribe to_regexp(name), NotificationAdapter.new(callable)
+      end
+
+      # Listen to all events
+      def all(callable = nil, &block)
+        callable ||= block
+        subscribe nil, callable
+      end
+
+      # Unsubscribe
+      def unsubscribe(name)
+        backend.unsubscribe name
+      end
+
+      # Called to process an event
+      def instrument(event:, type:)
+        backend.instrument name_with_namespace(type), event
+      end
+
+      # Strips down to event data only
+      class NotificationAdapter
+        def initialize(subscriber)
+          @subscriber = subscriber
+        end
+
+        def call(*args)
+          payload = args.last
+          @subscriber.call(payload)
+        end
+      end
+
+      private
+
+      def to_regexp(name)
+        %r{^#{Regexp.escape name_with_namespace(name)}}
+      end
+
+      def name_with_namespace(name, delimiter: ".")
+        [:pay, name].join(delimiter)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.6.1
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,68 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: braintree
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.92.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.92.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: stripe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: stripe_event
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: paddle_pay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +101,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Ruby on Rails subscription engine.
+description: Stripe, Paddle, and Braintree payments for Ruby on Rails apps
 email:
 - jason@thecharnes.com
 - excid3@gmail.com
@@ -181,6 +119,7 @@ files:
 - app/controllers/pay/payments_controller.rb
 - app/controllers/pay/webhooks/braintree_controller.rb
 - app/controllers/pay/webhooks/paddle_controller.rb
+- 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
@@ -191,6 +130,7 @@ files:
 - app/models/pay/subscription.rb
 - app/views/layouts/pay/application.html.erb
 - app/views/pay/payments/show.html.erb
+- app/views/pay/stripe/_checkout_button.html.erb
 - app/views/pay/user_mailer/payment_action_required.html.erb
 - app/views/pay/user_mailer/receipt.html.erb
 - app/views/pay/user_mailer/refund.html.erb
@@ -211,17 +151,26 @@ files:
 - lib/pay/billable.rb
 - lib/pay/billable/sync_email.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/subscription.rb
+- lib/pay/braintree/webhooks/subscription_canceled.rb
+- lib/pay/braintree/webhooks/subscription_charged_successfully.rb
+- lib/pay/braintree/webhooks/subscription_charged_unsuccessfully.rb
+- lib/pay/braintree/webhooks/subscription_expired.rb
+- lib/pay/braintree/webhooks/subscription_trial_ended.rb
+- lib/pay/braintree/webhooks/subscription_went_active.rb
+- lib/pay/braintree/webhooks/subscription_went_past_due.rb
 - lib/pay/engine.rb
 - lib/pay/env.rb
 - lib/pay/errors.rb
 - lib/pay/paddle.rb
 - lib/pay/paddle/billable.rb
 - lib/pay/paddle/charge.rb
+- lib/pay/paddle/error.rb
 - lib/pay/paddle/subscription.rb
-- lib/pay/paddle/webhooks.rb
 - lib/pay/paddle/webhooks/signature_verifier.rb
 - lib/pay/paddle/webhooks/subscription_cancelled.rb
 - lib/pay/paddle/webhooks/subscription_created.rb
@@ -233,8 +182,8 @@ files:
 - lib/pay/stripe.rb
 - lib/pay/stripe/billable.rb
 - lib/pay/stripe/charge.rb
+- lib/pay/stripe/error.rb
 - lib/pay/stripe/subscription.rb
-- lib/pay/stripe/webhooks.rb
 - lib/pay/stripe/webhooks/charge_refunded.rb
 - lib/pay/stripe/webhooks/charge_succeeded.rb
 - lib/pay/stripe/webhooks/customer_deleted.rb
@@ -246,7 +195,9 @@ files:
 - lib/pay/stripe/webhooks/subscription_renewing.rb
 - lib/pay/stripe/webhooks/subscription_updated.rb
 - lib/pay/version.rb
-homepage: https://github.com/jasoncharnes/pay
+- lib/pay/webhooks.rb
+- lib/pay/webhooks/delegator.rb
+homepage: https://github.com/pay-rails/pay
 licenses:
 - MIT
 metadata: {}
@@ -268,5 +219,5 @@ requirements: []
 rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
-summary: A Ruby on Rails subscription engine.
+summary: Payments engine for Ruby on Rails
 test_files: []

data/lib/pay/paddle/webhooks.rb

@@ -1 +0,0 @@
-Dir[File.join(__dir__, "webhooks", "**", "*.rb")].sort.each { |file| require file }

data/lib/pay/stripe/webhooks.rb

@@ -1,39 +0,0 @@
-require "stripe_event"
-Dir[File.join(__dir__, "webhooks", "**", "*.rb")].sort.each { |file| require file }
-
-StripeEvent.configure do |events|
-  # Listen to the charge event to make sure we get non-subscription
-  # purchases as well. Invoice is only for subscriptions and manual creation
-  # so it does not include individual charges.
-  events.subscribe "charge.succeeded", Pay::Stripe::Webhooks::ChargeSucceeded.new
-  events.subscribe "charge.refunded", Pay::Stripe::Webhooks::ChargeRefunded.new
-
-  # Warn user of upcoming charges for their subscription. This is handy for
-  # notifying annual users their subscription will renew shortly.
-  # This probably should be ignored for monthly subscriptions.
-  events.subscribe "invoice.upcoming", Pay::Stripe::Webhooks::SubscriptionRenewing.new
-
-  # Payment action is required to process an invoice
-  events.subscribe "invoice.payment_action_required", Pay::Stripe::Webhooks::PaymentActionRequired.new
-
-  # If a subscription is manually created on Stripe, we want to sync
-  events.subscribe "customer.subscription.created", Pay::Stripe::Webhooks::SubscriptionCreated.new
-
-  # If the plan, quantity, or trial ending date is updated on Stripe, we want to sync
-  events.subscribe "customer.subscription.updated", Pay::Stripe::Webhooks::SubscriptionUpdated.new
-
-  # When a customers subscription is canceled, we want to update our records
-  events.subscribe "customer.subscription.deleted", Pay::Stripe::Webhooks::SubscriptionDeleted.new
-
-  # Monitor changes for customer's default card changing
-  events.subscribe "customer.updated", Pay::Stripe::Webhooks::CustomerUpdated.new
-
-  # If a customer was deleted in Stripe, their subscriptions should be cancelled
-  events.subscribe "customer.deleted", Pay::Stripe::Webhooks::CustomerDeleted.new
-
-  # If a customer's payment source was deleted in Stripe, we should update as well
-  events.subscribe "payment_method.attached", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
-  events.subscribe "payment_method.updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
-  events.subscribe "payment_method.card_automatically_updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
-  events.subscribe "payment_method.detached", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
-end