fulfil_api 0.7.2 → 0.8.0

data/lib/fulfil_api/relation.rb

@@ -48,8 +48,8 @@ module FulfilApi
     #
     # @yield [resource] Yields each resource object to the given block.
     # @return [Enumerator, self] Returns an Enumerator if no block is given; otherwise, returns self.
-    def each(&block)
-      all.each(&block)
+    def each(&)
+      all.each(&)
     end
 
     # Resets any of the previously provided query conditions.

data/lib/fulfil_api/resource/attribute_assignable.rb

@@ -76,23 +76,23 @@ module FulfilApi
       #   $ build_attribute("warehouse.id", 10)
       #   => { "warehouse" => { "id" => 10 } }
       #
-      # @param attribute_names [String, Symbol] The expanded list of attribute names
+      # @example attribute where the relation and its field share a name
+      #   $ build_attribute("tracking_number.tracking_number", "T04DDA5014242536")
+      #   => { "tracking_number" => { "tracking_number" => "T04DDA5014242536" } }
+      #
+      # @param name [String, Symbol] The attribute name
       # @param value [Any] The attribute value
       # @return [Hash] The newly build attribute
-      def build_attribute(name, value) # rubocop:disable Metrics/MethodLength
-        attribute_names = name.to_s.split(".")
-        attribute = {}
-        attribute_level = attribute
+      def build_attribute(name, value)
+        *relation_names, attribute_name = name.to_s.split(".")
+        return {} if attribute_name.nil?
 
-        attribute_names.each do |attribute_name|
-          if attribute_name == attribute_names.last
-            attribute_level[attribute_name] = type_cast_attribute_value(value)
-          else
-            attribute_level[attribute_name] ||= {}
-            attribute_level = attribute_level[attribute_name]
-          end
+        attribute = {}
+        attribute_level = relation_names.reduce(attribute) do |level, relation_name|
+          level[relation_name] ||= {}
         end
 
+        attribute_level[attribute_name] = type_cast_attribute_value(value)
         attribute
       end
 

data/lib/fulfil_api/tpl_client.rb

@@ -128,6 +128,9 @@ module FulfilApi
           configure_persistent_connection(http)
         end
 
+        # Retries and other safeguards wrap every request, so they're added first
+        FulfilApi::Middleware.apply(connection, configuration)
+
         # Configuration of the request middleware
         connection.request :json
 
@@ -151,11 +154,9 @@ module FulfilApi
     # Tunes the underlying Net::HTTP::Persistent connection.
     #
     # The `net_http_persistent` adapter forces `max_retries` to 0 on every
-    #   request, which disables Ruby's built-in retry for idempotent requests.
-    #   Restoring it lets a stale keep-alive socket — one the server has already
-    #   closed — be retried transparently on a fresh socket instead of surfacing
-    #   as a read timeout. The config block runs after the adapter zeroes the
-    #   value, so this takes effect.
+    #   request. Retries are handled by {FulfilApi::Middleware::Retry} instead, so
+    #   `max_retries` is only restored when it's configured explicitly. The config
+    #   block runs after the adapter zeroes the value, so this takes effect.
     #
     # @param http [Net::HTTP::Persistent] The live persistent connection.
     # @return [void]
@@ -170,7 +171,10 @@ module FulfilApi
 
     # @return [Array] The cache key identifying a unique connection.
     def connection_cache_key
-      [merchant_id, api_version, configuration.request_options, configuration.connection_options]
+      [
+        merchant_id, api_version, configuration.request_options, configuration.connection_options,
+        configuration.retry_options, configuration.circuit_breaker
+      ]
     end
 
     # @param relative_path [String] The relative path to the API endpoint.

data/lib/fulfil_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FulfilApi
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/lib/fulfil_api.rb

@@ -3,18 +3,29 @@
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem
+loader.inflector.inflect("oauth" => "OAuth")
+loader.ignore("#{__dir__}/fulfil_api/engine.rb")
 loader.ignore("#{__dir__}/fulfil_api/test_helper.rb")
+loader.ignore("#{__dir__}/generators")
 loader.setup
 
 require "active_support"
+require "active_support/cache"
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/hash/deep_merge"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/object/blank"
 require "active_support/notifications"
+require "faraday"
+require "faraday/retry"
 
 module FulfilApi
 end
 
 loader.eager_load
