hanami 2.1.0.beta2 → 2.1.0.rc1

data/spec/integration/web/welcome_view_spec.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require "json"
+require "rack/test"
+
+RSpec.describe "Web / Welcome view", :app_integration do
+  include Rack::Test::Methods
+
+  let(:app) { Hanami.app }
+
+  before do
+    with_directory(@dir = make_tmp_directory) do
+      write "config/app.rb", <<~RUBY
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+            config.logger.stream = File::NULL
+          end
+        end
+      RUBY
+
+      write "config/routes.rb", <<~RUBY
+        module TestApp
+          class Routes < Hanami::Routes
+          end
+        end
+      RUBY
+
+      before_prepare if respond_to?(:before_prepare)
+      require "hanami/prepare"
+    end
+  end
+
+  context "no routes defined" do
+    it "renders the welcome page" do
+      get "/"
+
+      body = last_response.body.strip
+      expect(body).to include "<h1>Welcome to Hanami</h1>"
+      expect(body).to include "Hanami version: #{Hanami::VERSION}"
+      expect(body).to include "Ruby version: #{RUBY_DESCRIPTION}"
+
+      expect(last_response.status).to eq 200
+    end
+  end
+
+  context "routes defined" do
+    def before_prepare
+      write "config/routes.rb", <<~RUBY
+        module TestApp
+          class Routes < Hanami::Routes
+            root to: -> * { [200, {}, "Hello from a route"] }
+          end
+        end
+      RUBY
+    end
+
+    it "does not render the welcome page" do
+      get "/"
+
+      expect(last_response.body).to eq "Hello from a route"
+      expect(last_response.status).to eq 200
+    end
+  end
+
+  context "non-development env" do
+    def before_prepare
+      @hanami_env = ENV["HANAMI_ENV"]
+      ENV["HANAMI_ENV"] = "production"
+    end
+
+    after do
+      ENV["HANAMI_ENV"] = @hanami_env
+    end
+
+    it "does not render the welcome page" do
+      get "/"
+
+      expect(last_response.body).to eq "Not Found"
+      expect(last_response.status).to eq 404
+    end
+  end
+end

data/spec/support/app_integration.rb

@@ -39,15 +39,14 @@ module RSpec
 
       def compile_assets!
         link_node_modules
+        generate_assets_config
 
         require "hanami/cli/command"
         require "hanami/cli/commands/app/command"
         require "hanami/cli/commands/app/assets/compile"
-        compiler = Hanami::CLI::Commands::App::Assets::Compile.new(config: Hanami.app.config.assets)
+        assets_compile = Hanami::CLI::Commands::App::Assets::Compile.new(config: Hanami.app.config.assets)
 
-        with_directory(Hanami.app.root) do
-          compiler.call
-        end
+        with_directory(Hanami.app.root) { assets_compile.call }
       end
 
       def link_node_modules
@@ -58,6 +57,25 @@ module RSpec
         FileUtils.ln_s(node_modules_path, root)
       rescue Errno::EEXIST # rubocop:disable Lint/SuppressedException
       end
+
+      def generate_assets_config
+        root = Hanami.app.root
+
+        with_directory(root) do
+          write("config/assets.mjs", <<~JS) unless root.join("config", "assets.mjs").exist?
+            import * as assets from "hanami-assets";
+            await assets.run();
+          JS
+
+          write("package.json", <<~JSON) unless root.join("package.json").exist?
+            {
+              "scripts": {
+                "assets": "node config/assets.mjs"
+              }
+            }
+          JSON
+        end
+      end
     end
   end
 end

