pay 1.0.2 → 2.0.0

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

@@ -1,7 +1,6 @@
 module Pay
   module Stripe
     module Webhooks
-
       class CustomerDeleted
         def call(event)
           object = event.data.object
@@ -11,12 +10,12 @@ module Pay
           return unless user.present?
 
           user.update(
-            processor_id:   nil,
-            trial_ends_at:  nil,
-            card_type:      nil,
-            card_last4:     nil,
+            processor_id: nil,
+            trial_ends_at: nil,
+            card_type: nil,
+            card_last4: nil,
             card_exp_month: nil,
-            card_exp_year:  nil,
+            card_exp_year: nil,
           )
 
           user.subscriptions.update_all(
@@ -25,7 +24,6 @@ module Pay
           )
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Pay
   module Stripe
     module Webhooks
-
       class CustomerUpdated
         def call(event)
           object = event.data.object
@@ -13,7 +12,6 @@ module Pay
           user.sync_card_from_stripe
         end
       end
-
     end
   end
 end

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

@@ -0,0 +1,27 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentActionRequired
+        def call(event)
+          # Event is of type "invoice" see:
+          # https://stripe.com/docs/api/invoices/object
+
+          user = event.data.object.customer
+
+          subscription = Pay.subscription_model.find_by(
+            processor: :stripe,
+            processor_id: event.data.object.subscription
+          )
+
+          notify_user(user, event.data.object.payment_intent, subscription)
+        end
+
+        def notify_user(user, payment_intent_id, subscription)
+          if Pay.send_emails
+            Pay::UserMailer.payment_action_required(user, payment_intent_id, subscription).deliver_later
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pay/stripe/webhooks/{source_deleted.rb → payment_method_updated.rb}

@@ -1,8 +1,7 @@
 module Pay
   module Stripe
     module Webhooks
-
-      class SourceDeleted
+      class PaymentMethodUpdated
         def call(event)
           object = event.data.object
           user = Pay.user_model.find_by(processor: :stripe, processor_id: object.customer)
@@ -13,7 +12,6 @@ module Pay
           user.sync_card_from_stripe
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Pay
   module Stripe
     module Webhooks
-
       class SubscriptionCreated
         def call(event)
           object = event.data.object
@@ -19,28 +18,24 @@ module Pay
             subscription = Pay.subscription_model.new(owner: owner)
           end
 
-          subscription.quantity       = object.quantity
+          subscription.quantity = object.quantity
           subscription.processor_plan = object.plan.id
-          subscription.trial_ends_at  = Time.at(object.trial_end) if object.trial_end.present?
+          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
-          if object.cancel_at_period_end && subscription.on_trial?
-            subscription.ends_at = subscription.trial_ends_at
+          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
-            subscription.ends_at = Time.at(object.current_period_end)
+            Time.at(object.current_period_end)
 
-          # Subscription isn't marked to cancel at period end
-          else
-            subscription.ends_at = nil
+            # Subscription isn't marked to cancel at period end
           end
 
           subscription.save!
         end
       end
-
     end
   end
 end
-

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

@@ -1,10 +1,9 @@
 module Pay
   module Stripe
     module Webhooks
-
       class SubscriptionDeleted
         def call(event)
-          object       = event.data.object
+          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
@@ -15,7 +14,6 @@ module Pay
           subscription.update!(ends_at: Time.at(object.ended_at)) if subscription.ends_at.blank? && object.ended_at.present?
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Pay
   module Stripe
     module Webhooks
-
       class SubscriptionRenewing
         def call(event)
           # Event is of type "invoice" see:
@@ -19,7 +18,6 @@ module Pay
           end
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Pay
   module Stripe
     module Webhooks
-
       class SubscriptionUpdated
         def call(event)
           object = event.data.object
@@ -9,27 +8,31 @@ module Pay
 
           return if subscription.nil?
 
-          subscription.quantity       = object.quantity
+          # Delete any subscription attempts that have expired
+          if object.status == "incomplete_expired"
+            subscription.destroy
+            return
+          end
+
+          subscription.status = object.status
+          subscription.quantity = object.quantity
           subscription.processor_plan = object.plan.id
-          subscription.trial_ends_at  = Time.at(object.trial_end) if object.trial_end.present?
+          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
-          if object.cancel_at_period_end && subscription.on_trial?
-            subscription.ends_at = subscription.trial_ends_at
+          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
-            subscription.ends_at = Time.at(object.current_period_end)
+            Time.at(object.current_period_end)
 
-          # Subscription isn't marked to cancel at period end
-          else
-            subscription.ends_at = nil
+            # Subscription isn't marked to cancel at period end
           end
 
           subscription.save!
         end
       end
-
     end
   end
 end

data/lib/pay/stripe/webhooks.rb

@@ -1,33 +1,39 @@
-require 'stripe_event'
-Dir[File.join(__dir__, 'webhooks', '**', '*.rb')].each { |file| require file }
+require "stripe_event"
+Dir[File.join(__dir__, "webhooks", "**", "*.rb")].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
+  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
+  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
+  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
+  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
+  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
+  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
+  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 'customer.source.deleted', Pay::Stripe::Webhooks::SourceDeleted.new
+  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

data/lib/pay/stripe.rb

