hanami 2.0.0.rc1 → 2.0.1

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,16 +63,31 @@ 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
 
-      require "hanami/boot"
+      require "hanami/prepare"
 
       expect(Hanami.app["rack.monitor"]).to be_instance_of(Dry::Monitor::Rack::Middleware)
 
@@ -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,13 +107,115 @@ 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
 
-  describe "Request logging when using a slice" do
+  specify "Logging via the rack monitor even when notifications bus has already been used" do
+    dir = Dir.mktmpdir
+
+    with_tmp_directory(dir) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        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
+      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
+                def handle(req, resp)
+                  resp.body = req.params.to_h.keys
+                end
+              end
+            end
+          end
+        end
+      RUBY
+
+      require "hanami/prepare"
+
+      # Simulate any component interacting with the notifications bus such that it creates its
+      # internal bus with a duplicate copy of all currently registered events. This means that the
+      # class-level Dry::Monitor::Notification events implicitly registered by the
+      # Dry::Monitor::Rack::Middleware activated via the rack provider are ignored, unless our
+      # provider explicitly re-registers them on _instance_ of the notifications bus.
+      #
+      # See Hanami::Providers::Rack for more detail.
+      Hanami.app["notifications"].instrument(:sql)
+
+      logs = -> { Pathname(dir).join("test.log").realpath.read }
+
+      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 /}
+    end
+  end
+
+  describe "Request logging when using slice router" do
+    let(:app) { Main::Slice.rack_app }
+
+    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/prepare"
+
+        get "/"
+
+        logs = -> { Pathname(dir).join("test.log").realpath.read }
+
+        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
 
@@ -121,7 +244,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 /}
+        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/settings/access_in_slice_class_body_spec.rb

@@ -3,6 +3,7 @@
 RSpec.describe "Settings / Access within slice class bodies", :app_integration do
   before do
     @env = ENV.to_h
+    allow(Hanami::Env).to receive(:loaded?).and_return(false)
   end
 
   after do

data/spec/integration/settings/loading_from_env_spec.rb

@@ -3,6 +3,7 @@
 RSpec.describe "Settings / Access to constants", :app_integration do
   before do
     @env = ENV.to_h
+    allow(Hanami::Env).to receive(:loaded?).and_return(false)
   end
 
   after do

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/content_security_policy_spec.rb

@@ -13,21 +13,21 @@ RSpec.describe Hanami::Config::Actions, "#content_security_policy" do
         expect(content_security_policy[:base_uri]).to eq("'self'")
 
         expected = [
-          %(base-uri 'self';),
-          %(child-src 'self';),
-          %(connect-src 'self';),
-          %(default-src 'none';),
-          %(font-src 'self';),
-          %(form-action 'self';),
-          %(frame-ancestors 'self';),
-          %(frame-src 'self';),
-          %(img-src 'self' https: data:;),
-          %(media-src 'self';),
-          %(object-src 'none';),
-          %(plugin-types application/pdf;),
-          %(script-src 'self';),
+          %(base-uri 'self'),
+          %(child-src 'self'),
+          %(connect-src 'self'),
+          %(default-src 'none'),
+          %(font-src 'self'),
+          %(form-action 'self'),
+          %(frame-ancestors 'self'),
+          %(frame-src 'self'),
+          %(img-src 'self' https: data:),
+          %(media-src 'self'),
+          %(object-src 'none'),
+          %(plugin-types application/pdf),
+          %(script-src 'self'),
           %(style-src 'self' 'unsafe-inline' https:)
-        ].join("\n")
+        ].join(";")
 
         expect(content_security_policy.to_s).to eq(expected)
       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

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

@@ -13,22 +13,19 @@ RSpec.describe Hanami::Config, "#actions" do
     it "is a full actions config" do
       is_expected.to be_an_instance_of(Hanami::Config::Actions)
 
-      is_expected.to respond_to(:default_response_format)
-      is_expected.to respond_to(:default_response_format=)
+      is_expected.to respond_to(:format)
     end
 
     it "configures base action settings" do
-      expect { actions.default_request_format = :json }
-        .to change { actions.default_request_format }
-        .to :json
+      expect { actions.public_directory = "pub" }
+        .to change { actions.public_directory }
+        .to end_with("pub")
     end
 
     it "configures base actions settings using custom methods" do
-      actions.formats = {}
-
-      expect { actions.format json: "app/json" }
-        .to change { actions.formats }
-        .to("app/json" => :json)
+      expect { actions.formats.add(:json, "app/json") }
+        .to change { actions.formats.mapping }
+        .to include("app/json" => :json)
     end
 
     it "can be finalized" do

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

@@ -72,8 +72,8 @@ RSpec.describe Hanami::Config::Logger do
   end
 
   describe "#formatter" do
-    it "defaults to :rack" do
-      expect(subject.formatter).to eq(:rack)
+    it "defaults to :string" do
+      expect(subject.formatter).to eq(:string)
     end
 
     context "when :production environment" do
@@ -94,8 +94,8 @@ RSpec.describe Hanami::Config::Logger do
   end
 
   describe "#template" do
-    it "defaults to false" do
-      expect(subject.template).to eq("[%<progname>s] [%<severity>s] [%<time>s] %<message>s")
+    it "defaults to :details" do
+      expect(subject.template).to be(:details)
     end
   end
 

data/spec/unit/hanami/port_spec.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+require "hanami/port"
+
+RSpec.describe Hanami::Port do
+  context "Hanami::Port::DEFAULT" do
+    it "returns default value" do
+      expect(Hanami::Port::DEFAULT).to eq(2300)
+    end
+  end
+
+  context "Hanami::Port::ENV_VAR" do
+    it "returns default value" do
+      expect(Hanami::Port::ENV_VAR).to eq("HANAMI_PORT")
+    end
+  end
+
+  context ".call" do
+    let(:value) { nil }
+    let(:env) { nil }
+
+    it "is aliased as .[]" do
+      expect(described_class[value, env]).to be(2300)
+    end
+
+    context "when ENV var is nil" do
+      context "and value is nil" do
+        it "returns default value" do
+          expect(described_class.call(value, env)).to be(2300)
+        end
+      end
+
+      context "and value is not nil" do
+        let(:value) { 18_000 }
+
+        it "returns given value" do
+          expect(described_class.call(value, env)).to be(value)
+        end
+
+        context "and value is default" do
+          let(:value) { 2300 }
+
+          it "returns given value" do
+            expect(described_class.call(value, env)).to be(value)
+          end
+        end
+      end
+    end
+
+    context "when ENV var not nil" do
+      let(:env) { 9000 }
+
+      context "and value is nil" do
+        it "returns env value" do
+          expect(described_class.call(value, env)).to be(env)
+        end
+      end
+
+      context "and value is not nil" do
+        let(:value) { 18_000 }
+
+        it "returns given value" do
+          expect(described_class.call(value, env)).to be(value)
+        end
+
+        context "and value is default" do
+          let(:value) { 2300 }
+
+          it "returns env value" do
+            expect(described_class.call(value, env)).to be(env)
+          end
+        end
+      end
+    end
+  end
+
+  context ".call!" do
+    before { ENV.delete("HANAMI_PORT") }
+    let(:value) { 2300 }
+
+    context "when given value is default" do
+      it "doesn't set env var" do
+        described_class.call!(value)
+
+        expect(ENV.key?("HANAMI_PORT")).to be(false)
+      end
+    end
+
+    context "when given value isn't default" do
+      let(:value) { 9000 }
+
+      it "set env var" do
+        described_class.call!(value)
+
+        expect(ENV.fetch("HANAMI_PORT")).to eq(value.to_s)
+      end
+    end
+  end
+
+  context ".default?" do
+    context "when given value is default" do
+      let(:value) { 2300 }
+
+      it "returns true" do
+        expect(described_class.default?(value)).to be(true)
+      end
+    end
+
+    context "when given value isn't default" do
+      let(:value) { 9000 }
+
+      it "returns false" do
+        expect(described_class.default?(value)).to be(false)
+      end
+    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.0.0.rc1")
+    expect(Hanami::VERSION).to eq("2.0.1")
   end
 end

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

@@ -53,7 +53,10 @@ RSpec.describe Hanami::Web::RackLogger do
       stream.rewind
       actual = stream.read
 
-      expect(actual).to include(%([#{app_name}] [INFO] [#{time}] #{verb} #{status} #{elapsed}ms #{ip} #{path} #{content_length} {"user"=>{"password"=>"[FILTERED]"}}))
+      expect(actual).to eql(<<~LOG)
+        [#{app_name}] [INFO] [#{time}] #{verb} #{status} #{elapsed}µs #{ip} #{path} #{content_length}
+          {"user"=>{"password"=>"[FILTERED]"}}
+      LOG
     end
 
     context "ip" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -107,6 +110,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -116,56 +122,68 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.rc
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.rc
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: dry-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.rc
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.rc
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.rc
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.rc
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.rc
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.rc
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +268,7 @@ files:
 - lib/hanami/config/router.rb
 - lib/hanami/config/views.rb
 - lib/hanami/constants.rb
+- lib/hanami/env.rb
 - lib/hanami/errors.rb
 - lib/hanami/extensions.rb
 - lib/hanami/extensions/action.rb
@@ -258,6 +277,7 @@ files:
 - lib/hanami/extensions/view/context.rb
 - lib/hanami/extensions/view/slice_configured_context.rb
 - lib/hanami/extensions/view/slice_configured_view.rb
+- lib/hanami/port.rb
 - lib/hanami/prepare.rb
 - lib/hanami/providers/inflector.rb
 - lib/hanami/providers/logger.rb
@@ -281,6 +301,7 @@ files:
 - lib/hanami/web/rack_logger.rb
 - spec/integration/action/cookies_spec.rb
 - spec/integration/action/csrf_protection_spec.rb
+- spec/integration/action/format_config_spec.rb
 - spec/integration/action/routes_spec.rb
 - spec/integration/action/sessions_spec.rb
 - spec/integration/action/slice_configuration_spec.rb
@@ -357,6 +378,7 @@ files:
 - spec/unit/hanami/config/slices_spec.rb
 - spec/unit/hanami/config/views_spec.rb
 - spec/unit/hanami/env_spec.rb
+- spec/unit/hanami/port_spec.rb
 - spec/unit/hanami/settings/env_store_spec.rb
 - spec/unit/hanami/settings_spec.rb
 - spec/unit/hanami/slice_configurable_spec.rb
@@ -381,9 +403,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.3
 signing_key:
@@ -392,6 +414,7 @@ summary: The web, with simplicity
 test_files:
 - spec/integration/action/cookies_spec.rb
 - spec/integration/action/csrf_protection_spec.rb
+- spec/integration/action/format_config_spec.rb
 - spec/integration/action/routes_spec.rb
 - spec/integration/action/sessions_spec.rb
 - spec/integration/action/slice_configuration_spec.rb
@@ -468,6 +491,7 @@ test_files:
 - spec/unit/hanami/config/slices_spec.rb
 - spec/unit/hanami/config/views_spec.rb
 - spec/unit/hanami/env_spec.rb
+- spec/unit/hanami/port_spec.rb
 - spec/unit/hanami/settings/env_store_spec.rb
 - spec/unit/hanami/settings_spec.rb
 - spec/unit/hanami/slice_configurable_spec.rb