+
+# The Rails-specific parts of the gem — the engine, its models, its controllers,
+#   and its generators — are only loaded when the gem is used from within a
+#   Rails application.
+require "fulfil_api/engine" if defined?(Rails::Engine)

data/lib/generators/fulfil_api/install/install_generator.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+require "rails/generators/active_record"
+
+module FulfilApi
+  module Generators
+    # Sets a Rails application up for Fulfil's OAuth flow: it writes an
+    #   initializer, adds the migration for {FulfilApi::Installation}, and mounts
+    #   {FulfilApi::Engine}.
+    #
+    # @example
+    #   bin/rails generate fulfil_api:install
+    class InstallGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+
+      source_root File.expand_path("templates", __dir__)
+
+      desc "Installs the Fulfil OAuth initializer, migration, and engine route."
+
+      # @return [void]
+      def copy_initializer
+        template "fulfil_api.rb", "config/initializers/fulfil_api.rb"
+      end
+
+      # @return [void]
+      def create_migration_file
+        migration_template "create_fulfil_api_installations.rb",
+                           "db/migrate/create_fulfil_api_installations.rb"
+      end
+
+      # @return [void]
+      def mount_engine
+        route %(mount FulfilApi::Engine => "#{FulfilApi::OAuth::Configuration::DEFAULT_MOUNT_PATH}")
+      end
+
+      # @return [void]
+      def show_readme
+        say(remaining_steps)
+      end
+
+      private
+
+      # @return [String] The Active Record migration version to generate against.
+      def migration_version
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+      end
+
+      # Nothing changes in the application until these are done, so an existing
+      #   application can install the gem without switching to OAuth yet.
+      #
+      # @return [String]
+      def remaining_steps
+        <<~MESSAGE
+
+          Fulfil's OAuth flow is installed. To finish setting it up:
+
+            1. Run `bin/rails db:migrate` to create the fulfil_api_installations table.
+            2. Run `bin/rails db:encryption:init` and store the keys in your credentials,
+               unless Active Record encryption is already configured. The access tokens
+               are encrypted at rest.
+            3. Create an app on https://auth.fulfil.io/user/clients and whitelist
+               #{FulfilApi::OAuth::Configuration::DEFAULT_MOUNT_PATH}/callback as a redirection URL.
+            4. Fill in FULFIL_OAUTH_CLIENT_ID and FULFIL_OAUTH_CLIENT_SECRET.
+            5. Set config.oauth.parent_controller to the controller that authenticates
+               a request in this application. The OAuth flow refuses to run without it.
+
+        MESSAGE
+      end
+    end
+  end
+end

data/lib/generators/fulfil_api/install/templates/create_fulfil_api_installations.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class CreateFulfilApiInstallations < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :fulfil_api_installations do |t|
+      # An installation without an owner is the application-wide installation.
+      t.references :owner, polymorphic: true, null: true, index: false
+
+      t.string :merchant_id, null: false
+
+      # Fulfil grants the permanent token only in `offline_access` mode, and the
+      #   short-lived one is the only token in `user_session` mode. Neither is
+      #   required on its own; FulfilApi::Installation requires one of the two.
+      t.text :access_token
+      t.text :offline_access_token
+
+      # The gem fills the token type in rather than relying on Fulfil to send it.
+      t.string :token_type, null: false, default: "Bearer"
+
+      # Nullable because Active Record serialization writes an empty list as
+      #   NULL and reads it back as one, so the column is never meaningfully
+      #   blank even though it can be NULL.
+      t.text :scopes
+
+      # Describes the short-lived token only. A permanent token has no expiry:
+      #   it is revoked by uninstalling the app, not by time.
+      t.datetime :expires_at
+
+      # Who walked through the authorization flow. Recorded for support, nothing
+      #   in the gem depends on it, and Fulfil is free to leave parts of it out.
+      t.integer :associated_user_id
+      t.string :associated_user_email
+      t.string :associated_user_name
+
+      t.timestamps
+    end
+
+    # An owner is connected to a single Fulfil workspace. Databases treat NULLs
+    #   as distinct, so this index does not constrain the application-wide
+    #   installation; FulfilApi::Installation validates that case.
+    add_index :fulfil_api_installations, %i[owner_type owner_id], unique: true
+  end
+end

