hanami 2.0.0.rc1 → 2.0.0

data/spec/integration/action/format_config_spec.rb

@@ -0,0 +1,194 @@
+# frozen_string_literal: true
+
+require "json"
+require "rack/test"
+
+RSpec.describe "App action / Format config", :app_integration do
+  include Rack::Test::Methods
+
+  let(:app) { Hanami.app }
+
+  around do |example|
+    with_tmp_directory(Dir.mktmpdir, &example)
+  end
+
+  it "adds a body parser middleware for the accepted formats from the action config" do
+    write "config/app.rb", <<~RUBY
+      require "hanami"
+
+      module TestApp
+        class App < Hanami::App
+          config.logger.stream = StringIO.new
+
+          config.actions.format :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/action.rb", <<~RUBY
+      # auto_register: false
+
+      module TestApp
+        class Action < Hanami::Action
+        end
+      end
+    RUBY
+
+    write "app/actions/users/create.rb", <<~RUBY
+      module TestApp
+        module Actions
+          module Users
+            class Create < TestApp::Action
+              def handle(req, res)
+                res.body = req.params[:users].join("-")
+              end
+            end
+          end
+        end
+      end
+    RUBY
+
+    require "hanami/boot"
+
+    post(
+      "/users",
+      JSON.generate("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 "adds a body parser middleware configured to parse any custom content type for the accepted formats" do
+    write "config/app.rb", <<~RUBY
+      require "hanami"
+
+      module TestApp
+        class App < Hanami::App
+          config.logger.stream = StringIO.new
+
+          config.actions.formats.add :json, ["application/json+scim", "application/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/action.rb", <<~RUBY
+      # auto_register: false
+
+      module TestApp
+        class Action < Hanami::Action
+        end
+      end
+    RUBY
+
+    write "app/actions/users/create.rb", <<~RUBY
+      module TestApp
+        module Actions
+          module Users
+            class Create < TestApp::Action
+              def handle(req, res)
+                res.body = req.params[:users].join("-")
+              end
+            end
+          end
+        end
+      end
+    RUBY
+
+    require "hanami/boot"
+
+    post(
+      "/users",
+      JSON.generate("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")
+
+    post(
+      "/users",
+      JSON.generate("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
+
+  it "does not add a body parser middleware if one is already added" do
+    write "config/app.rb", <<~RUBY
+      require "hanami"
+
+      module TestApp
+        class App < Hanami::App
+          config.logger.stream = StringIO.new
+
+          config.actions.format :json
+          config.middleware.use :body_parser, [json: "application/json+custom"]
+        end
+      end
+    RUBY
+
+    write "config/routes.rb", <<~RUBY
+      module TestApp
+        class Routes < Hanami::Routes
+          post "/users", to: "users.create"
+        end
+      end
+    RUBY
+
+    write "app/action.rb", <<~RUBY
+      # auto_register: false
+
+      module TestApp
+        class Action < Hanami::Action
+        end
+      end
+    RUBY
+
+    write "app/actions/users/create.rb", <<~RUBY
+      module TestApp
+        module Actions
+          module Users
+            class Create < TestApp::Action
+              config.formats.clear
+
+              def handle(req, res)
+                res.body = req.params[:users].join("-")
+              end
+            end
+          end
+        end
+      end
+    RUBY
+
+    require "hanami/boot"
+
+    post(
+      "/users",
+      JSON.generate("users" => %w[jane john jade joe]),
+      "CONTENT_TYPE" => "application/json+custom"
+    )
+
+    expect(last_response).to be_successful
+    expect(last_response.body).to eql("jane-john-jade-joe")
+  end
+end

data/spec/integration/action/slice_configuration_spec.rb

@@ -34,24 +34,25 @@ RSpec.describe "App action / Slice configuration", :app_integration do
       it "applies default actions config from the app", :aggregate_failures do
         prepare_app
 
-        expect(TestApp::Action.config.default_request_format).to eq :html
-        expect(TestApp::Action.config.default_response_format).to eq :html
+        expect(TestApp::Action.config.formats.values).to eq []
       end
 
       it "applies actions config from the app" do
-        Hanami.app.config.actions.default_response_format = :json
+        Hanami.app.config.actions.format :json
 
         prepare_app
 
-        expect(TestApp::Action.config.default_response_format).to eq :json
+        expect(TestApp::Action.config.formats.values).to eq [:json]
       end
 
       it "does not override config in the base class" do
-        Hanami.app.config.actions.default_response_format = :csv
+        Hanami.app.config.actions.format :csv
 
         prepare_app
 
-        TestApp::Action.config.default_response_format = :json
+        TestApp::Action.config.format :json
+
+        expect(TestApp::Action.config.formats.values).to eq [:json]
       end
     end
 
@@ -74,24 +75,23 @@ RSpec.describe "App action / Slice configuration", :app_integration do
       it "applies default actions config from the app", :aggregate_failures do
         prepare_app
 
-        expect(TestApp::Actions::Articles::Index.config.default_request_format).to eq :html
-        expect(TestApp::Actions::Articles::Index.config.default_response_format).to eq :html
+        expect(TestApp::Actions::Articles::Index.config.formats.values).to eq []
       end
 
       it "applies actions config from the app" do
-        Hanami.app.config.actions.default_response_format = :json
+        Hanami.app.config.actions.format :json
 
         prepare_app
 
-        expect(TestApp::Actions::Articles::Index.config.default_response_format).to eq :json
+        expect(TestApp::Actions::Articles::Index.config.formats.values).to eq [:json]
       end
 
       it "applies config from the base class" do
         prepare_app
 
-        TestApp::Action.config.default_response_format = :json
+        TestApp::Action.config.format :json
 
-        expect(TestApp::Actions::Articles::Index.config.default_response_format).to eq :json
+        expect(TestApp::Actions::Articles::Index.config.formats.values).to eq [:json]
       end
     end
 
@@ -114,24 +114,23 @@ RSpec.describe "App action / Slice configuration", :app_integration do
       it "applies default actions config from the app", :aggregate_failures do
         prepare_app
 
-        expect(Admin::Actions::Articles::Index.config.default_request_format).to eq :html
-        expect(Admin::Actions::Articles::Index.config.default_response_format).to eq :html
+        expect(Admin::Actions::Articles::Index.config.formats.values).to eq []
       end
 
       it "applies actions config from the app" do
-        Hanami.app.config.actions.default_response_format = :json
+        Hanami.app.config.actions.format :json
 
         prepare_app
 
-        expect(Admin::Actions::Articles::Index.config.default_response_format).to eq :json
+        expect(Admin::Actions::Articles::Index.config.formats.values).to eq [:json]
       end
 
       it "applies config from the base class" do
         prepare_app
 
-        TestApp::Action.config.default_response_format = :json
+        TestApp::Action.config.format :json
 
-        expect(Admin::Actions::Articles::Index.config.default_response_format).to eq :json
+        expect(Admin::Actions::Articles::Index.config.formats.values).to eq [:json]
       end
     end
   end
@@ -152,24 +151,23 @@ RSpec.describe "App action / Slice configuration", :app_integration do
       it "applies default actions config from the app", :aggregate_failures do
         prepare_app
 
-        expect(Admin::Action.config.default_request_format).to eq :html
-        expect(Admin::Action.config.default_response_format).to eq :html
+        expect(Admin::Action.config.formats.values).to eq []
       end
 
       it "applies actions config from the app" do
-        Hanami.app.config.actions.default_response_format = :json
+        Hanami.app.config.actions.format :json
 
         prepare_app
 
-        expect(Admin::Action.config.default_response_format).to eq :json
+        expect(Admin::Action.config.formats.values).to eq [:json]
       end
 
       it "applies config from the app base class" do
         prepare_app
 
-        TestApp::Action.config.default_response_format = :json
+        TestApp::Action.config.format :json
 
-        expect(Admin::Action.config.default_response_format).to eq :json
+        expect(Admin::Action.config.formats.values).to eq [:json]
       end
 
       context "slice actions config present" do
@@ -178,7 +176,7 @@ RSpec.describe "App action / Slice configuration", :app_integration do
             write "config/slices/admin.rb", <<~'RUBY'
               module Admin
                 class Slice < Hanami::Slice
-                  config.actions.default_response_format = :csv
+                  config.actions.format :csv
                 end
               end
             RUBY
@@ -188,24 +186,24 @@ RSpec.describe "App action / Slice configuration", :app_integration do
         it "applies actions config from the slice" do
           prepare_app
 
-          expect(Admin::Action.config.default_response_format).to eq :csv
+          expect(Admin::Action.config.formats.values).to eq [:csv]
         end
 
         it "prefers actions config from the slice over config from the app-level base class" do
           prepare_app
 
-          TestApp::Action.config.default_response_format = :json
+          TestApp::Action.config.format :json
 
-          expect(Admin::Action.config.default_response_format).to eq :csv
+          expect(Admin::Action.config.formats.values).to eq [:csv]
         end
 
         it "prefers config from the base class over actions config from the slice" do
           prepare_app
 
-          TestApp::Action.config.default_response_format = :csv
-          Admin::Action.config.default_response_format = :json
+          TestApp::Action.config.format :csv
+          Admin::Action.config.format :json
 
-          expect(Admin::Action.config.default_response_format).to eq :json
+          expect(Admin::Action.config.formats.values).to eq [:json]
         end
       end
     end
@@ -229,16 +227,15 @@ RSpec.describe "App action / Slice configuration", :app_integration do
       it "applies default actions config from the app", :aggregate_failures do
         prepare_app
 
-        expect(Admin::Actions::Articles::Index.config.default_request_format).to eq :html
-        expect(Admin::Actions::Articles::Index.config.default_response_format).to eq :html
+        expect(Admin::Actions::Articles::Index.config.formats.values).to eq []
       end
 
       it "applies actions config from the app" do
-        Hanami.app.config.actions.default_response_format = :json
+        Hanami.app.config.actions.format :json
 
         prepare_app
 
-        expect(Admin::Actions::Articles::Index.config.default_response_format).to eq :json
+        expect(Admin::Actions::Articles::Index.config.formats.values).to eq [:json]
       end
 
       it "applies actions config from the slice" do
@@ -246,7 +243,7 @@ RSpec.describe "App action / Slice configuration", :app_integration do
           write "config/slices/admin.rb", <<~'RUBY'
             module Admin
               class Slice < Hanami::Slice
-                config.actions.default_response_format = :json
+                config.actions.format :json
               end
             end
           RUBY
@@ -254,15 +251,15 @@ RSpec.describe "App action / Slice configuration", :app_integration do
 
         prepare_app
 
-        expect(Admin::Actions::Articles::Index.config.default_response_format).to eq :json
+        expect(Admin::Actions::Articles::Index.config.formats.values).to eq [:json]
       end
 
       it "applies config from the slice base class" do
         prepare_app
 
-        Admin::Action.config.default_response_format = :json
+        Admin::Action.config.format :json
 
-        expect(Admin::Actions::Articles::Index.config.default_response_format).to eq :json
+        expect(Admin::Actions::Articles::Index.config.formats.values).to eq [:json]
       end
 
       it "prefers config from the slice base class over actions config from the slice" do
@@ -270,7 +267,7 @@ RSpec.describe "App action / Slice configuration", :app_integration do
           write "config/slices/admin.rb", <<~'RUBY'
             module Admin
               class Slice < Hanami::Slice
-                config.actions.default_response_format = :csv
+                config.actions.format :csv
               end
             end
           RUBY
@@ -278,9 +275,9 @@ RSpec.describe "App action / Slice configuration", :app_integration do
 
         prepare_app
 
-        Admin::Action.config.default_response_format = :json
+        Admin::Action.config.format :json
 
-        expect(Admin::Actions::Articles::Index.config.default_response_format).to eq :json
+        expect(Admin::Actions::Articles::Index.config.formats.values).to eq [:json]
       end
     end
   end

data/spec/integration/code_loading/loading_from_lib_spec.rb

@@ -82,6 +82,40 @@ RSpec.describe "Code loading / Loading from lib directory", :app_integration do
     end
   end
 
+  describe "default root with requires at top of app file" do
+    before :context do
+      with_directory(@dir = make_tmp_directory.realpath) do
+        write "config/app.rb", <<~'RUBY'
+          require "hanami"
+          require "external_class"
+
+          module TestApp
+            class App < Hanami::App
+              @class_from_lib = ExternalClass
+
+              def self.class_from_lib
+                @class_from_lib
+              end
+            end
+          end
+        RUBY
+
+        write "lib/external_class.rb", <<~'RUBY'
+          class ExternalClass
+          end
+        RUBY
+      end
+    end
+
+    before do
+      with_directory(@dir) { require "hanami/setup" }
+    end
+
+    specify "classes in lib/ can be required directly from the top of the app file" do
+      expect(Hanami.app.class_from_lib).to be ExternalClass
+    end
+  end
+
   context "app root reconfigured" do
     before :context do
       with_directory(@dir = make_tmp_directory.realpath) do

data/spec/integration/rack_app/body_parser_spec.rb

@@ -18,6 +18,7 @@ RSpec.describe "Hanami web app", :app_integration do
 
       module TestApp
         class App < Hanami::App
+          config.actions.format :json
           config.middleware.use :body_parser, :json
           config.logger.stream = StringIO.new
         end
@@ -37,8 +38,6 @@ RSpec.describe "Hanami web app", :app_integration do
         module Actions
           module Users
             class Create < Hanami::Action
-              accept :json
-
               def handle(req, res)
                 res.body = req.params[:users].join("-")
               end
@@ -66,7 +65,7 @@ RSpec.describe "Hanami web app", :app_integration do
 
       module TestApp
         class App < Hanami::App
-          config.actions.formats["application/json+scim"] = :json
+          config.actions.formats.add :json, ["application/json+scim"]
           config.middleware.use :body_parser, [json: "application/json+scim"]
           config.logger.stream = StringIO.new
         end
@@ -86,8 +85,6 @@ RSpec.describe "Hanami web app", :app_integration do
         module Actions
           module Users
             class Create < Hanami::Action
-              accept :json
-
               def handle(req, res)
                 res.body = req.params[:users].join("-")
               end

data/spec/integration/rack_app/rack_app_spec.rb

@@ -42,6 +42,8 @@ RSpec.describe "Hanami web app", :app_integration do
 
         module TestApp
           class App < Hanami::App
+            config.actions.format :json
+            config.logger.options = {colorize: true}
             config.logger.stream = config.root.join("test.log")
           end
         end
@@ -61,11 +63,26 @@ RSpec.describe "Hanami web app", :app_integration do
         end
       RUBY
 
+      write "app/actions/users/create.rb", <<~RUBY
+        module TestApp
+          module Actions
+            module Users
+              class Create < Hanami::Action
+                def handle(req, resp)
+                  resp.body = req.params.to_h.keys
+                end
+              end
+            end
+          end
+        end
+      RUBY
+
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
             root to: ->(env) { [200, {}, ["OK"]] }
             get "/users", to: "users.index"
+            post "/users", to: "users.create"
           end
         end
       RUBY
@@ -78,7 +95,11 @@ RSpec.describe "Hanami web app", :app_integration do
 
       logs = -> { Pathname(dir).join("test.log").realpath.read }
 
-      expect(logs.()).to match %r{GET 200 \d+ms 127.0.0.1 /}
+      expect(logs.()).to match %r{GET 200 \d+(µs|ms) 127.0.0.1 /}
+
+      post "/users", JSON.generate(name: "jane", password: "secret"), {"CONTENT_TYPE" => "application/json"}
+
+      expect(logs.()).to match %r{POST 200 \d+(µs|ms) 127.0.0.1 /}
 
       begin
         get "/users"
@@ -86,7 +107,10 @@ RSpec.describe "Hanami web app", :app_integration do
         raise unless e.to_s == "OH NOEZ"
       end
 
-      expect(logs.()).to match %r{OH NOEZ}
+      err_log = logs.()
+
+      expect(err_log).to include("OH NOEZ")
+      expect(err_log).to include("app/actions/users/index.rb:6:in `handle'")
     end
   end
 
@@ -121,7 +145,54 @@ RSpec.describe "Hanami web app", :app_integration do
 
         logs = -> { Pathname(dir).join("test.log").realpath.read }
 
-        expect(logs.()).to match %r{GET 200 \d+ms 127.0.0.1 /}
+        expect(logs.()).to match %r{GET 200 \d+(µs|ms) 127.0.0.1 /}
+      end
+    end
+  end
+
+  describe "Request logging on production" do
+    let(:app) { Main::Slice.rack_app }
+
+    around do |example|
+      ENV["HANAMI_ENV"] = "production"
+      example.run
+    ensure
+      ENV["HANAMI_ENV"] = "test"
+    end
+
+    specify "Has rack monitor preconfigured with default request logging (when used via a slice)" do
+      dir = Dir.mktmpdir
+
+      with_tmp_directory(dir) do
+        write "config/app.rb", <<~RUBY
+          require "hanami"
+
+          module TestApp
+            class App < Hanami::App
+              config.logger.stream = config.root.join("test.log")
+            end
+          end
+        RUBY
+
+        write "slices/main/config/routes.rb", <<~RUBY
+          module Main
+            class Routes < Hanami::Routes
+              root to: ->(env) { [200, {}, ["OK"]] }
+            end
+          end
+        RUBY
+
+        require "hanami/boot"
+
+        get "/"
+
+        logs = -> { Pathname(dir).join("test.log").realpath.read }
+
+        log_content = logs.()
+
+        expect(log_content).to match(%r["verb":"GET"])
+        expect(log_content).to match(%r["path":"/"])
+        expect(log_content).to match(%r[elapsed":\d+,"elapsed_unit":"µs"])
       end
     end
   end

data/spec/integration/setup_spec.rb

@@ -126,7 +126,7 @@ RSpec.describe "Hanami setup", :app_integration do
         with_tmp_directory(Dir.mktmpdir) do
           write "config/app.rb"
 
-          expect(app_path).to match(%r{^/.*/config/app.rb$})
+          expect(app_path.to_s).to match(%r{^/.*/config/app.rb$})
         end
       end
     end
@@ -138,7 +138,7 @@ RSpec.describe "Hanami setup", :app_integration do
           write "lib/foo/bar/.keep"
 
           Dir.chdir("lib/foo/bar") do
-            expect(app_path).to match(%r{^/.*/config/app.rb$})
+            expect(app_path.to_s).to match(%r{^/.*/config/app.rb$})
           end
         end
       end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+require "pathname"
+
 SPEC_ROOT = File.expand_path(__dir__).freeze
+LOG_DIR = Pathname(SPEC_ROOT).join("..").join("log")
 
 require_relative "support/coverage" if ENV["COVERAGE"].eql?("true")
 
@@ -14,3 +17,12 @@ Hanami::Utils::FileList["./spec/support/**/*.rb"].each do |file|
 
   require file
 end
+
+RSpec.configure do |config|
+  config.after(:suite) do
+    # TODO: Find out what causes logger to create this dir when running specs.
+    #       There's probably a test app class being created somewhere with root
+    #       not pointing to a tmp dir.
+    FileUtils.rm_r(LOG_DIR) if LOG_DIR.exist?
+  end
+end

data/spec/unit/hanami/config/actions/default_values_spec.rb

@@ -26,14 +26,6 @@ RSpec.describe Hanami::Config::Actions, "default values" do
   end
 
   describe "new default values applied to base action settings" do
-    describe "default_request_format" do
-      specify { expect(config.default_request_format).to eq :html }
-    end
-
-    describe "default_response_format" do
-      specify { expect(config.default_response_format).to eq :html }
-    end
-
     describe "content_security_policy" do
       specify { expect(config.content_security_policy).to be_kind_of(Hanami::Config::Actions::ContentSecurityPolicy) }
     end