hanami 2.1.1 → 2.2.0.beta2

data/spec/unit/hanami/providers/db/config/default_config_spec.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require "dry/system"
+require "hanami/providers/db"
+
+RSpec.describe "Hanami::Providers::DB / Config / Default config", :app_integration do
+  subject(:config) { provider.source.config }
+
+  let(:provider) {
+    Hanami.app.prepare
+    Hanami.app.configure_provider(:db)
+    Hanami.app.container.providers[:db]
+  }
+
+  before do
+    module TestApp
+      class App < Hanami::App
+      end
+    end
+  end
+
+  specify %(relations_path = "relations") do
+    expect(config)
+  end
+
+  describe "sql adapter" do
+    before do
+      skip_defaults if respond_to?(:skip_defaults)
+      config.adapter(:sql).configure_for_database("mysql://localhost/test_app_development")
+    end
+
+    describe "plugins" do
+      specify do
+        expect(config.adapter(:sql).plugins).to match [
+          [{relations: :instrumentation}, instance_of(Proc)],
+          [{relations: :auto_restrictions}, nil],
+        ]
+      end
+
+      describe "skipping defaults" do
+        def skip_defaults
+          config.adapter(:sql).skip_defaults :plugins
+        end
+
+        it "configures no plugins" do
+          expect(config.adapter(:sql).plugins).to eq []
+        end
+      end
+    end
+
+    describe "extensions" do
+      specify do
+        expect(config.adapter(:sql).extensions).to eq [
+          :caller_logging,
+          :error_sql,
+          :sql_comments
+        ]
+      end
+
+      describe "skipping defaults" do
+        def skip_defaults
+          config.adapter(:sql).skip_defaults :extensions
+        end
+
+        it "configures no extensions" do
+          expect(config.adapter(:sql).extensions).to eq []
+        end
+      end
+    end
+
+    describe "skipping all defaults" do
+      def skip_defaults
+        config.adapter(:sql).skip_defaults
+      end
+
+      it "configures no plugins or extensions" do
+        expect(config.adapter(:sql).plugins).to eq []
+        expect(config.adapter(:sql).extensions).to eq []
+      end
+    end
+  end
+
+  describe "sql adapter for postgres" do
+    before do
+      config.adapter(:sql).configure_for_database("postgresql://localhost/test_app_development")
+    end
+
+    specify "extensions" do
+      expect(config.adapters[:sql].extensions).to eq [
+        :caller_logging,
+        :error_sql,
+        :sql_comments,
+        :pg_array,
+        :pg_enum,
+        :pg_json,
+        :pg_range
+      ]
+    end
+  end
+end

