portage-ucp-shopify 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a765da54993cf41e31bf88ed87b7b77980c699d9870cc8669ed3129bd215322
-  data.tar.gz: f6ed02a45de96177706fd90283972623164b1cc48dc1d2e2b985bd2f34e3d002
+  metadata.gz: f492f3dcd92e8efe69af5241e1e216808a562c2b2f0647bc95992b4b90527956
+  data.tar.gz: bf68a6808d5e7f799d2eafca32cefec602b68c98b6e637d512c7278f9a17b3a8
 SHA512:
-  metadata.gz: 2c56b50e718ffffc7fffe8298d94b2b1ae716ea1664e85d3b7ba6ad4cb2e066906b8c0b6dc2b0bae67b2fce6060769707c4c104f9fcba04e53a55400b1984df1
-  data.tar.gz: 2b36bc54e055429bddf8b0ea01ca17f3abfe7f152576c6007775f3b5b31db2684348044dd2f54ee9be81d4f5b908ceef7e32a47ec404e057a3db4214c9881659
+  metadata.gz: a6e88da354126c906ea58feffed4fd49a290123c0afb5327930fbcb58d3e1d30b0576a835037a55a45d402d19a761a94733f2549427bf82d13086130dfee74f0
+  data.tar.gz: 0bf85bef1f694f5d5be78e0b927c7cdd0c175514530018686c594fc5ddc0e4e15e5a3a09124942ad70b243a4ff68d53e7ed9229ab318dd8c359b6a68b6610a3e

data/CHANGELOG.md

