hanami 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '099623ad9ce0088b28fc658340d85094d493f27e4320df725d4dfc062ee4939c'
-  data.tar.gz: 759492d76fb078f025d00e57d8c81cc5840ca769e5a20a0e50d20a0221c9a599
+  metadata.gz: 0e4e96c0b8ba475c9f256fa14b1af20a353804df3f0db3847b814899f7cdd394
+  data.tar.gz: 8bc463f8095b0bff1ac433fe1869f90e5d7a98e88198546e2fd78ac0caf13639
 SHA512:
-  metadata.gz: fa25a5f37d22c1faf03906914f1c0a4f5d119ae39088df6878d75ef5c830b7be7632b2b633aa915619ff44990784016da4df666b5343b56166cb31a1f613a4ea
-  data.tar.gz: ff70c18b250591af4c2fbaf32532a7ca5cb00adbc17ab87a03e0bb0dddd0ca5a19a7440aa63d0abc9c1570d9784027a4981d2d097632852e7b69f150ebd56328
+  metadata.gz: 5fc16cc328fc1756b03875d8e6ce6383771b432d85deab7c9fb55c77f9e9a573c0ed449312456c322dd202c0402dd40f5eb126d25b3d6c2b6666e6ff4d9d69c1
+  data.tar.gz: 903eaccd76b79b10d1ff1197fa6f12d99ce824d41a66be2579549884a9d45d25d3d186fc6f56e33b7badafec427b64da1455443ff674488f2bfb5e3502ca65f4

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 The web, with simplicity.
 
+## v2.0.3 - 2023-02-01
+
+### Added
+
+- [Luca Guidi] Official support for Ruby 3.2
+
+### Fixed
+
+- [Adam Lassek] Ensure to setup a logger in a non-default Hanami env
+- [R Gibim] Use production logger settings for non-default Hanami env
+- [Adam Lassek] Allow slices to have a default for registrations directory
+
 ## v2.0.2 - 2022-12-25
 
 ### Added

data/lib/hanami/config/logger.rb

@@ -126,7 +126,7 @@ module Hanami
           config.level = :debug
           config.stream = File.join("log", "#{env}.log") if env == :test
           config.logger_constructor = method(:development_logger)
-        when :production
+        else
           config.level = :info
           config.formatter = :json
           config.logger_constructor = method(:production_logger)

data/lib/hanami/slice.rb

@@ -843,6 +843,7 @@ module Hanami
         container.config.name = slice_name.to_sym
         container.config.root = root
         container.config.provider_dirs = [File.join("config", "providers")]
+        container.config.registrations_dir = File.join("config", "registrations")
 
         container.config.env = config.env
         container.config.inflector = config.inflector

data/lib/hanami/version.rb

@@ -7,7 +7,7 @@ module Hanami
   # @api private
   module Version
     # @api public
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
 
     # @since 0.9.0
     # @api private

data/lib/hanami/web/rack_logger.rb

@@ -38,30 +38,16 @@ module Hanami
       MICROSECOND = "µs"
       private_constant :MICROSECOND
 
-      # Dynamic extension used in production environments
-      # @api private
-      module Production
-        private
-
-        # @since 1.0.0
-        # @api private
-        def data(env, status:, elapsed:)
-          payload = super
-          payload[:elapsed] = elapsed
-          payload[:elapsed_unit] = MICROSECOND
-          payload
-        end
-      end
-
-      # Dynamic extension used in non-production environments
+      # Dynamic extension used in development and test environments
       # @api private
       module Development
         private
 
-        # @since 1.0.0
+        # @since 2.0.0
         # @api private
         def data(env, status:, elapsed:)
           payload = super
+          payload.delete(:elapsed_unit)
           payload[:elapsed] = elapsed > 1000 ? "#{elapsed / 1000}ms" : "#{elapsed}#{MICROSECOND}"
           payload
         end
@@ -71,7 +57,7 @@ module Hanami
       # @since 2.0.0
       def initialize(logger, env: :development)
         @logger = logger
-        extend(env == :production ? Production : Development)
+        extend(Development) if %i[development test].include?(env)
       end
 
       # @api private
@@ -116,7 +102,9 @@ module Hanami
           ip: env[HTTP_X_FORWARDED_FOR] || env[REMOTE_ADDR],
           path: "#{env[SCRIPT_NAME]}#{env[PATH_INFO]}",
           length: extract_content_length(env),
-          params: env.fetch(ROUTER_PARAMS, EMPTY_PARAMS)
+          params: env.fetch(ROUTER_PARAMS, EMPTY_PARAMS),
+          elapsed: elapsed,
+          elapsed_unit: MICROSECOND,
         }
       end
 

data/spec/integration/slices/slice_registrations_spec.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+RSpec.describe "Slice Registrations", :app_integration do
+  matcher :have_key do |name, value|
+    match do |slice|
+      slice.resolve(name) == value
+    end
+  end
+
+  specify "Registrations are loaded" 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/registrations/foo.rb", <<~RUBY
+        TestApp::App.register("foo") { "bar" }
+      RUBY
+
+      require "hanami/prepare"
+
+      expect(Hanami.app).to have_key(:foo, "bar")
+    end
+  end
+
+  specify "Slices load their own registrations" 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
+        module Admin
+          class Slice < Hanami::Slice
+          end
+        end
+      RUBY
+
+      write "config/slices/admin.rb", <<~RUBY
+        module Main
+          class Slice < Hanami::Slice
+          end
+        end
+      RUBY
+
+      write "config/registrations/foo.rb", <<~RUBY
+        TestApp::App.register("foo") { "bar" }
+      RUBY
+
+      write "slices/admin/config/registrations/bar.rb", <<~RUBY
+        Admin::Slice.register("bar") { "baz" }
+      RUBY
+
+      write "slices/main/config/registrations/baz.rb", <<~RUBY
+        Main::Slice.register("baz") { "quux" }
+      RUBY
+
+      require "hanami/prepare"
+
+      admin_slice = Hanami.app.slices[:admin]
+      main_slice  = Hanami.app.slices[:main]
+
+      aggregate_failures do
+        expect(Hanami.app).to have_key(:foo, "bar")
+        expect(admin_slice).to have_key(:bar, "baz")
+        expect(main_slice).to have_key(:baz, "quux")
+      end
+    end
+  end
+end

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

@@ -182,5 +182,14 @@ RSpec.describe Hanami::Config do
         .to change { config.logger_instance }
         .to logger_instance
     end
+
+    context "unrecognized :env" do
+      let(:env) { :staging }
+
+      it "provides a fail-safe configuration" do
+        expect { config.logger_instance }.to_not raise_error
+        expect(config.logger_instance).to be_a(Dry::Logger::Dispatcher)
+      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.2")
+    expect(Hanami::VERSION).to eq("2.0.3")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-25 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -337,6 +337,7 @@ 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/context/assets_spec.rb
@@ -407,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: The web, with simplicity
@@ -450,6 +451,7 @@ 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/context/assets_spec.rb