strada-rails 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 740926ca9ab2b6efe5fd77b47845ed644e69194012650288f455878dabb2590e
-  data.tar.gz: 3dd01fd9b07941f80858b0dc75fd891945070a71842550938d243a3005da0241
+  metadata.gz: eb9228de23e4d69eddc81e12af66c15a298b9b867024701af1e37c2a4fa33589
+  data.tar.gz: fdbfda34a88d91bfbf73084d3b0565686d89a92ec6a30b83d711b762dbb974f2
 SHA512:
-  metadata.gz: 171a27456df5587e48bb5ac64647f63108bcfc537054d975e0ae90894e0690c98bce6e1ca86eb7eb0ddf8dcf7bec1214716d0f22f6ad5093427afa132a4d1e93
-  data.tar.gz: 1766d2e43d0a65fefc410174d69664a4fb4cedcce1466bd46507f294f73c7fd900fd3bf626f97d617c33edbfac96b623b9584322a9497b3c610514e33dcd2386
+  metadata.gz: 3f56d6ea102e136c7e5e9ea6ab74bdd9b12846c5294f1338bced53e52cb1d097e9087196edac25c5dcde42829c5a4bf13b774327910cbe1933150424d960576d
+  data.tar.gz: e626f6fb0a22c11ef2f734c2ffd94bd49088b1ea54af4181bbc811bd11431ab5cba306cd83c544e253d7088b7b13d8e4924d18221c539e4febb5b5b03cfcfee5

data/lib/generators/strada/scaffold/templates/edit.html.erb.tt

@@ -1,10 +1,10 @@
-<h1 class="hide-on-mobile">Editing <%= human_name.downcase %></h1>
+<h1 class="hide-on-native">Editing <%= human_name.downcase %></h1>
 
 <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
 
 <br>
 
-<div class="hide-on-mobile">
+<div class="hide-on-native">
   <%%= link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %> %> |
   <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
 </div>

data/lib/generators/strada/scaffold/templates/index.html.erb.tt

@@ -2,7 +2,7 @@
   <p style="color: green" data-controller="bridge--flash-message"><%%= notice %></p>
 <%% end %>
 
-<h1 class="hide-on-mobile"><%= human_name.pluralize %></h1>
+<h1 class="hide-on-native"><%= human_name.pluralize %></h1>
 
 <div id="<%= plural_table_name %>">
   <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>

data/lib/generators/strada/scaffold/templates/new.html.erb.tt

@@ -1,9 +1,9 @@
-<h1 class="hide-on-mobile">New <%= human_name.downcase %></h1>
+<h1 class="hide-on-native">New <%= human_name.downcase %></h1>
 
 <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
 
 <br>
 
-<div class="hide-on-mobile">
+<div class="hide-on-native">
   <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
 </div>

data/lib/generators/strada/scaffold/templates/show.html.erb.tt

@@ -5,7 +5,7 @@
 <%%= render @<%= singular_table_name %> %>
 
 <div>
-  <div class="hide-on-mobile">
+  <div class="hide-on-native">
     <%%= link_to "Edit this <%= human_name.downcase %>", <%= edit_helper(type: :path) %>, data: { controller: "bridge--nav-button", bridge_title: "Edit" } %> |
     <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
   </div>

data/lib/install/app/assets/stylesheets/strada.css

