hot-glue 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81ca38b1bfb68e173a1665d924729b04afa26ccda900d707508a64e01977f1ad
-  data.tar.gz: 8d2b98c07d84ec264600d79f5073139ea717a3b66488b5b269a4466bc5eb04be
+  metadata.gz: 51ed0488e72bcd508f979de89c9f9d11ee1284c702c22066e72311d9cee03894
+  data.tar.gz: f30e2325ec4a08af8df44fa54e955b103aed04b650e2b165bcded589d2f8faa6
 SHA512:
-  metadata.gz: 4525044b21596dd6dc96d7aa397402421459ec483749df04dd08ad3f20de7a6a1998e38b9436d77522c48dedabb78a3b4e9e88ce2225e2c8633b8c32a30fa8a8
-  data.tar.gz: 06d16a32919eb23b306add1ca5e1997694f0bbbb21d0bc045992530b2963cf65f6dbb987fb3223b50a1e543598e1f42611f17b80b206fb032d2c00d8ddb72eb9
+  metadata.gz: 8eb5cf4982698c4b51ac9caa4c223885ea9f8c2eac423c45e11ff2c7ccbb6c8aaad0e5f43d00cdf4ef3376a04bdc5ea3477813302a1fec8cc3d82e22463a5b51
+  data.tar.gz: 94af84f2f7e66846e593e8ab7ac5c441fbd4b8814c1fc390823a97350fe00854f6c91868094820ca3461e28b10a671cc892430b5d86621a88ef8700376b81a87

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+
+before_install:
+  - gem update --system
+
+
+branches:
+  only:
+    - main
+
+
+script: "rake spec"
+
+rvm:
+  - 2.7.2

data/Gemfile

@@ -3,8 +3,14 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
+# not required for your app
 gem 'sqlite3'
 gem 'byebug'
-
 gem 'rails', '6.1'
-gem 'devise', require: true
+gem 'devise', require: true
+
+
+# for testing
+gem "rails-controller-testing", group: [:test]
+gem "database_cleaner", group: [:test]
+gem "rspec-rails", group: [:test]

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.2.0)
+    hot-glue (0.2.3)
       ffaker (~> 2.16)
       haml-rails (~> 2.0)
       kaminari (~> 1.2)
-      rails (~> 6.0)
+      rails (> 5.1, <= 7.0.0)
       sass-rails
       turbo-rails (~> 0.5)
 
@@ -76,12 +76,19 @@ GEM
     byebug (11.1.3)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
+    diff-lcs (1.4.4)
     erubi (1.10.0)
     erubis (2.7.0)
     ffaker (2.19.0)
@@ -154,6 +161,10 @@ GEM
       bundler (>= 1.15.0)
       railties (= 6.1.0)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -169,6 +180,23 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-rails (5.0.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.2)
     ruby_parser (3.17.0)
       sexp_processor (~> 4.15, >= 4.15.1)
     sass-rails (6.0.0)
@@ -193,7 +221,7 @@ GEM
     temple (0.8.2)
     thor (1.1.0)
     tilt (2.0.10)
