portage-ucp 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 826f590ea83ab80febf6e461f60d1eb580d7ebf460a419bafb81d0f713525e81
-  data.tar.gz: eb98a54978daf0904de0121101e98e597a67cd38dabd7440dd3813449b384635
+  metadata.gz: 411d3c147d477882ffab11e8679a8c188735faaf34cf764feab94e0b209d14cf
+  data.tar.gz: 9687a224d4cce5c79a6c501e4583d0adab98283aaa166027d91eb79213f04831
 SHA512:
-  metadata.gz: fcb26f95ac6d46b622f3495b945f76549d4c7525c25fbe0552c3485659395e35e1e0330fe212052f253ba79680d498e9de0b179d91c9bee17a4f2796ec33c50c
-  data.tar.gz: 4726bf3de6e45993612ea7a2c4bfd57ef418ad1a7c1d1a17efdffa90d20991df0fe9f623548f81065383b31aa99fd7210c2512d7994f6521a4bb6cfcfc494c1c
+  metadata.gz: ee057628093a5cca7d1240fbf1a0d2ac9982563f86a080536fe2d3f42e17476809415622c8e8f670125e131ba17bd7f54d7c8320f9d5c33531c99942f7240785
+  data.tar.gz: 74db4f514c5c9d3d3f57e8537ada8a1dddb51d29f912bfb5682c7ff22c244d6055459bade3483472ddb31c3cadbb8aae97c46c88d1800b9dcae122d3a7045643

data/CHANGELOG.md

@@ -4,6 +4,29 @@ 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.
 
+## [0.8.1] - 2026-09-22
+
+- `Resolver`'s WooCommerce platform entry threads `payment_method`/
+  `billing_address` from `WOOCOMMERCE_PAYMENT_METHOD`/`WOOCOMMERCE_BILLING_ADDRESS`
+  through to `Adapter.new`. It previously built the client and adapter
+  without either, so `complete_checkout` failed with no gateway or address
+  configured even when both env vars were set — the resolver's `env:` map
+  simply never named them.
+
+## [0.8.0] - 2026-09-17
+
+- **Breaking:** `Manifest#to_h` now emits the shape live UCP stores actually
+  serve (confirmed against Shopify's `2026-08-25` rollout) instead of the
+  flat one this gem invented: everything nests under a top-level `ucp`
+  object, `ucp_version` becomes `version`, and `capabilities` is keyed by
+  capability name (`{"dev.ucp.shopping.catalog" => [{version: ...}]}`)
+  rather than an array of `{name:, version:}` hashes. When a signer is
+  configured the signature still covers the manifest body and rides inside
+  the `ucp` object. Anything reading a Portage-served manifest by the old
+  top-level keys needs updating — `Rack::ManifestEndpoint`'s own
+  advertised-payment check and `skills/serve-via-ucp`'s `verify.sh` both
+  did, and are fixed here.
+
 ## [0.7.1] - 2026-09-16
 
 - No behavior change — 0.7.0 was built and pushed with `gem build` run from

data/lib/portage/ucp/manifest.rb

@@ -31,24 +31,31 @@ module Portage
         @services = services
       end
 
+      # Nests everything under a "ucp" envelope, and keys `capabilities` by
+      # capability name (matching what live Shopify UCP rollouts — Casper,
+      # Allbirds, Glossier, and 34+ others — actually serve as of manifest
+      # "version": "2026-08-25"; see docs/well-known-ucp.md and
+      # portage-ucp-client's Client.discover, which this shape now matches).
       def to_h
-        payload = {
-          ucp_version: UCP_VERSION,
+        ucp = {
+          version: UCP_VERSION,
           business: @business,
           services: @services,
-          capabilities: @registry.advertised(@adapter).map do |capability|
-            { name: capability.name, version: capability.version }
-          end,
+          capabilities: capability_hash,
           payment_handlers: @payment_handlers,
           signing_keys: @signing_keys
         }
-        return payload unless @signer
+        ucp = ucp.merge(signature: sign(ucp)) if @signer
 
-        payload.merge(signature: sign(payload))
+        { ucp: ucp }
       end
 
       private
 
+      def capability_hash
+        @registry.advertised(@adapter).to_h { |capability| [capability.name, [{ version: capability.version }]] }
+      end
+
       def sign(payload)
         canonical = JSON.generate(payload)
         { kid: @signer.kid, value: Base64.strict_encode64(@signer.sign(canonical)) }

data/lib/portage/ucp/rack/manifest_endpoint.rb

@@ -32,7 +32,7 @@ module Portage
         def payment_handlers_over_plaintext?(payload, request)
           return false if @allow_insecure || request.ssl?
 
-          !Array(payload[:payment_handlers]).empty?
+          !Array(payload.dig(:ucp, :payment_handlers)).empty?
         end
 
         def not_found

data/lib/portage/ucp/resolver.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module Portage
   module Ucp
     # Shared platform-detection + adapter-building logic for anything that
@@ -39,14 +41,17 @@ module Portage
           namespace: "WooCommerce",
           markers: [/woocommerce/i, %r{wp-content/plugins/woocommerce}i],
           env: { site_url: "WOOCOMMERCE_SITE_URL", consumer_key: "WOOCOMMERCE_CONSUMER_KEY",
-                 consumer_secret: "WOOCOMMERCE_CONSUMER_SECRET", currency: "WOOCOMMERCE_CURRENCY" },
+                 consumer_secret: "WOOCOMMERCE_CONSUMER_SECRET", currency: "WOOCOMMERCE_CURRENCY",
+                 payment_method: "WOOCOMMERCE_PAYMENT_METHOD", billing_address: "WOOCOMMERCE_BILLING_ADDRESS" },
           required: %i[site_url consumer_key consumer_secret],
           build_client: lambda { |ns, env|
             ns::Client.new(site_url: env.fetch(:site_url), consumer_key: env.fetch(:consumer_key),
                            consumer_secret: env.fetch(:consumer_secret))
           },
           build_adapter: lambda { |ns, client, env|
-            ns::Adapter.new(client: client, site_url: env.fetch(:site_url), currency: env.fetch(:currency, "USD"))
+            ns::Adapter.new(client: client, site_url: env.fetch(:site_url), currency: env.fetch(:currency, "USD"),
+                            payment_method: env[:payment_method],
+                            billing_address: env[:billing_address] && JSON.parse(env[:billing_address]))
           }
         ),
         Platform.new(

data/lib/portage/ucp/version.rb

@@ -1,5 +1,5 @@
 module Portage
   module Ucp
-    VERSION = "0.7.1".freeze
+    VERSION = "0.8.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: portage-ucp
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Tom Whitbread
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-16 00:00:00.000000000 Z
+date: 2026-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64