hanami 2.1.0.beta1 → 2.1.0.beta2.1

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

@@ -3,43 +3,31 @@
 require "hanami/config/actions"
 
 RSpec.describe Hanami::Config::Actions, "#content_security_policy" do
-  let(:config) { described_class.new }
+  let(:app_config) { Hanami::Config.new(app_name: "MyApp::App", env: :development) }
+  let(:config) { app_config.actions }
   subject(:content_security_policy) { config.content_security_policy }
 
   context "no CSP config specified" do
-    context "without assets_server_url" do
-
-      it "has defaults" 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'),
-          %(script-src 'self'),
-          %(style-src 'self' 'unsafe-inline' https:)
-        ].join(";")
-
-        expect(content_security_policy.to_s).to eq(expected)
-      end
-    end
-
-    context "with assets_server_url" do
-      let(:config) { described_class.new(assets_server_url: assets_server_url) }
-      let(:assets_server_url) { "http://localhost:8080" }
-
-      it "includes server url" do
-        expect(content_security_policy[:script_src]).to eq("'self' #{assets_server_url}")
-        expect(content_security_policy[:style_src]).to eq("'self' 'unsafe-inline' https: #{assets_server_url}")
-      end
+    it "has defaults" 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'),
+        %(script-src 'self'),
+        %(style-src 'self' 'unsafe-inline' https:)
+      ].join(";")
+
+      expect(content_security_policy.to_s).to eq(expected)
     end
   end
 
@@ -84,7 +72,7 @@ RSpec.describe Hanami::Config::Actions, "#content_security_policy" do
 
   context "with CSP enabled" do
     it "sets default header" do
-      config.finalize!
+      app_config.finalize!
 
       expect(config.default_headers.fetch("Content-Security-Policy")).to eq(content_security_policy.to_s)
     end
@@ -93,7 +81,7 @@ RSpec.describe Hanami::Config::Actions, "#content_security_policy" do
   context "with CSP disabled" do
     it "doesn't set default header" do
       config.content_security_policy = false
-      config.finalize!
+      app_config.finalize!
 
       expect(config.default_headers.key?("Content-Security-Policy")).to be(false)
     end

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

@@ -3,7 +3,8 @@
 require "hanami/config/actions"
 
 RSpec.describe Hanami::Config::Actions, "#csrf_protection" do
-  let(:config) { described_class.new }
+  let(:app_config) { Hanami::Config.new(app_name: "MyApp::App", env: :development) }
+  let(:config) { app_config.actions }
   subject(:value) { config.csrf_protection }
 
   context "non-finalized config" do
@@ -26,7 +27,7 @@ RSpec.describe Hanami::Config::Actions, "#csrf_protection" do
     context "sessions enabled" do
       before do
         config.sessions = :cookie, {secret: "abc"}
-        config.finalize!
+        app_config.finalize!
       end
 
       it "is true" do
@@ -46,7 +47,7 @@ RSpec.describe Hanami::Config::Actions, "#csrf_protection" do
 
     context "sessions not enabled" do
       before do
-        config.finalize!
+        app_config.finalize!
       end
 
       it "is true" do

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

@@ -3,7 +3,8 @@
 require "hanami/config/actions"
 
 RSpec.describe Hanami::Config::Actions, "default values" do
-  subject(:config) { described_class.new }
+  let(:app_config) { Hanami::Config.new(app_name: "MyApp::App", env: :development) }
+  subject(:config) { app_config.actions }
 
   describe "sessions" do
     specify { expect(config.sessions).not_to be_enabled }