@@ -4,7 +4,7 @@
  * Hide the submit button when the "form" component is registered.
  */
 [data-bridge-components~=form] [data-controller~=bridge--form] [type=submit] {
-  display: none
+  display: none;
 }
 
 /*

data/lib/install/app/javascript/controllers/bridge/nav_button_controller.js

@@ -5,7 +5,10 @@ export default class extends BridgeComponent {
 
   connect() {
     super.connect()
-    this.notifyBridgeOfConnect()
+
+    if (this.bridgeElement.enabled) {
+      this.notifyBridgeOfConnect()
+    }
   }
 
   notifyBridgeOfConnect() {

data/lib/install/strada_with_bun.rb

@@ -0,0 +1,28 @@
+APPLICATION_LAYOUT_PATH = Rails.root.join("app/views/layouts/application.html.erb")
+
+destination = Pathname(destination_root)
+
+say "Copy bridge controllers"
+directory "#{__dir__}/app/javascript/controllers/bridge", "app/javascript/controllers/bridge"
+
+say "Update stimulus manifest"
+rails_command "stimulus:manifest:update"
+
+say "Copy strada stylesheet"
+copy_file "#{__dir__}/app/assets/stylesheets/strada.css", "app/assets/stylesheets/strada.css"
+
+unless destination.join("app/assets/application.css").exist?
+  if (stylesheets = Dir.glob "#{destination_root}/app/assets/stylesheets/application.*.{scss,css}").length > 0
+    insert_into_file stylesheets.first.to_s, %(@import 'strada.css';)
+  end
+end
+
+say "Add hide-on-native style in application layout"
+insert_into_file APPLICATION_LAYOUT_PATH.to_s, <<~ERB.indent(4).prepend("\n"), before: /^\s*<\/head>/
+  <% if turbo_native_app? %>
+    <style>.hide-on-native { display: none; }</style>
+  <% end %>
+ERB
+
+say "Install Strada"
+run "bun add @hotwired/stimulus"

data/lib/install/strada_with_importmap.rb

@@ -1,10 +1,6 @@
 APPLICATION_LAYOUT_PATH = Rails.root.join("app/views/layouts/application.html.erb")
 
-HIDE_ON_MOBILE_STYLE = <<-HTML.chomp
-    <% if turbo_native_app? %>
-      <style>.hide-on-mobile { display: none; }</style>
-    <% end %>
-HTML
+destination = Pathname(destination_root)
 
 say "Copy bridge controllers"
 directory "#{__dir__}/app/javascript/controllers/bridge", "app/javascript/controllers/bridge"
@@ -12,8 +8,18 @@ directory "#{__dir__}/app/javascript/controllers/bridge", "app/javascript/contro
 say "Copy strada stylesheet"
 copy_file "#{__dir__}/app/assets/stylesheets/strada.css", "app/assets/stylesheets/strada.css"
 
-say "Add hide-on-mobile style in application layout"
-insert_into_file APPLICATION_LAYOUT_PATH.to_s, "\n\n#{HIDE_ON_MOBILE_STYLE}", before: /\s*<\/head>/
+unless destination.join("app/assets/application.css").exist?
+  if (stylesheets = Dir.glob "#{destination_root}/app/assets/stylesheets/application.*.{scss,css}").length > 0
+    insert_into_file stylesheets.first.to_s, %(@import 'strada.css';)
+  end
+end
+
+say "Add hide-on-native style in application layout"
+insert_into_file APPLICATION_LAYOUT_PATH.to_s, <<~ERB.indent(4).prepend("\n"), before: /^\s*<\/head>/
+  <% if turbo_native_app? %>
+    <style>.hide-on-native { display: none; }</style>
+  <% end %>
+ERB
 
 say "Pin Strada"
 say %(Appending: pin "@hotwired/strada", to: "strada.js", preload: true")

data/lib/install/strada_with_node.rb

@@ -1,19 +1,28 @@
 APPLICATION_LAYOUT_PATH = Rails.root.join("app/views/layouts/application.html.erb")
 
-HIDE_ON_MOBILE_STYLE = <<-HTML.chomp
-    <% if turbo_native_app? %>
-      <style>.hide-on-mobile { display: none; }</style>
-    <% end %>
-HTML
+destination = Pathname(destination_root)
 
 say "Copy bridge controllers"
 directory "#{__dir__}/app/javascript/controllers/bridge", "app/javascript/controllers/bridge"
 
+say "Update stimulus manifest"
+rails_command "stimulus:manifest:update"
+
 say "Copy strada stylesheet"
 copy_file "#{__dir__}/app/assets/stylesheets/strada.css", "app/assets/stylesheets/strada.css"
 
-say "Add hide-on-mobile style in application layout"
-insert_into_file APPLICATION_LAYOUT_PATH.to_s, "\n\n#{HIDE_ON_MOBILE_STYLE}", before: /\s*<\/head>/
+unless destination.join("app/assets/application.css").exist?
+  if (stylesheets = Dir.glob "#{destination_root}/app/assets/stylesheets/application.*.{scss,css}").length > 0
+    insert_into_file stylesheets.first.to_s, %(@import 'strada.css';)
+  end
+end
+
+say "Add hide-on-native style in application layout"
+insert_into_file APPLICATION_LAYOUT_PATH.to_s, <<~ERB.indent(4).prepend("\n"), before: /^\s*<\/head>/
+  <% if turbo_native_app? %>
+    <style>.hide-on-native { display: none; }</style>
+  <% end %>
+ERB
 
 say "Install Strada"
 run "yarn add @hotwired/strada"

data/lib/strada/version.rb

@@ -1,3 +1,3 @@
 module Strada
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/tasks/strada_tasks.rake

@@ -2,12 +2,26 @@ def run_strada_install_template(path)
   system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../install/#{path}.rb",  __dir__)}"
 end
 
+def install_strada_with_importmap?
+  Rails.root.join("config/importmap.rb").exist?
+end
+
+def install_strada_with_bun?
+  Rails.root.join("package.json").exist? && Rails.root.join("bun.config.js").exist?
+end
+
+def install_strada_with_node?
+  Rails.root.join("package.json").exist? && !Rails.root.join("bun.config.js").exist?
+end
+
 namespace :strada do
   desc "Install Strada into the app"
   task :install do
-    if Rails.root.join("config/importmap.rb").exist?
+    if install_strada_with_importmap?
       Rake::Task["strada:install:importmap"].invoke
-    elsif Rails.root.join("package.json").exist?
+    elsif install_strada_with_bun?
+      Rake::Task["strada:install:bun"].invoke
+    elsif install_strada_with_node?
       Rake::Task["strada:install:node"].invoke
     else
       puts "You must either be running with node (package.json) or importmap-rails (config/importmap.rb) to use this gem."
@@ -24,5 +38,10 @@ namespace :strada do
     task :node do
       run_strada_install_template "strada_with_node"
     end
+
+    desc "Install Stimulus on an app running bun"
+    task :bun do
+      run_strada_install_template "strada_with_bun"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strada-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -58,6 +58,7 @@ files:
 - lib/install/app/javascript/controllers/bridge/form_controller.js
 - lib/install/app/javascript/controllers/bridge/menu_controller.js
 - lib/install/app/javascript/controllers/bridge/nav_button_controller.js
+- lib/install/strada_with_bun.rb
 - lib/install/strada_with_importmap.rb
 - lib/install/strada_with_node.rb
 - lib/strada-rails.rb
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Create fully native controls, driven by your web app.