pay 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2166bd09d0f1dcafea1425635ec9346d4f7731c212fc695f46b0f2fedfa08d2e
-  data.tar.gz: b9a035ee4abda206db7e132e4ced798c5917829a5ecf94b1e89c587675a09cc3
+  metadata.gz: 4832547f758ca266af9bdb4e727dfec425fb7ace4cf6d3372f47dd0f73057ad4
+  data.tar.gz: 854f6d697267fe7e3c45799f036241266067140892d32470ee6be9d24f860e50
 SHA512:
-  metadata.gz: f5689e3cc0f8eaa890a8a8483910a2ee96c2e893e7484195de2554f9931f650f23f5bb9c37e5ceeb8cbf2c07048d1b4e3b398dd7c3ce52eb2901bc08bbececb9
-  data.tar.gz: dc10f025e73b6e4e053f11ecdabfb954fc6178090a9e3e82533b9bc2a7d3fc867d7f4a94871427541997e551589f82a0943efb091d199a86e53c2b6ccbf48d2c
+  metadata.gz: 7ca4679542933ddac4d75c5091dcc8653ffbe0f839d396aeec0d2aa0714117bb1a72e2b03d11f62e0d2508f1b7be71affd4f5703ec5c1da48462f35a7b194bf6
+  data.tar.gz: 62e21bae437f10db633efe35d993382a76c9b42e8cad661bed57f4a6cdc348889d7baae2b9c80d2f1219b050cc12d0c7e40c11dce4e87c613d077ed1005c7706

data/app/models/pay/subscription.rb

@@ -29,6 +29,15 @@ module Pay
 
     attribute :prorate, :boolean, default: true
 
+    # Helpers for payment processors
+    %w[braintree stripe paddle].each do |processor_name|
+      define_method "#{processor_name}?" do
+        processor == processor_name
+      end
+
+      scope processor_name, -> { where(processor: processor_name) }
+    end
+
     def no_prorate
       self.prorate = false
     end
@@ -71,12 +80,10 @@ module Pay
     end
 
     def paused?
-      return unless paddle?
       send("#{processor}_paused?")
     end
 
     def pause
-      return unless paddle?
       send("#{processor}_pause")
     end
 
@@ -89,22 +96,7 @@ module Pay
     end
 
     def resume
-      unless on_grace_period?
-        unless paddle?
-          raise StandardError,
-            "You can only resume subscriptions within their grace period."
-        end
-      end
-
-      unless paused?
-        if paddle?
-          raise StandardError,
-            "You can only resume paused subscriptions."
-        end
-      end
-
       send("#{processor}_resume")
-
       update(ends_at: nil, status: "active")
       self
     end

data/db/migrate/20200603134434_add_data_to_pay_models.rb

@@ -5,7 +5,12 @@ class AddDataToPayModels < ActiveRecord::Migration[4.2]
   end
 
   def data_column_type
-    case ActiveRecord::Base.configurations.default_hash.dig("adapter")
+    default_hash = ActiveRecord::Base.configurations.default_hash
+
+    # Rails 6.1 uses a symbol key instead of a string
+    adapter = default_hash.dig(:adapter) || default_hash.dig("adapter")
+
+    case adapter
     when "mysql2"
       :json
     when "postgresql"

data/lib/pay/braintree/subscription.rb

@@ -3,14 +3,6 @@ module Pay
     module Subscription
       extend ActiveSupport::Concern
 
-      included do
-        scope :braintree, -> { where(processor: :braintree) }
-      end
-
-      def braintree?
-        processor == "braintree"
-      end
-
       def braintree_cancel
         subscription = processor_subscription
 
@@ -38,7 +30,19 @@ module Pay
         canceled? && Time.zone.now < ends_at
       end
 
+      def braintree_paused?
+        false
+      end
+
+      def braintree_pause
+        raise NotImplementedError, "Braintree does not support pausing subscriptions"
+      end
+
       def braintree_resume
+        unless on_grace_period?
+          raise StandardError, "You can only resume subscriptions within their grace period."
+        end
+
         if canceled? && on_trial?
           duration = trial_ends_at.to_date - Date.today
 

data/lib/pay/paddle/subscription.rb

@@ -4,17 +4,11 @@ module Pay
       extend ActiveSupport::Concern
 
       included do
-        scope :paddle, -> { where(processor: :paddle) }
-
         store_accessor :data, :paddle_update_url
         store_accessor :data, :paddle_cancel_url
         store_accessor :data, :paddle_paused_from
       end
 
-      def paddle?
-        processor == "paddle"
-      end
-
       def paddle_cancel
         subscription = processor_subscription
         PaddlePay::Subscription::User.cancel(processor_id)
@@ -51,6 +45,10 @@ module Pay
       end
 
       def paddle_resume
+        unless paused?
+          raise StandardError, "You can only resume paused subscriptions."
+        end
+
         attributes = {pause: false}
         PaddlePay::Subscription::User.update(processor_id, attributes)
         update(status: :active, paddle_paused_from: nil)

data/lib/pay/stripe/subscription.rb

@@ -3,14 +3,6 @@ module Pay
     module Subscription
       extend ActiveSupport::Concern
 
-      included do
-        scope :stripe, -> { where(processor: :stripe) }
-      end
-
-      def stripe?
-        processor == "stripe"
-      end
-
       def stripe_cancel
         subscription = processor_subscription
         subscription.cancel_at_period_end = true
@@ -33,7 +25,19 @@ module Pay
         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"

data/lib/pay/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails