pay 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 245eccc7871a0e826b8879c65e34bd6c628a49c34f8f5a4fe36c0188e27a6bb8
-  data.tar.gz: ebf9e27a156d337908e6122fa5ceb4646fee91170c2a4bba061780ea02e7c224
+  metadata.gz: f7a284ee6da187cda76251887acb5192f351814f732b62708bec59ea1d016d80
+  data.tar.gz: a9838d32ccf610468681a707f69c14958e1838e49ed3ab7399e0ef6ffaa5a679
 SHA512:
-  metadata.gz: a25477e37ecbc71270d3882071e1074826b7745e919bfb5c45e124984d1975a64730e244949d5dbc04a4eedb5f949c75ee9d911cb90ae82245a57259400998a6
-  data.tar.gz: 8a90dfbbf5467fc1449746e8baceac913a6590cc8f94507440735c512ba650847c741d13be9d29341b1522ef4b00402c564fed348427e83e8219d538b898806f
+  metadata.gz: dc25980ecdfbeacdab79c0e5834a1c5c7c6932e693f1fb44f260d0ad0a468b0d8be34267d3eadd4a5cebe6d564bcf05c3b0bfc98c36cef749caa14bb76cf6406
+  data.tar.gz: 2654d78eeaddac5a8c923f895eab07619a0e960f19192a28e991b14bdb7d98a2963bed9e5d2bc54676e01c75d3ed5ea9e4a0c6c0f1cec52edaec31f6d89ce23e

data/app/models/pay/customer.rb

@@ -8,6 +8,7 @@ module Pay
 
     scope :active, -> { where(deleted_at: nil) }
     scope :deleted, -> { where.not(deleted_at: nil) }
+    scope :not_fake_processor, -> { where.not(processor: :fake_processor) }
 
     validates :processor, presence: true
     validates :processor_id, allow_blank: true, uniqueness: {scope: :processor, case_sensitive: true}
@@ -23,6 +24,14 @@ module Pay
     delegate :email, to: :owner
     delegate_missing_to :pay_processor
 
+    %w[stripe braintree paddle fake_processor].each do |processor_name|
+      scope processor_name, -> { where(processor: processor_name) }
+
+      define_method "#{processor_name}?" do
+        processor == processor_name
+      end
+    end
+
     def self.pay_processor_for(name)
       "Pay::#{name.to_s.classify}::Billable".constantize
     end
@@ -83,13 +92,5 @@ module Pay
       # If these match, consider it a generic trial
       subscription.trial_ends_at == subscription.ends_at
     end
-
-    %w[stripe braintree paddle fake_processor].each do |processor_name|
-      scope processor_name, -> { where(processor: processor_name) }
-
-      define_method "#{processor_name}?" do
-        processor == processor_name
-      end
-    end
   end
 end

data/lib/pay/stripe/subscription.rb

@@ -240,16 +240,23 @@ module Pay
       # create_usage_record(quantity: 4, action: :increment)
       # create_usage_record(subscription_item_id: "si_1234", quantity: 100, action: :set)
       def create_usage_record(**options)
-        subscription_item_id = options.fetch(:subscription_item_id, subscription_items.first["id"])
+        subscription_item_id = options.fetch(:subscription_item_id, metered_subscription_item&.dig("id"))
         ::Stripe::SubscriptionItem.create_usage_record(subscription_item_id, options, stripe_options)
       end
 
       # Returns usage record summaries for a subscription item
       def usage_record_summaries(**options)
-        subscription_item_id = options.fetch(:subscription_item_id, subscription_items.first["id"])
+        subscription_item_id = options.fetch(:subscription_item_id, metered_subscription_item&.dig("id"))
         ::Stripe::SubscriptionItem.list_usage_record_summaries(subscription_item_id, options, stripe_options)
       end
 
+      # Returns the first metered subscription item
+      def metered_subscription_item
+        subscription_items.find do |subscription_item|
+          subscription_item.dig("price", "recurring", "usage_type") == "metered"
+        end
+      end
+
       # Returns an upcoming invoice for a subscription
       def upcoming_invoice(**options)
         ::Stripe::Invoice.upcoming(options.merge(subscription: processor_id), stripe_options)

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "5.0.1"
+  VERSION = "5.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails