hanami 2.0.0.beta2 → 2.0.0.beta4

data/spec/integration/rack_app/body_parser_spec.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require "rack/test"
+
+RSpec.describe "Hanami web app", :app_integration do
+  include Rack::Test::Methods
+
+  let(:app) { Hanami.app }
+
+  around do |example|
+    with_tmp_directory(Dir.mktmpdir, &example)
+  end
+
+  specify "Setting middlewares in the config" do
+    write "config/app.rb", <<~RUBY
+      require "hanami"
+
+      module TestApp
+        class App < Hanami::App
+          config.middleware.use :body_parser, :json
+        end
+      end
+    RUBY
+
+    write "config/routes.rb", <<~RUBY
+      module TestApp
+        class Routes < Hanami::Routes
+          post "/users", to: "users.create"
+        end
+      end
+    RUBY
+
+    write "app/actions/users/create.rb", <<~RUBY
+      module TestApp
+        module Actions
+          module Users
+            class Create < Hanami::Action
+              accept :json
+
+              def handle(req, res)
+                res.body = req.params[:users].join("-")
+              end
+            end
+          end
+        end
+      end
+    RUBY
+
+    require "hanami/boot"
+
+    post(
+      "/users",
+      JSON.dump("users" => %w[jane john jade joe]),
+      "CONTENT_TYPE" => "application/json"
+    )
+
+    expect(last_response).to be_successful
+    expect(last_response.body).to eql("jane-john-jade-joe")
+  end
+
+  specify "Configuring custom mime-types and body parser" do
+    write "config/app.rb", <<~RUBY
+      require "hanami"
+
+      module TestApp
+        class App < Hanami::App
+          config.actions.formats["application/json+scim"] = :json
+          config.middleware.use :body_parser, [json: "application/json+scim"]
+        end
+      end
+    RUBY
+
+    write "config/routes.rb", <<~RUBY
+      module TestApp
+        class Routes < Hanami::Routes
+          post "/users", to: "users.create"
+        end
+      end
+    RUBY
+
+    write "app/actions/users/create.rb", <<~RUBY
+      module TestApp
+        module Actions
+          module Users
+            class Create < Hanami::Action
+              accept :json
+
+              def handle(req, res)
+                res.body = req.params[:users].join("-")
+              end
+            end
+          end
+        end
+      end
+    RUBY
+
+    require "hanami/boot"
+
+    post(
+      "/users",
+      JSON.dump("users" => %w[jane john jade joe]),
+      "CONTENT_TYPE" => "application/json+scim"
+    )
+
+    expect(last_response).to be_successful
+    expect(last_response.body).to eql("jane-john-jade-joe")
+  end
+end

data/spec/{new_integration → integration}/rack_app/middleware_spec.rb

@@ -64,10 +64,8 @@ RSpec.describe "Hanami web app", :app_integration do
 
       module TestApp
         class Routes < Hanami::Routes
-          define do
-            slice :main, at: "/" do
-              root to: "home.index"
-            end
+          slice :main, at: "/" do
+            root to: "home.index"
           end
         end
       end
@@ -113,14 +111,12 @@ RSpec.describe "Hanami web app", :app_integration do
 
       module TestApp
         class Routes < Hanami::Routes
-          define do
-            slice :main, at: "/" do
-              use TestApp::Middlewares::AppendOne
-              use TestApp::Middlewares::Prepare, before: TestApp::Middlewares::AppendOne
-              use TestApp::Middlewares::AppendTwo, after: TestApp::Middlewares::AppendOne
+          slice :main, at: "/" do
+            use TestApp::Middlewares::AppendOne
+            use TestApp::Middlewares::Prepare, before: TestApp::Middlewares::AppendOne
+            use TestApp::Middlewares::AppendTwo, after: TestApp::Middlewares::AppendOne
 
-              root to: "home.index"
-            end
+            root to: "home.index"
           end
         end
       end
@@ -180,10 +176,8 @@ RSpec.describe "Hanami web app", :app_integration do
 
       module TestApp
         class Routes < Hanami::Routes
-          define do
-            slice :main, at: "/" do
-              root to: "home.index"
-            end
+          slice :main, at: "/" do
+            root to: "home.index"
           end
         end
       end
@@ -212,4 +206,32 @@ RSpec.describe "Hanami web app", :app_integration do
     expect(last_response).to be_successful
     expect(last_response.body).to eql("yes")
   end
+
+  context "Using module as a middleware" do
+    it "sets the module as the middleware" do
+      mod = Module.new
+      app = Class.new(Hanami::App) { config.middleware.use(mod) }
+
+      expect(app.config.middleware.stack["/"][0]).to include(mod)
+    end
+  end
+
+  context "Setting an unsupported middleware" do
+    it "raises meaningful error when an unsupported middleware spec was passed" do
+      expect {
+        Class.new(Hanami::App) do
+          config.middleware.use("oops")
+        end
+      }.to raise_error(Hanami::UnsupportedMiddlewareSpecError)
+    end
+
+    it "raises meaningful error when corresponding file failed to load" do
+      expect {
+        Class.new(Hanami::App) do
+          config.middleware.namespaces.delete(Hanami::Middleware)
+          config.middleware.use(:body_parser)
+        end
+      }.to raise_error(Hanami::UnsupportedMiddlewareSpecError)
+    end
+  end
 end

data/spec/{new_integration → integration}/rack_app/non_booted_rack_app_spec.rb

@@ -24,11 +24,9 @@ RSpec.describe "Running a Rack app for a non-booted app", :app_integration do
 
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              slice :main, at: "/" do
-                root to: "home.show"
-                get "/articles", to: "articles.index"
-              end
+            slice :main, at: "/" do
+              root to: "home.show"
+              get "/articles", to: "articles.index"
             end
           end
         end

data/spec/{new_integration → integration}/rack_app/rack_app_spec.rb

@@ -21,9 +21,7 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              root to: ->(env) { [200, {}, ["OK"]] }
-            end
+            root to: ->(env) { [200, {}, ["OK"]] }
           end
         end
       RUBY
@@ -51,8 +49,7 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-            end
+            root to: ->(env) { [200, {}, ["OK"]] }
           end
         end
       RUBY
@@ -65,7 +62,7 @@ RSpec.describe "Hanami web app", :app_integration do
 
       logs = -> { Pathname(dir).join("test.log").realpath.read }
 
-      expect(logs.()).to match %r{GET 404 \d+ms 127.0.0.1 /}
+      expect(logs.()).to match %r{GET 200 \d+ms 127.0.0.1 /}
     end
   end
 
@@ -89,8 +86,7 @@ RSpec.describe "Hanami web app", :app_integration do
         write "slices/main/config/routes.rb", <<~RUBY
           module Main
             class Routes < Hanami::Routes
-              define do
-              end
+              root to: ->(env) { [200, {}, ["OK"]] }
             end
           end
         RUBY
@@ -101,7 +97,7 @@ RSpec.describe "Hanami web app", :app_integration do
 
         logs = -> { Pathname(dir).join("test.log").realpath.read }
 
-        expect(logs.()).to match %r{GET 404 \d+ms 127.0.0.1 /}
+        expect(logs.()).to match %r{GET 200 \d+ms 127.0.0.1 /}
       end
     end
   end
@@ -121,20 +117,18 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              get "/health", to: "health.show"
+            get "/health", to: "health.show"
 
-              get "/inline" do
-                "Inline"
-              end
+            get "/inline" do
+              "Inline"
+            end
 
-              slice :main, at: "/" do
-                root to: "home.index"
-              end
+            slice :main, at: "/" do
+              root to: "home.index"
+            end
 
-              slice :admin, at: "/admin" do
-                get "/dashboard", to: "dashboard.show"
-              end
+            slice :admin, at: "/admin" do
+              get "/dashboard", to: "dashboard.show"
             end
           end
         end
@@ -228,12 +222,10 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              root to: "home.index"
+            root to: "home.index"
 
-              slice :main, at: "/" do
-                root to: "home.index"
-              end
+            slice :main, at: "/" do
+              root to: "home.index"
             end
           end
         end
@@ -295,12 +287,10 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              get "/feedbacks", to: "feedbacks.index"
+            get "/feedbacks", to: "feedbacks.index"
 
-              slice :api, at: "/api" do
-                get "/people", to: "people.index"
-              end
+            slice :api, at: "/api" do
+              get "/people", to: "people.index"
             end
           end
         end
@@ -374,9 +364,7 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              get "/missing", to: "missing.action"
-            end
+            get "/missing", to: "missing.action"
           end
         end
       RUBY
@@ -405,10 +393,8 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              slice :admin, at: "/admin" do
-                get "/missing", to: "missing.action"
-              end
+            slice :admin, at: "/admin" do
+              get "/missing", to: "missing.action"
             end
           end
         end
@@ -437,9 +423,7 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              get "/missing", to: "missing.action"
-            end
+            get "/missing", to: "missing.action"
           end
         end
       RUBY
@@ -470,10 +454,8 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              slice :admin, at: "/admin" do
-                get "/missing", to: "missing.action"
-              end
+            slice :admin, at: "/admin" do
+              get "/missing", to: "missing.action"
             end
           end
         end
@@ -504,10 +486,8 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              slice :foo, at: "/foo" do
-                get "/bar", to: "bar.index"
-              end
+            slice :foo, at: "/foo" do
+              get "/bar", to: "bar.index"
             end
           end
         end

data/spec/integration/settings/access_in_slice_class_body_spec.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+RSpec.describe "Settings / Access within slice class bodies", :app_integration do
+  before do
+    @env = ENV.to_h
+  end
+
+  after do
+    ENV.replace(@env)
+  end
+
+  context "app class" do
+    it "provides access to the settings inside the class body" do
+      with_directory(make_tmp_directory) do
+        write "config/app.rb", <<~'RUBY'
+          require "hanami"
+
+          module TestApp
+            class App < Hanami::App
+              @some_flag = settings.some_flag
+            end
+          end
+        RUBY
+
+        write ".env", <<~'TEXT'
+          SOME_FLAG=true
+        TEXT
+
+        write "config/settings.rb", <<~'RUBY'
+          module TestApp
+            class Settings < Hanami::Settings
+              setting :some_flag
+            end
+          end
+        RUBY
+
+        require "hanami/setup"
+
+        expect(Hanami.app.instance_variable_get(:@some_flag)).to eq "true"
+      end
+    end
+  end
+
+  context "slice class" do
+    it "provides access to the settings inside the class body" do
+      with_directory(make_tmp_directory) do
+        write "config/app.rb", <<~'RUBY'
+          require "hanami"
+
+          module TestApp
+            class App < Hanami::App
+            end
+          end
+        RUBY
+
+        write "config/slices/main.rb", <<~'RUBY'
+          module Main
+            class Slice < Hanami::Slice
+              @some_flag = settings.some_flag
+            end
+          end
+        RUBY
+
+        write ".env", <<~'TEXT'
+          SOME_FLAG=true
+        TEXT
+
+        write "slices/main/config/settings.rb", <<~'RUBY'
+          module Main
+            class Settings < Hanami::Settings
+              setting :some_flag
+            end
+          end
+        RUBY
+
+        require "hanami/prepare"
+
+        expect(Main::Slice.instance_variable_get(:@some_flag)).to eq "true"
+      end
+    end
+  end
+end

data/spec/integration/settings/access_to_constants_spec.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+RSpec.describe "Settings / Access to constants", :app_integration do
+  before do
+    @env = ENV.to_h
+  end
+
+  after do
+    ENV.replace(@env)
+  end
+
+  specify "Settings can not access autoloadable constants" do
+    with_directory(make_tmp_directory) do
+      write "config/app.rb", <<~'RUBY'
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "config/settings.rb", <<~'RUBY'
+        module TestApp
+          class Settings < Hanami::Settings
+            setting :some_flag, constructor: TestApp::Types::Params::Bool
+          end
+        end
+      RUBY
+
+      write "app/types.rb", <<~'RUBY'
+        # auto_register: false
+
+        require "dry/types"
+
+        module TestApp
+          Types = Dry.Types()
+        end
+      RUBY
+
+      require "hanami/setup"
+
+      expect { Hanami.app.settings }.to raise_error(NameError, /TestApp::Types/)
+    end
+  end
+end

data/spec/{new_integration/slices/slice_settings_spec.rb → integration/settings/slice_registration_spec.rb}

@@ -1,4 +1,6 @@
-RSpec.describe "Slices / Slice settings", :app_integration do
+# frozen_string_literal: true
+
+RSpec.describe "Settings / Slice registration", :app_integration do
   specify "Settings are registered for each slice with a settings file" do
     with_tmp_directory(Dir.mktmpdir) do
       write "config/app.rb", <<~RUBY
@@ -10,6 +12,8 @@ RSpec.describe "Slices / Slice settings", :app_integration do
         end
       RUBY
 
+      # n.b. no app-level settings file
+
       # The main slice has settings
       write "slices/main/config/settings.rb", <<~RUBY
         # frozen_string_literal: true

