hanami 2.1.0.beta2.1 → 2.1.0.rc2

data/spec/integration/rack_app/method_override_spec.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require "rack/test"
+require "stringio"
+
+RSpec.describe "Hanami web app: Method Override", :app_integration do
+  include Rack::Test::Methods
+
+  let(:app) { Hanami.app }
+
+  around do |example|
+    with_tmp_directory(Dir.mktmpdir, &example)
+  end
+
+  context "enabled by default" do
+    before do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+            config.logger.stream = StringIO.new
+          end
+        end
+      RUBY
+
+      generate_app_code
+    end
+
+    it "overrides the original HTTP method" do
+      post(
+        "/users/:id",
+        {"_method" => "PUT"},
+        "CONTENT_TYPE" => "multipart/form-data"
+      )
+
+      expect(last_response).to be_successful
+      expect(last_response.body).to eq("PUT")
+    end
+  end
+
+  context "when disabled" do
+    before do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+            config.logger.stream = StringIO.new
+            config.actions.method_override = false
+          end
+        end
+      RUBY
+
+      generate_app_code
+    end
+
+    it "overrides the original HTTP method" do
+      post(
+        "/users/:id",
+        {"_method" => "PUT"},
+        "CONTENT_TYPE" => "multipart/form-data"
+      )
+
+      expect(last_response).to_not be_successful
+      expect(last_response.status).to be(404)
+    end
+  end
+
+  private
+
+  def generate_app_code
+    write "config/routes.rb", <<~RUBY
+      module TestApp
+        class Routes < Hanami::Routes
+          put "/users/:id", to: "users.update"
+        end
+      end
+    RUBY
+
+    write "app/actions/users/update.rb", <<~RUBY
+      module TestApp
+        module Actions
+          module Users
+            class Update < Hanami::Action
+              def handle(req, res)
+                res.body = req.env.fetch("REQUEST_METHOD")
+              end
+            end
+          end
+        end
+      end
+    RUBY
+
+    require "hanami/boot"
+  end
+end

data/spec/integration/slices_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe "Slices", :app_integration do
-  it "Loading a slice uses a defined slice class" do
+  specify "Loading a slice from a slice class in the app's config dir" do
     with_tmp_directory(Dir.mktmpdir) do
       write "config/app.rb", <<~RUBY
         require "hanami"
@@ -31,7 +31,7 @@ RSpec.describe "Slices", :app_integration do
     end
   end
 
-  it "Loading a slice with a defined slice class but no slice dir" do
+  specify "Loading a slice from a slice class in the app's config dir, even when no slice dir exists" do
     with_tmp_directory(Dir.mktmpdir) do
       write "config/app.rb", <<~RUBY
         require "hanami"
@@ -55,7 +55,7 @@ RSpec.describe "Slices", :app_integration do
     end
   end
 
-  specify "Loading a nested slice with a defined slice class" do
+  specify "Loading a nested slice from a slice class in its parent's config dir" do
     with_tmp_directory(Dir.mktmpdir) do
       write "config/app.rb", <<~RUBY
         require "hanami"
@@ -81,7 +81,277 @@ RSpec.describe "Slices", :app_integration do
     end
   end
 
