crudable-rails 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '082ec216ec1a73916737ffc58f6db08819237176efcaceb3b8c3978b5d3667e7'
-  data.tar.gz: 4ff9fd3a946d9ee5bb2839d0c41b72eac71a5139f26b87d01c9a608c8fa9204a
+  metadata.gz: 6bc075d091ac9fd062d7aa5c2ab7cceecaaa189c152d603a73006891650a661f
+  data.tar.gz: 1cca79a75e27ec9fdf7d82b889030fc1c208caa63308993b2accf5226789a347
 SHA512:
-  metadata.gz: 894987edb86a9fd16948ea85009387f8872667bfa2b49b0852193a3277147ffa39186450dcd7632a0984881ca3fea5723e3a024d8516e1ffacea5f2d72a7d50b
-  data.tar.gz: 9b3cd6f17af0ef03e9e95186fac23a7fbfd9e9572d079a93c4e1886fc29b112348bc23f0d39476a5b91843c98781035781e4d81b8cf44e506053f1505de854f4
+  metadata.gz: 9b8f108bf56e924eb6c47fafaeabacc2a2e2b94380cfd7cd885e9ded0bc4f36f83155d63449d1349b7a9c1a56d2a21ec6f9281d5668ffa5f3c4b3597f11628e9
+  data.tar.gz: 00e9eb6393f9582fb722ea57794c5ba234eab1eecded762fd0d14760adae60098cfbc2c1d89d531b68e17fd2c2ad842b6acfff23c124578fa725cd8ace03660b

data/README.md

