purchasekit 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82311c2fb6a6a3aea1ffe6997cfece956e4aef5544fa2ef3cb5e4fcb5a8266d8
-  data.tar.gz: aa2785f59d913cade15b3bd0c1335326279673c0a9e519af90fdc22d9de37e90
+  metadata.gz: c4b7e933f67b6bb8b2d52dce69e7897d9e6834c58f593a44eb6c27629228d8fa
+  data.tar.gz: 2ff18e42f762b9613aedebbe3a05a12e0cb127cb425f4cce0d79c1010bcfdf3e
 SHA512:
-  metadata.gz: 752531ead05262da654b7069194df36af97cc4c9dd7fa2c496d230bf637e356ba4aebc97b1d02e44bccd37b34836fcaf432929c7fe46041bb518002979738d0c
-  data.tar.gz: 131b2ecb97d17134ff6ecea92162422bf82c9d14e7c938f526ba31c245e47bafdc5d14a394818260598b137e1588aea45981a5dcbe42ee86c6bed25a9d5f5340
+  metadata.gz: eed594dc1d832cd950327956578f421598d68395c353d1aa3f1790d635ab744ca3fc8573d7888a5a1b34d8d19ba0308b929ed3eb215d2ca53fef001edb988520
+  data.tar.gz: 470631898b0a2b6872903299a2e4c947bac402c30eaea904eeb5eaa029c77d66f9f6878bfaf0fd485e842e6e62d2eeaaeec452e6f9e4dab46d6c4ec8be4982a8

data/README.md

@@ -113,6 +113,7 @@ end
 | `event.subscription_id` | Store's subscription ID |
 | `event.store` | `"apple"` or `"google"` |
 | `event.store_product_id` | e.g., `"com.example.pro.annual"` |
+| `event.google_base_plan_id` | Google Play base plan ID (e.g., `"annual"`) when using umbrella subscriptions, nil otherwise |
 | `event.status` | `"active"`, `"canceled"`, `"expired"` |
 | `event.current_period_start` | Start of billing period |
 | `event.current_period_end` | End of billing period |

data/app/helpers/purchase_kit/paywall_helper.rb

@@ -6,6 +6,11 @@ module PurchaseKit
     #   events. With Pay, this must be `Pay::Customer.id` (the webhook handler
     #   does `Pay::Customer.find(customer_id)`). Without Pay, use your own user ID.
     # @param success_path [String] Where to redirect after successful purchase
+    # @param proration_mode [String] Google Play replacement mode used when a base
+    #   plan is swapped within one umbrella subscription (e.g. monthly to annual).
+    #   One of "charge_prorated_price" (default), "with_time_proration",
+    #   "charge_full_price", "without_proration", or "deferred". Ignored on Apple,
+    #   which handles intra-group upgrades and downgrades automatically.
     # @yield [PaywallBuilder] Builder for plan options and buttons
     #
     # Example (with Pay):
@@ -17,14 +22,15 @@ module PurchaseKit
     #     <%= paywall.submit "Subscribe" %>
     #   <% end %>
     #
-    def purchasekit_paywall(customer_id:, success_path: main_app.root_path, **options)
+    def purchasekit_paywall(customer_id:, success_path: main_app.root_path, proration_mode: "charge_prorated_price", **options)
       raise ArgumentError, "customer_id is required" if customer_id.blank?
 
       builder = PaywallBuilder.new(self)
 
       form_data = (options.delete(:data) || {}).merge(
         controller: "purchasekit--paywall",
-        purchasekit__paywall_customer_id_value: customer_id
+        purchasekit__paywall_customer_id_value: customer_id,
+        purchasekit__paywall_proration_mode_value: proration_mode
       )
 
       form_with(url: purchase_kit.purchases_path, id: "purchasekit_paywall", data: form_data, **options) do |form|

data/app/javascript/controllers/purchasekit/paywall_controller.js

