hotwire_native_rails 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b64d65dc8f90e19441ff12633025b080fa0a99096dc3d32c2477aeda01780d1
-  data.tar.gz: 58c56ca7d31535fdb87028170962e16d28ac589cfde0b7d5b1f04cc7214aa7e9
+  metadata.gz: b9a2e5493ea7c812bac6c062d58bcd6d2cecf0813e98bbe1c8b04b1d1f19624b
+  data.tar.gz: f8d1b8babe84f397588fb343f4941a22d633fc1364c2a32b030547e0b08e2fae
 SHA512:
-  metadata.gz: 93ce3791ac063e486b1ff7486774f927398d05b99f70681b840bfd6725623e3f6cf7e7a4a60697dee5df7222f5a33c10467908846881e28eda3c656e9eae910e
-  data.tar.gz: aa745e677e5099397ef9be5583b10f6ccc765cb2dd6dd5277753ae897409928881321c55ee26ff9ef91529d5566dc14a84e82f949ded6485fe5cc48894f10287
+  metadata.gz: 214c4723dbfb23fb8f7e056217f19804bcbda9c49bd2afb92b881e481ea6ae9b893007a8ec70b23ef9949314ec86b95b9eb582338335c6c8b36aca212d264eb4
+  data.tar.gz: 92d65d6d21760e3334bd109d3d2fb8851b6d84c486f7171ac3b36e91fa79b26076ea503242a4f80bbfb5754bde39b630ef7e391d27d0ef22562ef4c0b3b58cf7

data/.github/workflows/main.yml

@@ -1,27 +1,30 @@
-name: Ruby
+name: Smoke test
 
 on:
   push:
     branches:
-      - master
-
+      - main
   pull_request:
 
 jobs:
-  build:
+  smoke:
     runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }}
+    name: ${{ matrix.flavor }}
     strategy:
+      fail-fast: false
       matrix:
-        ruby:
-          - '3.3.3'
+        flavor:
+          - tailwind4
+          - tailwind3
+          - css
 
     steps:
       - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Run the default task