data/spec/unit/hanami/providers/db/config_spec.rb

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+require "dry/system"
+require "hanami/providers/db"
+
+RSpec.describe "Hanami::Providers::DB.config", :app_integration do
+  subject(:config) { provider.source.config }
+
+  let(:provider) {
+    Hanami.app.prepare
+    Hanami.app.configure_provider(:db)
+    Hanami.app.container.providers[:db]
+  }
+
+  before do
+    module TestApp
+      class App < Hanami::App
+      end
+    end
+  end
+
+  describe "#adapter" do
+    it "adds an adapter" do
+      expect { config.adapter(:yaml) }
+        .to change { config.adapters.to_h }
+        .to hash_including(:yaml)
+    end
+
+    it "yields the adapter for configuration" do
+      expect { |b| config.adapter(:yaml, &b) }
+        .to yield_with_args(an_instance_of(Hanami::Providers::DB::Adapter))
+    end
+  end
+
+  describe "#any_adapter" do
+    it "adds an adapter keyed without a name" do
+      expect { config.any_adapter }
+        .to change { config.adapters.to_h }
+        .to hash_including(nil)
+    end
+
+    it "yields the adapter for configuration" do
+      expect { |b| config.any_adapter(&b) }
+        .to yield_with_args(an_instance_of(Hanami::Providers::DB::Adapter))
+    end
+  end
+
+  describe "adapters" do
+    subject(:adapter) { config.adapter(:yaml) }
+
+    describe "#plugin" do
+      it "adds a plugin without a block" do
+        expect { adapter.plugin relations: :foo }
+          .to change { adapter.plugins }
+          .to [[{relations: :foo}, nil]]
+      end
+
+      it "adds a plugin with a block" do
+        block = -> plugin_config { }
+
+        expect {
+          adapter.plugin(relations: :foo, &block)
+        }
+          .to change { adapter.plugins }
+          .to [[{relations: :foo}, block]]
+      end
+    end
+
+    describe "#plugins" do
+      it "can be cleared" do
+        adapter.plugin relations: :foo
+
+        expect { adapter.plugins.clear }
+          .to change { adapter.plugins }
+          .to []
+      end
+    end
+
+    describe "#gateway_cache_keys" do
+      it "includes the configured extensions" do
+        expect(adapter.gateway_cache_keys).to eq({})
+      end
+    end
+
+    describe "#gateway_options" do
+      specify do
+        expect(adapter.gateway_options).to eq({})
+      end
+    end
+
+    describe "#clear" do
+      it "clears previously configured plugins" do
+        adapter.plugin relations: :foo
+
+        expect { adapter.clear }.to change { adapter.plugins }.to([])
+      end
+    end
+
+    describe ":sql adapter" do
+      subject(:adapter) { config.adapter(:sql) }
+
+      describe "#extension" do
+        it "adds an extension" do
+          adapter.clear
+          expect { adapter.extension :foo }
+            .to change { adapter.extensions }
+            .to [:foo]
+        end
+
+        it "adds multiple extensions" do
+          adapter.clear
+          expect { adapter.extension :foo, :bar }
+            .to change { adapter.extensions }
+            .to [:foo, :bar]
+        end
+      end
+
+      describe "#extensions" do
+        it "can be cleareed" do
+          adapter.extension :foo
+
+          expect { adapter.extensions.clear }
+            .to change { adapter.extensions }
+            .to []
+        end
+      end
+
+      describe "#gateway_cache_keys" do
+        it "includes the configured extensions" do
+          adapter.clear
+          adapter.extension :foo, :bar
+          expect(adapter.gateway_cache_keys).to eq(extensions: [:foo, :bar])
+        end
+      end
+
+      describe "#gateway_options" do
+        it "includes the configured extensions" do
+          adapter.clear
+          adapter.extension :foo, :bar
+          expect(adapter.gateway_options).to eq(extensions: [:foo, :bar])
+        end
+      end
+
+      describe "#clear" do
+        it "clears previously configured plugins and extensions" do
+          adapter.plugin relations: :foo
+          adapter.extension :foo
+
+          expect { adapter.clear }
+            .to change { adapter.plugins }.to([])
+            .and change { adapter.extensions }.to([])
+        end
+      end
+    end
+  end
+end

data/spec/unit/hanami/slice_spec.rb

@@ -8,6 +8,26 @@ RSpec.describe Hanami::Slice, :app_integration do
     end
   end
 
+  describe ".app" do
+    subject(:slice) { Hanami.app.register_slice(:main) }
+
+    it "returns the top-level Hanami App slice" do
+      expect(slice.app).to eq Hanami.app
+    end
+  end
+
+  describe ".app?" do
+    it "returns true if the slice is Hanami.app" do
+      subject = Hanami.app
+      expect(subject.app?).to eq true
+    end
+
+    it "returns false if the slice is not Hanami.app" do
+      subject = Hanami.app.register_slice(:main)
+      expect(subject.app?).to eq false
+    end
+  end
+
   describe ".environment" do
     subject(:slice) { Hanami.app.register_slice(:main) }
 
@@ -46,4 +66,16 @@ RSpec.describe Hanami::Slice, :app_integration do
         .to raise_error Hanami::SliceLoadError, /Slice must have a class name/
     end
   end
