hanami 2.1.0.beta2 → 2.1.0.beta2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d7766d5bdb4f510945a2065cc15457acbf00f43970d691afda74219f0aeb02
-  data.tar.gz: 58935ca7f23c3d3612a91b277827ed941c30839d04c9bf577e35a095fa667f6f
+  metadata.gz: 219f0622f399b1e3f94c77c5d7556b6bdd26122181929b444eb8fca436e9d0d2
+  data.tar.gz: 3dc2468f5561eb8d70fa62d3f5b7f755f096ab764cfbfd43fca93d6001061908
 SHA512:
-  metadata.gz: 50a785250f4cf249c5721dd37a5e5a7a240282e5d3820fe848a53c133b1727ea57e5beb351429e636bb4a7d89812bfc53794b5357865b134598a5d54e60666db
-  data.tar.gz: 677f40136e0477c57e493e41ed9a25666d9b53d6dd4ae4c23ee6e61d062f9537c39d86eb16d264f194eda4209e5eb0e38fa0554fd3efaf2d39ea23afa1ead27b
+  metadata.gz: f38c4b54000182e7ab4fb63be367131c6580df35519f97d5fd171de016b4ec96590c5f7c0822044421e0efec64813a492d4e106a803ea6028ba6d6d105db2ee6
+  data.tar.gz: 8648d6b907fbc4a600a4561184631b2868a577a2280c6bade34af1726d3bd6458045268c8517956e52bc4e6b2a6dfc78b0bee938e254563cac3fbbae91afc6d2

data/CHANGELOG.md

@@ -2,26 +2,33 @@
 
 The web, with simplicity.
 