-        run: bundle exec rake
+          ruby-version: '3.4'
+      - name: Install Rails
+        run: gem install rails --no-document
+      - name: Generate an app, run the generator and its tests
+        run: bin/smoke ${{ matrix.flavor }}

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 /hotwire_native_rails-*.gem
+/Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [0.5.0] - 2026-11-14
+
+- Generated code uses `hotwire_native_app?` instead of `turbo_native_app?` (#2). Requires `turbo-rails` >= 2.0.11.
+- Fix: Tailwind 3 apps crashed the generator (`add_tailwind_3_css_variants` was undefined).
+- Fix: Tailwind 4 apps did not get the `hotwire-native:` variants, because `@import "tailwindcss";` (double quotes) was not matched.
+- Fix: the `link_to` override now also drops `target` for internal links written with a block, and no longer modifies the options hash passed in (#9).
+- `internal_url?` compares against the request host instead of `root_url`, and treats `mailto:`/`tel:` links as external.
+- README: the request variant is `:native` (`index.html+native.erb`), not `:mobile`.
+- CI runs the generator in fresh Tailwind 4, Tailwind 3 and plain-CSS Rails apps (`bin/smoke`).
+
 ## [0.1.0] - 2024-11-30
 
 - Initial release

data/README.md

@@ -4,6 +4,8 @@ Power pack to make your Rails app [Hotwire Native](https://native.hotwired.dev)
 
 ## Installation
 
+Requires `turbo-rails` 2.0.11 or newer (for the `hotwire_native_app?` helper).
+
 Install the gem:
 
 ```sh
@@ -18,13 +20,11 @@ rails g hotwire_native
 
 ## Usage
 
-Recommended to use with [my fork of iOS Hotwire Native starter app](https://github.com/yshmarov/hotwire-native-ios/tree/superails-extensions-2/Demo).
-
 #### Helpers
 - `viewport_meta_tag` - forbid zooming on mobile/native
 - use `data: { turbo_action: replace_if_native }` to submit authentication forms & forms in modals
-- `:mobile` request variant. `index.html+mobile.erb`
-- override `link_to` to not open internal links in in-app browser on native app
+- `:native` request variant for Hotwire Native requests: `index.html+native.erb`
+- override `link_to` so internal links open in the app, not the in-app browser (drops `target="_blank"` for your own host; works with and without a block)
 - conditionally override page `<title>` for native apps
 
 #### CSS
@@ -49,14 +49,21 @@ Run the local version of the gem:
 gem 'hotwire_native_rails', path: '/Users/myusername/Documents/GitHub.nosync/hotwire_native_rails'
 ```
 
+Test the generator in brand-new Rails apps (Tailwind 4, Tailwind 3 and plain CSS). Each run generates an app under `tmp/`, runs `rails g hotwire_native`, checks what it changed and runs the generated tests:
+
+```sh
+bin/smoke tailwind4   # or tailwind3, css
+bundle exec rake      # all three
+```
+
 Make a release to rubygems:
 
 ```sh
-# 1. update version in version.rb
-# 2. zip the gem
+# 1. update version in version.rb and CHANGELOG.md
+# 2. build the gem
 gem build hotwire_native_rails.gemspec
-# 3. push the zip to rubygems
-gem push hotwire_native_rails-0.4.0.gem
+# 3. push it to rubygems
+gem push hotwire_native_rails-X.Y.Z.gem
 ```
 
 - [Github source](https://github.com/yshmarov/hotwire_native_rails)

data/Rakefile

@@ -1,2 +1,13 @@
 require "bundler/gem_tasks"
+
+SMOKE_FLAVORS = %w[tailwind4 tailwind3 css].freeze
+
+desc "Run the generator in fresh Rails apps (#{SMOKE_FLAVORS.join(", ")}) and run their tests"
+task :test do
+  # bin/smoke runs `rails new` and the new app's own bundle, so leave this gem's bundle.
+  Bundler.with_unbundled_env do
+    SMOKE_FLAVORS.each { |flavor| sh "bin/smoke #{flavor}" }
+  end
+end
+
 task default: :test

data/bin/smoke

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# Smoke-tests the generator in a brand-new Rails app, the way a user runs it.
+#
+#   bin/smoke tailwind4   rails new --css=tailwind (tailwindcss-rails 4)
+#   bin/smoke tailwind3   a config/tailwind.config.js app (Tailwind 3 setup)
+#   bin/smoke css         plain CSS, no Tailwind
+#
+# It generates the app under tmp/, installs this checkout of the gem, runs
+# `rails g hotwire_native`, checks the files it should have changed, then runs
+# the tests the generator copied into the app.
+set -euo pipefail
+
+flavor="${1:-tailwind4}"
+root="$(cd "$(dirname "$0")/.." && pwd)"
+app="$root/tmp/smoke-$flavor"
+
+rm -rf "$app"
+mkdir -p "$root/tmp"
+
+css_flag=()
+if [ "$flavor" = "tailwind4" ]; then css_flag=(--css=tailwind); fi
+
+rails new "$app" ${css_flag[@]+"${css_flag[@]}"} --quiet --skip-git --skip-docker --skip-kamal \
+  --skip-thruster --skip-solid --skip-action-mailbox --skip-action-text \
+  --skip-active-storage --skip-jbuilder --skip-ci --skip-rubocop --skip-brakeman \
+  --skip-system-test --skip-bootsnap
+
+cd "$app"
+
+if [ "$flavor" = "tailwind3" ]; then
+  printf 'module.exports = {\n  plugins: [\n  ]\n}\n' > config/tailwind.config.js
+fi
+
+bundle add hotwire_native_rails --path "$root"
+
+# The generated integration tests request root_path, so give the app a page.
+bin/rails generate controller pages home --skip-routes --no-helper --quiet
+ruby -pi -e 'sub(/^Rails.application.routes.draw do\n/) { "#{$&}  root \"pages#home\"\n" }' config/routes.rb
+
+bin/rails generate hotwire_native
+
+fail() { echo "SMOKE FAIL ($flavor): $*" >&2; exit 1; }
+layout=app/views/layouts/application.html.erb
+grep -q "viewport_meta_tag" "$layout" || fail "viewport_meta_tag not in layout"
+grep -q "platform_identifier" "$layout" || fail "platform_identifier not on <html>"
+grep -q "page_title" "$layout" || fail "page_title not in <title>"
+grep -q "include DeviceFormat" app/controllers/application_controller.rb || fail "DeviceFormat not included"
+grep -q "draw(:hotwire_native)" config/routes.rb || fail "routes not drawn"
+grep -rq "turbo_native_app?" app test && fail "turbo_native_app? still generated"
+
+case "$flavor" in
+  tailwind4) grep -q "@custom-variant hotwire-native" app/assets/tailwind/application.css || fail "Tailwind 4 variants not added" ;;
+  tailwind3) grep -q 'addVariant("hotwire-native"' config/tailwind.config.js || fail "Tailwind 3 variants not added" ;;
+  css)       grep -q "body.hotwire-native" app/assets/stylesheets/application.css || fail "CSS class not added"
+             grep -q "hotwire_native_app?" "$layout" || fail "body class not added" ;;
+esac
+
+bin/rails test
+echo "SMOKE OK ($flavor)"

data/hotwire_native_rails.gemspec

@@ -11,6 +11,10 @@ Gem::Specification.new do |spec|
   spec.summary = "Generate Hotwire Native Rails helpers and bridge components"
   spec.homepage = "https://github.com/yshmarov/hotwire_native_rails"
   spec.license = "MIT"
+  spec.required_ruby_version = ">= 3.1"
+
+  # hotwire_native_app? (used by every generated helper) arrived in turbo-rails 2.0.11.
+  spec.add_dependency "turbo-rails", ">= 2.0.11"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

data/lib/generators/hotwire_native/hotwire_native_generator.rb

@@ -85,7 +85,7 @@ class HotwireNativeGenerator < Rails::Generators::Base
 
   # class="hotwire-native:hidden"
   # class="non-hotwire-native:hidden"
-  def add_tailwind_css_variants
+  def add_tailwind_3_css_variants
     prepend_to_file "config/tailwind.config.js", "const plugin = require('tailwindcss/plugin')\n"
 
     inject_into_file "config/tailwind.config.js", after: "plugins: [" do
@@ -100,7 +100,7 @@ class HotwireNativeGenerator < Rails::Generators::Base
   end
 
   def add_tailwind_4_css_variants
-    inject_into_file "app/assets/tailwind/application.css", after: "@import 'tailwindcss';\n" do
+    inject_into_file "app/assets/tailwind/application.css", after: /@import ["']tailwindcss["'];\n/ do
       <<-CSS
 @custom-variant hotwire-native {
   html[data-hotwire-native] & {
@@ -119,7 +119,7 @@ class HotwireNativeGenerator < Rails::Generators::Base
 
   # class="hotwire-native:hidden"
   def add_hotwire_native_css
-    gsub_file "app/views/layouts/application.html.erb", "<body>", "<body class=\"<%= \"hotwire-native\" if turbo_native_app? %>\">"
+    gsub_file "app/views/layouts/application.html.erb", "<body>", "<body class=\"<%= \"hotwire-native\" if hotwire_native_app? %>\">"
 
     append_to_file "app/assets/stylesheets/application.css" do
       <<-CSS

data/lib/generators/hotwire_native/templates/controllers/concerns/device_format.rb

@@ -8,8 +8,8 @@ module DeviceFormat
   private
 
   def set_variant
-    # request.variant = :mobile if turbo_native_app? || browser.device.mobile?
+    # request.variant = :mobile if hotwire_native_app? || browser.device.mobile?
     # request.variant = :mobile if browser.device.mobile?
-    request.variant = :native if turbo_native_app?
+    request.variant = :native if hotwire_native_app?
   end
 end

data/lib/generators/hotwire_native/templates/helpers/hotwire_native_helper.rb

@@ -10,7 +10,7 @@ module HotwireNativeHelper
   # <% content_for :title, "Sign in | My App" %>
   def page_title
     title_options = [
-      (content_for(:hotwire_native_title) if turbo_native_app?),
+      (content_for(:hotwire_native_title) if hotwire_native_app?),
       content_for(:title),
       @page_title,
       Rails.application.class.module_parent.name
@@ -22,13 +22,13 @@ module HotwireNativeHelper
   # forbid zooming on mobile devices
   def viewport_meta_tag
     content = ['width=device-width,initial-scale=1']
-    content << 'maximum-scale=1, user-scalable=0' if turbo_native_app? || browser.device.mobile?
+    content << 'maximum-scale=1, user-scalable=0' if hotwire_native_app? || browser.device.mobile?
     tag.meta(name: 'viewport', content: content.join(','))
   end
 
   # set on <html> tag
   def platform_identifier
-    'data-hotwire-native' if turbo_native_app?
+    'data-hotwire-native' if hotwire_native_app?
   end
 
   # link_to 'Next', next_path, data: { turbo_action: replace_if_native }
@@ -36,15 +36,33 @@ module HotwireNativeHelper
   # caution: if you open a modal on top of the root page, and replace, it will replace the root page.
   # projects#show will replace projects#index => BAD
   def replace_if_native
-    return 'replace' if turbo_native_app?
+    return 'replace' if hotwire_native_app?
 
     'advance'
   end
 
-  # override link_to to not open internal links in in-app browser on native app
-  def link_to(name = nil, options = nil, html_options = {}, &)
-    html_options[:target] = '' if turbo_native_app? && internal_url?(url_for(options))
-    super
+  # In the native app, drop target="_blank" from links to your own host, so they
+  # open in the app instead of the in-app browser. External links keep it.
+  # Handles both forms:
+  #   link_to "Home", root_path, target: "_blank"
+  #   link_to root_path, target: "_blank" do ... end
+  # (with a block, the URL and HTML options arrive one argument earlier).
+  # The caller's options hash is copied, never modified.
+  def link_to(name = nil, options = nil, html_options = nil, &block)
+    if hotwire_native_app?
+      url, attributes = block ? [name, options] : [options, html_options]
+
+      if url && attributes.is_a?(Hash) && internal_url?(url_for(url))
+        attributes = attributes.except(:target, 'target')
+        if block
+          options = attributes
+        else
+          html_options = attributes
+        end
+      end
+    end
+
+    super(name, options, html_options, &block)
   end
 
   # https://github.com/joemasilotti/daily-log/blob/main/rails/app/helpers/form_helper.rb
@@ -82,11 +100,14 @@ module HotwireNativeHelper
     }
   end
 
+  # A relative path, or an http(s) URL on the current host.
+  # mailto:, tel: and other schemes are never internal.
   def internal_url?(url)
     uri = URI.parse(url)
-    return true if uri.path.present? && uri.host.blank?
-    return true if url.include?(root_url)
+    return false if uri.scheme.present? && !uri.scheme.match?(/\Ahttps?\z/)
 
+    uri.host.blank? || uri.host == request.host
+  rescue URI::InvalidURIError
     false
   end
 end

data/lib/generators/hotwire_native/templates/test_unit/hotwire_native_helper_test.rb

@@ -7,8 +7,8 @@ class HotwireNativeHelperTest < ActionView::TestCase
     end
   end
 
-  test 'link_to removes target for internal links in turbo native app' do
-    def turbo_native_app?
+  test 'link_to removes target for internal links in hotwire native app' do
+    def hotwire_native_app?
       true
     end
 
@@ -16,8 +16,8 @@ class HotwireNativeHelperTest < ActionView::TestCase
     assert_no_match(/target="_blank"/, result)
   end
 
-  test 'link_to keeps target for external links in turbo native app' do
-    def turbo_native_app?
+  test 'link_to keeps target for external links in hotwire native app' do
+    def hotwire_native_app?
       true
     end
 
@@ -25,8 +25,8 @@ class HotwireNativeHelperTest < ActionView::TestCase
     assert_match(/target="_blank"/, result)
   end
 
-  test 'link_to keeps target for internal links when not in turbo native app' do
-    def turbo_native_app?
+  test 'link_to keeps target for internal links when not in hotwire native app' do
+    def hotwire_native_app?
       false
     end
 
@@ -34,8 +34,8 @@ class HotwireNativeHelperTest < ActionView::TestCase
     assert_match(/target="_blank"/, result)
   end
 
-  test 'link_to keeps target for external links when not in turbo native app' do
-    def turbo_native_app?
+  test 'link_to keeps target for external links when not in hotwire native app' do
+    def hotwire_native_app?
       false
     end
 
@@ -43,11 +43,42 @@ class HotwireNativeHelperTest < ActionView::TestCase
     assert_match(/target="_blank"/, result)
   end
 
+  test 'link_to with a block removes target for internal links in hotwire native app' do
+    def hotwire_native_app?
+      true
+    end
+
+    result = link_to('/foo/bar', target: '_blank') { 'Home' }
+    assert_no_match(/target=/, result)
+    assert_match(%r{href="/foo/bar"}, result)
+  end
+
+  test 'link_to with a block keeps target for external links in hotwire native app' do
+    def hotwire_native_app?
+      true
+    end
+
+    result = link_to('http://external.com', target: '_blank') { 'External' }
+    assert_match(/target="_blank"/, result)
+  end
+
+  test 'link_to does not modify the html options passed in' do
+    def hotwire_native_app?
+      true
+    end
+
+    html_options = { target: '_blank' }
+    link_to('Home', '/foo/bar', html_options)
+    assert_equal({ target: '_blank' }, html_options)
+  end
+
   test 'internal_url? returns true for internal links' do
     assert internal_url?('http://test.host/some_path')
+    assert internal_url?('/some_path')
   end
 
   test 'internal_url? returns false for external links' do
     assert_not internal_url?('http://external.com')
+    assert_not internal_url?('mailto:hello@test.host')
   end
 end

data/lib/hotwire_native_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HotwireNativeRails
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: hotwire_native_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Yaro Shm
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
-dependencies: []
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: turbo-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.11
 email:
 - yshmarov@gmail.com
 executables: []
@@ -24,6 +38,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/smoke
 - hotwire_native_rails.gemspec
 - lib/generators/hotwire_native/hotwire_native_generator.rb
 - lib/generators/hotwire_native/templates/controllers/concerns/device_format.rb
@@ -57,14 +72,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Generate Hotwire Native Rails helpers and bridge components
 test_files: []