hanami 2.0.2 → 2.1.0.beta1

data/spec/unit/hanami/router/errors/not_allowed_error_spec.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "hanami/router"
+require "hanami/extensions/router/errors"
+
+RSpec.describe(Hanami::Router::NotAllowedError) do
+  subject(:error) { described_class.new(env, allowed_methods) }
+
+  let(:env) { Rack::MockRequest.env_for("http://example.com/example", method: "POST") }
+  let(:allowed_methods) { ["GET", "HEAD"] }
+
+  it "is a Hanami::Router::Error" do
+    expect(error.class).to be < Hanami::Router::Error
+  end
+
+  it "returns a relevant message" do
+    expect(error.to_s).to eq "Only GET, HEAD requests are allowed at /example"
+  end
+
+  it "returns the env" do
+    expect(error.env).to be env
+  end
+
+  it "returns the allowed methods" do
+    expect(error.allowed_methods).to be allowed_methods
+  end
+end

data/spec/unit/hanami/router/errors/not_found_error_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "hanami/router"
+require "hanami/extensions/router/errors"
+
+RSpec.describe(Hanami::Router::NotFoundError) do
+  subject(:error) { described_class.new(env) }
+
+  let(:env) { Rack::MockRequest.env_for("http://example.com/example", method: "GET") }
+
+  it "is a Hanami::Router::Error" do
+    expect(error.class).to be < Hanami::Router::Error
+  end
+
+  it "returns a relevant message" do
+    expect(error.to_s).to eq "No route found for GET /example"
+  end
+
+  it "returns the env" do
+    expect(error.env).to be env
+  end
+end

data/spec/unit/hanami/slice_configurable_spec.rb

@@ -72,6 +72,24 @@ RSpec.describe Hanami::SliceConfigurable, :app_integration do
     end
   end
 
+  context "subclass inside slice with name overlapping another slice" do
+    let(:app_modules) { super() << :ExternalAdmin }
+
+    before do
+      TestApp::App.register_slice :external_admin
+
+      module ExternalAdmin
+        class MySubclass < TestApp::BaseClass; end
+      end
+    end
+
+    subject(:subclass) { ExternalAdmin::MySubclass }
+
+    it "calls `configure_for_slice` with the correct matching slice" do
+      expect(subclass.traces).to eq [ExternalAdmin::Slice]
+    end
+  end
+
   context "class inside app" do
     before do
       module TestApp

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.0.2")
+    expect(Hanami::VERSION).to eq("2.1.0.beta1")
   end
 end

data/spec/unit/hanami/web/rack_logger_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Hanami::Web::RackLogger do
       verb = "POST"
 
       env = Rack::MockRequest.env_for(path, method: verb)