+## v2.1.0.beta2.1 - 2023-10-04
+
+### Added
+
+- [Tim Riley, Luca Guidi] Added assets helpers aliases (#1319, #1339):
+  - Added `#js` and `#javascript_tag` as alias for `#javascript`
+  - Added `#css` and `#stylesheet_link_tag` as alias for `#stylesheet`
+  - Added `#image_tag` as alias for `#image`
+  - Added `#favicon_link_tag` as alias for `#favicon`
+  - Added `#video_tag` as alias for `#video`
+  - Added `#audio_tag` as alias for `#audio`
+
 ## v2.1.0.beta2 - 2023-10-04
 
 ### Added
 
 - [Luca Guidi, Tim Riley] Reimplement assets integration (#1319, #1332, #1333, #1336)
 - [Tim Riley] Introduce `Hanami::Helpers::AssetsHelper`, automatically included in view templates, scopes and parts when hanami-assets is bundled (#1319)
-- [Tim Riley] Renamed assets helpers (#1319):
-  - Removed `#asset_path` in favour of `#asset_url` only
-  - Renamed `#javascript` to `#javascript_tag`, retaining `#js` alias
-  - Renamed `#stylesheet` to `#stylesheet_link_tag`, retaining `#css` alias
-  - Renamed `#image` to `#image_tag`
-  - Renamed `#favicon` to `#favicon_link_tag`, with `#favicon` retained as an alias
-  - Renamed `#video` to `#video_tag`
-  - Renamed `#audio` to `#audio_tag`
-
 
 ### Fixed
 
 - [Tim Riley] Return appropriate response statuses based on error type (#1330)
 
+### Changed
+
+- [Tim Riley] Removed `#asset_path` in favour of `#asset_url` only (#1319)
+
 ## v2.1.0.beta1 - 2023-06-29
 
 ### Added

data/lib/hanami/helpers/assets_helper.rb

@@ -154,7 +154,7 @@ module Hanami
       #
       #   # <script src="https://assets.bookshelf.org/assets/application-28a6b886de2372ee3922fcaf3f78f2d8.js"
       #   #         type="text/javascript"></script>
-      def javascript_tag(*source_paths, **options)
+      def javascript(*source_paths, **options)
         options = options.reject { |k, _| k.to_sym == :src }
 
         _safe_tags(*source_paths) do |source|
@@ -175,7 +175,11 @@ module Hanami
 
       # @api public
       # @since 2.1.0
-      alias_method :js, :javascript_tag
+      alias_method :js, :javascript
+
+      # @api public
+      # @since 2.1.0
+      alias_method :javascript_tag, :javascript
 
       # Generate `link` tag for given source(s)
       #
@@ -251,7 +255,7 @@ module Hanami
       #
       #   # <link href="https://assets.bookshelf.org/assets/application-28a6b886de2372ee3922fcaf3f78f2d8.css"
       #   #       type="text/css" rel="stylesheet">
-      def stylesheet_link_tag(*source_paths, **options)
+      def stylesheet(*source_paths, **options)
         options = options.reject { |k, _| k.to_sym == :href }
 
         _safe_tags(*source_paths) do |source_path|
@@ -273,7 +277,11 @@ module Hanami
 
       # @api public
       # @since 2.1.0
-      alias_method :css, :stylesheet_link_tag
+      alias_method :css, :stylesheet
+
+      # @api public
+      # @since 2.1.0
+      alias_method :stylesheet_link_tag, :stylesheet
 
       # Generate `img` tag for given source
       #
@@ -305,40 +313,40 @@ module Hanami
       #
       # @example Basic Usage
       #
-      #   <%= image_tag "logo.png" %>
+      #   <%= image "logo.png" %>
       #
       #   # <img src="/assets/logo.png" alt="Logo">
       #
       # @example Custom alt Attribute
       #
-      #   <%= image_tag "logo.png", alt: "Application Logo" %>
+      #   <%= image "logo.png", alt: "Application Logo" %>
       #
       #   # <img src="/assets/logo.png" alt="Application Logo">
       #
       # @example Custom HTML Attributes
       #
-      #   <%= image_tag "logo.png", id: "logo", class: "image" %>
+      #   <%= image "logo.png", id: "logo", class: "image" %>
       #
       #   # <img src="/assets/logo.png" alt="Logo" id="logo" class="image">
       #
       # @example Absolute URL
       #
-      #   <%= image_tag "https://example-cdn.com/images/logo.png" %>
+      #   <%= image "https://example-cdn.com/images/logo.png" %>
       #
       #   # <img src="https://example-cdn.com/images/logo.png" alt="Logo">
       #
       # @example Fingerprint Mode
       #
-      #   <%= image_tag "logo.png" %>
+      #   <%= image "logo.png" %>
       #
       #   # <img src="/assets/logo-28a6b886de2372ee3922fcaf3f78f2d8.png" alt="Logo">
       #
       # @example CDN Mode
       #
-      #   <%= image_tag "logo.png" %>
+      #   <%= image "logo.png" %>
       #
       #   # <img src="https://assets.bookshelf.org/assets/logo-28a6b886de2372ee3922fcaf3f78f2d8.png" alt="Logo">
-      def image_tag(source, options = {})
+      def image(source, options = {})
         options = options.reject { |k, _| k.to_sym == :src }
         attributes = {
           src: asset_url(source),
@@ -349,6 +357,10 @@ module Hanami
         tag.img(**attributes)
       end
 
+      # @api public
+      # @since 2.1.0
+      alias_method :image_tag, :image
+
       # Generate `link` tag application favicon.
       #
       # If no argument is given, it assumes `favico.ico` from the application.
@@ -376,35 +388,35 @@ module Hanami
       #
       # @example Basic Usage
       #
-      #   <%= favicon_link_tag %>
+      #   <%= favicon %>
       #
       #   # <link href="/assets/favicon.ico" rel="shortcut icon" type="image/x-icon">
       #
       # @example Custom Path
       #
-      #   <%= favicon_link_tag "fav.ico" %>
+      #   <%= favicon "fav.ico" %>
       #
       #   # <link href="/assets/fav.ico" rel="shortcut icon" type="image/x-icon">
       #
       # @example Custom HTML Attributes
       #
-      #   <%= favicon_link_tag "favicon.ico", id: "fav" %>
+      #   <%= favicon "favicon.ico", id: "fav" %>
       #
       #   # <link id: "fav" href="/assets/favicon.ico" rel="shortcut icon" type="image/x-icon">
       #
       # @example Fingerprint Mode
       #
-      #   <%= favicon_link_tag %>
+      #   <%= favicon %>
       #
       #   # <link href="/assets/favicon-28a6b886de2372ee3922fcaf3f78f2d8.ico" rel="shortcut icon" type="image/x-icon">
       #
       # @example CDN Mode
       #
-      #   <%= favicon_link_tag %>
+      #   <%= favicon %>
       #
       #   # <link href="https://assets.bookshelf.org/assets/favicon-28a6b886de2372ee3922fcaf3f78f2d8.ico"
       #           rel="shortcut icon" type="image/x-icon">
-      def favicon_link_tag(source = DEFAULT_FAVICON, options = {})
+      def favicon(source = DEFAULT_FAVICON, options = {})
         options = options.reject { |k, _| k.to_sym == :href }
 
         attributes = {
@@ -419,7 +431,7 @@ module Hanami
 
       # @api public
       # @since 2.1.0
-      alias_method :favicon, :favicon_link_tag
+      alias_method :favicon_link_tag, :favicon
 
       # Generate `video` tag for given source
       #
@@ -454,26 +466,26 @@ module Hanami
       #
       # @example Basic Usage
       #
-      #   <%= video_tag "movie.mp4" %>
+      #   <%= video "movie.mp4" %>
       #
       #   # <video src="/assets/movie.mp4"></video>
       #
       # @example Absolute URL
       #
-      #   <%= video_tag "https://example-cdn.com/assets/movie.mp4" %>
+      #   <%= video "https://example-cdn.com/assets/movie.mp4" %>
       #
       #   # <video src="https://example-cdn.com/assets/movie.mp4"></video>
       #
       # @example Custom HTML Attributes
       #
-      #   <%= video_tag("movie.mp4", autoplay: true, controls: true) %>
+      #   <%= video("movie.mp4", autoplay: true, controls: true) %>
       #
       #   # <video src="/assets/movie.mp4" autoplay="autoplay" controls="controls"></video>
       #
       # @example Fallback Content
       #
       #   <%=
-      #     video_tag("movie.mp4") do
+      #     video("movie.mp4") do
       #       "Your browser does not support the video tag"
       #     end
       #   %>
@@ -485,7 +497,7 @@ module Hanami
       # @example Tracks
       #
       #   <%=
-      #     video_tag("movie.mp4") do
+      #     video("movie.mp4") do
       #       tag.track(kind: "captions", src: asset_url("movie.en.vtt"),
       #             srclang: "en", label: "English")
       #     end
@@ -497,32 +509,36 @@ module Hanami
       #
       # @example Without Any Argument
       #
-      #   <%= video_tag %>
+      #   <%= video %>
       #
       #   # ArgumentError
       #
       # @example Without src And Without Block
       #
-      #   <%= video_tag(content: true) %>
+      #   <%= video(content: true) %>
       #
       #   # ArgumentError
       #
       # @example Fingerprint Mode
       #
-      #   <%= video_tag "movie.mp4" %>
+      #   <%= video "movie.mp4" %>
       #
       #   # <video src="/assets/movie-28a6b886de2372ee3922fcaf3f78f2d8.mp4"></video>
       #
       # @example CDN Mode
       #
-      #   <%= video_tag "movie.mp4" %>
+      #   <%= video "movie.mp4" %>
       #
       #   # <video src="https://assets.bookshelf.org/assets/movie-28a6b886de2372ee3922fcaf3f78f2d8.mp4"></video>
-      def video_tag(source = nil, options = {}, &blk)
+      def video(source = nil, options = {}, &blk)
         options = _source_options(source, options, &blk)
         tag.video(**options, &blk)
       end
 
+      # @api public
+      # @since 2.1.0
+      alias_method :video_tag, :video
+
       # Generate `audio` tag for given source
       #
       # It accepts one string representing the name of the asset, if it comes
@@ -556,26 +572,26 @@ module Hanami
       #
       # @example Basic Usage
       #
-      #   <%= audio_tag "song.ogg" %>
+      #   <%= audio "song.ogg" %>
       #
       #   # <audio src="/assets/song.ogg"></audio>
       #
       # @example Absolute URL
       #
-      #   <%= audio_tag "https://example-cdn.com/assets/song.ogg" %>
+      #   <%= audio "https://example-cdn.com/assets/song.ogg" %>
       #
       #   # <audio src="https://example-cdn.com/assets/song.ogg"></audio>
       #
       # @example Custom HTML Attributes
       #
-      #   <%= audio_tag("song.ogg", autoplay: true, controls: true) %>
+      #   <%= audio("song.ogg", autoplay: true, controls: true) %>
       #
       #   # <audio src="/assets/song.ogg" autoplay="autoplay" controls="controls"></audio>
       #
       # @example Fallback Content
       #
       #   <%=
-      #     audio_tag("song.ogg") do
+      #     audio("song.ogg") do
       #       "Your browser does not support the audio tag"
       #     end
       #   %>
@@ -587,7 +603,7 @@ module Hanami
       # @example Tracks
       #
       #   <%=
-      #     audio_tag("song.ogg") do
+      #     audio("song.ogg") do
       #       tag.track(kind: "captions", src: asset_url("song.pt-BR.vtt"),
       #             srclang: "pt-BR", label: "Portuguese")
       #     end
@@ -599,32 +615,36 @@ module Hanami
       #
       # @example Without Any Argument
       #
-      #   <%= audio_tag %>
+      #   <%= audio %>
       #
       #   # ArgumentError
       #
       # @example Without src And Without Block
       #
-      #   <%= audio_tag(controls: true) %>
+      #   <%= audio(controls: true) %>
       #
       #   # ArgumentError
       #
       # @example Fingerprint Mode
       #
-      #   <%= audio_tag "song.ogg" %>
+      #   <%= audio "song.ogg" %>
       #
       #   # <audio src="/assets/song-28a6b886de2372ee3922fcaf3f78f2d8.ogg"></audio>
       #
       # @example CDN Mode
       #
-      #   <%= audio_tag "song.ogg" %>
+      #   <%= audio "song.ogg" %>
       #
       #   # <audio src="https://assets.bookshelf.org/assets/song-28a6b886de2372ee3922fcaf3f78f2d8.ogg"></audio>
-      def audio_tag(source = nil, options = {}, &blk)
+      def audio(source = nil, options = {}, &blk)
         options = _source_options(source, options, &blk)
         tag.audio(**options, &blk)
       end
 
+      # @api public
+      # @since 2.1.0
+      alias_method :audio_tag, :audio
+
       # It generates the relative or absolute URL for the given asset.
       # It automatically decides if it has to use the relative or absolute
       # depending on the configuration and current environment.

data/lib/hanami/version.rb

@@ -7,7 +7,7 @@ module Hanami
   # @api private
   module Version
     # @api public
-    VERSION = "2.1.0.beta2"
+    VERSION = "2.1.0.beta2.1"
 
     # @since 0.9.0
     # @api private

data/spec/unit/hanami/helpers/assets_helper/{audio_tag_spec.rb → audio_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 {
@@ -14,8 +14,8 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#audio_tag", :app_integration do
     }.new(context)
   }
 
-  def audio_tag(...)
-    subject.audio_tag(...)
+  def audio(...)
+    subject.audio(...)
   end
 
   let(:context) { TestApp::Views::Context.new }
@@ -53,22 +53,26 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#audio_tag", :app_integration do
   end
 
   it "returns an instance of HtmlBuilder" do
-    actual = audio_tag("song.ogg")
+    actual = audio("song.ogg")
     expect(actual).to be_instance_of(::Hanami::View::HTML::SafeString)
   end
 
   it "renders <audio> tag" do
-    actual = audio_tag("song.ogg").to_s
+    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_tag("song.ogg", autoplay: true, controls: true).to_s
+    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_tag("song.ogg") do
+    actual = audio("song.ogg") do
       "Your browser does not support the audio tag"
     end.to_s
 
@@ -76,7 +80,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#audio_tag", :app_integration do
   end
 
   it "renders with tracks" do
-    actual = audio_tag("song.ogg") 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
 
@@ -84,7 +88,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"
@@ -95,7 +99,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#audio_tag", :app_integration do
 
   it "raises an exception when no arguments" do
     expect do
-      audio_tag
+      audio
     end.to raise_error(
       ArgumentError,
       "You should provide a source via `src` option or with a `source` HTML tag"
@@ -104,7 +108,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#audio_tag", :app_integration do
 
   it "raises an exception when no src and no block" do
     expect do
-      audio_tag(controls: true)
+      audio(controls: true)
     end.to raise_error(
       ArgumentError,
       "You should provide a source via `src` option or with a `source` HTML tag"
@@ -119,7 +123,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#audio_tag", :app_integration do
     end
 
     it "returns absolute url for src attribute" do
-      actual = audio_tag("song.ogg").to_s
+      actual = audio("song.ogg").to_s
       expect(actual).to eq(%(<audio src="#{base_url}/assets/song.ogg"></audio>))
     end
   end

data/spec/unit/hanami/helpers/assets_helper/{favicon_link_tag_spec.rb → favicon_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(...)
+    obj.instance_eval { favicon(...) }
   end
 
   let(:root) { make_tmp_directory }
@@ -53,26 +53,26 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#favicon_link_tag", :app_integrat
   end
 
   it "returns an instance of SafeString" do
-    actual = favicon_link_tag
+    actual = favicon
     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
+  it "is aliased as #favicon_link_tag" do
+    expect(subject.favicon_link_tag).to eq(favicon)
   end
 
   it "renders <link> tag" do
-    actual = favicon_link_tag.to_s
+    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_link_tag("favicon.png", rel: "icon", type: "image/png").to_s
+    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_link_tag("favicon.png", href: "wrong").to_s
+    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
 
@@ -84,7 +84,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.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 → image_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 {
@@ -14,8 +14,8 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#image_tag", :app_integration do
     }.new(context)
   }
 
-  def image_tag(...)
-    subject.image_tag(...)
+  def image(...)
+    subject.image(...)
   end
 
   let(:root) { make_tmp_directory }
@@ -53,27 +53,31 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#image_tag", :app_integration do
   end
 
   it "returns an instance of HtmlBuilder" do
-    actual = image_tag("application.jpg")
+    actual = image("application.jpg")
     expect(actual).to be_instance_of(::Hanami::View::HTML::SafeString)
   end
 
   it "renders an <img> tag" do
-    actual = image_tag("application.jpg").to_s
+    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_tag("application.jpg", alt: "My Alt").to_s
+    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_tag("application.jpg", "data-user-id" => 5).to_s
+    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_tag("application.jpg", src: "wrong").to_s
+    actual = image("application.jpg", src: "wrong").to_s
     expect(actual).to eq(%(<img src="/assets/application.jpg" alt="Application">))
   end
 
@@ -85,7 +89,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#image_tag", :app_integration do
     end
 
     it "returns absolute url for src attribute" do
-      actual = image_tag("application.jpg").to_s
+      actual = image("application.jpg").to_s
       expect(actual).to eq(%(<img src="#{base_url}/assets/application.jpg" alt="Application">))
     end
   end

data/spec/unit/hanami/helpers/assets_helper/{javascript_tag_spec.rb → javascript_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 {
@@ -14,8 +14,8 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#javascript_tag", :app_integratio
     }.new(context)
   }
 
-  def javascript_tag(...)
-    subject.javascript_tag(...)
+  def javascript(...)
+    subject.javascript(...)
   end
 
   let(:context) { TestApp::Views::Context.new }
@@ -65,52 +65,56 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#javascript_tag", :app_integratio
   end
 
   it "returns an instance of SafeString" do
-    actual = javascript_tag("feature-a")
+    actual = javascript("feature-a")
     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 #js" do
+    expect(subject.js("feature-a")).to eq javascript("feature-a")
+  end
+
+  it "is aliased as #javascript_tag" do
+    expect(subject.javascript_tag("feature-a")).to eq javascript("feature-a")
   end
 
   it "renders <script> tag" do
-    actual = javascript_tag("feature-a")
+    actual = javascript("feature-a")
     expect(actual).to eq(%(<script src="/assets/feature-a.js" type="text/javascript"></script>))
   end
 
   xit "renders <script> tag without appending ext after query string" do
-    actual = javascript_tag("feature-x?callback=init")
+    actual = javascript("feature-x?callback=init")
     expect(actual).to eq(%(<script src="/assets/feature-x?callback=init" type="text/javascript"></script>))
   end
 
   it "renders <script> tag with a defer attribute" do
-    actual = javascript_tag("feature-a", defer: true)
+    actual = javascript("feature-a", defer: true)
     expect(actual).to eq(%(<script src="/assets/feature-a.js" type="text/javascript" defer="defer"></script>))
   end
 
   it "renders <script> tag with an integrity attribute" do
-    actual = javascript_tag("feature-a", integrity: "sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC")
+    actual = javascript("feature-a", integrity: "sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC")
     expect(actual).to eq(%(<script src="/assets/feature-a.js" type="text/javascript" integrity="sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC" crossorigin="anonymous"></script>))
   end
 
   it "renders <script> tag with a crossorigin attribute" do
-    actual = javascript_tag("feature-a", integrity: "sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC", crossorigin: "use-credentials")
+    actual = javascript("feature-a", integrity: "sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC", crossorigin: "use-credentials")
     expect(actual).to eq(%(<script src="/assets/feature-a.js" type="text/javascript" integrity="sha384-oqVuAfXRKap7fdgcCY5uykM6+R9GqQ8K/uxy9rx7HNQlGYl1kPzQho1wx4JwY8wC" crossorigin="use-credentials"></script>))
   end
 
   it "ignores src passed as an option" do
-    actual = javascript_tag("feature-a", src: "wrong")
+    actual = javascript("feature-a", src: "wrong")
     expect(actual).to eq(%(<script src="/assets/feature-a.js" type="text/javascript"></script>))
   end
 
   describe "async option" do
     it "renders <script> tag with an async=true if async option is true" do
-      actual = javascript_tag("feature-a", async: true)
+      actual = javascript("feature-a", async: true)
       expect(actual).to eq(%(<script src="/assets/feature-a.js" type="text/javascript" async="async"></script>))
     end
 
     it "renders <script> tag without an async=true if async option is false" do
-      actual = javascript_tag("feature-a", async: false)
+      actual = javascript("feature-a", async: false)
       expect(actual).to eq(%(<script src="/assets/feature-a.js" type="text/javascript"></script>))
     end
   end
@@ -123,7 +127,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#javascript_tag", :app_integratio
     before { compile_assets! }
 
     it "includes subresource_integrity and crossorigin attributes" do
-      actual = javascript_tag("app")
+      actual = javascript("app")
       expect(actual).to match(%r{<script src="/assets/app-[A-Z0-9]{8}.js" type="text/javascript" integrity="sha384-[A-Za-z0-9+/]{64}" crossorigin="anonymous"></script>})
     end
   end
@@ -136,7 +140,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#javascript_tag", :app_integratio
     end
 
     it "returns absolute url for src attribute" do
-      actual = javascript_tag("feature-a")
+      actual = javascript("feature-a")
       expect(actual).to eq(%(<script src="#{base_url}/assets/feature-a.js" type="text/javascript"></script>))
     end
   end

data/spec/unit/hanami/helpers/assets_helper/{stylesheet_link_tag_spec.rb → stylesheet_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(...)
+    subject.stylesheet(...)
   end
 
   let(:context) { TestApp::Views::Context.new }
@@ -65,36 +65,40 @@ 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("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 #css" do
+    expect(subject.css("main")).to eq stylesheet("main")
+  end
+
+  it "is aliased as #stylesheet_link_tag" do
+    expect(subject.stylesheet_link_tag("main")).to eq stylesheet("main")
   end
 
   it "renders <link> tag" do
-    actual = stylesheet_link_tag("main")
+    actual = stylesheet("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("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("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("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("main", href: "wrong")
     expect(actual).to eq(%(<link href="/assets/main.css" type="text/css" rel="stylesheet">))
   end
 
@@ -106,7 +110,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("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 +123,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("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 → video_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 {
@@ -14,8 +14,8 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#video_tag", :app_integration do
     }.new(context)
   }
 
-  def video_tag(...)
-    subject.video_tag(...)
+  def video(...)
+    subject.video(...)
   end
 
   let(:context) { TestApp::Views::Context.new }
@@ -53,22 +53,26 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#video_tag", :app_integration do
   end
 
   it "returns an instance of HtmlBuilder" do
-    actual = video_tag("movie.mp4")
+    actual = video("movie.mp4")
     expect(actual).to be_instance_of(::Hanami::View::HTML::SafeString)
   end
 
   it "renders <video> tag" do
-    actual = video_tag("movie.mp4").to_s
+    actual = video("movie.mp4").to_s
     expect(actual).to eq(%(<video src="/assets/movie.mp4"></video>))
   end
 
+  it "is aliased as #video_tag" do
+    expect(video("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
+    actual = video("movie.mp4", autoplay: true, controls: true).to_s
     expect(actual).to eq(%(<video autoplay="autoplay" controls="controls" src="/assets/movie.mp4"></video>))
   end
 
   it "renders with fallback content" do
-    actual = video_tag("movie.mp4") do
+    actual = video("movie.mp4") do
       "Your browser does not support the video tag"
     end.to_s
 
@@ -76,7 +80,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#video_tag", :app_integration do
   end
 
   it "renders with tracks" do
-    actual = video_tag("movie.mp4") do
+    actual = video("movie.mp4") do
       tag.track kind: "captions", src: subject.asset_url("movie.en.vtt"), srclang: "en", label: "English"
     end.to_s
 
@@ -95,7 +99,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#video_tag", :app_integration do
 
   it "raises an exception when no arguments" do
     expect do
-      video_tag
+      video
     end.to raise_error(
       ArgumentError,
       "You should provide a source via `src` option or with a `source` HTML tag"
@@ -104,7 +108,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#video_tag", :app_integration do
 
   it "raises an exception when no src and no block" do
     expect do
-      video_tag(content: true)
+      video(content: true)
     end.to raise_error(
       ArgumentError,
       "You should provide a source via `src` option or with a `source` HTML tag"
@@ -119,7 +123,7 @@ RSpec.describe Hanami::Helpers::AssetsHelper, "#video_tag", :app_integration do
     end
 
     it "returns absolute url for src attribute" do
-      actual = video_tag("movie.mp4").to_s
+      actual = video("movie.mp4").to_s
       expect(actual).to eq(%(<video src="#{base_url}/assets/movie.mp4"></video>))
     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.1.0.beta2")
+    expect(Hanami::VERSION).to eq("2.1.0.beta2.1")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta2
+  version: 2.1.0.beta2.1
 platform: ruby
 authors:
 - Luca Guidi
@@ -406,12 +406,12 @@ files:
 - spec/unit/hanami/env_spec.rb
 - 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/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/video_tag_spec.rb
+- spec/unit/hanami/helpers/assets_helper/audio_spec.rb
+- spec/unit/hanami/helpers/assets_helper/favicon_spec.rb
+- spec/unit/hanami/helpers/assets_helper/image_spec.rb
+- spec/unit/hanami/helpers/assets_helper/javascript_spec.rb
+- spec/unit/hanami/helpers/assets_helper/stylesheet_spec.rb
+- spec/unit/hanami/helpers/assets_helper/video_spec.rb
 - spec/unit/hanami/helpers/form_helper_spec.rb
 - spec/unit/hanami/port_spec.rb
 - spec/unit/hanami/router/errors/not_allowed_error_spec.rb
@@ -544,12 +544,12 @@ test_files:
 - spec/unit/hanami/env_spec.rb
 - 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/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/video_tag_spec.rb
+- spec/unit/hanami/helpers/assets_helper/audio_spec.rb
+- spec/unit/hanami/helpers/assets_helper/favicon_spec.rb
+- spec/unit/hanami/helpers/assets_helper/image_spec.rb
+- spec/unit/hanami/helpers/assets_helper/javascript_spec.rb
+- spec/unit/hanami/helpers/assets_helper/stylesheet_spec.rb
+- spec/unit/hanami/helpers/assets_helper/video_spec.rb
 - spec/unit/hanami/helpers/form_helper_spec.rb
 - spec/unit/hanami/port_spec.rb
 - spec/unit/hanami/router/errors/not_allowed_error_spec.rb