hanami 2.2.0.beta1 → 2.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ada7b19a9d5205199e825e57d41758bbc67c350f3d565b01cd4720b9ed8f3ad4
-  data.tar.gz: 2af8c539547dcbc78dde70db5e31fc72bafa9578dcf391178ec342b618ea6467
+  metadata.gz: 6d6bd309aaaf86dce283f25dbdf786db6da76567ae8b00aed92c34de637f8909
+  data.tar.gz: 3b6430d47afb052bdc4df9ce200ceb3b2888b733b040bdb4de056052a8e99db2
 SHA512:
-  metadata.gz: ed3735c73b897db477ba35cd3d2f0aee79c98940eb4cba651590e5bedf74f34d3969a8dc8200fcae2cfda1a1f7345e873b9bcd075a3f3a627d81eef0ac36ac94
-  data.tar.gz: 65aebf467d397b29148dda81262550c528469adbd75759615415e89293cefd0cdb1444bd7fc1513c07d46da290ac2092f31752c4d3adeb856f709c04d540497f
+  metadata.gz: a73cfea60952ba798fe2d04b2cf430996f8b81960959054251e4277b9f0a53aadfdad23850d389fcedcdb3f77a0855acd2e128e5d8aa3cc8a82df485ae11d592
+  data.tar.gz: 05a033e21dd6b9499b125583de931a39f128828ef5f8d730c7ef1522db765ffef35eb1938013b8f58d1199d68aa8564d5183a726bb733e4d1c5b1aaae9f79f7f

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 The web, with simplicity.
 
