pay 2.2.2 → 2.4.3

data/lib/pay/stripe/billable.rb

@@ -1,6 +1,12 @@
 module Pay
   module Stripe
     module Billable
+      extend ActiveSupport::Concern
+
+      included do
+        scope :stripe, -> { where(processor: :stripe) }
+      end
+
       # Handles Billable#customer
       #
       # Returns Stripe::Customer
@@ -11,7 +17,7 @@ module Pay
           create_stripe_customer
         end
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def create_setup_intent
@@ -41,7 +47,7 @@ module Pay
         # Create a new charge object
         Stripe::Webhooks::ChargeSucceeded.new.create_charge(self, payment_intent.charges.first)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       # Handles Billable#subscribe
@@ -74,7 +80,7 @@ module Pay
 
         subscription
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       # Handles Billable#update_card
@@ -91,7 +97,7 @@ module Pay
         update_stripe_card_on_file(payment_method.card)
         true
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def update_stripe_email!

data/lib/pay/stripe/charge.rb

@@ -3,6 +3,10 @@ module Pay
     module Charge
       extend ActiveSupport::Concern
 
+      included do
+        scope :stripe, -> { where(processor: :stripe) }
+      end
+
       def stripe?
         processor == "stripe"
       end
@@ -10,7 +14,7 @@ module Pay
       def stripe_charge
         ::Stripe::Charge.retrieve(processor_id)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def stripe_refund!(amount_to_refund)
@@ -21,7 +25,7 @@ module Pay
 
         update(amount_refunded: amount_to_refund)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
     end
   end

data/lib/pay/stripe/subscription.rb

@@ -1,9 +1,7 @@
 module Pay
   module Stripe
     module Subscription
-      def stripe?
-        processor == "stripe"
-      end
+      extend ActiveSupport::Concern
 
       def stripe_cancel
         subscription = processor_subscription
@@ -13,24 +11,40 @@ module Pay
         new_ends_at = on_trial? ? trial_ends_at : Time.at(subscription.current_period_end)
         update(ends_at: new_ends_at)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def stripe_cancel_now!
         processor_subscription.delete
         update(ends_at: Time.zone.now, status: :canceled)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
+      end
+
+      def stripe_on_grace_period?
+        canceled? && Time.zone.now < ends_at
+      end
+
+      def stripe_paused?
+        false
+      end
+
+      def stripe_pause
+        raise NotImplementedError, "Stripe does not support pausing subscriptions"
       end
 
       def stripe_resume
+        unless on_grace_period?
+          raise StandardError, "You can only resume subscriptions within their grace period."
+        end
+
         subscription = processor_subscription
         subscription.plan = processor_plan
         subscription.trial_end = on_trial? ? trial_ends_at.to_i : "now"
         subscription.cancel_at_period_end = false
         subscription.save
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def stripe_swap(plan)
@@ -42,7 +56,7 @@ module Pay
         subscription.quantity = quantity if quantity?
         subscription.save
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
     end
   end

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

@@ -12,9 +12,9 @@ module Pay
           notify_user(charge.owner, charge)
         end
 
-        def notify_user(user, charge)
+        def notify_user(billable, charge)
           if Pay.send_emails
-            Pay::UserMailer.refund(user, charge).deliver_later
+            Pay::UserMailer.with(billable: billable, charge: charge).refund.deliver_later
           end
         end
       end

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

@@ -9,13 +9,11 @@ module Pay
           return unless billable.present?
           return if billable.charges.where(processor_id: object.id).any?
 
-          charge = create_charge(billable, object)
-          notify_user(billable, charge)
-          charge
+          create_charge(billable, object)
         end
 
-        def create_charge(user, object)
-          charge = user.charges.find_or_initialize_by(
+        def create_charge(billable, object)
+          charge = billable.charges.find_or_initialize_by(
             processor: :stripe,
             processor_id: object.id
           )
@@ -29,12 +27,14 @@ module Pay
             created_at: Time.zone.at(object.created)
           )
 