-    turbo-rails (0.7.11)
+    turbo-rails (0.8.1)
       rails (>= 6.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -210,10 +238,13 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
+  database_cleaner
   devise
   hot-glue!
   rails (= 6.1)
+  rails-controller-testing
+  rspec-rails
   sqlite3
 
 BUNDLED WITH
-   2.2.19
+   2.1.4

data/README.md

@@ -1,7 +1,17 @@
 
+[![Build Status](https://app.travis-ci.com/jasonfb/hot-glue.svg?branch=main)](https://travis-ci.com/jasonfb/hot-glue)
+
+
 Hot Glue is a Rails scaffold builder for the Turbo era. It is an evolution of the admin-interface style scaffolding systems of the 2010s ([activeadmin](https://github.com/activeadmin/activeadmin), [rails_admin](https://github.com/sferik/rails_admin), and [active_scaffold](https://github.com/activescaffold/active_scaffold)). 
 
-Using Turbo-Rails and Hotwire you get a lightning-fast out-of-the-box CRUD building experience. Every page displays only a list view: new and edit operations happen as 'edit-in-place', so the user never leaves the page. 
+
+Using Turbo-Rails and Hotwire (default in Rails 7) you get a lightning-fast out-of-the-box CRUD building experience. 
+
+Every page displays only a list view: new and edit operations happen as 'edit-in-place', so the user never leaves the page. 
+
+Because all page navigation is Turbo's responsibilty, everything plugs & plays nicely into a Turbo-backed Rails app. 
+
+Alternatively, you can use this tool to create a Turbo-backed *section* of your Rails app-- like an admin interface -- while still treating the rest of the Rails app as an API or building out other features by hand. 
 
 It will read your relationships and field types to generate your code for you, leaving you with a 'sourdough starter' to work from. If you modify the generated code, you're on your own if you want to preserve your changes and also re-generate scaffold after adding fields. 
 
@@ -15,7 +25,7 @@ Hot Glue generates functionality that's quick and dirty. It let's you be crafty.
 * Automatically reads your ActiveRecord models and relationships (make them before building your scaffolding!)
 * Create-read-update-delete (CRUD) with pagination (one day: sorting & searching)
 * Excellent tool for prototyping and hackathons, but a knowledge of Rails is needed. 
-* Nest your routes model-by-model for built-in poor man's authentication. (Customers have_many :invoices; Invoices have_many :line_items; etc)
+* Nest your routes model-by-model for built-in poor man's access control. (Customers have_many :invoices; Invoices have_many :line_items; etc)
 * Plays nicely with Devise, but you can implement your own current_user object instead.
 * Kaminari for pagination.
 * Create specs automatically along with the controllers.
@@ -44,8 +54,25 @@ Instantly get a simple CRUD interface
 
 ![hot-glue-4](https://user-images.githubusercontent.com/59002/116405517-c2b2e300-a7fd-11eb-8423-d43e3afc9fa6.gif)
 
+## TO INSTALL (RAILS 7)
+
+- Install Turbo `rails turbo:install` (?)
 
-## TO INSTALL
+- Add `gem 'hot-glue'` to your Gemfile
+- `bundle install`
+- `rails generate hot_glue:install --markup=erb` for ERB
+- or `rails generate hot_glue:install --markup=haml` for HAML
+
+- Add to your `application.html.erb`
+```
+  <%= render partial: 'layouts/flash_notices' %>
+```
+- Or for Haml add to your `application.haml`
+```
+    = render partial: 'layouts/flash_notices' 
+```
+
+## TO INSTALL (RAILS 6)
 
 - Add `gem 'turbo-rails'` to your Gemfile & `bundle install`
   
@@ -55,14 +82,27 @@ Instantly get a simple CRUD interface
   
 - Add `gem 'hot-glue'` to your Gemfile & `bundle install`
   
-- Run the hot-glue installation with `rails generate hot_glue:install`
+- in `javascript/packs/application.js` remove this line:
+`import Turbolinks from "turbolinks"`
+
+- in the same file (`javascript/packs/application.js`) add this line:
+`import { Turbo } from "@hotwired/turbo-rails"`
+
+- Run the hot-glue install generator 
+
+FOR ERB:
+`rails generate hot_glue:install --markup=erb`
+
+FOR HAML:
+`rails generate hot_glue:install --markup=haml`
 
 - Add to your `application.html.erb`
 ```
   <%= render partial: 'layouts/flash_notices' %>
 ```
 
-- Rspec setup
+
+## Rspec setup
   - add `gem 'rspec-rails'` to your gemfile inside :development and :test
   - add `gem 'factory_bot_rails'` to your gemfile inside :development and :test
   - run `rails generate rspec:install`
@@ -88,10 +128,28 @@ Instantly get a simple CRUD interface
     end
     ```
 
-- Install Bootstrap (optional)
+## Install Bootstrap using Sprockets (IMPORTANT: YOU DO NOT NEED JQUERY*)
+Bootstrap with Sprockets for Rails 5 or 7 default — Rails 6 custom
+      - use twbs/bootstrap-rubygem gem
+      - see README for bootstrap-rubygem to install
+Bootstrap with Webpack for FOR RAILS 7 :
+          
+- add to Gemfile
+- gem 'bootstrap', '~> 5.1.0'
+
+
+- completely delete the file `app/assets/application.css`
+- create new file where it was `app/assets/application.scss` with this contents (do not keep the contents of the old application.css file):
+
+``` 
+// Custom bootstrap variables must be set or imported *before* bootstrap.
+@import "bootstrap";
+```
+
+* You do not need jQuery for HotGlue to work *
 
-Bootstrap with Webpack: 
-  - change `stylesheet_link_tag` to `stylesheet_pack_tag` in your application layout
+### Bootstrap with Webpack RAILS 6 ONLY:
+- change `stylesheet_link_tag` to `stylesheet_pack_tag` in your application layout
   - run `yarn add bootstrap`
   - create a new file at `app/javascript/require_bootstrap.scss` with this content
     ```
@@ -102,16 +160,14 @@ Bootstrap with Webpack:
     ```
     import 'require_bootstrap'
     ```
-    
-Bootstrap with Sprockets:
-  - use bootstrap-rubygem gem 
-  - see README for bootstrap-rubygem to install
   
 
-- Install Devise or implement your own authentication
+
+
+## Install Devise or implement your own authentication
   (or only use --gd mode, see below)
 
-- font-awesome
+## install font-awesome. I recommend https://github.com/tomkra/font_awesome5_rails or https://github.com/FortAwesome/font-awesome-sass
 
 
 ### First Argument
@@ -188,7 +244,7 @@ Then, finally the @charge will be loaded
 
 `@charge = @line.charges.find(params[:id])`
 
-It's called "poor man's auth" because if a user attempts to hack the URL by passing ids for objects they don't own--- which Rails makes relatively easy with its default URL pattern-- they will hit ActiveRecord not found errors (the objects they don't own won't be found in the associated relationship).
+It's called "poor man's access control" because if a user attempts to hack the URL by passing ids for objects they don't own--- which Rails makes relatively easy with its default URL pattern-- they will hit ActiveRecord not found errors (the objects they don't own won't be found in the associated relationship).
 
 It works, but it isn't granular. As well, it isn't appropriate for a large app with any level of intricacy to access control (that is, having roles).
 
@@ -201,7 +257,7 @@ By default, it will be assumed you have a `current_user` for your user authentic
 
 The poor man's auth presumes that object graphs have only one natural way to traverse them (that is, one primary way to traverse them), and that all relationships infer that a set of things or their descendants are granted access to me for reading, writing, updating, and deleting.
 
-Of course this is a sloppy way to do authentication, and can easily leave open endpoints your real users shouldn't have access to.
+Of course this is a sloppy way to do access control, and can easily leave open endpoints your real users shouldn't have access to.
 
 When you display anything built with the scaffolding, we assume the `current_user` will have `has_many` association that matches the pluralized name of the scaffold. In the case of nesting, we will automatically find the nested objects first, then continue down the nest chain to find the target object. In this way, we know that all object are 'anchored' to the logged-in user.
 
@@ -303,21 +359,37 @@ IMPORTANT: By default, all fields that begin with an underscore (`_`) are automa
 
 I would recommend this for fields you want globally non-editable by users in your app. For example, a counter cache or other field set only by a backend mechanism.
 
-### `--god` or `--gd`
+### `--stimulus_syntax=true` or `--stimulus_syntax=false`
+(for Rails <=6, default is false. For Rails 7, default is true.)
 
-Use this flag to create controllers with no root authentication. You can still use an auth_identifier, which can be useful for a meta-leval authentication to the controller.
+Stimulus is only used for the delete button's confirmation dialog. 
 
-For example, FOR ADMIN CONTROLLERS ONLY, supply a auth_identifier and use `--god` flag. 
+If you don't have stimulus syntax enabled, your delete buttons have this. This will confirm the delete with a simple alert if you have UJS enabled. 
+
+```
+{confirm: 'Are you sure?'}
+```
+
+If you do have Stimulus syntax enabled, your delete buttons will look like so:
+```
+    <%= button_to "Delete <i class='fa fa-1x fa-remove'></i>".html_safe, 
+        thing_path(branch), method: :delete, 
+        data: {
+            'controller: 'confirmable', 
+            'confirm-message': 'Are you sure you want to delete Thing?', 
+            'action': 'confirmation#confirm'
+        },  
+        disable_with: "Loading...", class: "delete-branch-button btn btn-primary " %>
+```
+
+Your install script will output an additional stimulus controller:
 
-In Gd mode, the objects are loaded directly from the base class (these controllers have full access)
 ```
-def load_thing
-    @thing = Thing.find(params[:id])
-end
 
 ```
 
 
+
 ### `--markup` (default: 'erb')
 
 ERB is default. For HAML, `--markup=haml`. 
@@ -326,6 +398,21 @@ ERB is default. For HAML, `--markup=haml`.
 ## FLAGS (Options with no values)
 These options (flags) also uses `--` syntax but do not take any values. Everything is assumed (default) to be false unless specified.
 
+### `--god` or `--gd`
+
+Use this flag to create controllers with no root authentication. You can still use an auth_identifier, which can be useful for a meta-leval authentication to the controller.
+
+For example, FOR ADMIN CONTROLLERS ONLY, supply a auth_identifier and use `--god` flag.
+
+In Gd mode, the objects are loaded directly from the base class (these controllers have full access)
+```
+def load_thing
+    @thing = Thing.find(params[:id])
+end
+
+```
+
+
 ### `--specs-only`
 
 Produces ONLY the controller spec file, nothing else.
@@ -351,15 +438,46 @@ Omits delete action.
 
 ### `--big-edit`
 
-If you do not want inline editing of your list items but instead to fall back to old fashioned new page behavior for your edit views, use `--big-edit`.
+If you do not want inline editing of your list items but instead to fall back to full page style behavior for your edit views, use `--big-edit`. Turbo still handles the page interactions, but the user is taken to a full-screen edit page instead of an edit-in-place interaction.
+
 
+## Automatic Base Controller
 
+HotGlue will copy a file named base_controller.rb to the same folder where it tries to create any controller, unless such a file exists there already.
+
+Obviously, the created controller will always have this base controller as its subclass. In this way, you are encouraged to implement functionality common to the *namespace* (shared between the controllers in the namespace), using this technique.
+
+## Field Types Supported
+
+- Integers that don't end with `_id`, they will be displayed as text fields.
+- Integers that do end with `_id` will be treated automatically as associations. You should have a Rails association defined. (Hot Glue will warn you if it can't find one.)
+- String*
+- Text*
+- Float*
+- Datetime
+- Date (TOOD: implement this)
+- Time (TOOD: implement this)
+- Boolean 
+- Enum - will be magically displayed as a value list populated from the enum list defined on your model. see https://jasonfleetwoodboldt.com/courses/stepping-up-rails/enumerated-types-in-rails-and-postgres/
+    
+* shows in a size-aware container, i.e. in a bigger box if the field allows for more content
 
 
 
 # VERSION HISTORY
 
-#### 2021-09-06 - v0.2.0 - SLIM and ERB ; use the option --markup=erb or --markup=haml (default is now erb)
+#### 2021-10-07 - v0.2.4 - removes erroneous icons display in delete buttos (these don't work inside of button_to); 
+                            - adds support for ENUM types direclty on your field types
+                            - you  must use activerecord-pgenum
+                            - see my blog post at https://jasonfleetwoodboldt.com/courses/stepping-up-rails/enumerated-types-in-rails-and-postgres/
+
+#### 2021-09-30 - v0.2.3 - fixes ERB output for show-only fields; fixes flash_notices for erb or haml; adds @stimulus_syntax flag for delete confirmations with stimulus
+
+#### 2021-09-27  - v0.2.2 - Fixes some issues with related fields; unlocks Rails 7 in Gemspec file
+
+#### 2021-09-20  - v0.2.1 - Fixes nesting behavior when using gd option
+
+#### 2021-09-06 - v0.2.0 - ERB or HAML; use the option --markup=erb or --markup=haml (default is now erb)
 
 #### 2021-06-28 - v0.1.2 - fixes problem with namespaces on path helpers
 

data/Rakefile

@@ -1,32 +1,42 @@
+
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'HotGlue'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
-load 'rails/tasks/engine.rake'
-
-load 'rails/tasks/statistics.rake'
-
-require 'bundler/gem_tasks'
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task :default => :spec
+rescue LoadError
+  puts 'FAILED: unable to load rspec/core/rake_task in Rakefile'
 end
 
-task default: :test
+#
+# require 'rdoc/task'
+#
+# RDoc::Task.new(:rdoc) do |rdoc|
+#   rdoc.rdoc_dir = 'rdoc'
+#   rdoc.title    = 'HotGlue'
+#   rdoc.options << '--line-numbers'
+#   rdoc.rdoc_files.include('README.md')
+#   rdoc.rdoc_files.include('lib/**/*.rb')
+# end
+#
+# APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
+# load 'rails/tasks/engine.rake'
+#
+# load 'rails/tasks/statistics.rake'
+#
+# require 'bundler/gem_tasks'
+
+# require 'rake/testtask'
+#
+# Rake::TestTask.new(:test) do |t|
+#   t.libs << 'test'
+#   t.pattern = 'test/**/*_test.rb'
+#   t.verbose = false
+# end
+#
+# task default: :test

data/app/helpers/hot_glue_helper.rb

@@ -1,4 +1,8 @@
 module HotGlueHelper
 
+  def enum_to_collection_select(hash)
+    hash.collect{|k,v| OpenStruct.new({key: k, value: v})}
+
+  end
 
 end

data/lib/generators/hot_glue/install_generator.rb

@@ -4,13 +4,25 @@ require 'ffaker'
 module HotGlue
   class InstallGenerator < Rails::Generators::Base
     hook_for :form_builder, :as => :scaffold
+    class_option :markup, type: :string, default: "erb"
 
     source_root File.expand_path('templates', __dir__)
 
 
     def initialize(*args) #:nodoc:
       super
-      copy_file "_flash_notices.haml", "#{'spec/dummy/' if Rails.env.test?}app/views/layouts/_flash_notices.haml"
+      @markup = options['markup']
+      if @markup == "haml"
+        copy_file "haml/_flash_notices.haml", "#{'spec/dummy/' if Rails.env.test?}app/views/layouts/_flash_notices.haml"
+      elsif @markup == "erb"
+        copy_file "erb/_flash_notices.erb", "#{'spec/dummy/' if Rails.env.test?}app/views/layouts/_flash_notices.erb"
+
+      end
+
+      if Rails.version.split(".")[0].to_i >= 7
+        copy_file "confirmable.js", "#{'spec/dummy/' if Rails.env.test?}app/javascript/controllers/confirmable.js"
+
+      end
     end
   end
 end

data/lib/generators/hot_glue/markup_templates/erb.rb

@@ -1,6 +1,7 @@
 module  HotGlue
   class ErbTemplate < TemplateBase
 
+    # include GeneratorHelper
     attr_accessor :singular
 
     def field_output(col, type = nil, width, col_identifier )
@@ -18,7 +19,6 @@ module  HotGlue
 
 
     def all_form_fields(*args)
-
       columns = args[0][:columns]
       show_only = args[0][:show_only]
       singular_class = args[0][:singular_class]
@@ -35,10 +35,11 @@ module  HotGlue
 
         if show_only.include?(col)
 
-          "#{col_identifier}{class: \"form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
-    = @#{singular}.#{col.to_s}
-    %label.form-text
-      #{col.to_s.humanize}\n"
+          "<div class=\"#{col_identifier} form-group <%= 'alert-danger' if #{singular}.errors.details.keys.include?(:#{col}) %>\">" +
+          "<%= @#{singular}.#{col.to_s} %>" +
+            "<label class='form-text'>#{col.to_s.humanize}</label>" +
+          "</div>"
+
         else
 
 
@@ -56,15 +57,14 @@ module  HotGlue
                 exit_message= "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
                 exit
               end
-              display_column = derrive_reference_name(assoc.class_name)
+              display_column = HotGlue.derrive_reference_name(assoc.class_name)
 
-
-              "<div class='#{col_identifier} form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{assoc_name.to_s})}>
-<%= f.collection_select(:#{col.to_s}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control')
+              "<div class='#{col_identifier} form-group <%= 'alert-danger' if #{singular}.errors.details.keys.include?(:#{assoc_name.to_s}) %>' >
+<%= f.collection_select(:#{col.to_s}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
 <label class='small form-text text-muted'>#{col.to_s.humanize}</label></div>"
 
             else
-              "<div class=\"#{col_identifier} form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col})}\" >
+              "<div class=\"#{col_identifier} form-group <%= 'alert-danger' if #{singular}.errors.details.keys.include?(:#{col}) %> \" >
 <%= f.text_field :#{col.to_s}, value: #{singular}.#{col.to_s}, class: 'form-control', size: 4, type: 'number' %>
 <label class='small form-text text-muted'>#{col.to_s.humanize}</label></div>"
 
@@ -112,7 +112,14 @@ module  HotGlue
               "  <%= f.radio_button(:#{col.to_s}, '1',  checked: #{singular}.#{col.to_s}  ? 'checked' : '') %>\n" +
               "  <%= f.label(:#{col.to_s}, value: 'Yes', for: '#{singular}_#{col.to_s}_1') %>\n" +
             "</div>"
+          when :enum
+            enum_name ="enum_name"
+            "<div class='#{col_identifier} form-group <%= 'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s}) %>' >
+<%= f.collection_select(:#{col.to_s},  enum_to_collection_select( #{singular_class}.defined_enums['#{col.to_s}']), :key, :value, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
+<label class='small form-text text-muted'>#{col.to_s.humanize}</label></div>"
+
           end
+
         end
       }.join("\n")
       return res
@@ -156,8 +163,7 @@ module  HotGlue
               raise(HotGlue::Error,exit_message)
             end
 
-            display_column =  derrive_reference_name(assoc.class_name)
-
+            display_column =  HotGlue.derrive_reference_name(assoc.class_name)
 
             "<div class='#{col_identifer}'>
   <%= #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe %>
@@ -169,9 +175,8 @@ module  HotGlue
           end
         when :float
           width = (limit && limit < 40) ? limit : (40)
-          "#{col_identifer}
-  = #{singular}.#{col}"
-
+          "<div class='#{col_identifer}'>
+<%= #{singular}.#{col}%></div>"
         when :string
           width = (limit && limit < 40) ? limit : (40)
           "<div class='#{col_identifer}'>
@@ -217,6 +222,14 @@ module  HotGlue
     NO
   <% end %>
 </div>
+"        when :enum
+                                                                                                         "<div class='#{col_identifer}'>
+  <% if #{singular}.#{col}.nil? %>
+      <span class='alert-danger'>MISSING</span>
+  <% else %>
+    <%=  #{singular}.#{col} %>
+  <% end %>
+</div>
 "
         end #end of switch
       }.join("\n")

data/lib/generators/hot_glue/markup_templates/haml.rb

@@ -1,6 +1,19 @@
 module  HotGlue
   class HamlTemplate < TemplateBase
 
+    def text_area_output(col, field_length, col_identifier )
+      lines = field_length % 40
+      if lines > 5
+        lines = 5
+      end
+
+      "#{col_identifier}{class: \"form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = f.text_area :#{col.to_s}, class: 'form-control', cols: 40, rows: '#{lines}'
+    %label.form-text
+      #{col.to_s.humanize}\n"
+    end
+
+
     attr_accessor :singular
 
     def field_output(col, type = nil, width, col_identifier )

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -10,56 +10,32 @@ module HotGlue
   class Error < StandardError
   end
 
-  module GeneratorHelper
-    def derrive_reference_name thing_as_string
-      assoc_class = eval(thing_as_string)
-
-      if assoc_class.respond_to?("name")
-        display_column = "name"
-      elsif assoc_class.respond_to?("to_label")
-        display_column = "to_label"
-      elsif assoc_class.respond_to?("full_name")
-        display_column = "full_name"
-      elsif assoc_class.respond_to?("display_name")
-        display_column = "display_name"
-      elsif assoc_class.respond_to?("email")
-        display_column = "email"
-      else
-        raise("this should have been caught by the checker in the initializer")
-        # puts "*** Oops: Can't find any column to use as the display label for the #{assoc.name.to_s} association on the #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, or 5) email directly on your #{assoc.class_name} model (either as database field or model methods), then RERUN THIS GENERATOR. (If more than one is implemented, the field to use will be chosen based on the rank here, e.g., if name is present it will be used; if not, I will look for a to_label, etc)"
-      end
-      display_column
-    end
-
-
-    def text_area_output(col, field_length, col_identifier )
-      lines = field_length % 40
-      if lines > 5
-        lines = 5
-      end
-
-      "#{col_identifier}{class: \"form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
-    = f.text_area :#{col.to_s}, class: 'form-control', cols: 40, rows: '#{lines}'
-    %label.form-text
-      #{col.to_s.humanize}\n"
-    end
-
-
-
-
+  def self.derrive_reference_name(thing_as_string)
+    assoc_class = eval(thing_as_string)
+
+    if assoc_class.respond_to?("name")
+      display_column = "name"
+    elsif assoc_class.respond_to?("to_label")
+      display_column = "to_label"
+    elsif assoc_class.respond_to?("full_name")
+      display_column = "full_name"
+    elsif assoc_class.respond_to?("display_name")
+      display_column = "display_name"
+    elsif assoc_class.respond_to?("email")
+      display_column = "email"
+    else
+      raise("this should have been caught by the checker in the initializer")
+      # puts "*** Oops: Can't find any column to use as the display label for the #{assoc.name.to_s} association on the #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, or 5) email directly on your #{assoc.class_name} model (either as database field or model methods), then RERUN THIS GENERATOR. (If more than one is implemented, the field to use will be chosen based on the rank here, e.g., if name is present it will be used; if not, I will look for a to_label, etc)"
+    end
+    display_column
   end
 
-
   class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
-    hook_for :form_builder, :as => :scaffold
+     hook_for :form_builder, :as => :scaffold
 
     source_root File.expand_path('templates', __dir__)
     attr_accessor :path, :singular, :plural, :singular_class, :nest_with
 
-
-    include GeneratorHelper
-
-
     class_option :singular, type: :string, default: nil
     class_option :plural, type: :string, default: nil
     class_option :singular_class, type: :string, default: nil
@@ -79,6 +55,7 @@ module HotGlue
     class_option :big_edit, type: :boolean, default: false
     class_option :show_only, type: :string, default: ""
     class_option :markup, type: :string, default: "erb"
+     class_option :stimulus_syntax, type: :boolean, default: nil
 
 
 
@@ -104,6 +81,14 @@ module HotGlue
         raise(HotGlue::Error, "*** Oops: You seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. sorry.")
       end
 
+      if @stimulus_syntax.nil?
+        if Rails.version.split(".")[0].to_i >= 7
+          @stimulus_syntax = true
+        else
+          @stimulus_syntax = false
+        end
+      end
+
       if options['markup'] == "erb"
         @template_builder = HotGlue::ErbTemplate.new
       elsif options['markup'] == "slim"
@@ -188,6 +173,8 @@ module HotGlue
         end
       end
 
+      @reference_name = HotGlue.derrive_reference_name(singular_class)
+
       identify_object_owner
       setup_fields
     end
@@ -196,7 +183,7 @@ module HotGlue
       auth_assoc = @auth && @auth.gsub("current_","")
 
       if !@object_owner_sym.empty?
-        auth_assoc_field = auth_assoc + "_id"
+        auth_assoc_field = auth_assoc + "_id" unless @god
         assoc = eval("#{singular_class}.reflect_on_association(:#{@object_owner_sym})")
 
         if assoc
@@ -299,9 +286,10 @@ module HotGlue
       nil
     end
 
+
+
     def copy_controller_and_spec_files
       @default_colspan = @columns.size
-
       unless @specs_only
         template "controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
         if @namespace
@@ -431,7 +419,14 @@ module HotGlue
     end
 
     def new_path_name
-      "new_#{@namespace+"_" if @namespace}#{singular}_path"
+
+      base =   "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{singular}_path"
+      if @nested_args.any?
+        base += "(" + @nested_args.collect { |arg|
+          "@#{arg}.id"
+        }.join(", ") + ")"
+      end
+      base
     end
 
     def nested_assignments
@@ -661,9 +656,19 @@ module HotGlue
      end
    end
 
-    def paginate
-      @template_builder.paginate(plural: plural)
+   def paginate
+     @template_builder.paginate(plural: plural)
+   end
+
+  def delete_confirmation_syntax
+    if !@stimulus_syntax
+     "{confirm: 'Are you sure?'}"
+    else
+     "{controller: 'confirmable', 'confirm-message': \"Are you sure you want to delete \#{ #{@singular}.#{ display_class } } \", 'action': 'confirmation#confirm'}"
     end
+  end
+
+
   private # thor does something fancy like sending the class all of its own methods during some strange run sequence
     # does not like public methods
 
@@ -671,7 +676,6 @@ module HotGlue
       [name, file_format].compact.join(".")
     end
   end
-
 end
 
 

data/lib/generators/hot_glue/templates/confirmable.js

@@ -0,0 +1,14 @@
+import { Controller } from "@hotwired/stimulus"
+
+console.log("defining Confirmable....")
+export default class extends Controller {
+  static values = { message: String }
+
+  confirm(event) {
+
+    if(!window.confirm(this.message)) {
+      event.preventDefault();
+      event.stopPropagation()
+    }
+  }
+}

data/lib/generators/hot_glue/templates/controller.rb.erb

@@ -1,6 +1,11 @@
 class <%= controller_class_name %> < <%= controller_descends_from %>
 <% unless @auth_identifier == '' || @auth.nil? %>before_action :authenticate_<%= @auth_identifier %>!<% end %>
 
+  <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each { |arg|
+    this_scope =   nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "#{nest_chain.last}.#{arg}s"
+      nest_chain << arg %>
+  before_action :<%= arg %>
+    <% } %><% end %>
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
   helper :hot_glue
   include HotGlue::ControllerHelper
@@ -9,9 +14,16 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   # TODO: implement current_user or use Devise
 <% end %>
 
+
+
   <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each { |arg|
-    this_scope =   nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "#{nest_chain.last}.#{arg}s"
-      nest_chain << arg %>
+    if !@god
+      this_scope = nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "#{nest_chain.last}.#{arg}s"
+    else
+      this_scope = eval(class_name + ".reflect_on_association(:#{arg})").class_name
+    end
+    nest_chain << arg
+    %>
   def <%= arg %>
     @<%= arg %> ||= <%= this_scope %>.find(params[:<%= arg %>_id])
   end<% } %><% end %>
@@ -56,7 +68,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       load_all_<%= plural %>
       respond_to do |format|
         format.turbo_stream
-        format.html { redirect_to <%= plural %>_path }
+        format.html { redirect_to <%= path_helper_plural %> }
       end
     else
       flash[:alert] = "Oops, your <%= singular_name %> could not be created."
@@ -101,7 +113,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     load_all_<%= plural %>
     respond_to do |format|
       format.turbo_stream
-      format.html { redirect_to <%= plural %>_path }
+      format.html { redirect_to <%= path_helper_plural %> }
     end
   end<% end %>
 

data/lib/generators/hot_glue/templates/erb/_show.erb

@@ -1,7 +1,7 @@
 <%= all_line_fields %>
 <div class="col">
   <% if destroy_action %>
-    <\%= link_to "Delete <i class='fa fa-1x fa-remove'></i>".html_safe, <%= path_helper_singular %>(<%= path_helper_args %>), method: :delete, data: {confirm: 'Are you sure?'},  disable_with: "Loading...", class: "delete-<%= singular %>-button btn btn-primary " %>
+    <\%= button_to "Delete".html_safe, <%= path_helper_singular %>(<%= path_helper_args %>), method: :delete, data: <%= delete_confirmation_syntax  %>,  disable_with: "Loading...", class: "delete-<%= singular %>-button btn btn-primary " %>
   <% end %>
   &nbsp;
   <\%= link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= path_helper_args %>), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary " %>

data/lib/generators/hot_glue/templates/system_spec.rb.erb

@@ -98,7 +98,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       visit <%= path_helper_plural %>
       find("a.edit-<%= singular %>-button[href='/<%= namespace_with_slash %><%= plural %>/#{<%= singular %>1.id}/edit']").click
 
-      expect(page).to have_content("Editing #{<%= singular %>1.<%= derrive_reference_name(singular_class) %>}")
+      expect(page).to have_content("Editing #{<%= singular %>.<%= "abc" %>}")
 <%=
     @columns.map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.2.0'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -96,13 +102,14 @@ dependencies:
         version: '2.16'
 description: Simple, plug & play Rails scaffold building companion for Turbo-Rails
   and Hotwire
-email: tech@datatravels.com
+email: code@jasonfb.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENCE
@@ -127,6 +134,7 @@ files:
 - lib/generators/hot_glue/markup_templates/slim.rb
 - lib/generators/hot_glue/scaffold_generator.rb
 - lib/generators/hot_glue/templates/base_controller.rb.erb
+- lib/generators/hot_glue/templates/confirmable.js
 - lib/generators/hot_glue/templates/controller.rb.erb
 - lib/generators/hot_glue/templates/erb/_errors.erb
 - lib/generators/hot_glue/templates/erb/_flash_notices.erb
@@ -162,7 +170,7 @@ files:
 - lib/hot-glue.rb
 - lib/hotglue/engine.rb
 - lib/hotglue/version.rb
-homepage: https://blog.jasonfleetwoodboldt.com/hot-glue/
+homepage: https://jasonfleetwoodboldt.com/hot-glue/
 licenses:
 - Nonstandard
 metadata:
@@ -200,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A gem build scaffolding.