+## v2.2.0.beta2 - 2024-09-26
+
+### Added
+
+- [Tim Riley] Support multiple gateways within each slice's `:db` provider (#1452)
+- [Tim Riley] Register ROM commands and mappers in `db/commands/` and `db/mappers/`. Support registration of components from deeply nested files within these directories. (#1448)
+- [Adam Lassek, Tim Riley] Make `slice` available inside providers (as an alias for `target`) (#1446)
+
+### Changed
+
+- [Tim Riley] Register deeply nested relation files with ROM (#1448)
+- [Kyle Plump] Raise helpful error when preparing `:db` provider if the relevant driver gem for the configured database type is not installed (#1453)
+- [Sean Collins] Remove "disabled" attribute on the `<option>` generated via the `select` helper's `prompt:`, so it shows properly on the select box in the browser (#1444)
+
 ## v2.2.0.beta1 - 2024-07-16
 
 ### Added

data/hanami.gemspec

@@ -36,9 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-core",         "~> 1.0", "< 2"
   spec.add_dependency "dry-inflector",    "~> 1.0", ">= 1.1.0", "< 2"
   spec.add_dependency "dry-monitor",      "~> 1.0", ">= 1.0.1", "< 2"
-  spec.add_dependency "dry-system",       "= 1.1.0.beta1"
+  spec.add_dependency "dry-system",       "= 1.1.0.beta2"
   spec.add_dependency "dry-logger",       "~> 1.0", "< 2"
-  spec.add_dependency "hanami-cli",       "= 2.2.0.beta1"
+  spec.add_dependency "hanami-cli",       "= 2.2.0.beta2"
   spec.add_dependency "hanami-utils",     "~> 2.2.beta"
   spec.add_dependency "zeitwerk",         "~> 2.6"
 

data/lib/hanami/constants.rb

@@ -52,4 +52,8 @@ module Hanami
   # @api private
   RB_EXT = ".rb"
   private_constant :RB_EXT
+
+  # @api private
+  RB_EXT_REGEXP = %r{.rb$}
+  private_constant :RB_EXT_REGEXP
 end

data/lib/hanami/helpers/form_helper/form_builder.rb

@@ -938,7 +938,7 @@ module Hanami
         #
         #   =>
         #   <select name="book[store]" id="book-store" class="form-control">
-        #     <option disabled="disabled">Select a store</option>
+        #     <option>Select a store</option>
         #     <option value="it">Italy</option>
         #     <option value="au">Australia</option>
         #   </select>
@@ -995,7 +995,7 @@ module Hanami
           input_value = _value(name)
 
           option_tags = []
-          option_tags << tag.option(prompt, disabled: true) if prompt
+          option_tags << tag.option(prompt) if prompt
 
           already_selected = nil
           values.each do |content, value|

data/lib/hanami/provider/source.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Hanami
+  module Provider
+    class Source < Dry::System::Provider::Source
+      attr_reader :slice
+
+      def initialize(slice:, **options, &block)
+        @slice = slice
+        super(**options, &block)
+      end
+
+      def target_container = slice
+    end
+  end
+end

data/lib/hanami/provider_registrar.rb

@@ -19,8 +19,10 @@ module Hanami
       @slice = slice
     end
 
-    def target_container
-      slice
+    def provider_source_class = Hanami::Provider::Source
+
+    def provider_source_options
+      {slice: slice}
     end
   end
 end

data/lib/hanami/providers/assets.rb

@@ -9,7 +9,7 @@ module Hanami
     #
     # @api private
     # @since 2.0.0
-    class Assets < Dry::System::Provider::Source
+    class Assets < Hanami::Provider::Source
       # @api private
       def prepare
         require "hanami/assets"
@@ -17,9 +17,9 @@ module Hanami
 
       # @api private
       def start
-        root = target.app.root.join("public", "assets", Hanami::Assets.public_assets_dir(target).to_s)
+        root = slice.app.root.join("public", "assets", Hanami::Assets.public_assets_dir(target).to_s)
 
-        assets = Hanami::Assets.new(config: target.config.assets, root: root)
+        assets = Hanami::Assets.new(config: slice.config.assets, root: root)
 
         register(:assets, assets)
       end

data/lib/hanami/providers/db/adapter.rb

@@ -4,7 +4,7 @@ require "dry/configurable"
 
 module Hanami
   module Providers
-    class DB < Dry::System::Provider::Source
+    class DB < Hanami::Provider::Source
       # @api public
       # @since 2.2.0
       class Adapter
@@ -30,6 +30,13 @@ module Hanami
           @skip_defaults[setting_name]
         end
 
+        # @api private
+        def configure_from_adapter(other_adapter)
+          return if skip_defaults?
+
+          plugins.concat(other_adapter.plugins).uniq! unless skip_defaults?(:plugins)
+        end
+
         # @api private
         def configure_for_database(database_url)
         end

data/lib/hanami/providers/db/adapters.rb

@@ -2,7 +2,7 @@
 
 module Hanami
   module Providers
-    class DB < Dry::System::Provider::Source
+    class DB < Hanami::Provider::Source
       # @api public
       # @since 2.2.0
       class Adapters
@@ -17,6 +17,12 @@ module Hanami
 
         def_delegators :adapters, :[], :[]=, :each, :to_h
 
+        # @api private
+        # @since 2.2.0
+        def self.new_adapter(name)
+          ADAPTER_CLASSES[name].new
+        end
+
         # @api private
         # @since 2.2.0
         attr_reader :adapters
@@ -25,7 +31,7 @@ module Hanami
         # @since 2.2.0
         def initialize
           @adapters = Hash.new do |hsh, key|
-            hsh[key] = ADAPTER_CLASSES[key].new
+            hsh[key] = self.class.new_adapter(key)
           end
         end
 

data/lib/hanami/providers/db/config.rb

@@ -4,12 +4,20 @@ require "dry/core"
 
 module Hanami
   module Providers
-    class DB < Dry::System::Provider::Source
+    class DB < Hanami::Provider::Source
       # @api public
       # @since 2.2.0
       class Config < Dry::Configurable::Config
         include Dry::Core::Constants
 
+        # @api public
+        # @since 2.2.0
+        def gateway(key)
+          gateway = (gateways[key] ||= Gateway.new)
+          yield gateway if block_given?
+          gateway
+        end
+
         # @api public
         # @since 2.2.0
         def adapter_name
@@ -30,34 +38,22 @@ module Hanami
         # @since 2.2.0
         def any_adapter
           adapter = (adapters[nil] ||= Adapter.new)
-          yield adapter  if block_given?
+          yield adapter if block_given?
           adapter
         end
 
         # @api private
-        # @since 2.2.0
-        def gateway_cache_keys
-          adapters[adapter_name].gateway_cache_keys
-        end
-
-        # @api private
-        # @since 2.2.0
-        def gateway_options
-          adapters[adapter_name].gateway_options
-        end
-
-        # @api public
-        # @since 2.2.0
         def each_plugin
-          universal_plugins = adapters[nil].plugins
-          adapter_plugins = adapters[adapter_name].plugins
+          return to_enum(__method__) unless block_given?
 
-          plugins = universal_plugins + adapter_plugins
+          universal_plugins = adapters[nil].plugins
 
-          return to_enum(__method__) unless block_given?
+          gateways.values.group_by(&:adapter_name).each do |adapter_name, adapter_gateways|
+            per_adapter_plugins = adapter_gateways.map { _1.adapter.plugins }.flatten(1)
 
-          plugins.each do |plugin_spec, config_block|
-            yield plugin_spec, config_block
+            (universal_plugins + per_adapter_plugins).uniq.each do |plugin_spec, config_block|
+              yield adapter_name, plugin_spec, config_block
+            end
           end
         end
       end

data/lib/hanami/providers/db/gateway.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "dry/configurable"
+require "dry/core"
+
+module Hanami
+  module Providers
+    class DB < Hanami::Provider::Source
+      # @api public
+      # @since 2.2.0
+      class Gateway
+        include Dry::Core::Constants
+        include Dry::Configurable
+
+        setting :database_url
+        setting :adapter_name, default: :sql
+        setting :adapter, mutable: true
+
+        # @api public
+        # @since 2.2.0
+        def adapter(name = Undefined)
+          return config.adapter if name.eql?(Undefined)
+
+          if block_given?
+            # If a block is given, explicitly configure the gateway's adapter
+            config.adapter_name = name
+            adapter = (config.adapter ||= Adapters.new_adapter(name))
+            yield adapter
+            adapter
+          else
+            # If an adapter name is given without a block, use the default adapter configured with
+            # the same name
+            config.adapter_name = adapter_name
+          end
+        end
+
+        # @api private
+        def configure_adapter(default_adapters)
+          default_adapter = default_adapters[config.adapter_name]
+          config.adapter ||= default_adapter.dup
+
+          config.adapter.configure_from_adapter(default_adapter)
+          config.adapter.configure_from_adapter(default_adapters[nil])
+          config.adapter.configure_for_database(config.database_url)
+
+          self
+        end
+
+        # @api private
+        def cache_keys
+          [config.database_url, config.adapter.gateway_cache_keys]
+        end
+
+        private
+
+        def method_missing(name, *args, &block)
+          if config.respond_to?(name)
+            config.public_send(name, *args, &block)
+          else
+            super
+          end
+        end
+
+        def respond_to_missing?(name, _include_all = false)
+          config.respond_to?(name) || super
+        end
+      end
+    end
+  end
+end

data/lib/hanami/providers/db/sql_adapter.rb

@@ -2,7 +2,7 @@
 
 module Hanami
   module Providers
-    class DB < Dry::System::Provider::Source
+    class DB < Hanami::Provider::Source
       # @api public
       # @since 2.2.0
       class SQLAdapter < Adapter
@@ -22,6 +22,20 @@ module Hanami
           config.extensions ||= []
         end
 
+        # @api private
+        def configure_from_adapter(other_adapter)
+          super
+
+          return if skip_defaults?
+
+          # As part of gateway configuration, every gateway will receive the "any adapter" here,
+          # which is a plain `Adapter`, not an `SQLAdapter`. Its configuration will have been merged
+          # by `super`, so no further work is required.
+          return unless other_adapter.is_a?(self.class)
+
+          extensions.concat(other_adapter.extensions).uniq! unless skip_defaults?(:extensions)
+        end
+
         # @api private
         def configure_for_database(database_url)
           return if skip_defaults?
@@ -34,13 +48,19 @@ module Hanami
         private def configure_plugins
           return if skip_defaults?(:plugins)
 
-          plugin relations: :instrumentation do |plugin|
-            plugin.notifications = target["notifications"]
-          end
+          # Configure the plugin via a frozen proc, so it can be properly uniq'ed when configured
+          # for multiple gateways. See `Hanami::Providers::DB::Config#each_plugin`.
+          plugin(relations: :instrumentation, &INSTRUMENTATION_PLUGIN_CONFIG)
 
           plugin relations: :auto_restrictions
         end
 
+        # @api private
+        INSTRUMENTATION_PLUGIN_CONFIG = -> plugin {
+          plugin.notifications = target["notifications"]
+        }.freeze
+        private_constant :INSTRUMENTATION_PLUGIN_CONFIG
+
         # @api private
         private def configure_extensions(database_url)
           return if skip_defaults?(:extensions)
@@ -53,7 +73,7 @@ module Hanami
           )
 
           # Extensions for specific databases
-          if database_url.to_s.start_with?("postgresql://")
+          if database_url.to_s.start_with?(%r{postgres(ql)*://}) # FIXME: what is the canonical postgres URL?
             extension(
               :pg_array,
               :pg_enum,