@@ -3,6 +3,7 @@ import { BridgeComponent } from "@hotwired/hotwire-native-bridge"
 export default class extends BridgeComponent {
   static component = "paywall"
   static targets = ["planRadio", "price", "submitButton", "response", "environment", "restoreButton"]
+  static values = { prorationMode: { type: String, default: "charge_prorated_price" } }
 
   connect() {
     super.connect()
@@ -13,6 +14,7 @@ export default class extends BridgeComponent {
     if (this.#fallbackTimeoutId) {
       clearTimeout(this.#fallbackTimeoutId)
     }
+    this.#stopWatchingForCompletion()
   }
 
   restore() {
@@ -53,11 +55,14 @@ export default class extends BridgeComponent {
 
     element.remove()
     this.#disableForm()
+    this.dispatch("initiated", { detail: { correlationId } })
     this.#triggerNativePurchase(productIds, correlationId, xcodeCompletionUrl, successPath)
   }
 
   #triggerNativePurchase(productIds, correlationId, xcodeCompletionUrl, successPath) {
-    this.send("purchase", { ...productIds, correlationId, xcodeCompletionUrl }, message => {
+    // googleStoreProrationMode only applies on Android plan swaps; iOS ignores it.
+    const googleStoreProrationMode = this.prorationModeValue
+    this.send("purchase", { ...productIds, correlationId, xcodeCompletionUrl, googleStoreProrationMode }, message => {
       const { status, error } = message.data
 
       if (error) {
@@ -72,16 +77,53 @@ export default class extends BridgeComponent {
         return
       }
 
-      // On success, Turbo Stream will broadcast redirect when webhook completes.
-      // Fallback: redirect after 30 seconds in case ActionCable isn't connected.
-      if (successPath) {
-        this.#fallbackTimeoutId = setTimeout(() => {
-          window.Turbo.visit(successPath)
-        }, 30000)
-      }
+      // The store confirmed the purchase. The Pay::Subscription (and the redirect)
+      // still depend on the server webhook, so move into the awaiting state.
+      this.dispatch("store-confirmed", { detail: { status } })
+      this.#awaitCompletion(successPath)
     })
   }
 
+  // Waits for the webhook-driven redirect after the store confirms a purchase.
+  // The redirect arrives as a Turbo Stream "redirect" action over ActionCable, with
+  // a 30-second fallback for when ActionCable isn't connected.
+  #awaitCompletion(successPath) {
+    this.dispatch("awaiting-webhook", { detail: {} })
+
+    this.#streamRenderListener = event => {
+      if (event.target?.getAttribute("action") === "redirect") {
+        this.#complete()
+      }
+    }
+    document.addEventListener("turbo:before-stream-render", this.#streamRenderListener)
+
+    if (successPath) {
+      this.#fallbackTimeoutId = setTimeout(() => {
+        this.#complete()
+        window.Turbo.visit(successPath)
+      }, 30000)
+    }
+  }
+
+  #complete() {
+    if (this.#completed) return
+    this.#completed = true
+
+    if (this.#fallbackTimeoutId) {
+      clearTimeout(this.#fallbackTimeoutId)
+      this.#fallbackTimeoutId = null
+    }
+    this.#stopWatchingForCompletion()
+    this.dispatch("complete", { detail: {} })
+  }
+
+  #stopWatchingForCompletion() {
+    if (this.#streamRenderListener) {
+      document.removeEventListener("turbo:before-stream-render", this.#streamRenderListener)
+      this.#streamRenderListener = null
+    }
+  }
+
   #submitRestore(url, subscriptionIds) {
     const csrfToken = document.querySelector("meta[name=csrf-token]")?.content
 
@@ -103,6 +145,8 @@ export default class extends BridgeComponent {
   }
 
   #fallbackTimeoutId = null
+  #streamRenderListener = null
+  #completed = false
 
   #fetchPrices() {
     const products = this.priceTargets.map(el => this.#productIds(el))

data/lib/purchasekit/events.rb

@@ -94,6 +94,13 @@ module PurchaseKit
         payload[:store_product_id]
       end
 
+      # The Google Play base plan ID (e.g., "annual", "monthly").
+      # Only present when the purchase used Google's umbrella subscription
+      # with multiple base plans. Nil for Apple and for flat Google products.
+      def google_base_plan_id
+        payload[:google_base_plan_id]
+      end
+
       # The subscription name you configured in PurchaseKit
       def subscription_name
         payload[:subscription_name]

data/lib/purchasekit/pay/webhooks/subscription_created.rb

@@ -23,7 +23,10 @@ module PurchaseKit
             current_period_end: parse_time(event["current_period_end"]),
             trial_ends_at: parse_time(event["trial_ends_at"]),
             ends_at: parse_time(event["ends_at"]),
-            data: (subscription.data || {}).merge("store" => event["store"])
+            data: (subscription.data || {}).merge(
+              "store" => event["store"],
+              "google_base_plan_id" => event["google_base_plan_id"]
+            ).compact
           )
 
           return unless is_new

data/lib/purchasekit/pay/webhooks/subscription_updated.rb

@@ -22,7 +22,10 @@ module PurchaseKit
             current_period_end: parse_time(event["current_period_end"]),
             trial_ends_at: parse_time(event["trial_ends_at"]),
             ends_at: parse_time(event["ends_at"]),
-            data: (subscription.data || {}).merge("store" => event["store"])
+            data: (subscription.data || {}).merge(
+              "store" => event["store"],
+              "google_base_plan_id" => event["google_base_plan_id"]
+            ).compact
           )
 
           broadcast_redirect(customer, event) if event["success_path"].present?

data/lib/purchasekit/version.rb

@@ -1,3 +1,3 @@
 module PurchaseKit
-  VERSION = "0.7.1"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purchasekit
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Joe Masilotti
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -224,6 +225,7 @@ metadata:
   homepage_uri: https://purchasekit.com
   source_code_uri: https://github.com/purchasekit/purchasekit
   changelog_uri: https://github.com/purchasekit/purchasekit/blob/main/CHANGELOG.md
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -238,7 +240,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: In-app purchase infrastructure for Rails
 test_files: []