+          notify_user(billable, charge)
+
           charge
         end
 
-        def notify_user(user, charge)
+        def notify_user(billable, charge)
           if Pay.send_emails && charge.respond_to?(:receipt)
-            Pay::UserMailer.receipt(user, charge).deliver_later
+            Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
           end
         end
       end

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

@@ -6,19 +6,18 @@ module Pay
           # Event is of type "invoice" see:
           # https://stripe.com/docs/api/invoices/object
 
-          user = event.data.object.customer
+          object = event.data.object
 
-          subscription = Pay.subscription_model.find_by(
-            processor: :stripe,
-            processor_id: event.data.object.subscription
-          )
+          subscription = Pay.subscription_model.find_by(processor: :stripe, processor_id: object.subscription)
+          return if subscription.nil?
+          billable = subscription.owner
 
-          notify_user(user, event.data.object.payment_intent, subscription)
+          notify_user(billable, event.data.object.payment_intent, subscription)
         end
 
-        def notify_user(user, payment_intent_id, subscription)
+        def notify_user(billable, payment_intent_id, subscription)
           if Pay.send_emails
-            Pay::UserMailer.payment_action_required(user, payment_intent_id, subscription).deliver_later
+            Pay::UserMailer.with(billable: billable, payment_intent_id: payment_intent_id, subscription: subscription).payment_action_required.deliver_later
           end
         end
       end

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

@@ -18,7 +18,7 @@ module Pay
               return
             end
 
-            subscription = Pay.subscription_model.new(owner: owner)
+            subscription = Pay.subscription_model.new(name: Pay.default_product_name, owner: owner, processor: :stripe, processor_id: object.id)
           end
 
           subscription.quantity = object.quantity

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

@@ -9,12 +9,13 @@ module Pay
             processor: :stripe,
             processor_id: event.data.object.subscription
           )
-          notify_user(subscription.owner, subscription) if subscription.present?
+          date = Time.zone.at(event.data.object.next_payment_attempt)
+          notify_user(subscription.owner, subscription, date) if subscription.present?
         end
 
-        def notify_user(user, subscription)
+        def notify_user(billable, subscription, date)
           if Pay.send_emails
-            Pay::UserMailer.subscription_renewing(user, subscription).deliver_later
+            Pay::UserMailer.with(billable: billable, subscription: subscription, date: date).subscription_renewing.deliver_later
           end
         end
       end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.2.2"
+  VERSION = "2.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
         version: 2.92.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: 2.92.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: stripe
   requirement: !ruby/object:Gem::Requirement
@@ -74,49 +74,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-rails
+  name: paddle_pay
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,20 +135,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +180,7 @@ files:
 - app/controllers/pay/application_controller.rb
 - app/controllers/pay/payments_controller.rb
 - app/controllers/pay/webhooks/braintree_controller.rb
+- app/controllers/pay/webhooks/paddle_controller.rb
 - app/helpers/pay/application_helper.rb
 - app/jobs/pay/application_job.rb
 - app/jobs/pay/email_sync_job.rb
@@ -221,6 +200,7 @@ files:
 - db/migrate/20170205020145_create_pay_subscriptions.rb
 - db/migrate/20170727235816_create_pay_charges.rb
 - db/migrate/20190816015720_add_status_to_pay_subscriptions.rb
+- db/migrate/20200603134434_add_data_to_pay_models.rb
 - lib/generators/active_record/pay_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/pay/email_views_generator.rb
@@ -236,6 +216,18 @@ files:
 - lib/pay/braintree/subscription.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/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
+- lib/pay/paddle/webhooks/subscription_payment_refunded.rb
+- lib/pay/paddle/webhooks/subscription_payment_succeeded.rb
+- lib/pay/paddle/webhooks/subscription_updated.rb
 - lib/pay/payment.rb
 - lib/pay/receipts.rb
 - lib/pay/stripe.rb
@@ -273,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A Ruby on Rails subscription engine.