-  it "Loading a slice generates a slice class if none is defined" do
+  specify "Loading a slice from a slice class in its own config dir" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "slices/main/config/slice.rb", <<~RUBY
+        module Main
+          class Slice < Hanami::Slice
+            def self.loaded_from = "own config dir"
+          end
+        end
+      RUBY
+
+      require "hanami/prepare"
+
+      expect(Hanami.app.slices[:main]).to be Main::Slice
+      expect(Hanami.app.slices[:main].loaded_from).to eq "own config dir"
+    end
+  end
+
+  specify "Loading a slice from a slice class in the app's config dir, in preference to a slice class in its own config dir" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "config/slices/main.rb", <<~RUBY
+        require "hanami"
+
+        module Main
+          class Slice < Hanami::Slice
+            def self.loaded_from = "app config dir"
+          end
+        end
+      RUBY
+
+      write "slices/main/config/slice.rb", <<~RUBY
+        raise "This should not be loaded"
+      RUBY
+
+      require "hanami/prepare"
+
+      expect(Hanami.app.slices[:main]).to be Main::Slice
+      expect(Hanami.app.slices[:main].loaded_from).to eq "app config dir"
+    end
+  end
+
+  specify "Loading a nested slice from a slice class in its own config dir" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "slices/main/slices/nested/config/slice.rb", <<~RUBY
+        module Main
+          module Nested
+            class Slice < Hanami::Slice
+              def self.loaded_from = "own config dir"
+            end
+          end
+        end
+      RUBY
+
+      require "hanami/prepare"
+
+      expect(Hanami.app.slices[:main]).to be Main::Slice
+      expect(Hanami.app.slices[:main].slices[:nested].loaded_from).to eq "own config dir"
+    end
+  end
+
+  specify "Loading a deeply nested slice from a slice class in its own config dir" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      # It does NOT look up "grandparent" (or above) configs; only the parent and the app
+      write "slices/main/config/slices/deeply/nested.rb", <<~RUBY
+        raise "This should not be loaded"
+      RUBY
+
+      write "slices/main/slices/deeply/slices/nested/config/slice.rb", <<~RUBY
+        module Main
+          module Deeply
+            module Nested
+              class Slice < Hanami::Slice
+                def self.loaded_from = "own config dir"
+              end
+            end
+          end
+        end
+      RUBY
+
+      require "hanami/prepare"
+
+      expect(Hanami.app.slices[:main].slices[:deeply].slices[:nested]).to be Main::Deeply::Nested::Slice
+      expect(Hanami.app.slices[:main].slices[:deeply].slices[:nested].loaded_from).to eq "own config dir"
+    end
+  end
+
+  specify "Loading a nested slice from a slice class in its parent's config dir, in preference to a slice class in its own config dir" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "slices/main/config/slices/nested.rb", <<~RUBY
+        require "hanami"
+
+        module Main
+          module Nested
+            class Slice < Hanami::Slice
+              def self.loaded_from = "parent config dir"
+            end
+          end
+        end
+      RUBY
+
+      write "slices/main/slices/nested/config/slice.rb", <<~RUBY
+        raise "This should not be loaded"
+      RUBY
+
+      require "hanami/prepare"
+
+      expect(Hanami.app.slices[:main]).to be Main::Slice
+      expect(Hanami.app.slices[:main].slices[:nested].loaded_from).to eq "parent config dir"
+    end
+  end
+
+  specify "Loading a deeply nested slice from a slice class in its parent's config dir, in preference to a slice class in its own config dir" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      # It does NOT look up "grandparent" (or above) configs; only the parent and the app
+      write "slices/main/config/slices/deeply/nested.rb", <<~RUBY
+        raise "This should not be loaded"
+      RUBY
+
+      write "slices/main/slices/deeply/config/slices/nested.rb", <<~RUBY
+        module Main
+          module Deeply
+            module Nested
+              class Slice < Hanami::Slice
+                def self.loaded_from = "parent config dir"
+              end
+            end
+          end
+        end
+      RUBY
+
+      write "slices/main/slices/deeply/slices/nested/config/slice.rb", <<~RUBY
+        raise "This should not be loaded"
+      RUBY
+
+      require "hanami/prepare"
+
+      expect(Hanami.app.slices[:main].slices[:deeply].slices[:nested]).to be Main::Deeply::Nested::Slice
+      expect(Hanami.app.slices[:main].slices[:deeply].slices[:nested].loaded_from).to eq "parent config dir"
+    end
+  end
+
+  specify "Loading a nested slice from a slice class in the app's config dir, in preference to a slice class in the slice's parent config dir or the slice's own config dir" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "config/slices/main/nested.rb", <<~RUBY
+        require "hanami"
+
+        module Main
+          module Nested
+            class Slice < Hanami::Slice
+              def self.loaded_from = "app config dir"
+            end
+          end
+        end
+      RUBY
+
+      write "slices/main/config/slices/nested.rb", <<~RUBY
+        raise "This should not be loaded"
+      RUBY
+
+      write "slices/main/slices/nested/config/slice.rb", <<~RUBY
+        raise "This should not be loaded"
+      RUBY
+
+      require "hanami/prepare"
+
+      expect(Hanami.app.slices[:main]).to be Main::Slice
+      expect(Hanami.app.slices[:main].slices[:nested].loaded_from).to eq "app config dir"
+    end
+  end
+
+  specify "Loading a deeply nested slice from a slice class in the app's config dir, in preference to a slice class in the slice's parent config dir or the slice's own config dir" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "config/slices/main/deeply/nested.rb", <<~RUBY
+        module Main
+          module Deeply
+            module Nested
+              class Slice < Hanami::Slice
+                def self.loaded_from = "app config dir"
+              end
+            end
+          end
+        end
+      RUBY
+
+      write "slices/main/config/slices/deeply/nested.rb", <<~RUBY
+        raise "This should not be loaded"
+      RUBY
+
+      write "slices/main/slices/deeply/slices/nested/config/slice.rb", <<~RUBY
+        raise "This should not be loaded"
+      RUBY
+
+      require "hanami/prepare"
+
+      expect(Hanami.app.slices[:main].slices[:deeply].slices[:nested]).to be Main::Deeply::Nested::Slice
+      expect(Hanami.app.slices[:main].slices[:deeply].slices[:nested].loaded_from).to eq "app config dir"
+    end
+  end
+
+  specify "Loading a slice generates a slice class if none is defined" do
     with_tmp_directory(Dir.mktmpdir) do
       write "config/app.rb", <<~RUBY
         require "hanami"
