hanami 2.1.0 → 2.2.0.beta1

data/spec/integration/slices/slice_configuration_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe "Slices / Slice configuration", :app_integration do
           class App < Hanami::App
             config.logger.stream = StringIO.new
 
-            config.no_auto_register_paths << "structs"
+            config.no_auto_register_paths = ["structs"]
           end
         end
       RUBY
@@ -34,9 +34,9 @@ RSpec.describe "Slices / Slice configuration", :app_integration do
 
       require "hanami/prepare"
 
-      expect(TestApp::App.config.no_auto_register_paths).to eq %w[entities structs]
-      expect(Main::Slice.config.no_auto_register_paths).to eq %w[entities structs schemas]
-      expect(Search::Slice.config.no_auto_register_paths).to eq %w[entities structs]
+      expect(TestApp::App.config.no_auto_register_paths).to eq %w[structs]
+      expect(Main::Slice.config.no_auto_register_paths).to eq %w[structs schemas]
+      expect(Search::Slice.config.no_auto_register_paths).to eq %w[structs]
     end
   end
 end

data/spec/integration/view/config/template_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe "App view / Config / Template", :app_integration do
   subject(:template) { view_class.config.template }
   let(:view_class) { TestApp::Views::Article::Index }
 
-  it "configures the tempalte to match the class name" do
+  it "configures the template to match the class name" do
     expect(template).to eq "article/index"
   end
 end

data/spec/integration/view/context/request_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe "App view / Context / Request", :app_integration do
     end
   end
 
-  describe "#sesion" do
+  describe "#session" do
     let(:session) { double(:session) }
 
     before do

data/spec/support/app_integration.rb

@@ -118,6 +118,9 @@ RSpec.configure do |config|
     Hanami.instance_variable_set(:@_bundled, {})
     Hanami.remove_instance_variable(:@_app) if Hanami.instance_variable_defined?(:@_app)
 
+    # Clear cached DB gateways across slices
+    Hanami::Providers::DB.cache.clear
+
     $LOAD_PATH.replace(@load_paths)
 
     # Remove example-specific LOADED_FEATURES added when running each example

data/spec/unit/hanami/config/db_spec.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "hanami/config"
+
+RSpec.describe Hanami::Config, "#db" do
+  let(:config) { described_class.new(app_name: app_name, env: :development) }
+  let(:app_name) { "MyApp::App" }
+
+  subject(:db) { config.db }
+
+  context "hanami-router is bundled" do
+    it "is a full router configuration" do
+      is_expected.to be_an_instance_of(Hanami::Config::DB)
+
+      is_expected.to respond_to(:import_from_parent)
+    end
+
+    it "can be finalized" do
+      is_expected.to respond_to(:finalize!)
+    end
+  end
+
+  context "hanami-db is not bundled" do
+    before do
+      allow(Hanami).to receive(:bundled?).and_call_original
+      allow(Hanami).to receive(:bundled?).with("hanami-db").and_return(false)
+    end
+
+    it "does not expose any settings" do
+      is_expected.to be_an_instance_of(Hanami::Config::NullConfig)
+      is_expected.not_to respond_to(:import_from_parent)
+    end
+
+    it "can be finalized" do
+      is_expected.to respond_to(:finalize!)
+    end
+  end
+end

data/spec/unit/hanami/config/router_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Hanami::Config, "#router" do
   context "hanami-router is not bundled" do
     before do
       allow(Hanami).to receive(:bundled?).and_call_original
-      expect(Hanami).to receive(:bundled?).with("hanami-router").and_return(false)
+      allow(Hanami).to receive(:bundled?).with("hanami-router").and_return(false)
     end
 
     it "does not expose any settings" do

data/spec/unit/hanami/helpers/form_helper_spec.rb

@@ -80,8 +80,8 @@ RSpec.describe Hanami::Helpers::FormHelper do
     end
 
     it "allows to specify HTML attributes" do
-      html = form_for("/books", class: "form-horizonal")
-      expect(html).to eq %(<form action="/books" class="form-horizonal" accept-charset="utf-8" method="POST"></form>)
+      html = form_for("/books", class: "form-horizontal")
+      expect(html).to eq %(<form action="/books" class="form-horizontal" accept-charset="utf-8" method="POST"></form>)
     end
 
     context "input name" do
