purchasekit 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80efbcba7ccd188e7f24d392bec5690bd1799d6aa3ad4c97045a6e7022242e64
-  data.tar.gz: 1f6efa6565a3439bd10b36a0ec4aa484166201c4fdb372b87de73707b6fe8872
+  metadata.gz: 5d05f29f2c2248e33c8ee228dc191914f6aa66174505f5ddd3612987258c23a8
+  data.tar.gz: 1734e423d697dacab4cdfcf67bee287d43c48b6c5c40d38f229a1e2536ba5032
 SHA512:
-  metadata.gz: f9ca56c119d365deadcff6b69826a5c5440e51d119bcbf560bab1cf3af1b7f228e7d5a8c331fcf13ef2affb6c7973c18e09a605ac5c6c36fa4761d282ac1e77c
-  data.tar.gz: 1618b92df987fe7d7159391af48fa11de39b76993066239deb13b6a912b7c1dbba662ee998759adc30e0d392ba6024071b395f939fc86824c4eec064ebbec86e
+  metadata.gz: 6d1226d312912c774fef81504560f1bdbb8ec9be76d260588647494243e6319fa240a04f72e98048d6cd8ccf30f06754be95517c5ab79b2f174dbb839a7aaace
+  data.tar.gz: 88aa46c038eb5d35603df2a010fc4443949c8d25fbcdb7f17ecbbaa5e736422d8e8ea82652b0d8950d67245751f3717cd3ec5ba0fd6802756ef00e7b8a6e31e1

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 |
@@ -125,7 +126,36 @@ Webhooks may be delivered more than once. Write idempotent callbacks using `find
 
 ## Paywall helper
 
-Build a paywall using the included helper. Subscribe to the Turbo Stream for real-time redirects:
+Build a paywall using the included helper. Subscribe to a Turbo Stream channel for real-time redirects after purchase. The `customer_id` you pass flows through the store and back to your webhook handler, so it must match what the handler expects.
+
+### With Pay
+
+Pass the `Pay::Customer.id` (not your user ID), and subscribe to the Pay customer's `dom_id` channel:
+
+```erb
+<% pay_customer = current_user.set_payment_processor(:purchasekit) %>
+
+<%= turbo_stream_from dom_id(pay_customer) %>
+
+<%= purchasekit_paywall customer_id: pay_customer.id, success_path: dashboard_path do |paywall| %>
+  <%= paywall.plan_option product: @annual, selected: true do %>
+    Annual - <%= paywall.price %>/year
+  <% end %>
+
+  <%= paywall.plan_option product: @monthly do %>
+    Monthly - <%= paywall.price %>/month
+  <% end %>
+
+  <%= paywall.submit "Subscribe" %>
+  <%= paywall.restore url: restore_purchases_path, class: "btn btn-link" %>
+<% end %>
+```
+
+`set_payment_processor(:purchasekit)` finds or creates the `Pay::Customer` row. Calling it on every paywall render guarantees the row exists before the webhook tries to look it up.
+
+### Without Pay
+
+Use your own user ID for both the `customer_id` and the Turbo Stream channel:
 
 ```erb
 <%= turbo_stream_from "purchasekit_customer_#{current_user.id}" %>

data/app/controllers/purchase_kit/purchases_controller.rb

@@ -1,6 +1,8 @@
 module PurchaseKit
   class PurchasesController < ApplicationController
     def create
+      raise PurchaseKit::NotFoundError, "No product selected" if params[:product_id].blank?
+
       intent = PurchaseKit::Purchase::Intent.create(
         product_id: params[:product_id],
         customer_id: params[:customer_id],

data/app/helpers/purchase_kit/paywall_helper.rb

@@ -2,12 +2,15 @@ module PurchaseKit
   module PaywallHelper
     # Renders a paywall form that triggers native in-app purchases
     #
-    # @param customer_id [String, Integer] Your user/customer identifier
+    # @param customer_id [String, Integer] The identifier passed back in webhook
+    #   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
     # @yield [PaywallBuilder] Builder for plan options and buttons
     #
-    # Example:
-    #   <%= purchasekit_paywall customer_id: current_user.id, success_path: dashboard_path do |paywall| %>
+    # Example (with Pay):
+    #   <% pay_customer = current_user.set_payment_processor(:purchasekit) %>
+    #   <%= purchasekit_paywall customer_id: pay_customer.id, success_path: dashboard_path do |paywall| %>
     #     <%= paywall.plan_option product: @annual, selected: true do %>
     #       Annual - <%= paywall.price %>
     #     <% end %>
@@ -48,6 +51,7 @@ module PurchaseKit
         selected,
         id: input_id,
         class: input_class,
+        required: true,
         autocomplete: "off",
         data: {
           purchasekit__paywall_target: "planRadio",

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

@@ -6,21 +6,34 @@ module PurchaseKit
         include Turbo::Streams::ActionHelper
 
         def call(event)
-          update_subscription(event,
+          customer = ::Pay::Customer.find(event["customer_id"])
+
+          subscription = ::Pay::Purchasekit::Subscription.find_or_initialize_by(
+            customer: customer,
+            processor_id: event["subscription_id"]
+          )
+          subscription.name ||= event["subscription_name"] || ::Pay.default_product_name
+          subscription.quantity ||= 1
+
+          subscription.update!(
             processor_plan: event["store_product_id"],
             status: event["status"],
             current_period_start: parse_time(event["current_period_start"]),
             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"]))
+            ends_at: parse_time(event["ends_at"]),
+            data: (subscription.data || {}).merge(
+              "store" => event["store"],
+              "google_base_plan_id" => event["google_base_plan_id"]
+            ).compact
+          )
 
-          broadcast_redirect(event) if event["success_path"].present?
+          broadcast_redirect(customer, event) if event["success_path"].present?
         end
 
         private
 
-        def broadcast_redirect(event)
-          customer = ::Pay::Customer.find(event["customer_id"])
+        def broadcast_redirect(customer, event)
           Turbo::StreamsChannel.broadcast_stream_to(
             dom_id(customer),
             content: turbo_stream_action_tag(:redirect, url: event["success_path"])

data/lib/purchasekit/version.rb

@@ -1,3 +1,3 @@
 module PurchaseKit
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purchasekit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Joe Masilotti