data/spec/unit/hanami/helpers/assets_helper/audio_tag_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Hanami::Helpers::AssetsHelper, "#audio_tag", :app_integration do
+RSpec.describe Hanami::Helpers::AssetsHelper, "#audio", :app_integration do
   subject(:obj) {
     helpers = described_class
     Class.new {
@@ -84,7 +84,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#audio_tag", :app_integration do
   end
 
   xit "renders with sources" do
-    actual = audio_tag do
+    actual = audio do
       tag.text "Your browser does not support the audio tag"
       tag.source src: subject.asset_url("song.ogg"), type: "audio/ogg"
       tag.source src: subject.asset_url("song.wav"), type: "audio/wav"

data/spec/unit/hanami/helpers/assets_helper/{favicon_link_tag_spec.rb → favicon_tag_spec.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Hanami::Helpers::AssetsHelper, "#favicon_link_tag", :app_integration do
+RSpec.describe Hanami::Helpers::AssetsHelper, "#favicon", :app_integration do
   subject(:obj) {
     helpers = described_class
     Class.new {
@@ -14,8 +14,8 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#favicon_link_tag", :app_integrat
     }.new(context)
   }
 
-  def favicon_link_tag(...)
-    obj.instance_eval { favicon_link_tag(...) }
+  def favicon_tag(...)
+    obj.instance_eval { favicon_tag(...) }
   end
 
   let(:root) { make_tmp_directory }
@@ -53,26 +53,22 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#favicon_link_tag", :app_integrat
   end
 
   it "returns an instance of SafeString" do
-    actual = favicon_link_tag
+    actual = favicon_tag
     expect(actual).to be_instance_of(::Hanami::View::HTML::SafeString)
   end
 
-  it "is aliased as `favicon`" do
-    expect(subject.favicon).to eq favicon_link_tag
-  end
-
   it "renders <link> tag" do
-    actual = favicon_link_tag.to_s
+    actual = favicon_tag.to_s
     expect(actual).to eq(%(<link href="/assets/favicon.ico" rel="shortcut icon" type="image/x-icon">))
   end
 
   it "renders with HTML attributes" do
-    actual = favicon_link_tag("favicon.png", rel: "icon", type: "image/png").to_s
+    actual = favicon_tag("favicon.png", rel: "icon", type: "image/png").to_s
     expect(actual).to eq(%(<link href="/assets/favicon.png" rel="icon" type="image/png">))
   end
 
   it "ignores href passed as an option" do
-    actual = favicon_link_tag("favicon.png", href: "wrong").to_s
+    actual = favicon_tag("favicon.png", href: "wrong").to_s
     expect(actual).to eq(%(<link href="/assets/favicon.png" rel="shortcut icon" type="image/x-icon">))
   end
 
@@ -84,7 +80,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#favicon_link_tag", :app_integrat
     end
 
     it "returns absolute url for href attribute" do
-      actual = favicon_link_tag.to_s
+      actual = favicon_tag.to_s
       expect(actual).to eq(%(<link href="#{base_url}/assets/favicon.ico" rel="shortcut icon" type="image/x-icon">))
     end
   end

data/spec/unit/hanami/helpers/assets_helper/image_tag_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Hanami::Helpers::AssetsHelper, "#image_tag", :app_integration do
+RSpec.describe Hanami::Helpers::AssetsHelper, "#image", :app_integration do
   subject(:obj) {
     helpers = described_class
     Class.new {

data/spec/unit/hanami/helpers/assets_helper/javascript_tag_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Hanami::Helpers::AssetsHelper, "#javascript_tag", :app_integration do
+RSpec.describe Hanami::Helpers::AssetsHelper, "#javascript", :app_integration do
   subject(:obj) {
     helpers = described_class
     Class.new {
@@ -69,8 +69,8 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#javascript_tag", :app_integratio
     expect(actual).to be_instance_of(::Hanami::View::HTML::SafeString)
   end
 
-  it "is aliased as `js`" do
-    expect(subject.js("feature-a")).to eq javascript_tag("feature-a")
+  it "is aliased as #javascript_tag" do
+    expect(subject.javascript_tag("feature-a")).to eq javascript_tag("feature-a")
   end
 
   it "renders <script> tag" do

data/spec/unit/hanami/helpers/assets_helper/{stylesheet_link_tag_spec.rb → stylesheet_tag_spec.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Hanami::Helpers::AssetsHelper, "#stylesheet_link_tag", :app_integration do
+RSpec.describe Hanami::Helpers::AssetsHelper, "#stylesheet", :app_integration do
   subject(:obj) {
     helpers = described_class
     Class.new {
@@ -14,8 +14,8 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#stylesheet_link_tag", :app_integ
     }.new(context)
   }
 
-  def stylesheet_link_tag(...)
-    subject.stylesheet_link_tag(...)
+  def stylesheet_tag(...)
+    subject.stylesheet_tag(...)
   end
 
   let(:context) { TestApp::Views::Context.new }
@@ -65,36 +65,36 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#stylesheet_link_tag", :app_integ
   end
 
   it "returns an instance of SafeString" do
-    actual = stylesheet_link_tag("main")
+    actual = stylesheet_tag("main")
     expect(actual).to be_instance_of(::Hanami::View::HTML::SafeString)
   end
 
-  it "is aliased as `css`" do
-    expect(subject.css("main")).to eq stylesheet_link_tag("main")
+  it "is aliased as #stylesheet_tag" do
+    expect(subject.stylesheet_tag("main")).to eq stylesheet_tag("main")
   end
 
   it "renders <link> tag" do
-    actual = stylesheet_link_tag("main")
+    actual = stylesheet_tag("main")
     expect(actual).to eq(%(<link href="/assets/main.css" type="text/css" rel="stylesheet">))
   end
 
   xit "renders <link> tag without appending ext after query string" do
-    actual = stylesheet_link_tag("fonts?font=Helvetica")
+    actual = stylesheet_tag("fonts?font=Helvetica")
     expect(actual).to eq(%(<link href="/assets/fonts?font=Helvetica" type="text/css" rel="stylesheet">))
   end
 
   it "renders <link> tag with an integrity attribute" do
-    actual = stylesheet_link_tag("main", integrity: "sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC")
+    actual = stylesheet_tag("main", integrity: "sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC")
     expect(actual).to eq(%(<link href="/assets/main.css" type="text/css" rel="stylesheet" integrity="sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC" crossorigin="anonymous">))
   end
 
   it "renders <link> tag with a crossorigin attribute" do
-    actual = stylesheet_link_tag("main", integrity: "sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC", crossorigin: "use-credentials")
+    actual = stylesheet_tag("main", integrity: "sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC", crossorigin: "use-credentials")
     expect(actual).to eq(%(<link href="/assets/main.css" type="text/css" rel="stylesheet" integrity="sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC" crossorigin="use-credentials">))
   end
 
   it "ignores href passed as an option" do
-    actual = stylesheet_link_tag("main", href: "wrong")
+    actual = stylesheet_tag("main", href: "wrong")
     expect(actual).to eq(%(<link href="/assets/main.css" type="text/css" rel="stylesheet">))
   end
 
@@ -106,7 +106,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#stylesheet_link_tag", :app_integ
     before { compile_assets! }
 
     it "includes subresource_integrity and crossorigin attributes" do
-      actual = stylesheet_link_tag("app")
+      actual = stylesheet_tag("app")
       expect(actual).to match(%r{<link href="/assets/app-[A-Z0-9]{8}.css" type="text/css" rel="stylesheet" integrity="sha384-[A-Za-z0-9+/]{64}" crossorigin="anonymous">})
     end
   end
@@ -119,7 +119,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#stylesheet_link_tag", :app_integ
     end
 
     it "returns absolute url for href attribute" do
-      actual = stylesheet_link_tag("main")
+      actual = stylesheet_tag("main")
       expect(actual).to eq(%(<link href="#{base_url}/assets/main.css" type="text/css" rel="stylesheet">))
     end
   end

data/spec/unit/hanami/helpers/assets_helper/video_tag_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Hanami::Helpers::AssetsHelper, "#video_tag", :app_integration do
+RSpec.describe Hanami::Helpers::AssetsHelper, "#video", :app_integration do
   subject(:obj) {
     helpers = described_class
     Class.new {
@@ -62,6 +62,10 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#video_tag", :app_integration do
     expect(actual).to eq(%(<video src="/assets/movie.mp4"></video>))
   end
 
+  it "is aliased as #video_tag" do
+    expect(video_tag("movie.mp4")).to eq(subject.video_tag("movie.mp4"))
+  end
+
   it "renders with html attributes" do
     actual = video_tag("movie.mp4", autoplay: true, controls: true).to_s
     expect(actual).to eq(%(<video autoplay="autoplay" controls="controls" src="/assets/movie.mp4"></video>))

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.1.0.beta2")
+    expect(Hanami::VERSION).to eq("2.1.0.rc1")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta2
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -279,6 +279,7 @@ files:
 - lib/hanami/extensions/view/scope.rb
 - lib/hanami/extensions/view/slice_configured_context.rb
 - lib/hanami/extensions/view/slice_configured_helpers.rb
+- lib/hanami/extensions/view/slice_configured_part.rb
 - lib/hanami/extensions/view/slice_configured_view.rb
 - lib/hanami/extensions/view/standard_helpers.rb
 - lib/hanami/helpers/assets_helper.rb
@@ -311,6 +312,8 @@ files:
 - lib/hanami/slice_registrar.rb
 - lib/hanami/version.rb
 - lib/hanami/web/rack_logger.rb
+- lib/hanami/web/welcome.html.erb
+- lib/hanami/web/welcome.rb
 - spec/integration/action/cookies_spec.rb
 - spec/integration/action/csrf_protection_spec.rb
 - spec/integration/action/format_config_spec.rb
@@ -341,6 +344,7 @@ files:
 - spec/integration/logging/notifications_spec.rb
 - spec/integration/logging/request_logging_spec.rb
 - spec/integration/rack_app/body_parser_spec.rb
+- spec/integration/rack_app/method_override_spec.rb
 - spec/integration/rack_app/middleware_spec.rb
 - spec/integration/rack_app/non_booted_rack_app_spec.rb
 - spec/integration/rack_app/rack_app_spec.rb
@@ -376,10 +380,12 @@ files:
 - spec/integration/view/helpers/scope_helpers_spec.rb
 - spec/integration/view/helpers/user_defined_helpers/part_helpers_spec.rb
 - spec/integration/view/helpers/user_defined_helpers/scope_helpers_spec.rb
+- spec/integration/view/parts/default_rendering_spec.rb
 - spec/integration/view/slice_configuration_spec.rb
 - spec/integration/view/views_spec.rb
 - spec/integration/web/render_detailed_errors_spec.rb
 - spec/integration/web/render_errors_spec.rb
+- spec/integration/web/welcome_view_spec.rb
 - spec/spec_helper.rb
 - spec/support/app_integration.rb
 - spec/support/coverage.rb
@@ -407,10 +413,10 @@ files:
 - spec/unit/hanami/extensions/view/context_spec.rb
 - spec/unit/hanami/helpers/assets_helper/asset_url_spec.rb
 - spec/unit/hanami/helpers/assets_helper/audio_tag_spec.rb
-- spec/unit/hanami/helpers/assets_helper/favicon_link_tag_spec.rb
+- spec/unit/hanami/helpers/assets_helper/favicon_tag_spec.rb
 - spec/unit/hanami/helpers/assets_helper/image_tag_spec.rb
 - spec/unit/hanami/helpers/assets_helper/javascript_tag_spec.rb
-- spec/unit/hanami/helpers/assets_helper/stylesheet_link_tag_spec.rb
+- spec/unit/hanami/helpers/assets_helper/stylesheet_tag_spec.rb
 - spec/unit/hanami/helpers/assets_helper/video_tag_spec.rb
 - spec/unit/hanami/helpers/form_helper_spec.rb
 - spec/unit/hanami/port_spec.rb
@@ -479,6 +485,7 @@ test_files:
 - spec/integration/logging/notifications_spec.rb
 - spec/integration/logging/request_logging_spec.rb
 - spec/integration/rack_app/body_parser_spec.rb
+- spec/integration/rack_app/method_override_spec.rb
 - spec/integration/rack_app/middleware_spec.rb
 - spec/integration/rack_app/non_booted_rack_app_spec.rb
 - spec/integration/rack_app/rack_app_spec.rb
@@ -514,10 +521,12 @@ test_files:
 - spec/integration/view/helpers/scope_helpers_spec.rb
 - spec/integration/view/helpers/user_defined_helpers/part_helpers_spec.rb
 - spec/integration/view/helpers/user_defined_helpers/scope_helpers_spec.rb
+- spec/integration/view/parts/default_rendering_spec.rb
 - spec/integration/view/slice_configuration_spec.rb
 - spec/integration/view/views_spec.rb
 - spec/integration/web/render_detailed_errors_spec.rb
 - spec/integration/web/render_errors_spec.rb
+- spec/integration/web/welcome_view_spec.rb
 - spec/spec_helper.rb
 - spec/support/app_integration.rb
 - spec/support/coverage.rb
@@ -545,10 +554,10 @@ test_files:
 - spec/unit/hanami/extensions/view/context_spec.rb
 - spec/unit/hanami/helpers/assets_helper/asset_url_spec.rb
 - spec/unit/hanami/helpers/assets_helper/audio_tag_spec.rb
-- spec/unit/hanami/helpers/assets_helper/favicon_link_tag_spec.rb
+- spec/unit/hanami/helpers/assets_helper/favicon_tag_spec.rb
 - spec/unit/hanami/helpers/assets_helper/image_tag_spec.rb
 - spec/unit/hanami/helpers/assets_helper/javascript_tag_spec.rb
-- spec/unit/hanami/helpers/assets_helper/stylesheet_link_tag_spec.rb
+- spec/unit/hanami/helpers/assets_helper/stylesheet_tag_spec.rb
 - spec/unit/hanami/helpers/assets_helper/video_tag_spec.rb
 - spec/unit/hanami/helpers/form_helper_spec.rb
 - spec/unit/hanami/port_spec.rb