@@ -1,8 +1,8 @@
-require 'pay/env'
-require 'pay/stripe/billable'
-require 'pay/stripe/charge'
-require 'pay/stripe/subscription'
-require 'pay/stripe/webhooks'
+require "pay/env"
+require "pay/stripe/billable"
+require "pay/stripe/charge"
+require "pay/stripe/subscription"
+require "pay/stripe/webhooks"
 
 module Pay
   module Stripe

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = '1.0.2'
+  VERSION = "2.0.0"
 end

data/lib/pay.rb

@@ -1,6 +1,7 @@
-require 'pay/engine'
-require 'pay/billable'
-require 'pay/receipts'
+require "pay/engine"
+require "pay/billable"
+require "pay/receipts"
+require "pay/payment"
 
 module Pay
   # Define who owns the subscription
@@ -8,18 +9,18 @@ module Pay
   mattr_accessor :billable_table
   mattr_accessor :braintree_gateway
 
-  @@billable_class = 'User'
+  @@billable_class = "User"
   @@billable_table = @@billable_class.tableize
 
   mattr_accessor :chargeable_class
   mattr_accessor :chargeable_table
-  @@chargeable_class = 'Pay::Charge'
-  @@chargeable_table = 'pay_charges'
+  @@chargeable_class = "Pay::Charge"
+  @@chargeable_table = "pay_charges"
 
   mattr_accessor :subscription_class
   mattr_accessor :subscription_table
-  @@subscription_class = 'Pay::Subscription'
-  @@subscription_table = 'pay_subscriptions'
+  @@subscription_class = "Pay::Subscription"
+  @@subscription_table = "pay_subscriptions"
 
   # Business details for receipts
   mattr_accessor :application_name
@@ -32,17 +33,19 @@ module Pay
   @@send_emails = true
 
   mattr_accessor :email_receipt_subject
-  @@email_receipt_subject = 'Payment receipt'
+  @@email_receipt_subject = "Payment receipt"
   mattr_accessor :email_refund_subject
-  @@email_refund_subject = 'Payment refunded'
+  @@email_refund_subject = "Payment refunded"
   mattr_accessor :email_renewing_subject
-  @@email_renewing_subject = 'Your upcoming subscription renewal'
+  @@email_renewing_subject = "Your upcoming subscription renewal"
+  mattr_accessor :email_action_required_subject
+  @@email_action_required_subject = "Confirm your payment"
 
-  mattr_accessor :automount_webhook_routes
-  @@automount_webhook_routes = true
+  mattr_accessor :automount_routes
+  @@automount_routes = true
 
-  mattr_accessor :webhooks_path
-  @@webhooks_path = '/webhooks'
+  mattr_accessor :routes_path
+  @@routes_path = "/pay"
 
   def self.setup
     yield self
@@ -82,4 +85,28 @@ module Pay
 
   class Error < StandardError
   end
+
+  class InvalidPaymentMethod < Error
+    attr_reader :payment
+
+    def initialize(payment)
+      @payment = payment
+    end
+
+    def message
+      "This payment attempt failed beacuse of an invalid payment method."
+    end
+  end
+
+  class ActionRequired < Error
+    attr_reader :payment
+
+    def initialize(payment)
+      @payment = payment
+    end
+
+    def message
+      "This payment attempt failed because additional action is required before it can be completed."
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2020-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,37 +59,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: stripe_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -113,14 +107,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -150,47 +144,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standardrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: stripe-ruby-mock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +214,7 @@ files:
 - app/assets/javascripts/pay/application.js
 - app/assets/stylesheets/pay/application.css
 - app/controllers/pay/application_controller.rb
+- app/controllers/pay/payments_controller.rb
 - app/controllers/pay/webhooks/braintree_controller.rb
 - app/helpers/pay/application_helper.rb
 - app/jobs/pay/application_job.rb
@@ -244,14 +225,19 @@ files:
 - app/models/pay/charge.rb
 - app/models/pay/subscription.rb
 - app/views/layouts/pay/application.html.erb
+- app/views/pay/payments/show.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
 - app/views/pay/user_mailer/subscription_renewing.html.erb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20170205020145_create_subscriptions.rb
 - db/migrate/20170503131610_add_fields_to_billable.rb
 - db/migrate/20170727235816_create_charges.rb
+- db/migrate/20190816015720_add_status_to_subscriptions.rb
 - lib/generators/pay/email_views_generator.rb
+- lib/generators/pay/views_generator.rb
 - lib/pay.rb
 - lib/pay/billable.rb
 - lib/pay/billable/sync_email.rb
@@ -261,6 +247,7 @@ files:
 - lib/pay/braintree/subscription.rb
 - lib/pay/engine.rb
 - lib/pay/env.rb
+- lib/pay/payment.rb
 - lib/pay/receipts.rb
 - lib/pay/stripe.rb
 - lib/pay/stripe/billable.rb
@@ -271,7 +258,8 @@ files:
 - lib/pay/stripe/webhooks/charge_succeeded.rb
 - lib/pay/stripe/webhooks/customer_deleted.rb
 - lib/pay/stripe/webhooks/customer_updated.rb
-- lib/pay/stripe/webhooks/source_deleted.rb
+- lib/pay/stripe/webhooks/payment_action_required.rb
+- lib/pay/stripe/webhooks/payment_method_updated.rb
 - lib/pay/stripe/webhooks/subscription_created.rb
 - lib/pay/stripe/webhooks/subscription_deleted.rb
 - lib/pay/stripe/webhooks/subscription_renewing.rb
@@ -296,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Ruby on Rails subscription engine.