@@ -28,7 +29,7 @@ RSpec.describe Hanami::Config::Actions, "default values" do
 
     describe "default_headers" do
       specify {
-        config.finalize!
+        app_config.finalize!
 
         expect(config.default_headers).to eq(
           "X-Frame-Options" => "DENY",

data/spec/unit/hanami/env_spec.rb

@@ -1,54 +1,40 @@
 # frozen_string_literal: true
 
 RSpec.describe Hanami, ".env" do
-  subject(:env) { described_class.env }
-
-  before do
-    @orig_env = ENV.to_h
-  end
-
-  after do
-    ENV.replace(@orig_env)
-  end
+  subject { described_class.env(e: env) }
 
   context "HANAMI_ENV in ENV" do
-    before do
-      ENV["HANAMI_ENV"] = "test"
-    end
+    let(:env) { {"HANAMI_ENV" => "test"} }
 
     it "is the value of HANAMI_ENV" do
-      is_expected.to eq :test
+      is_expected.to eq(:test)
     end
   end
 
   context "RACK_ENV in ENV" do
-    before do
-      ENV["RACK_ENV"] = "test"
-    end
+    let(:env) { {"HANAMI_ENV" => "test"} }
 
     it "is the value of RACK_ENV" do
-      is_expected.to eq :test
+      is_expected.to eq(:test)
     end
   end
 
   context "both HANAMI_ENV and RACK_ENV in ENV" do
-    before do
-      ENV["HANAMI_ENV"] = "test"
-      ENV["RACK_ENV"] = "production"
+    let(:env) do
+      {"HANAMI_ENV" => "test",
+       "RACK_ENV" => "production"}
     end
 
     it "is the value of HANAMI_ENV" do
-      is_expected.to eq :test
+      is_expected.to eq(:test)
     end
   end
 
   context "no ENV vars set" do
-    before do
-      ENV.delete("HANAMI_ENV")
-    end
+    let(:env) { {} }
 
     it "defaults to \"development\"" do
-      is_expected.to eq :development
+      is_expected.to eq(:development)
     end
   end
 end

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

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+RSpec.describe Hanami::Helpers::AssetsHelper, "#asset_url", :app_integration do
+  subject(:obj) {
+    helpers = described_class
+    Class.new {
+      include helpers
+
+      attr_reader :_context
+
+      def initialize(context)
+        @_context = context
+      end
+    }.new(context)
+  }
+
+  def asset_url(...)
+    subject.asset_url(...)
+  end
+
+  let(:context) { TestApp::Views::Context.new }
+  let(:root) { make_tmp_directory }
+
+  before do
+    with_directory(root) do
+      write "config/app.rb", <<~RUBY
+        module TestApp
+          class App < Hanami::App
+            config.logger.stream = StringIO.new
+          end
+        end
+      RUBY
+
+      write "app/views/context.rb", <<~RUBY
+        # auto_register: false
+
+        require "hanami/view/context"
+
+        module TestApp
+          module Views
+            class Context < Hanami::View::Context
+            end
+          end
+        end
+      RUBY
+
+      write "app/assets/js/app.ts", <<~JS
+        import "../css/app.css";
+
+        console.log("Hello from index.ts");
+      JS
+
+      write "app/assets/css/app.css", <<~CSS
+        .btn {
+          background: #f00;
+        }
+      CSS
+
+      stub_assets("app.js")
+
+      require "hanami/setup"
+      before_prepare if respond_to?(:before_prepare)
+      require "hanami/prepare"
+    end
+  end
+
+  context "when configurated relative path only" do
+    context "without manifest" do
+      it "returns the relative URL to the asset" do
+        expect(asset_url("app.js")).to eq("/assets/app.js")
+      end
+
+      it "returns absolute URL if the argument is an absolute URL" do
+        result = asset_url("http://assets.hanamirb.org/assets/application.css")
+        expect(result).to eq("http://assets.hanamirb.org/assets/application.css")
+      end
+    end
+
+    context "with manifest" do
+      before { compile_assets! }
+
+      it "returns the relative URL to the asset" do
+        expect(asset_url("app.js")).to match(%r{/assets/app-[A-Z0-9]{8}\.js})
+      end
+    end
+  end
+
+  context "when configured with base url" do
+    let(:base_url) { "https://hanami.test" }
+
+    def before_prepare
+      Hanami.app.config.assets.base_url = base_url
+    end
+
+    context "without manifest" do
+      it "returns the absolute URL to the asset" do
+        expect(asset_url("app.js")).to eq("#{base_url}/assets/app.js")
+      end
+    end
+
+    context "with manifest" do
+      before { compile_assets! }
+
+      it "returns the relative path to the asset" do
+        expect(asset_url("app.js")).to match(%r{#{base_url}/assets/app-[A-Z0-9]{8}.js})
+      end
+    end
+  end
+end

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

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+RSpec.describe Hanami::Helpers::AssetsHelper, "#audio", :app_integration do
+  subject(:obj) {
+    helpers = described_class
+    Class.new {
+      include helpers
+
+      attr_reader :_context
+
+      def initialize(context)
+        @_context = context
+      end
+    }.new(context)
+  }
+
+  def audio(...)
+    subject.audio(...)
+  end
+
+  let(:context) { TestApp::Views::Context.new }
+  let(:root) { make_tmp_directory }
+
+  before do
+    with_directory(root) do
+      write "config/app.rb", <<~RUBY
+        module TestApp
+          class App < Hanami::App
+            config.logger.stream = StringIO.new
+          end
+        end
+      RUBY
+
+      write "app/views/context.rb", <<~RUBY
+        # auto_register: false
+
+        require "hanami/view/context"
+
+        module TestApp
+          module Views
+            class Context < Hanami::View::Context
+            end
+          end
+        end
+      RUBY
+
+      stub_assets("song.ogg", "song.pt-BR.vtt")
+
+      require "hanami/setup"
+      before_prepare if respond_to?(:before_prepare)
+      require "hanami/prepare"
+    end
+  end
+
+  it "returns an instance of HtmlBuilder" do
+    actual = audio("song.ogg")
+    expect(actual).to be_instance_of(::Hanami::View::HTML::SafeString)
+  end
+
+  it "renders <audio> tag" do
+    actual = audio("song.ogg").to_s
+    expect(actual).to eq(%(<audio src="/assets/song.ogg"></audio>))
+  end
+
+  it "is aliased as #audio_tag" do
+    expect(subject.audio_tag("song.ogg")).to eq(audio("song.ogg"))
+  end
+
+  it "renders with html attributes" do
+    actual = audio("song.ogg", autoplay: true, controls: true).to_s
+    expect(actual).to eq(%(<audio autoplay="autoplay" controls="controls" src="/assets/song.ogg"></audio>))
+  end
+
+  it "renders with fallback content" do
+    actual = audio("song.ogg") do
+      "Your browser does not support the audio tag"
+    end.to_s
+
+    expect(actual).to eq(%(<audio src="/assets/song.ogg">Your browser does not support the audio tag</audio>))
+  end
+
+  it "renders with tracks" do
+    actual = audio("song.ogg") do
+      tag.track kind: "captions", src: subject.asset_url("song.pt-BR.vtt"), srclang: "pt-BR", label: "Portuguese"
+    end.to_s
+
+    expect(actual).to eq(%(<audio src="/assets/song.ogg"><track kind="captions" src="/assets/song.pt-BR.vtt" srclang="pt-BR" label="Portuguese"></audio>))
+  end
+
+  xit "renders with sources" 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"
+    end.to_s
+
+    expect(actual).to eq(%(<audio>Your browser does not support the audio tag<source src="/assets/song.ogg" type="audio/ogg"><source src="/assets/song.wav" type="audio/wav"></audio>))
+  end
+
+  it "raises an exception when no arguments" do
+    expect do
+      audio
+    end.to raise_error(
+      ArgumentError,
+      "You should provide a source via `src` option or with a `source` HTML tag"
+    )
+  end
+
+  it "raises an exception when no src and no block" do
+    expect do
+      audio(controls: true)
+    end.to raise_error(
+      ArgumentError,
+      "You should provide a source via `src` option or with a `source` HTML tag"
+    )
+  end
+
+  describe "cdn mode" do
+    let(:base_url) { "https://hanami.test" }
+
+    def before_prepare
+      Hanami.app.config.assets.base_url = base_url
+    end
+
+    it "returns absolute url for src attribute" do
+      actual = audio("song.ogg").to_s
+      expect(actual).to eq(%(<audio src="#{base_url}/assets/song.ogg"></audio>))
+    end
+  end
+
+  private
+
+  def tag(...)
+    subject.__send__(:tag, ...)
+  end
+end

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

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+RSpec.describe Hanami::Helpers::AssetsHelper, "#favicon", :app_integration do
+  subject(:obj) {
+    helpers = described_class
+    Class.new {
+      include helpers
+
+      attr_reader :_context
+
+      def initialize(context)
+        @_context = context
+      end
+    }.new(context)
+  }
+
+  def favicon(...)
+    obj.instance_eval { favicon(...) }
+  end
+
+  let(:root) { make_tmp_directory }
+  let(:context) { TestApp::Views::Context.new }
+
+  before do
+    with_directory(root) do
+      write "config/app.rb", <<~RUBY
+        module TestApp
+          class App < Hanami::App
+            config.logger.stream = StringIO.new
+          end
+        end
+      RUBY
+
+      write "app/views/context.rb", <<~RUBY
+        # auto_register: false
+
+        require "hanami/view/context"
+
+        module TestApp
+          module Views
+            class Context < Hanami::View::Context
+            end
+          end
+        end
+      RUBY
+
+      stub_assets("favicon.ico", "favicon.png")
+
+      require "hanami/setup"
+      before_prepare if respond_to?(:before_prepare)
+      require "hanami/prepare"
+    end
+  end
+
+  it "returns an instance of SafeString" do
+    actual = favicon
+    expect(actual).to be_instance_of(::Hanami::View::HTML::SafeString)
+  end
+
+  it "is aliased as #favicon_link_tag" do
+    expect(subject.favicon_link_tag).to eq(favicon)
+  end
+
+  it "renders <link> tag" do
+    actual = favicon.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("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("favicon.png", href: "wrong").to_s
+    expect(actual).to eq(%(<link href="/assets/favicon.png" rel="shortcut icon" type="image/x-icon">))
+  end
+
+  describe "cdn mode" do
+    let(:base_url) { "https://hanami.test" }
+
+    def before_prepare
+      Hanami.app.config.assets.base_url = "https://hanami.test"
+    end
+
+    it "returns absolute url for href attribute" do
+      actual = favicon.to_s
+      expect(actual).to eq(%(<link href="#{base_url}/assets/favicon.ico" rel="shortcut icon" type="image/x-icon">))
+    end
+  end
+end

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

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+RSpec.describe Hanami::Helpers::AssetsHelper, "#image", :app_integration do
+  subject(:obj) {
+    helpers = described_class
+    Class.new {
+      include helpers
+
+      attr_reader :_context
+
+      def initialize(context)
+        @_context = context
+      end
+    }.new(context)
+  }
+
+  def image(...)
+    subject.image(...)
+  end
+
+  let(:root) { make_tmp_directory }
+  let(:context) { TestApp::Views::Context.new }
+
+  before do
+    with_directory(root) do
+      write "config/app.rb", <<~RUBY
+        module TestApp
+          class App < Hanami::App
+            config.logger.stream = StringIO.new
+          end
+        end
+      RUBY
+
+      write "app/views/context.rb", <<~RUBY
+        # auto_register: false
+
+        require "hanami/view/context"
+
+        module TestApp
+          module Views
+            class Context < Hanami::View::Context
+            end
+          end
+        end
+      RUBY
+
+      stub_assets("application.jpg")
+
+      require "hanami/setup"
+      before_prepare if respond_to?(:before_prepare)
+      require "hanami/prepare"
+    end
+  end
+
+  it "returns an instance of HtmlBuilder" do
+    actual = image("application.jpg")
+    expect(actual).to be_instance_of(::Hanami::View::HTML::SafeString)
+  end
+
+  it "renders an <img> tag" do
+    actual = image("application.jpg").to_s
+    expect(actual).to eq(%(<img src="/assets/application.jpg" alt="Application">))
+  end
+
+  it "is aliased as #image_tag" do
+    expect(subject.image_tag("application.jpg")).to eq image("application.jpg")
+  end
+
+  it "custom alt" do
+    actual = image("application.jpg", alt: "My Alt").to_s
+    expect(actual).to eq(%(<img src="/assets/application.jpg" alt="My Alt">))
+  end
+
+  it "custom data attribute" do
+    actual = image("application.jpg", "data-user-id" => 5).to_s
+    expect(actual).to eq(%(<img src="/assets/application.jpg" alt="Application" data-user-id="5">))
+  end
+
+  it "ignores src passed as an option" do
+    actual = image("application.jpg", src: "wrong").to_s
+    expect(actual).to eq(%(<img src="/assets/application.jpg" alt="Application">))
+  end
+
+  describe "cdn mode" do
+    let(:base_url) { "https://hanami.test" }
+
+    def before_prepare
+      Hanami.app.config.assets.base_url = "https://hanami.test"
+    end
+
+    it "returns absolute url for src attribute" do
+      actual = image("application.jpg").to_s
+      expect(actual).to eq(%(<img src="#{base_url}/assets/application.jpg" alt="Application">))
+    end
+  end
+end