pay 7.1.1 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5976a641a8e7a7eafa74d343fa1bdb2ab4c1b07d234d44e1efafba5b9b34b34d
-  data.tar.gz: 57f00237ae29f1a611f714f473a05de859277cdc5bb515741cefa5f75426b393
+  metadata.gz: b50cc63cfa61beffbc725d9f6c623c469a6357e0808ff06d3e814c4aa4e19955
+  data.tar.gz: ae87dbfcd24862baa2f156cb2b1b94fe836a0d113853b562cbe59835e59569c5
 SHA512:
-  metadata.gz: '0396532d1af2f80400facc5f6294d7b2f6bcbeab373d004a241e05eb8213a4c91c09ae3fd28655501fec298cfb75520c8506ce697629f41e21cfc961cb76b7bc'
-  data.tar.gz: 6e0a26efaf1eb11347ab34c2eac50a25ed59d4f6b9b8eaa11707eb6f3b0d72d4708c3dcb399cbf915999343fd35625397c00c800f90853634db8da00c24643a7
+  metadata.gz: 459524ff5b772a08c1ee1d994088b71f0e9a854f4b1afa76ecdb60fa8229f43ea72ed327a6dbf55d497478d033f99f1d19c4ed978c69931e27ad9ddc99fd57af
+  data.tar.gz: 200898e080a94d76520e0a85088d43691f64a27da3d94ac4fa74a9f14db4f6a5c1bdc16992422b3f4c4ab9b63bb35344e099799984cca0beb4cff8a6dc6e8512

data/README.md

@@ -44,7 +44,7 @@ Want to add a new payment provider? Contributions are welcome.
 * **Payment Processors**
   * [Stripe](docs/stripe/1_overview.md)
   * [Braintree](docs/braintree/1_overview.md)
-  * [Paddle](docs/paddle/1_overview.md)
+  * [Paddle](docs/paddle_billing/1_overview.md)
   * [Fake Processor](docs/fake_processor/1_overview.md)
 * **Marketplaces**
   * [Stripe Connect](docs/marketplaces/stripe_connect.md)
@@ -55,6 +55,10 @@ Want to add a new payment provider? Contributions are welcome.
 
 If you have an issue you'd like to submit, please do so using the issue tracker in GitHub. In order for us to help you in the best way possible, please be as detailed as you can.
 