+
+  describe ".source_path" do
+    it "provides a path to the app directory for Hanami.app" do
+      subject = Hanami.app
+      expect(subject.source_path).to eq Hanami.app.root.join("app")
+    end
+
+    it "provides a path to the slice root for a Slice" do
+      subject = Hanami.app.register_slice(:main)
+      expect(subject.source_path).to eq subject.root
+    end
+  end
 end

data/spec/unit/hanami/version_spec.rb

@@ -2,6 +2,6 @@
 
 RSpec.describe "Hanami::VERSION" do
   it "returns current version" do
-    expect(Hanami::VERSION).to eq("2.1.1")
+    expect(Hanami::VERSION).to eq("2.2.0.beta2")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-12 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -37,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -47,6 +50,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -77,6 +83,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -87,6 +96,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -120,22 +132,16 @@ dependencies:
   name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.1.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.1.0.beta2
 - !ruby/object:Gem::Dependency
   name: dry-logger
   requirement: !ruby/object:Gem::Requirement
@@ -160,30 +166,30 @@ dependencies:
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.2.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.2.0.beta2
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.2.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.2.beta
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +268,7 @@ files:
 - lib/hanami/config/actions/cookies.rb
 - lib/hanami/config/actions/sessions.rb
 - lib/hanami/config/assets.rb
+- lib/hanami/config/db.rb
 - lib/hanami/config/logger.rb
 - lib/hanami/config/null_config.rb
 - lib/hanami/config/router.rb
@@ -272,6 +279,7 @@ files:
 - lib/hanami/extensions.rb
 - lib/hanami/extensions/action.rb
 - lib/hanami/extensions/action/slice_configured_action.rb
+- lib/hanami/extensions/db/repo.rb
 - lib/hanami/extensions/router/errors.rb
 - lib/hanami/extensions/view.rb
 - lib/hanami/extensions/view/context.rb
@@ -291,10 +299,20 @@ files:
 - lib/hanami/middleware/render_errors.rb
 - lib/hanami/port.rb
 - lib/hanami/prepare.rb
+- lib/hanami/provider/source.rb
+- lib/hanami/provider_registrar.rb
 - lib/hanami/providers/assets.rb
+- lib/hanami/providers/db.rb
+- lib/hanami/providers/db/adapter.rb
+- lib/hanami/providers/db/adapters.rb
+- lib/hanami/providers/db/config.rb
+- lib/hanami/providers/db/gateway.rb
+- lib/hanami/providers/db/sql_adapter.rb
+- lib/hanami/providers/db_logging.rb
 - lib/hanami/providers/inflector.rb
 - lib/hanami/providers/logger.rb
 - lib/hanami/providers/rack.rb
+- lib/hanami/providers/relations.rb
 - lib/hanami/providers/routes.rb
 - lib/hanami/rake_tasks.rb
 - lib/hanami/routes.rb
@@ -336,10 +354,24 @@ files:
 - spec/integration/container/autoloader_spec.rb
 - spec/integration/container/imports_spec.rb
 - spec/integration/container/prepare_container_spec.rb
+- spec/integration/container/provider_environment_spec.rb
 - spec/integration/container/provider_lifecycle_spec.rb
 - spec/integration/container/shutdown_spec.rb
 - spec/integration/container/standard_providers/rack_provider_spec.rb
 - spec/integration/container/standard_providers_spec.rb
+- spec/integration/db/auto_registration_spec.rb
+- spec/integration/db/commands_spec.rb
+- spec/integration/db/db_inflector_spec.rb
+- spec/integration/db/db_slices_spec.rb
+- spec/integration/db/db_spec.rb
+- spec/integration/db/gateways_spec.rb
+- spec/integration/db/logging_spec.rb
+- spec/integration/db/mappers_spec.rb
+- spec/integration/db/provider_config_spec.rb
+- spec/integration/db/provider_spec.rb
+- spec/integration/db/relations_spec.rb
+- spec/integration/db/repo_spec.rb
+- spec/integration/db/slices_importing_from_parent.rb
 - spec/integration/dotenv_loading_spec.rb
 - spec/integration/logging/exception_logging_spec.rb
 - spec/integration/logging/notifications_spec.rb