@@ -61,7 +61,7 @@ bin/rails generate crudable:scaffold Post title:string body:text
 bin/rails generate crudable:scaffold Post title:string body:text --turbo-forms
 ```
 
-With `--turbo-forms`, generated `new` and `edit` views wrap the `_form` partial in a `dom_id(record, :form)` target and add matching `new.turbo_stream.erb` / `edit.turbo_stream.erb` templates. Failed create/update actions rendered by crudable will replace that form partial with validation errors inline.
+With `--turbo-forms`, generated `new.turbo_stream.erb` and `edit.turbo_stream.erb` templates re-render the scaffold `_form` partial on validation failure. HTML views and `_form` are left to the scaffold generator (for example tailwindcss-rails or your view component extension). The `_form` partial should expose a `dom_id(record, :form)` target so turbo_stream responses can replace it inline.
 
 **Controller only** — when you already have a model and views, or want to wire up the controller yourself:
 

data/lib/crudable/rails/generators/scaffold_controller_extension.rb

@@ -2,6 +2,7 @@
 
 require_relative '../../../generators/crudable/controller_helpers'
 require_relative 'turbo_forms_generator_option'
+require_relative 'turbo_forms_scaffold_extension'
 
 module Crudable
   module Rails
@@ -36,7 +37,6 @@ Rails.application.config.after_initialize do
   require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
   require 'rails/generators/rails/scaffold/scaffold_generator'
   require_relative 'scaffold_extension'
-  require_relative 'turbo_forms_scaffold_extension'
 
   unless Rails::Generators::ScaffoldControllerGenerator
         .ancestors.include?(Crudable::Rails::Generators::ScaffoldControllerExtension)
@@ -53,3 +53,7 @@ Rails.application.config.after_initialize do
     Erb::Generators::ScaffoldGenerator.prepend Crudable::Rails::Generators::TurboFormsScaffoldExtension
   end
 end
+
+Rails.application.config.to_prepare do
+  Crudable::Rails::Generators.install_tailwindcss_turbo_forms_extension!
+end

data/lib/crudable/rails/generators/turbo_forms_scaffold_extension.rb

@@ -6,12 +6,28 @@ require_relative '../../../generators/crudable/controller_helpers'
 module Crudable
   module Rails
     module Generators
+      module TurboFormsViewFileCopying
+        extend ActiveSupport::Concern
+
+        private
+
+        def copy_turbo_forms_view_files
+          view_path = File.join('app/views', controller_file_path)
+
+          %w[new edit].each do |view|
+            template "turbo_forms/#{view}.turbo_stream.erb",
+                     File.join(view_path, "#{view}.turbo_stream.erb")
+          end
+        end
+      end
+
       module TurboFormsScaffoldExtension
         extend ActiveSupport::Concern
 
         prepended do
           include TurboFormsGeneratorOption
           include ::Crudable::Generators::ControllerHelpers
+          include TurboFormsViewFileCopying
         end
 
         def copy_view_files
@@ -20,22 +36,26 @@ module Crudable
 
           copy_turbo_forms_view_files
         end
+      end
 
-        private
+      def self.install_tailwindcss_turbo_forms_extension!
+        return unless defined?(Tailwindcss::Generators::ScaffoldGenerator)
 
-        def copy_turbo_forms_view_files
-          view_path = File.join('app/views', controller_file_path)
+        klass = Tailwindcss::Generators::ScaffoldGenerator
+        return if klass.instance_methods.include?(:copy_view_files_without_crudable_turbo_forms)
 
-          template 'turbo_forms/_form.html.erb',
-                   File.join(view_path, '_form.html.erb'),
-                   force: true
+        klass.include TurboFormsGeneratorOption
+        klass.include ::Crudable::Generators::ControllerHelpers
+        klass.include TurboFormsViewFileCopying
 
-          %w[new edit].each do |view|
-            template "turbo_forms/#{view}.html.erb",
-                     File.join(view_path, "#{view}.html.erb"),
-                     force: true
-            template "turbo_forms/#{view}.turbo_stream.erb",
-                     File.join(view_path, "#{view}.turbo_stream.erb")
+        klass.class_eval do
+          alias_method :copy_view_files_without_crudable_turbo_forms, :copy_view_files
+
+          def copy_view_files
+            copy_view_files_without_crudable_turbo_forms
+            return unless options.turbo_forms?
+
+            copy_turbo_forms_view_files
           end
         end
       end

data/lib/crudable/rails/version.rb

@@ -3,6 +3,6 @@
 # Crudable Version
 module Crudable
   module Rails
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
   end
 end

data/lib/generators/crudable/scaffold/USAGE

@@ -11,8 +11,9 @@ Example:
     This will create the same files as `rails generate scaffold`, but the controller
     will use `crudable` with documented override hooks.
 
-    With --turbo-forms, new and edit views wrap the form partial in a dom_id target
-    and generate matching turbo_stream templates for validation error responses.
+    With --turbo-forms, matching new.turbo_stream.erb and edit.turbo_stream.erb templates
+    are generated for validation error responses. Scaffold HTML views and _form.html.erb
+    are left to the scaffold generator (e.g. tailwindcss-rails).
 
 Notes:
     Nested routing is automatically supported: if a parent `*_id` param is present

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crudable-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Tomislav Simnett
@@ -118,10 +118,7 @@ files:
 - lib/generators/crudable/scaffold/USAGE
 - lib/generators/crudable/scaffold/scaffold_generator.rb
 - lib/generators/crudable/templates/crudable_controller.rb.tt
-- lib/generators/crudable/templates/turbo_forms/_form.html.erb.tt
-- lib/generators/crudable/templates/turbo_forms/edit.html.erb.tt
 - lib/generators/crudable/templates/turbo_forms/edit.turbo_stream.erb.tt
-- lib/generators/crudable/templates/turbo_forms/new.html.erb.tt
 - lib/generators/crudable/templates/turbo_forms/new.turbo_stream.erb.tt
 - lib/tasks/crudable_tasks.rake
 homepage: https://gitlab.com/initforthe/crudable-rails

data/lib/generators/crudable/templates/turbo_forms/_form.html.erb.tt

@@ -1,37 +0,0 @@
-<%%= form_with model: <%= form_with_model %> do |f| %>
-  <%% if f.object.errors.any? %>
-    <div style="color: red">
-      <h2><%%= pluralize(f.object.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
-
-      <ul>
-        <%% f.object.errors.each do |error| %>
-          <li><%%= error.full_message %></li>
-        <%% end %>
-      </ul>
-    </div>
-  <%% end %>
-
-<% form_attributes.each do |attribute| -%>
-  <div>
-<% if attribute.password_digest? -%>
-    <%%= f.label :password, style: "display: block" %>
-    <%%= f.password_field :password %>
-  </div>
-
-  <div>
-    <%%= f.label :password_confirmation, style: "display: block" %>
-    <%%= f.password_field :password_confirmation %>
-<% elsif attribute.attachments? -%>
-    <%%= f.label :<%= attribute.column_name %>, style: "display: block" %>
-    <%%= f.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true %>
-<% else -%>
-    <%%= f.label :<%= attribute.column_name %>, style: "display: block" %>
-    <%%= f.<%= attribute.field_type %> :<%= attribute.column_name %> %>
-<% end -%>
-  </div>
-
-<% end -%>
-  <div>
-    <%%= f.submit %>
-  </div>
-<%% end %>

data/lib/generators/crudable/templates/turbo_forms/edit.html.erb.tt

@@ -1,14 +0,0 @@
-<%% content_for :title, "Editing <%= human_name.downcase %>" %>
-
-<h1>Editing <%= human_name.downcase %></h1>
-
-<%%= tag.div id: dom_id(@<%= singular_table_name %>, :form) do %>
-  <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
-<%% end %>
-
-<br>
-
-<div>
-  <%%= 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/crudable/templates/turbo_forms/new.html.erb.tt

@@ -1,13 +0,0 @@
-<%% content_for :title, "New <%= human_name.downcase %>" %>
-
-<h1>New <%= human_name.downcase %></h1>
-
-<%%= tag.div id: dom_id(@<%= singular_table_name %>, :form) do %>
-  <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
-<%% end %>
-
-<br>
-
-<div>
-  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
-</div>