pay 11.7.0 → 11.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d601b9570c286a5518fad5444be12f07069b6d0b8afe8a879089040f77c7f7be
-  data.tar.gz: 1b81304fce9611e742d5cc2c8638a51634f174b9f68a319c47956329c8e7e183
+  metadata.gz: 3c2ba6d976f257c274ab9d25a84e91e13a8917be7b39100f47e9b33430cee814
+  data.tar.gz: 6a44d98ade15ef41f4a12764db46798f33840d027198db190ae49ef32264fcd8
 SHA512:
-  metadata.gz: de12f02fef6df24c30a05bf5e42b8905cac6ecdd258015d63e9b58e1985c930c5deae3f6992d92d3efd7b3cdae0f37a7ec8309c4fb85bb5956685c9f84374abe
-  data.tar.gz: f81848b21ebb2b75511aa6ed8fdd7df9f68449a8ac497669690de7310e2c3a3a5a4b795fce6017e11494dc2138b12b7829675ae5f9e8533a3cf63ce9d6f7358c
+  metadata.gz: 57ff1cc4b2ff4400f6146dc9c0957254fcb918008f48394d28145eff032db91a3a308471f404beaa4512418b911405f7b553061b59ff7649b9bb07285e167558
+  data.tar.gz: 222dd985ce44ab7218077e599670a55b35d4dd8ad0ed77efa907a731e382ec0c4f7931e9f82f7dd9650395e70df927b29da5c8e75b4c9825723be5ebd435c5d8

data/app/models/pay/customer.rb

@@ -34,8 +34,11 @@ module Pay
       add_payment_method(payment_method_id, default: true)
     end
 
+    # Returns the active or paused subscription for the given name, falling
+    # back to the most recently created subscription when none are active.
     def subscription(name: Pay.default_product_name)
-      subscriptions.order(created_at: :desc).for_name(name).first
+      scope = subscriptions.for_name(name).order(created_at: :desc)
+      scope.active_or_paused.first || scope.first
     end
 
     def subscribed?(name: Pay.default_product_name, processor_plan: nil)

data/lib/pay/engine.rb

@@ -17,6 +17,16 @@ module Pay
       end
     end
 
+    initializer "pay.receipts" do
+      if defined?(::Receipts::VERSION)
+        raise "[Pay] receipts gem must be version ~> 2" unless Pay::Engine.version_matches?(required: "~> 2", current: ::Receipts::VERSION)
+
+        ActiveSupport.on_load :pay_charge do
+          include Pay::Receipts
+        end
+      end
+    end
+
     config.after_initialize do
       ActiveSupport.run_load_hooks(:pay, Pay)
     end
@@ -36,14 +46,6 @@ module Pay
       Pay::Braintree.setup if Pay::Braintree.enabled?
       Pay::PaddleBilling.setup if Pay::PaddleBilling.enabled?
       Pay::LemonSqueezy.setup if Pay::LemonSqueezy.enabled?
-
-      if defined?(::Receipts::VERSION)
-        if Pay::Engine.version_matches?(required: "~> 2", current: ::Receipts::VERSION)
-          Pay::Charge.include Pay::Receipts
-        else
-          raise "[Pay] receipts gem must be version ~> 2"
-        end
-      end
     end
 
     # Determines if a gem version matches requirements

data/lib/pay/stripe.rb

@@ -41,7 +41,7 @@ module Pay
     end
 
     def self.setup
-      ::Stripe.api_key = private_key
+      ::Stripe.api_key ||= private_key
 
       # When private_key is a Stripe Organizations API key (sk_org_...),
       # every request must identify the target account with the

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "11.7.0"
+  VERSION = "11.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 11.7.0
+  version: 11.7.2
 platform: ruby
 authors:
 - Jason Charnes
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Payments engine for Ruby on Rails
 test_files: []