@@ -403,6 +435,7 @@ files:
 - spec/unit/hanami/config/actions/sessions_spec.rb
 - spec/unit/hanami/config/actions_spec.rb
 - spec/unit/hanami/config/base_url_spec.rb
+- spec/unit/hanami/config/db_spec.rb
 - spec/unit/hanami/config/inflector_spec.rb
 - spec/unit/hanami/config/logger_spec.rb
 - spec/unit/hanami/config/render_detailed_errors_spec.rb
@@ -421,6 +454,8 @@ files:
 - spec/unit/hanami/helpers/assets_helper/video_tag_spec.rb
 - spec/unit/hanami/helpers/form_helper_spec.rb
 - spec/unit/hanami/port_spec.rb
+- spec/unit/hanami/providers/db/config/default_config_spec.rb
+- spec/unit/hanami/providers/db/config_spec.rb
 - spec/unit/hanami/router/errors/not_allowed_error_spec.rb
 - spec/unit/hanami/router/errors/not_found_error_spec.rb
 - spec/unit/hanami/settings/env_store_spec.rb
@@ -444,14 +479,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: The web, with simplicity
@@ -478,10 +513,24 @@ test_files:
 - spec/integration/container/autoloader_spec.rb
 - spec/integration/container/imports_spec.rb
 - spec/integration/container/prepare_container_spec.rb
+- spec/integration/container/provider_environment_spec.rb
 - spec/integration/container/provider_lifecycle_spec.rb
 - spec/integration/container/shutdown_spec.rb
 - spec/integration/container/standard_providers/rack_provider_spec.rb
 - spec/integration/container/standard_providers_spec.rb
+- spec/integration/db/auto_registration_spec.rb
+- spec/integration/db/commands_spec.rb
+- spec/integration/db/db_inflector_spec.rb
+- spec/integration/db/db_slices_spec.rb
+- spec/integration/db/db_spec.rb
+- spec/integration/db/gateways_spec.rb
+- spec/integration/db/logging_spec.rb
+- spec/integration/db/mappers_spec.rb
+- spec/integration/db/provider_config_spec.rb
+- spec/integration/db/provider_spec.rb
+- spec/integration/db/relations_spec.rb
+- spec/integration/db/repo_spec.rb
+- spec/integration/db/slices_importing_from_parent.rb
 - spec/integration/dotenv_loading_spec.rb
 - spec/integration/logging/exception_logging_spec.rb
 - spec/integration/logging/notifications_spec.rb
@@ -545,6 +594,7 @@ test_files:
 - spec/unit/hanami/config/actions/sessions_spec.rb
 - spec/unit/hanami/config/actions_spec.rb
 - spec/unit/hanami/config/base_url_spec.rb
+- spec/unit/hanami/config/db_spec.rb
 - spec/unit/hanami/config/inflector_spec.rb
 - spec/unit/hanami/config/logger_spec.rb
 - spec/unit/hanami/config/render_detailed_errors_spec.rb
@@ -563,6 +613,8 @@ test_files:
 - spec/unit/hanami/helpers/assets_helper/video_tag_spec.rb
 - spec/unit/hanami/helpers/form_helper_spec.rb
 - spec/unit/hanami/port_spec.rb
+- spec/unit/hanami/providers/db/config/default_config_spec.rb
+- spec/unit/hanami/providers/db/config_spec.rb
 - spec/unit/hanami/router/errors/not_allowed_error_spec.rb
 - spec/unit/hanami/router/errors/not_found_error_spec.rb
 - spec/unit/hanami/settings/env_store_spec.rb