Rename associations (#1175)

excid3 · web-flow · commit e9aef96f1c25 · 2025-06-05T09:39:08.000-05:00
* Rename charge and subscription associations to prevent conflicts

* Version bump
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 ### Unreleased
 
+### 11.0.0
+
+* [Breaking] Renames `pay_customer` associations for `charges` and `subscriptions` to prevent conflicts
+  To upgrade, add the `pay_` prefix when referencing associations.
+
+  ```ruby
+  @user.pay_subscriptions
+  @user.pay_charges
+  ```
+
+* `on_trial?` and `trial_ended?` now consider if a `Pay::Subscription` was canceled. #1172
+* Stripe `cancel_now!` no longer sets `trial_ends_at` when there was no trial #1172
+* Stripe `cancel` and `cancel_now!` set values from the API response to match the values when syncing via webhooks. #1172
+* Stripe `Subscription#sync` now sets `trial_ends_at` to `nil` if the API response is also nil. #1172
+  Previously, it would leave the value unmodified in the database but this ensures the value is always in sync with the Stripe API.
+* Braintree subscriptions that `cancel_now!` now consider their trial ended immediately to match.
+
 ### 10.1.5
 
 * Fix Stripe payment controller rescue
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pay (10.1.5)
+    pay (11.0.0)
       rails (>= 7.0.0)
 
 GEM
diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    pay (10.1.5)
+    pay (11.0.0)
       rails (>= 7.0.0)
 
 GEM
diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    pay (10.1.5)
+    pay (11.0.0)
       rails (>= 7.0.0)
 
 GEM
diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    pay (10.1.5)
+    pay (11.0.0)
       rails (>= 7.0.0)
 
 GEM
diff --git a/gemfiles/rails_8.0.gemfile.lock b/gemfiles/rails_8.0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    pay (10.1.5)
+    pay (11.0.0)
       rails (>= 7.0.0)
 
 GEM
diff --git a/gemfiles/rails_main.gemfile.lock b/gemfiles/rails_main.gemfile.lock
@@ -101,7 +101,7 @@ GIT
 PATH
   remote: ..
   specs:
-    pay (10.1.5)
+    pay (11.0.0)
       rails (>= 7.0.0)
 
 GEM
diff --git a/lib/pay/version.rb b/lib/pay/version.rb
@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "10.1.5"
+  VERSION = "11.0.0"
 end