data/lib/generators/fulfil_api/install/templates/fulfil_api.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+FulfilApi.configure do |config|
+  # The subdomain of the Fulfil workspace this application talks to. Leave it
+  #   blank when every tenant brings its own workspace, and override
+  #   `fulfil_merchant_id` in ApplicationController instead.
+  config.merchant_id = ENV.fetch("FULFIL_MERCHANT_ID", nil)
+
+  # The credentials of the app registered on https://auth.fulfil.io/user/clients.
+  config.oauth.client_id = ENV.fetch("FULFIL_OAUTH_CLIENT_ID", nil)
+  config.oauth.client_secret = ENV.fetch("FULFIL_OAUTH_CLIENT_SECRET", nil)
+
+  # The scopes to request. See https://developers.fulfil.io for the full list.
+  config.oauth.scopes = []
+
+  # `:offline_access` grants a permanent token that keeps working when no user
+  #   is around, which is what background jobs need. `:user_session` grants a
+  #   token that expires with the user's Fulfil session.
+  config.oauth.access_type = :offline_access
+
+  # Where the user ends up after installing the app, unless they were sent to
+  #   the flow from somewhere else. Accepts a path or a callable taking the
+  #   FulfilApi::Installation that was created.
+  config.oauth.after_install_path = "/"
+
+  # REQUIRED before the OAuth flow can be used. The engine's controllers inherit
+  #   from this one, so it has to be a controller that authenticates the request
+  #   and — in an application serving many merchants — establishes the current
+  #   tenant. There is deliberately no default: an unauthenticated flow lets a
+  #   stranger record their own Fulfil workspace over yours, and a flow outside
+  #   the application's tenancy records installations against the wrong owner.
+  #
+  # config.oauth.parent_controller = "AuthenticatedController"
+
+  # Fulfil requires the redirect URL to be whitelisted on the app. It defaults
+  #   to the engine's callback URL, which is derived from the incoming request.
+  # config.oauth.redirect_uri = "https://example.com/fulfil/callback"
+end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: fulfil_api
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Stefan Vermaas
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -80,14 +93,29 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/concerns/fulfil_api/authenticated.rb
+- app/controllers/concerns/fulfil_api/installation_scoped.rb
+- app/controllers/fulfil_api/application_controller.rb
+- app/controllers/fulfil_api/installations_controller.rb
+- app/models/concerns/fulfil_api/installable.rb
+- app/models/fulfil_api/installation.rb
+- config/routes.rb
 - lib/fulfil_api.rb
 - lib/fulfil_api/access_token.rb
+- lib/fulfil_api/circuit_open.rb
 - lib/fulfil_api/client.rb
 - lib/fulfil_api/configuration.rb
 - lib/fulfil_api/customer_shipment.rb
+- lib/fulfil_api/engine.rb
 - lib/fulfil_api/error.rb
 - lib/fulfil_api/error/notifiable.rb
 - lib/fulfil_api/http_error.rb
+- lib/fulfil_api/middleware.rb
+- lib/fulfil_api/middleware/circuit_breaker.rb
+- lib/fulfil_api/oauth.rb
+- lib/fulfil_api/oauth/authorization.rb
+- lib/fulfil_api/oauth/configuration.rb
+- lib/fulfil_api/oauth/token.rb
 - lib/fulfil_api/relation.rb
 - lib/fulfil_api/relation/batchable.rb
 - lib/fulfil_api/relation/countable.rb
@@ -105,6 +133,9 @@ files:
 - lib/fulfil_api/test_helper.rb
 - lib/fulfil_api/tpl_client.rb
 - lib/fulfil_api/version.rb
+- lib/generators/fulfil_api/install/install_generator.rb
+- lib/generators/fulfil_api/install/templates/create_fulfil_api_installations.rb
+- lib/generators/fulfil_api/install/templates/fulfil_api.rb
 - sig/fulfil_api.rbs
 homepage: https://www.github.com/codeturebv/fulfil_api
 licenses:
@@ -114,7 +145,13 @@ metadata:
   source_code_uri: https://www.github.com/codeturebv/fulfil_api
   changelog_uri: https://www.github.com/codeturebv/fulfil_api/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: |+
+  Using fulfil_api in a Rails application? Run the install generator to set up
+  Fulfil's OAuth flow, then run the migration it adds:
+
+    bin/rails generate fulfil_api:install
+    bin/rails db:migrate
+
 rdoc_options: []
 require_paths:
 - lib
@@ -122,15 +159,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A HTTP client to interact the Fulfil.io API
 test_files: []
+...