@@ -393,6 +393,29 @@ RSpec.describe Hanami::Helpers::FormHelper do
 
       expect(html).to eq_html(expected)
     end
+
+    context "with base name" do
+      let(:params) { {book: {categories: [{name: "foo"}, {name: "bar"}]}} }
+
+      it "renders" do
+        html = render(<<~ERB)
+          <%= form_for("book", "/books") do |f| %>
+            <% f.fields_for_collection "categories" do |fa| %>
+              <%= fa.text_field :name %>
+            <% end %>
+          <% end %>
+        ERB
+
+        expected = <<~HTML
+          <form action="/books" accept-charset="utf-8" method="POST">
+            <input type="text" name="book[categories][][name]" id="book-categories-0-name" value="foo">
+            <input type="text" name="book[categories][][name]" id="book-categories-1-name" value="bar">
+          </form>
+        HTML
+
+        expect(html).to eq_html(expected)
+      end
+    end
   end
 
   describe "#label" do
@@ -404,6 +427,14 @@ RSpec.describe Hanami::Helpers::FormHelper do
       expect(html).to include %(<label for="book-free-shipping">Free shipping</label>)
     end
 
+    it "accepts a symbol" do
+      html = form_for("/books") do |f|
+        f.label :free_shipping
+      end
+
+      expect(html).to include %(<label for="free-shipping">Free shipping</label>)
+    end
+
     it "accepts a string as custom content" do
       html = form_for("/books") do |f|
         f.label "Free Shipping!", for: "book.free_shipping"

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

@@ -0,0 +1,107 @@
+# 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.configure_provider(:db)
+    Hanami.app.container.providers[:db]
+  }
+
+  before do
+    module TestApp
+      class App < Hanami::App
+      end
+    end
+  end
+
+  specify "database_url = nil" do
+    expect(config.database_url).to be nil
+  end
+
+  specify "adapter = :sql" do
+    expect(config.adapter).to eq :sql
+  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,206 @@
+# 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.configure_provider(:db)
+    Hanami.app.container.providers[:db]
+  }
+
+  before do
+    module TestApp
+      class App < Hanami::App
+      end
+    end
+  end
+
+  describe "#adapter_name" do
+    it "aliases #adapter" do
+      expect { config.adapter = :yaml }
+        .to change { config.adapter_name }
+        .to :yaml
+    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
+
+      # TODO clear
+    end
+  end
+
+  describe "#gateway_cache_keys" do
+    it "returns the cache keys from the currently configured adapter" do
+      config.adapter(:sql) { |a| a.clear; a.extension :foo }
+      config.adapter = :sql
+
+      expect(config.gateway_cache_keys).to eq(config.adapter(:sql).gateway_cache_keys)
+    end
+  end
+
+  describe "#gateway_options" do
+    it "returns the options from the currently configured adapter" do
+      config.adapter(:sql) { |a| a.clear; a.extension :foo }
+      config.adapter = :sql
+
+      expect(config.gateway_options).to eq(config.adapter(:sql).gateway_options)
+    end
+  end
+
+  describe "#each_plugin" do
+    before do
+      config.any_adapter { |a| a.plugin relations: :any_foo }
+      config.adapter(:yaml) { |a| a.plugin relations: :yaml_foo }
+      config.adapter = :yaml
+    end
+
+    it "yields the plugins specified for any adapter as well as the currently configured adapter" do
+      expect { |b| config.each_plugin(&b) }
+        .to yield_successive_args(
+          [{relations: :any_foo}, nil],
+          [{relations: :yaml_foo}, nil]
+        )
+    end
+
+    it "returns the plugins as an enumerator if no block is given" do
+      expect(config.each_plugin.to_a).to eq [
+        [{relations: :any_foo}, nil],
+        [{relations: :yaml_foo}, nil]
+      ]
+    end
+  end
+end

data/spec/unit/hanami/slice_spec.rb

@@ -8,7 +8,27 @@ RSpec.describe Hanami::Slice, :app_integration do
     end
   end
 
-  describe ".environemnt" do
+  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) }
 
     before do
@@ -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.0")
+    expect(Hanami::VERSION).to eq("2.2.0.beta1")
   end
 end