+For those using devcontainers, if you want to test the application with different databases:
+1. Uncomment the `DATABASE_URL` corresponding to the database type you wish to use in the `.devcontainer/devcontainer.json` file.
+2. Rebuild the devcontainer, which will configure the application to use the selected database for your development environment.
+
 If you'd like to open a PR please make sure the following things pass:
 
 ```ruby

data/app/models/pay/subscription.rb

@@ -9,11 +9,11 @@ module Pay
 
     # Scopes
     scope :for_name, ->(name) { where(name: name) }
-    scope :on_trial, -> { where("trial_ends_at > ?", Time.current) }
+    scope :on_trial, -> { where(status: ["trialing", "active"]).where("trial_ends_at > ?", Time.current) }
     scope :canceled, -> { where.not(ends_at: nil) }
     scope :cancelled, -> { canceled }
     scope :on_grace_period, -> { where("#{table_name}.ends_at IS NOT NULL AND #{table_name}.ends_at > ?", Time.current) }
-    scope :active, -> { where(status: ["trialing", "active"]).pause_not_started.where("#{table_name}.ends_at IS NULL OR #{table_name}.ends_at > ?", Time.current).where("trial_ends_at IS NULL OR trial_ends_at > ?", Time.current) }
+    scope :active, -> { where(status: "active").pause_not_started.where("#{table_name}.ends_at IS NULL OR #{table_name}.ends_at > ?", Time.current).or(on_trial) }
     scope :paused, -> { where(status: "paused").or(where("pause_starts_at <= ?", Time.current)) }
     scope :pause_not_started, -> { where("pause_starts_at IS NULL OR pause_starts_at > ?", Time.current) }
     scope :active_or_paused, -> { active.or(paused) }

data/lib/pay/fake_processor/billable.rb

@@ -28,7 +28,8 @@ module Pay
         # Make to generate a processor_id
         customer
 
-        attributes = options.merge(
+        valid_attributes = options.slice(*Pay::Charge.attribute_names.map(&:to_sym))
+        attributes = {
           processor_id: NanoId.generate,
           amount: amount,
           data: {
@@ -38,7 +39,7 @@ module Pay
             exp_month: Date.today.month,
             exp_year: Date.today.year
           }
-        )
+        }.deep_merge(valid_attributes)
         pay_customer.charges.create!(attributes)
       end
 

data/lib/pay/paddle_billing/charge.rb

@@ -37,8 +37,8 @@ module Pay
           subscription: pay_customer.subscriptions.find_by(processor_id: object.subscription_id)
         }
 
-        if object.payment
-          case object.payment.method_details.type.downcase
+        if (details = Array.wrap(object.payments).first&.method_details)
+          case details.type.downcase
           when "card"
             attrs[:payment_method_type] = "card"
             attrs[:brand] = details.card.type

data/lib/pay/paddle_billing/payment_method.rb

@@ -5,6 +5,13 @@ module Pay
 
       delegate :customer, :processor_id, to: :pay_payment_method
 
+      def self.sync_from_transaction(pay_customer:, transaction:)
+        transaction = ::Paddle::Transaction.retrieve(id: transaction)
+        return unless transaction.status == "completed"
+        return if transaction.payments.empty?
+        sync(pay_customer: pay_customer, attributes: transaction.payments.first)
+      end
+
       def self.sync(pay_customer:, attributes:)
         details = attributes.method_details
         attrs = {
@@ -19,7 +26,7 @@ module Pay
           attrs[:exp_year] = details.card.expiry_year
         end
 
-        payment_method = pay_customer.payment_methods.find_or_initialize_by(processor_id: attributes.stored_payment_method_id)
+        payment_method = pay_customer.payment_methods.find_or_initialize_by(processor_id: attributes.payment_method_id)
         payment_method.update!(attrs)
         payment_method
       end

data/lib/pay/paddle_billing/subscription.rb

@@ -56,9 +56,9 @@ module Pay
           # Remove payment methods since customer cannot be reused after cancelling
           Pay::PaymentMethod.where(customer_id: object.customer_id).destroy_all
         when "trialing"
-          attributes[:trial_ends_at] = Time.parse(object.next_billed_at)
+          attributes[:trial_ends_at] = Time.parse(object.next_billed_at) if object.next_billed_at
         when "paused"
-          attributes[:pause_starts_at] = Time.parse(object.paused_at)
+          attributes[:pause_starts_at] = Time.parse(object.paused_at) if object.paused_at
         when "active", "past_due"
           attributes[:trial_ends_at] = nil
           attributes[:pause_starts_at] = nil
@@ -109,7 +109,7 @@ module Pay
         )
         pay_subscription.update(
           status: response.status,
-          ends_at: response.scheduled_change.effective_at
+          ends_at: response.scheduled_change&.effective_at || Time.current
         )
       rescue ::Paddle::Error => e
         raise Pay::PaddleBilling::Error, e

data/lib/pay/stripe/subscription.rb

@@ -207,7 +207,7 @@ module Pay
       # cancel_now!(prorate: true)
       # cancel_now!(invoice_now: true)
       def cancel_now!(**options)
-        return if canceled?
+        return if canceled? && ends_at.past?
 
         @stripe_subscription = ::Stripe::Subscription.cancel(processor_id, options.merge(expand_options), stripe_options)
         pay_subscription.update(ends_at: Time.current, status: :canceled)

data/lib/pay/stripe.rb

@@ -30,7 +30,7 @@ module Pay
 
     extend Env
 
-    REQUIRED_VERSION = "~> 10"
+    REQUIRED_VERSION = "~> 11"
 
     # A list of database model names that include Pay
     # Used for safely looking up models with client_reference_id

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "7.1.1"
+  VERSION = "7.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.2.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails