hanami 2.2.1 → 2.3.0.beta2

data/spec/unit/hanami/env_spec.rb

@@ -3,30 +3,27 @@
 RSpec.describe Hanami, ".env" do
   subject { described_class.env(e: env) }
 
-  context "HANAMI_ENV in ENV" do
-    let(:env) { {"HANAMI_ENV" => "test"} }
+  context "HANAMI_ENV, APP_ENV and RACK_ENV in ENV" do
+    let(:env) { { "HANAMI_ENV" => "test", "APP_ENV" => "development", "RACK_ENV" => "production" } }
 
     it "is the value of HANAMI_ENV" do
       is_expected.to eq(:test)
     end
   end
 
-  context "RACK_ENV in ENV" do
-    let(:env) { {"HANAMI_ENV" => "test"} }
+  context "APP_ENV and RACK_ENV in ENV" do
+    let(:env) { {"APP_ENV" => "development", "RACK_ENV" => "production" } }
 
-    it "is the value of RACK_ENV" do
-      is_expected.to eq(:test)
+    it "is the value of APP_ENV" do
+      is_expected.to eq(:development)
     end
   end
 
-  context "both HANAMI_ENV and RACK_ENV in ENV" do
-    let(:env) do
-      {"HANAMI_ENV" => "test",
-       "RACK_ENV" => "production"}
-    end
+  context "RACK_ENV in ENV" do
+    let(:env) { { "RACK_ENV" => "production" } }
 
-    it "is the value of HANAMI_ENV" do
-      is_expected.to eq(:test)
+    it "is the value of RACK_ENV" do
+      is_expected.to eq(:production)
     end
   end
 

data/spec/unit/hanami/slice_spec.rb

@@ -65,6 +65,24 @@ RSpec.describe Hanami::Slice, :app_integration do
       expect { Class.new(described_class).prepare }
         .to raise_error Hanami::SliceLoadError, /Slice must have a class name/
     end
+
+    it "does not allow special characters in slice names" do
+      expect { Hanami.app.register_slice(:'test_$lice') }
+        .to raise_error(ArgumentError, /must be lowercase alphanumeric text and underscores only/)
+    end
+
+    it "does not allow uppercase characters in slice names" do
+      expect { Hanami.app.register_slice(:TEST_slice) }
+        .to raise_error(ArgumentError, /must be lowercase alphanumeric text and underscores only/)
+    end
+
+    it "allows lowercase alphanumeric text and underscores only" do
+      expect { Hanami.app.register_slice(:test_slice) }.not_to raise_error
+    end
+
+    it "allows single character slice names" do
+      expect { Hanami.app.register_slice(:t) }.not_to raise_error
+    end
   end
 
   describe ".source_path" do

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

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0.beta2
 platform: ruby
 authors:
-- Luca Guidi
-autorequire:
+- Hanakai team
 bindir: bin
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,28 +167,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.3.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.3.0.beta2
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.3.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.3.0.beta2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +217,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: rack-session
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -238,14 +251,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -260,9 +273,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: Hanami is a web framework for Ruby
+description: A flexible framework for maintainable Ruby apps
 email:
-- me@lucaguidi.com
+- info@hanakai.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -282,6 +295,7 @@ files:
 - lib/hanami/config/actions/cookies.rb
 - lib/hanami/config/actions/sessions.rb
 - lib/hanami/config/assets.rb
+- lib/hanami/config/console.rb
 - lib/hanami/config/db.rb
 - lib/hanami/config/logger.rb
 - lib/hanami/config/null_config.rb
@@ -310,6 +324,7 @@ files:
 - lib/hanami/helpers/form_helper/form_builder.rb
 - lib/hanami/helpers/form_helper/values.rb
 - lib/hanami/middleware/assets.rb
+- lib/hanami/middleware/content_security_policy_nonce.rb
 - lib/hanami/middleware/public_errors_app.rb
 - lib/hanami/middleware/render_errors.rb
 - lib/hanami/port.rb
@@ -423,7 +438,6 @@ files:
 - spec/integration/view/context/inflector_spec.rb
 - spec/integration/view/context/request_spec.rb
 - spec/integration/view/context/routes_spec.rb
-- spec/integration/view/context/settings_spec.rb
 - spec/integration/view/helpers/form_helper_spec.rb
 - spec/integration/view/helpers/part_helpers_spec.rb
 - spec/integration/view/helpers/scope_helpers_spec.rb
@@ -432,6 +446,7 @@ files:
 - spec/integration/view/parts/default_rendering_spec.rb
 - spec/integration/view/slice_configuration_spec.rb
 - spec/integration/view/views_spec.rb
+- spec/integration/web/content_security_policy_nonce_spec.rb
 - spec/integration/web/render_detailed_errors_spec.rb
 - spec/integration/web/render_errors_spec.rb
 - spec/integration/web/welcome_view_spec.rb
@@ -440,10 +455,6 @@ files:
 - spec/support/coverage.rb
 - spec/support/matchers.rb
 - spec/support/rspec.rb
-- spec/support/shared_examples/cli/generate/app.rb
-- spec/support/shared_examples/cli/generate/migration.rb
-- spec/support/shared_examples/cli/generate/model.rb
-- spec/support/shared_examples/cli/new.rb
 - spec/unit/hanami/config/actions/content_security_policy_spec.rb
 - spec/unit/hanami/config/actions/cookies_spec.rb
 - spec/unit/hanami/config/actions/csrf_protection_spec.rb
@@ -451,6 +462,7 @@ files:
 - spec/unit/hanami/config/actions/sessions_spec.rb
 - spec/unit/hanami/config/actions_spec.rb
 - spec/unit/hanami/config/base_url_spec.rb
+- spec/unit/hanami/config/console_spec.rb
 - spec/unit/hanami/config/db_spec.rb
 - spec/unit/hanami/config/inflector_spec.rb
 - spec/unit/hanami/config/logger_spec.rb
@@ -480,7 +492,6 @@ files:
 - spec/unit/hanami/slice_configurable_spec.rb
 - spec/unit/hanami/slice_name_spec.rb
 - spec/unit/hanami/slice_spec.rb
-- spec/unit/hanami/version_spec.rb
 - spec/unit/hanami/web/rack_logger_spec.rb
 homepage: http://hanamirb.org
 licenses:
@@ -488,7 +499,6 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -496,17 +506,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
-summary: The web, with simplicity
+summary: A flexible framework for maintainable Ruby apps
 test_files:
 - spec/integration/action/cookies_spec.rb
 - spec/integration/action/csrf_protection_spec.rb
@@ -584,7 +593,6 @@ test_files:
 - spec/integration/view/context/inflector_spec.rb
 - spec/integration/view/context/request_spec.rb
 - spec/integration/view/context/routes_spec.rb
-- spec/integration/view/context/settings_spec.rb
 - spec/integration/view/helpers/form_helper_spec.rb
 - spec/integration/view/helpers/part_helpers_spec.rb
 - spec/integration/view/helpers/scope_helpers_spec.rb
@@ -593,6 +601,7 @@ test_files:
 - spec/integration/view/parts/default_rendering_spec.rb
 - spec/integration/view/slice_configuration_spec.rb
 - spec/integration/view/views_spec.rb
+- spec/integration/web/content_security_policy_nonce_spec.rb
 - spec/integration/web/render_detailed_errors_spec.rb
 - spec/integration/web/render_errors_spec.rb
 - spec/integration/web/welcome_view_spec.rb
@@ -601,10 +610,6 @@ test_files:
 - spec/support/coverage.rb
 - spec/support/matchers.rb
 - spec/support/rspec.rb
-- spec/support/shared_examples/cli/generate/app.rb
-- spec/support/shared_examples/cli/generate/migration.rb
-- spec/support/shared_examples/cli/generate/model.rb
-- spec/support/shared_examples/cli/new.rb
 - spec/unit/hanami/config/actions/content_security_policy_spec.rb
 - spec/unit/hanami/config/actions/cookies_spec.rb
 - spec/unit/hanami/config/actions/csrf_protection_spec.rb
@@ -612,6 +617,7 @@ test_files:
 - spec/unit/hanami/config/actions/sessions_spec.rb
 - spec/unit/hanami/config/actions_spec.rb
 - spec/unit/hanami/config/base_url_spec.rb
+- spec/unit/hanami/config/console_spec.rb
 - spec/unit/hanami/config/db_spec.rb
 - spec/unit/hanami/config/inflector_spec.rb
 - spec/unit/hanami/config/logger_spec.rb
@@ -641,5 +647,4 @@ test_files:
 - spec/unit/hanami/slice_configurable_spec.rb
 - spec/unit/hanami/slice_name_spec.rb
 - spec/unit/hanami/slice_spec.rb
-- spec/unit/hanami/version_spec.rb
 - spec/unit/hanami/web/rack_logger_spec.rb

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

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami"
-require "hanami/settings"
-
-RSpec.describe "App view / Context / Settings", :app_integration do
-  before do
-    module TestApp
-      class App < Hanami::App
-      end
-
-      class Settings < Hanami::Settings
-      end
-    end
-
-    Hanami.prepare
-
-    module TestApp
-      module Views
-        class Context < Hanami::View::Context
-        end
-      end
-    end
-  end
-
-  let(:context_class) { TestApp::Views::Context }
-  subject(:context) { context_class.new }
-
-  describe "#settings" do
-    it "is the app settings by default" do
-      expect(context.settings).to be TestApp::App["settings"]
-    end
-
-    context "injected settings" do
-      subject(:context) {
-        context_class.new(settings: settings)
-      }
-
-      let(:settings) { double(:settings) }
-
-      it "is the injected settings" do
-        expect(context.settings).to be settings
-      end
-    end
-  end
-end