data/spec/{new_integration → integration}/settings/using_types_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe "Settings / Using types", :app_integration do
     ENV.replace(@env)
   end
 
-  specify "dry-types can be used as setting constructors to coerce values" do
+  specify "types from a provided types module can be used as setting constructors to coerce values" do
     with_tmp_directory(Dir.mktmpdir) do
       write "config/app.rb", <<~RUBY
         require "hanami"
@@ -23,14 +23,12 @@ RSpec.describe "Settings / Using types", :app_integration do
       RUBY
 
       write "config/settings.rb", <<~RUBY
-        require "dry/types"
-
         module TestApp
           class Settings < Hanami::Settings
-            Types = Dry.Types()
+            Bool = Types::Params::Bool
 
             setting :numeric, constructor: Types::Params::Integer
-            setting :flag, constructor: Types::Params::Bool
+            setting :flag, constructor: Bool
           end
         end
       RUBY
@@ -45,7 +43,7 @@ RSpec.describe "Settings / Using types", :app_integration do
     end
   end
 
-  specify "errors raised from setting constructors are collected and re-raised in aggregate" do
+  specify "errors raised from setting constructors are collected and re-raised in aggregate, and will prevent the app from booting" do
     with_tmp_directory(Dir.mktmpdir) do
       write "config/app.rb", <<~RUBY
         require "hanami"
@@ -57,12 +55,8 @@ RSpec.describe "Settings / Using types", :app_integration do
       RUBY
 
       write "config/settings.rb", <<~RUBY
-        require "dry/types"
-
         module TestApp
           class Settings < Hanami::Settings
-            Types = Dry.Types()
-
             setting :numeric, constructor: Types::Params::Integer
             setting :flag, constructor: Types::Params::Bool
           end
@@ -83,5 +77,4 @@ RSpec.describe "Settings / Using types", :app_integration do
       )
     end
   end
-
 end

data/spec/{new_integration → integration}/setup_spec.rb

@@ -55,6 +55,26 @@ RSpec.describe "Hanami setup", :app_integration do
 
         expect { setup }.not_to raise_error
       end
+
+      %w[hanami-view hanami-actions hanami-router].each do |gem_name|
+        it "works when #{gem_name} gem is not bundled" do
+          allow(Hanami).to receive(:bundled?).and_call_original
+          expect(Hanami).to receive(:bundled?).with("hanami-router").and_return(false)
+
+          with_tmp_directory(Dir.mktmpdir) do
+            write "config/app.rb", <<~RUBY
+            require "hanami"
+
+            module TestApp
+              class App < Hanami::App
+              end
+            end
+            RUBY
+
+            expect { setup }.to change { Hanami.app? }.to true
+          end
+        end
+      end
     end
 
     describe "using hanami/setup require" do

data/spec/{new_integration → integration}/slices/external_slice_spec.rb

@@ -27,10 +27,8 @@ RSpec.describe "Slices / External slices", :app_integration do
 
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              slice :external, at: "/" do
-                root to: "test_action"
-              end
+            slice :external, at: "/" do
+              root to: "test_action"
             end
           end
         end

data/spec/{new_integration → integration}/slices/slice_routing_spec.rb

@@ -44,9 +44,7 @@ RSpec.describe "Slices / Slice routing", :app_integration do
 
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              get "home", to: "home.show", as: :home
-            end
+            get "home", to: "home.show", as: :home
           end
         end
       RUBY
@@ -79,9 +77,7 @@ RSpec.describe "Slices / Slice routing", :app_integration do
 
         module Main
           class Routes < Hanami::Routes
-            define do
-              get "home", to: "home.show", as: :home
-            end
+            get "home", to: "home.show", as: :home
           end
         end
       RUBY
@@ -130,11 +126,9 @@ RSpec.describe "Slices / Slice routing", :app_integration do
         write "config/routes.rb", <<~'RUBY'
           module TestApp
             class Routes < Hanami::Routes
-              define do
-                root to: "home.show"
+              root to: "home.show"
 
-                slice :main, at: "/main"
-              end
+              slice :main, at: "/main"
             end
           end
         RUBY
@@ -158,9 +152,7 @@ RSpec.describe "Slices / Slice routing", :app_integration do
         write "slices/main/config/routes.rb", <<~'RUBY'
           module Main
             class Routes < Hanami::Routes
-              define do
-                root to: "home.show"
-              end
+              root to: "home.show"
             end
           end
         RUBY