-      env["Content-Length"] = content_length
+      env["CONTENT_LENGTH"] = content_length
       env["REMOTE_ADDR"] = ip
 
       params = {"user" => {"password" => "secret"}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-25 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,28 +162,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.beta
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.beta
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -273,10 +273,20 @@ files:
 - lib/hanami/extensions.rb
 - lib/hanami/extensions/action.rb
 - lib/hanami/extensions/action/slice_configured_action.rb
+- lib/hanami/extensions/router/errors.rb
 - lib/hanami/extensions/view.rb
 - lib/hanami/extensions/view/context.rb
+- lib/hanami/extensions/view/part.rb
+- lib/hanami/extensions/view/scope.rb
 - lib/hanami/extensions/view/slice_configured_context.rb
+- lib/hanami/extensions/view/slice_configured_helpers.rb
 - lib/hanami/extensions/view/slice_configured_view.rb
+- lib/hanami/extensions/view/standard_helpers.rb
+- lib/hanami/helpers/form_helper.rb
+- lib/hanami/helpers/form_helper/form_builder.rb
+- lib/hanami/helpers/form_helper/values.rb
+- lib/hanami/middleware/public_errors_app.rb
+- lib/hanami/middleware/render_errors.rb
 - lib/hanami/port.rb
 - lib/hanami/prepare.rb
 - lib/hanami/providers/inflector.rb
@@ -305,9 +315,9 @@ files:
 - spec/integration/action/routes_spec.rb
 - spec/integration/action/sessions_spec.rb
 - spec/integration/action/slice_configuration_spec.rb
-- spec/integration/action/view_integration_spec.rb
 - spec/integration/action/view_rendering/automatic_rendering_spec.rb
 - spec/integration/action/view_rendering/paired_view_inference_spec.rb
+- spec/integration/action/view_rendering/view_context_spec.rb
 - spec/integration/action/view_rendering_spec.rb
 - spec/integration/code_loading/loading_from_app_spec.rb
 - spec/integration/code_loading/loading_from_lib_spec.rb
@@ -337,29 +347,35 @@ files:
 - spec/integration/slices/external_slice_spec.rb
 - spec/integration/slices/slice_configuration_spec.rb
 - spec/integration/slices/slice_loading_spec.rb
+- spec/integration/slices/slice_registrations_spec.rb
 - spec/integration/slices/slice_routing_spec.rb
 - spec/integration/slices_spec.rb
+- spec/integration/view/config/default_context_spec.rb
+- spec/integration/view/config/inflector_spec.rb
+- spec/integration/view/config/part_class_spec.rb
+- spec/integration/view/config/part_namespace_spec.rb
+- spec/integration/view/config/paths_spec.rb
+- spec/integration/view/config/scope_class_spec.rb
+- spec/integration/view/config/scope_namespace_spec.rb
+- spec/integration/view/config/template_spec.rb
 - spec/integration/view/context/assets_spec.rb
 - spec/integration/view/context/inflector_spec.rb
 - spec/integration/view/context/request_spec.rb
 - spec/integration/view/context/routes_spec.rb
 - spec/integration/view/context/settings_spec.rb
-- spec/integration/view/inflector_spec.rb
-- spec/integration/view/part_namespace_spec.rb
-- spec/integration/view/path_spec.rb
+- spec/integration/view/helpers/form_helper_spec.rb
+- spec/integration/view/helpers/part_helpers_spec.rb
+- spec/integration/view/helpers/scope_helpers_spec.rb
+- spec/integration/view/helpers/user_defined_helpers/part_helpers_spec.rb
+- spec/integration/view/helpers/user_defined_helpers/scope_helpers_spec.rb
 - spec/integration/view/slice_configuration_spec.rb
-- spec/integration/view/template_spec.rb
 - spec/integration/view/views_spec.rb
-- spec/isolation/hanami/application/already_configured_spec.rb
-- spec/isolation/hanami/application/inherit_anonymous_class_spec.rb
-- spec/isolation/hanami/application/inherit_concrete_class_spec.rb
-- spec/isolation/hanami/application/not_configured_spec.rb
-- spec/isolation/hanami/application/routes/configured_spec.rb
-- spec/isolation/hanami/application/routes/not_configured_spec.rb
-- spec/isolation/hanami/boot/success_spec.rb
+- spec/integration/web/render_detailed_errors_spec.rb
+- spec/integration/web/render_errors_spec.rb
 - spec/spec_helper.rb
 - spec/support/app_integration.rb
 - spec/support/coverage.rb
+- spec/support/matchers.rb
 - spec/support/rspec.rb
 - spec/support/shared_examples/cli/generate/app.rb
 - spec/support/shared_examples/cli/generate/migration.rb
@@ -374,11 +390,17 @@ files:
 - spec/unit/hanami/config/base_url_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
+- spec/unit/hanami/config/render_errors_spec.rb
 - spec/unit/hanami/config/router_spec.rb
 - spec/unit/hanami/config/slices_spec.rb
 - spec/unit/hanami/config/views_spec.rb
 - spec/unit/hanami/env_spec.rb
+- spec/unit/hanami/extensions/view/context_spec.rb
+- spec/unit/hanami/helpers/form_helper_spec.rb
 - spec/unit/hanami/port_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
 - spec/unit/hanami/settings_spec.rb
 - spec/unit/hanami/slice_configurable_spec.rb
@@ -403,11 +425,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: The web, with simplicity
@@ -418,9 +440,9 @@ test_files:
 - spec/integration/action/routes_spec.rb
 - spec/integration/action/sessions_spec.rb
 - spec/integration/action/slice_configuration_spec.rb
-- spec/integration/action/view_integration_spec.rb
 - spec/integration/action/view_rendering/automatic_rendering_spec.rb
 - spec/integration/action/view_rendering/paired_view_inference_spec.rb
+- spec/integration/action/view_rendering/view_context_spec.rb
 - spec/integration/action/view_rendering_spec.rb
 - spec/integration/code_loading/loading_from_app_spec.rb
 - spec/integration/code_loading/loading_from_lib_spec.rb
@@ -450,29 +472,35 @@ test_files:
 - spec/integration/slices/external_slice_spec.rb
 - spec/integration/slices/slice_configuration_spec.rb
 - spec/integration/slices/slice_loading_spec.rb
+- spec/integration/slices/slice_registrations_spec.rb
 - spec/integration/slices/slice_routing_spec.rb
 - spec/integration/slices_spec.rb
+- spec/integration/view/config/default_context_spec.rb
+- spec/integration/view/config/inflector_spec.rb
+- spec/integration/view/config/part_class_spec.rb
+- spec/integration/view/config/part_namespace_spec.rb
+- spec/integration/view/config/paths_spec.rb
+- spec/integration/view/config/scope_class_spec.rb
+- spec/integration/view/config/scope_namespace_spec.rb
+- spec/integration/view/config/template_spec.rb
 - spec/integration/view/context/assets_spec.rb
 - spec/integration/view/context/inflector_spec.rb
 - spec/integration/view/context/request_spec.rb
 - spec/integration/view/context/routes_spec.rb
 - spec/integration/view/context/settings_spec.rb
-- spec/integration/view/inflector_spec.rb
-- spec/integration/view/part_namespace_spec.rb
-- spec/integration/view/path_spec.rb
+- spec/integration/view/helpers/form_helper_spec.rb
+- spec/integration/view/helpers/part_helpers_spec.rb
+- spec/integration/view/helpers/scope_helpers_spec.rb
+- spec/integration/view/helpers/user_defined_helpers/part_helpers_spec.rb
+- spec/integration/view/helpers/user_defined_helpers/scope_helpers_spec.rb
 - spec/integration/view/slice_configuration_spec.rb
-- spec/integration/view/template_spec.rb
 - spec/integration/view/views_spec.rb
-- spec/isolation/hanami/application/already_configured_spec.rb
-- spec/isolation/hanami/application/inherit_anonymous_class_spec.rb
-- spec/isolation/hanami/application/inherit_concrete_class_spec.rb
-- spec/isolation/hanami/application/not_configured_spec.rb
-- spec/isolation/hanami/application/routes/configured_spec.rb
-- spec/isolation/hanami/application/routes/not_configured_spec.rb
-- spec/isolation/hanami/boot/success_spec.rb
+- spec/integration/web/render_detailed_errors_spec.rb
+- spec/integration/web/render_errors_spec.rb
 - spec/spec_helper.rb
 - spec/support/app_integration.rb
 - spec/support/coverage.rb
+- spec/support/matchers.rb
 - spec/support/rspec.rb
 - spec/support/shared_examples/cli/generate/app.rb
 - spec/support/shared_examples/cli/generate/migration.rb
@@ -487,11 +515,17 @@ test_files:
 - spec/unit/hanami/config/base_url_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
+- spec/unit/hanami/config/render_errors_spec.rb
 - spec/unit/hanami/config/router_spec.rb
 - spec/unit/hanami/config/slices_spec.rb
 - spec/unit/hanami/config/views_spec.rb
 - spec/unit/hanami/env_spec.rb
+- spec/unit/hanami/extensions/view/context_spec.rb
+- spec/unit/hanami/helpers/form_helper_spec.rb
 - spec/unit/hanami/port_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
 - spec/unit/hanami/settings_spec.rb
 - spec/unit/hanami/slice_configurable_spec.rb

data/spec/integration/action/view_integration_spec.rb

@@ -1,165 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "App action / View integration", :app_integration do
-  before do
-    module TestApp
-      class App < Hanami::App
-      end
-    end
-
-    Hanami.app.instance_eval(&app_hook) if respond_to?(:app_hook)
-    Hanami.app.prepare
-
-    module TestApp
-      class Action < Hanami::Action; end
-    end
-
-    module TestApp
-      module Actions
-        module Articles
-          class Index < TestApp::Action; end
-        end
-      end
-    end
-  end
-
-  let(:action_class) { TestApp::Actions::Articles::Index }
-  subject(:action) { action_class.new(**action_args) }
-  let(:action_args) { {} }
-
-  describe "#view_context" do
-    subject(:view_context) { action.view_context }
-
-    context "Explicitly injected view context" do
-      let(:view_context) { double(:view_context) }
-      let(:action_args) { {view_context: view_context} }
-
-      it "returns the injected object" do
-        is_expected.to eql view_context
-      end
-    end
-
-    context "No view context registered" do
-      it "is nil" do
-        is_expected.to be_nil
-      end
-    end
-
-    context "Default view context identifier" do
-      context "View context registered in slice" do
-        before do
-          TestApp::App.register "views.context", slice_view_context
-        end
-
-        let(:slice_view_context) { double(:slice_view_context) }
-
-        it "is the slice's view context" do
-          is_expected.to eql slice_view_context
-        end
-      end
-
-      context "View context registered in app" do
-        before do
-          Hanami.app.register "views.context", app_view_context
-        end
-
-        let(:app_view_context) { double(:app_view_context) }
-
-        it "is the apps's view context" do
-          is_expected.to eql app_view_context
-        end
-      end
-    end
-
-    context "custom view context identifier" do
-      let(:app_hook) {
-        proc do |app|
-          app.config.actions.view_context_identifier = "view.custom_context"
-        end
-      }
-
-      before do
-        TestApp::App.register "view.custom_context", custom_view_context
-      end
-
-      let(:custom_view_context) { double(:custom_view_context) }
-
-      it "is the context registered with the custom identifier" do
-        is_expected.to eql custom_view_context
-      end
-    end
-  end
-
-  describe "#view_options" do
-    subject(:view_options) { action.send(:view_options, req, res) }
-    let(:req) { double(:req) }
-    let(:res) { double(:res) }
-
-    context "without view context" do
-      it "is an empty hash" do
-        is_expected.to eq({})
-      end
-    end
-
-    context "with view context" do
-      let(:initial_view_context) { double(:initial_view_context) }
-      let(:action_args) { {view_context: initial_view_context} }
-
-      context "default #view_context_options" do
-        let(:request_view_context) { double(:request_view_context) }
-
-        before do
-          allow(initial_view_context).to receive(:with).with(
-            request: req,
-            response: res,
-          ) { request_view_context }
-        end
-
-        it "is the view context with the request and response provided" do
-          is_expected.to eq(context: request_view_context)
-        end
-      end
-
-      context "custom #view_context_options" do
-        let(:custom_view_context) { double(:custom_view_context)}
-
-        before do
-          action_class.class_eval do
-            def view_context_options(req, res)
-              {custom_option: "custom option"}
-            end
-          end
-
-          allow(initial_view_context).to receive(:with).with(
-            custom_option: "custom option"
-          ) { custom_view_context }
-        end
-
-        it "is the view context with the custom options provided" do
-          is_expected.to eq(context: custom_view_context)
-        end
-      end
-
-      context "specialized method (calling super) defined in action class" do
-        let(:request_view_context) { double(:request_view_context) }
-
-        before do
-          allow(initial_view_context).to receive(:with).with(
-            request: req,
-            response: res,
-          ) { request_view_context }
-
-          action_class.class_eval do
-            def view_options(req, res)
-              super.merge(extra_option: "extra option")
-            end
-          end
-        end
-
-        it "includes the options provided by the specialized method" do
-          is_expected.to eq(context: request_view_context, extra_option: "extra option")
-        end
-      end
-    end
-  end
-end

data/spec/integration/view/part_namespace_spec.rb

@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami"
-
-RSpec.describe "App view / Part namespace", :app_integration do
-  before do
-    module TestApp
-      class App < Hanami::App
-        config.root = "/test_app"
-      end
-    end
-
-    Hanami.app.instance_eval(&app_hook) if respond_to?(:app_hook)
-    Hanami.app.register_slice :main
-    Hanami.app.prepare
-
-    # The parts module (or any related setup) must exist _before_ we subclass
-    # Hanami::View, because the parts_namespace is configured at the time of
-    # subclassing (which happens right below)
-    parts_module! if respond_to?(:parts_module!)
-
-    module TestApp
-      class View < Hanami::View
-      end
-    end
-
-    module TestApp
-      module Views
-        module Article
-          class Index < TestApp::View
-          end
-        end
-      end
-    end
-  end
-
-  subject(:part_namespace) { view_class.config.part_namespace }
-
-  let(:view_class) { TestApp::Views::Article::Index }
-
-  context "default parts_path" do
-    let(:parts_module!) do
-      module TestApp
-        module Views
-          module Parts
-          end
-        end
-      end
-    end
-
-    it "is View::Parts" do
-      is_expected.to eq TestApp::Views::Parts
-    end
-  end
-
-  context "custom parts_path configured" do
-    let(:app_hook) {
-      proc do
-        config.views.parts_path = "views/custom_parts"
-      end
-    }
-
-    context "parts module exists" do
-      let(:parts_module!) do
-        module TestApp
-          module Views
-            module CustomParts
-            end
-          end
-        end
-      end
-
-      it "is the matching module within the slice" do
-        is_expected.to eq TestApp::Views::CustomParts
-      end
-    end
-
-    context "namespace does not exist" do
-      it "is nil" do
-        is_expected.to be_nil
-      end
-    end
-  end
-
-  context "nil parts_path configured" do
-    let(:app_hook) {
-      proc do
-        config.views.parts_path = nil
-      end
-    }
-
-    it "is nil" do
-      is_expected.to be_nil
-    end
-  end
-end

data/spec/integration/view/path_spec.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami"
-
-RSpec.describe "App view / Path", :app_integration do
-  before do
-    module TestApp
-      class App < Hanami::App
-        config.root = "/test_app"
-      end
-    end
-
-    Hanami.app.instance_eval(&app_hook) if respond_to?(:app_hook)
-    Hanami.app.register_slice :main
-    Hanami.app.prepare
-
-    module TestApp
-      class View < Hanami::View
-      end
-    end
-  end
-
-  let(:view_class) { TestApp::View }
-
-  subject(:paths) { view_class.config.paths }
-
-  context "default path" do
-    it "is 'templates' appended to the slice's root path" do
-      expect(paths.map { |path| path.dir.to_s }).to eq ["/test_app/app/templates"]
-    end
-  end
-
-  context "relative path provided in app config" do
-    let(:app_hook) {
-      proc do
-        config.views.paths = ["my_templates"]
-      end
-    }
-
-    it "configures the path as the relative path appended to the slice's root path" do
-      expect(paths.map { |path| path.dir.to_s }).to eq ["/test_app/app/my_templates"]
-    end
-  end
-
-  context "absolute path provided in app config" do
-    let(:app_hook) {
-      proc do
-        config.views.paths = ["/absolute/path"]
-      end
-    }
-
-    it "leaves the absolute path in place" do
-      expect(paths.map { |path| path.dir.to_s }).to eq ["/absolute/path"]
-    end
-  end
-end