@@ -178,7 +448,7 @@ RSpec.describe "Slices", :app_integration do
     end
   end
 
-  it "Registering a slice with a block creates a slice class and evals the block" do
+  specify "Registering a slice with a block creates a slice class and evals the block" do
     with_tmp_directory(Dir.mktmpdir) do
       write "config/app.rb", <<~RUBY
         require "hanami"

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

@@ -47,14 +47,6 @@ RSpec.describe "App view / Context / Assets", :app_integration do
         it "is the injected assets" do
           expect(context.assets).to be assets
         end
-
-        context "rebuilt context" do
-          subject(:new_context) { context.with }
-
-          it "retains the injected assets" do
-            expect(new_context.assets).to be assets
-          end
-        end
       end
     end
   end

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

@@ -35,14 +35,6 @@ RSpec.describe "App view / Context / Inflector", :app_integration do
       it "is the injected inflector" do
         expect(context.inflector).to be inflector
       end
-
-      context "rebuilt context" do
-        subject(:new_context) { context.with }
-
-        it "retains the injected inflector" do
-          expect(new_context.inflector).to be inflector
-        end
-      end
     end
   end
 end

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

@@ -41,14 +41,6 @@ RSpec.describe "App view / Context / Settings", :app_integration do
       it "is the injected settings" do
         expect(context.settings).to be settings
       end
-
-      context "rebuilt context" do
-        subject(:new_context) { context.with }
-
-        it "retains the injected settings" do
-          expect(new_context.settings).to be settings
-        end
-      end
     end
   end
 end

data/spec/integration/view/helpers/part_helpers_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe "App view / Helpers / Part helpers", :app_integration do
             module Parts
               class Post < TestApp::Views::Part
                 def number
-                  format_number(value.number)
+                  helpers.format_number(value.number)
                 end
               end
             end
@@ -99,7 +99,7 @@ RSpec.describe "App view / Helpers / Part helpers", :app_integration do
             module Parts
               class Post < Main::Views::Part
                 def number
-                  format_number(value.number)
+                  helpers.format_number(value.number)
                 end
               end
             end

data/spec/integration/view/helpers/user_defined_helpers/part_helpers_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe "App view / Helpers / User-defined helpers / Scope helpers", :app
           module Views
             module Helpers
               def exclaim_from_app(str)
-                tag.h1("#{str}! (app helper)")
+                tag.h1("#{str}! (app #{_context.inflector.pluralize('helper')})")
               end
             end
           end
@@ -65,7 +65,7 @@ RSpec.describe "App view / Helpers / User-defined helpers / Scope helpers", :app
             module Parts
               class Post < TestApp::Views::Part
                 def title
-                  exclaim_from_app(value.title)
+                  helpers.exclaim_from_app(value.title)
                 end
               end
             end
@@ -78,11 +78,11 @@ RSpec.describe "App view / Helpers / User-defined helpers / Scope helpers", :app
       ERB
     end
 
-    it "makes user-defined helpers available in parts" do
+    it "makes user-defined helpers available in parts via a `helpers` object" do
       post = OpenStruct.new(title: "Hello world")
       output = TestApp::App["views.posts.show"].call(post: post).to_s.strip
 
-      expect(output).to eq "<h1>Hello world! (app helper)</h1>"
+      expect(output).to eq "<h1>Hello world! (app helpers)</h1>"
     end
   end
 
@@ -104,7 +104,7 @@ RSpec.describe "App view / Helpers / User-defined helpers / Scope helpers", :app
           module Views
             module Helpers
               def exclaim_from_slice(str)
-                tag.h1("#{str}! (slice helper)")
+                tag.h1("#{str}! (slice #{_context.inflector.pluralize('helper')})")
               end
             end
           end
@@ -129,11 +129,11 @@ RSpec.describe "App view / Helpers / User-defined helpers / Scope helpers", :app
             module Parts
               class Post < Main::Views::Part
                 def title
-                  exclaim_from_slice(value.title)
+                  helpers.exclaim_from_slice(value.title)
                 end
 
                 def title_from_app
-                  exclaim_from_app(value.title)
+                  helpers.exclaim_from_app(value.title)
                 end
               end
             end
@@ -147,13 +147,13 @@ RSpec.describe "App view / Helpers / User-defined helpers / Scope helpers", :app
       ERB
     end
 
-    it "makes user-defined helpers (from app as well as slice) available in parts" do
+    it "makes user-defined helpers (from app as well as slice) available in parts via a `helpers` object" do
       post = OpenStruct.new(title: "Hello world")
       output = Main::Slice["views.posts.show"].call(post: post).to_s
 
       expect(output).to eq <<~HTML
-        <h1>Hello world! (slice helper)</h1>
-        <h1>Hello world! (app helper)</h1>
+        <h1>Hello world! (slice helpers)</h1>
+        <h1>Hello world! (app helpers)</h1>
       HTML
     end
   end

data/spec/integration/view/parts/default_rendering_spec.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+RSpec.describe "App view / Parts / Default rendering", :app_integration do
+  before do
+    with_directory(make_tmp_directory) do
+      write "config/app.rb", <<~RUBY
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "app/view.rb", <<~RUBY
+        # auto_register: false
+
+        require "hanami/view"
+
+        module TestApp
+          class View < Hanami::View
+            config.layout = nil
+          end
+        end
+      RUBY
+
+      write "app/views/part.rb", <<~RUBY
+        # auto_register: false
+
+        module TestApp
+          module Views
+            class Part < Hanami::View::Part
+            end
+          end
+        end
+      RUBY
+
+      before_prepare if respond_to?(:before_prepare)
+      require "hanami/prepare"
+    end
+  end
+
+  describe "app part" do
+    def before_prepare
+      write "app/views/helpers.rb", <<~RUBY
+        # auto_register: false
+
+        module TestApp
+          module Views
+            module Helpers
+              def app_screaming_snake_case(str)
+                _context.inflector
+                  .underscore(str)
+                  .gsub(/\s+/, "_")
+                  .upcase + "!"
+              end
+            end
+          end
+        end
+      RUBY
+      write "app/views/parts/post.rb", <<~RUBY
+        # auto_register: false
+
+        module TestApp
+          module Views
+            module Parts
+              class Post < TestApp::Views::Part
+                def title_tag
+                  helpers.tag.h1(helpers.app_screaming_snake_case(value.title))
+                end
+              end
+            end
+          end
+        end
+      RUBY
+    end
+
+    it "provides a default rendering from the app" do
+      post = Struct.new(:title).new("Hello world")
+      part = TestApp::Views::Parts::Post.new(value: post)
+
+      expect(part.title_tag).to eq "<h1>HELLO_WORLD!</h1>"
+    end
+  end
+
+  describe "slice part" do
+    def before_prepare
+      write "slices/main/views/helpers.rb", <<~RUBY
+        # auto_register: false
+
+        module Main
+          module Views
+            module Helpers
+              def slice_screaming_snake_case(str)
+                _context.inflector
+                  .underscore(str)
+                  .gsub(/\s+/, "_")
+                  .upcase + "!"
+              end
+            end
+          end
+        end
+      RUBY
+
+      write "slices/main/views/part.rb", <<~RUBY
+        # auto_register: false
+
+        module Main
+          module Views
+            class Part < TestApp::View::Part
+            end
+          end
+        end
+      RUBY
+
+      write "slices/main/views/parts/post.rb", <<~RUBY
+        # auto_register: false
+
+        module Main
+          module Views
+            module Parts
+              class Post < Main::Views::Part
+                def title_tag
+                  helpers.tag.h1(helpers.slice_screaming_snake_case(value.title))
+                end
+              end
+            end
+          end
+        end
+      RUBY
+    end
+
+    it "provides a default rendering from the app" do
+      post = Struct.new(:title).new("Hello world")
+      part = Main::Views::Parts::Post.new(value: post)
+
+      expect(part.title_tag).to eq "<h1>HELLO_WORLD!</h1>"
+    end
+  end
+end