@@ -4,7 +4,33 @@ All notable changes to this project are documented here. Format loosely follows
 [Keep a Changelog](https://keepachangelog.com/en/1.0.0/); this project is
 pre-1.0, so APIs may still shift between minor versions.
 
-## [Unreleased]
+## [0.4.3] - 2026-09-16
+
+- No behavior change — 0.4.2 was built and pushed with `gem build` run from
+  the workspace root instead of this gem's own directory, so `spec.files =
+  Dir[...]` resolved against the wrong working directory and packaged an
+  empty gem. 0.4.2 has been yanked; 0.4.3 repackages the exact same 0.4.2
+  code correctly.
+
+## [0.4.2] - 2026-09-16
+
+- Fix `GraphqlError` crashing with `NoMethodError` instead of surfacing the
+  real message when Shopify's `errors` field is a bare string rather than
+  the usual array of objects (confirmed live on an expired/invalid admin
+  token).
+- Add a live-store spec that searches the catalog, buys a random in-stock
+  product through checkout creation, and retries past a line Storefront
+  silently rejects (`quantity: 0`, empty `userErrors`) despite the Admin
+  API reporting it available.
+- Widens the `portage-ucp` dependency pin to `~> 0.7` so this gem can
+  install alongside `portage-ucp` 0.7.0 (the pessimistic `~> 0.6` pin
+  published with 0.4.1 excludes it).
+
+## [0.4.1] - 2026-09-15
+
+- No behavior change — widens the `portage-ucp` dependency pin to `~> 0.6`
+  so this gem can install alongside `portage-ucp` 0.6.0 (the pessimistic
+  `~> 0.5` pin published with 0.4.0 excludes it).
 
 ## [0.4.0] - 2026-09-14
 

data/lib/portage/ucp/shopify/adapter.rb

@@ -274,28 +274,33 @@ module Portage
 
         def replace_lines(cart_id, line_items, discount_codes)
           synchronize(cart_id) do
-            current_line_ids = fetch_cart_node(cart_id).dig("lines", "nodes").map { |n| n["id"] }
-            unless current_line_ids.empty?
-              removed = @client.storefront_query(Queries::CART_LINES_REMOVE,
-                                                 variables: { cartId: cart_id, lineIds: current_line_ids })
-              unwrap!(removed, "cartLinesRemove")
-            end
-
-            cart_node = if line_items.empty?
-                          fetch_cart_node(cart_id)
-                        else
-                          added = @client.storefront_query(
-                            Queries::CART_LINES_ADD,
-                            variables: { cartId: cart_id, lines: cart_lines(line_items) }
-                          )
-                          unwrap!(added, "cartLinesAdd")
-                        end
+            remove_current_lines(cart_id)
+            cart_node = add_lines(cart_id, line_items)
             next cart_node if discount_codes.nil?
 
             apply_discount_codes(cart_id, discount_codes)
           end
         end
 
+        def remove_current_lines(cart_id)
+          current_line_ids = fetch_cart_node(cart_id).dig("lines", "nodes").map { |n| n["id"] }
+          return if current_line_ids.empty?
+
+          removed = @client.storefront_query(Queries::CART_LINES_REMOVE,
+                                             variables: { cartId: cart_id, lineIds: current_line_ids })
+          unwrap!(removed, "cartLinesRemove")
+        end
+
+        def add_lines(cart_id, line_items)
+          return fetch_cart_node(cart_id) if line_items.empty?
+
+          added = @client.storefront_query(
+            Queries::CART_LINES_ADD,
+            variables: { cartId: cart_id, lines: cart_lines(line_items) }
+          )
+          unwrap!(added, "cartLinesAdd")
+        end
+
         def apply_discount_codes(cart_id, discount_codes)
           data = @client.storefront_query(Queries::CART_DISCOUNT_CODES_UPDATE,
                                           variables: { cartId: cart_id, discountCodes: discount_codes })
@@ -314,8 +319,8 @@ module Portage
 
             pay_for_cart(checkout_id, cart_node.dig("cost", "totalAmount"), payment_token)
 
-            status, order = poll_submission(checkout_id, idempotency_key)
-            Mapper.checkout(cart_node, status: status, order: order)
+            status, order, resume_url = poll_submission(checkout_id, idempotency_key)
+            Mapper.checkout(cart_node, status: status, order: order, resume_url: resume_url)
           end
         end
 
@@ -359,10 +364,10 @@ module Portage
           with_retry(max_attempts: SUBMIT_POLL_MAX_ATTEMPTS) do
             submit_data = @client.storefront_query(Queries::CART_SUBMIT_FOR_COMPLETION,
                                                    variables: { cartId: checkout_id, attemptToken: idempotency_key })
-            status = unwrap_submit!(submit_data)
+            status, resume_url = unwrap_submit!(submit_data)
             record_checkout_status(checkout_id, status)
             order = link_cart_to_order(checkout_id) if status == "completed"
-            [status, order]
+            [status, order, resume_url]
           end
         rescue Portage::Ucp::Shopify::SubmitThrottled
           raise Portage::Ucp::UpstreamThrottledError, "checkout #{checkout_id} still processing after retries"
@@ -397,16 +402,21 @@ module Portage
           raise Portage::Ucp::OutOfStockError, "no longer available: #{titles}"
         end
 
+        # On SubmitFailed (declines, 3DS/verification challenges, etc.),
+        # Shopify hands back its own `checkoutUrl` for the buyer to finish in
+        # a browser rather than a bare error — surfaced as "requires_escalation"
+        # plus that URL so #submit_payment can thread it into a resume-checkout
+        # Link, instead of raising and discarding it.
         def unwrap_submit!(data)
           payload = data.fetch("cartSubmitForCompletion")
           errors = payload["userErrors"]
           raise Portage::Ucp::Shopify::UserError.new("cartSubmitForCompletion", errors) if errors && !errors.empty?
 
           result = payload["result"]
-          raise Portage::Ucp::Shopify::Error, result.dig("errors", 0, "message") if result["errors"]
+          return ["requires_escalation", result["checkoutUrl"]] if result["errors"]
           raise Portage::Ucp::Shopify::SubmitThrottled, result["pollAfter"] if result.key?("pollAfter")
 
-          "completed"
+          ["completed", nil]
         end
       end
     end

data/lib/portage/ucp/shopify/errors.rb

@@ -11,8 +11,14 @@ module Portage
       # rejection (e.g. "line item not found").
       class GraphqlError < Error
         def initialize(errors)
-          @errors = errors
-          super(errors.map { |e| e["message"] }.join("; "))
+          # Normally an array of {"message" => ...} objects, but an
+          # authentication rejection (confirmed live: an expired/invalid
+          # admin token) skips GraphQL's own error shape entirely and sends
+          # a bare string instead — e.g. {"errors":"[API] Invalid API key
+          # or access token..."}. Wrapping it here keeps #message and
+          # #throttled? working either way instead of crashing on `#map`.
+          @errors = errors.is_a?(String) ? [{ "message" => errors }] : errors
+          super(@errors.map { |e| e["message"] }.join("; "))
         end
 
         # Shopify's cost-throttling reports THROTTLED as a top-level error's

data/lib/portage/ucp/shopify/mapper.rb

@@ -217,20 +217,34 @@ module Portage
         # `status` isn't a Shopify Cart field — Cart/Checkout is one object in
         # Shopify's model, so the adapter tracks status itself across the
         # create/update/complete/cancel lifecycle and passes it in here.
-        def checkout(node, status:, order: nil)
+        #
+        # `resume_url` is the SubmitFailed-specific checkoutUrl (3DS/
+        # verification/decline) — falls back to the cart's own checkoutUrl
+        # (CART_FIELDS, always present) so any non-completed checkout still
+        # carries a browser handoff link.
+        def checkout(node, status:, order: nil, resume_url: nil)
           Portage::Ucp::Checkout.new(
             id: node["id"],
             status: status,
             line_items: node.dig("lines", "nodes").map { |n| cart_line_item(n) },
             currency: node.dig("cost", "subtotalAmount", "currencyCode"),
             totals: totals(node),
-            links: [],
+            links: checkout_links(node, status: status, resume_url: resume_url),
             order: order,
             discounts: discounts(node),
             fulfillment: checkout_fulfillment(node)
           )
         end
 
+        def checkout_links(node, status:, resume_url:)
+          return [] if status == "completed"
+
+          url = resume_url || node["checkoutUrl"]
+          return [] unless url
+
+          [Portage::Ucp::Link.new(type: "resume-checkout", url: url)]
+        end
+
         # dev.ucp.shopping.fulfillment (pre-purchase shipping-option
         # selection) built from Cart#deliveryGroups — read straight off
         # CART_FIELDS, no separate query. Shopify has no "fulfillment method"

data/lib/portage/ucp/shopify/version.rb

@@ -1,7 +1,7 @@
 module Portage
   module Ucp
     module Shopify
-      VERSION = "0.4.0".freeze
+      VERSION = "0.4.3".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: portage-ucp-shopify
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Tom Whitbread
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-14 00:00:00.000000000 Z
+date: 2026-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: portage-ucp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement