hot-glue 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afc68861e358b8c531dc375f1430773020b486019ea649e81fb428fcf1e16176
-  data.tar.gz: a1120fd066f8a36cccc5a2f909f9d7dd64e2e8bb1f2a20c4a7c8a88829b014b5
+  metadata.gz: ea7829bc862ee2a0a10b70bc624c31f2f20391731932857423483d27f068a173
+  data.tar.gz: 22f9c32718db75de7d4bd84a5486218b2a75823dba7a2b191bb211cdf5b7770f
 SHA512:
-  metadata.gz: 0d7e6a3503778e7403af19cee81120a30a79b8463a34f6458919091d95531636f9c4251b7c0c4b25542855f718481960610d3d94d41691d0216c2ccac9b29cde
-  data.tar.gz: a5c32f698bd91486f7100b936e3eafd2333656de8bc2e1ddbcdf56351b9248aad1dd4934da8736d9c072c6bcac901af9d9043c6e9014bcd9beb3b700a28c3284
+  metadata.gz: 1d98362fe10be3c546ea9aa253a3141ca936e53adc05028c899667e46601fc8278d818865e503941fcd3d045d300325b083c75cbd507ef70389e904766cc3f46
+  data.tar.gz: 8378310ecb1563d2c7601954d5e0c1bb9494ed49c88ebbe3bc50a15536b19f8dcc5232457e15bdc7ddb27229cf0c87dc4db25fd36861eeeddf0e6ca920c09634

data/.circleci/config.yml

@@ -0,0 +1,71 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
+# See: https://circleci.com/docs/2.0/orb-intro/
+orbs:
+  ruby: circleci/ruby@1.4.0
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  build:
+    docker:
+      - image: cimg/ruby:2.7.5-browsers
+    executor: ruby/default
+    steps:
+      - checkout
+      - ruby/install-deps # use the ruby orb to install dependencies
+
+      - run:
+          name: Which bundler?
+          command: bundle -v
+  test:  # our next job, called "test"
+    parallelism: 1
+    # here we set TWO docker images.
+    docker:
+
+      - image: cimg/ruby:2.7.5-browsers # this is our primary docker image, where step commands run.
+        auth:
+          username: mydockerhub-user
+          password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
+      - image: redis:6.2.6
+      - image: circleci/postgres:9.5-alpine
+        auth:
+          username: mydockerhub-user
+          password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
+        environment: # add POSTGRES environment variables.
+          POSTGRES_USER: circleci-demo-ruby
+          POSTGRES_DB: hot-glue-test
+          POSTGRES_PASSWORD: ""
+    # environment variables specific to Ruby/Rails, applied to the primary container.
+    environment:
+      BUNDLE_JOBS: "3"
+      BUNDLE_RETRY: "3"
+      PGHOST: 127.0.0.1
+      PGUSER: circleci-demo-ruby
+      PGPASSWORD: ""
+      RAILS_ENV: test
+    # A series of steps to run, some are similar to those in "build".
+    steps:
+      - checkout
+      - ruby/install-deps
+      # Here we make sure that the secondary container boots
+      # up before we run operations on the database.
+      - run:
+          name: Wait for DB
+          command: dockerize -wait tcp://localhost:5432 -timeout 1m
+      # Run rspec in parallel
+      - ruby/rspec-test
+
+# We use workflows to orchestrate the jobs that we declared above.
+workflows:
+  version: 2
+  build_and_test:     # The name of our workflow is "build_and_test"
+    jobs:             # The list of jobs we run as part of this workflow.
+      - build         # Run build first.
+      - test:         # Then run test,
+          requires:   # Test requires that build passes for it to run.
+            - build   # Finally, run the build job.
+

data/.gitignore

@@ -18,4 +18,5 @@ spec/dummy/app/views/
 spec/dummy/app/controllers/
 spec/dummy/specs/
 
-spec/strawman/
+spec/dummy/node_modules/
+spec/dummy/log/

data/Gemfile

@@ -1,10 +1,12 @@
+# THESE GEMS ARE NOT PART OF YOUR RAILS APP!!!
+
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
 # not required for your app
-gem 'pg'
+gem 'sqlite3'
 gem 'byebug'
 gem 'rails'
 gem 'devise', require: true
@@ -13,4 +15,5 @@ gem 'devise', require: true
 gem "rails-controller-testing", group: [:test]
 gem "database_cleaner", group: [:test]
 gem "rspec-rails", group: [:test]
+gem "rspec_junit_formatter", group: [:test]
 gem "factory_bot", group: [:test]

data/Gemfile.lock

@@ -5,7 +5,6 @@ PATH
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
-      sass-rails
 
 GEM
   remote: https://rubygems.org/
@@ -91,7 +90,6 @@ GEM
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
     ffaker (2.20.0)
-    ffi (1.15.5)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (1.8.10)
@@ -127,7 +125,6 @@ GEM
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pg (1.2.3)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -183,16 +180,8 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
+    rspec_junit_formatter (0.5.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -200,8 +189,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
     thor (1.1.0)
-    tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     warden (1.2.9)
@@ -221,10 +210,11 @@ DEPENDENCIES
   devise
   factory_bot
   hot-glue!
-  pg
   rails
   rails-controller-testing
   rspec-rails
+  rspec_junit_formatter
+  sqlite3
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -1,6 +1,5 @@
 
-[![Build Status](https://app.travis-ci.com/jasonfb/hot-glue.svg?branch=main)](https://travis-ci.com/jasonfb/hot-glue)
-
+[![Hot Glue](https://circleci.com/gh/jasonfb/hot-glue.svg?style=shield)](https://circleci.com/gh/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)).
 
@@ -79,11 +78,17 @@ _BOOTSTRAP IS NO LONGER NEEDED_, but I recommend it.
 
 IF you are using `--layout=bootstrap` (step 3), you must install Bootstrap here.
 
-Bootstrap with Webpacker is no longer in Rails 7 by default. (For that see ________TBD________)
+Webpacker is no longer in Rails 7. Also, there is a new option for Rails 7 to build Bootstrap using `cssbundling-rails`
+
+
+
 
-For Bootstrap with Sprockets (recommended by Rails team), see https://github.com/twbs/bootstrap-rubygem
 
-If going the the Bootstrap with Sprockets route, note the gem is
+For the old method:
+
+- https://github.com/twbs/bootstrap-rubygem
+
+With the old method, install the gem using:
 ```
 gem 'bootstrap', '~> 5.1.3'
 ```
@@ -243,7 +248,7 @@ https://github.com/FortAwesome/font-awesome-sass
 
 Add to your Gemfile
 
-As of 2021-12-28 Devise for Rails 7 is still not released so you must use main branch, like so:
+As of 2022-01-26 Devise for Rails 7 is still not released so you must use main branch, like so:
 `gem 'devise', branch: 'main', git: 'https://github.com/heartcombo/devise.git'`
 
 If on Rails 6 **or** Rails 7, you must do the steps in **Legacy Step #5** (below).
@@ -252,6 +257,7 @@ If on Rails 6 **or** Rails 7, you must do the steps in **Legacy Step #5** (below
 
 To be clear: You CAN use Devise with Rails 7, but you must still do the Legacy Step #5 described below for your login to work.
 
+You MUST run the installer FIRST or else you will put your app into a non-workable state:
 ```
 rails generate devise:install
 ```
@@ -277,6 +283,18 @@ As described in Legacy Step #5, **you cannot** skip Devise installer Step 4, eve
 Once you copy the files, you must modify the Devise views to disable Turbo as described in Legacy Step #5.
 
 
+Be sure to create primary auth model with:
+
+`rails generate devise User name:string`
+
+Remember, you don't need to tell Devise that your User has an email, an encrypted password, a reset token, and a 'remember me' flag to let the user stay logged in.
+
+Those features come by default with Devise, and you'll find the fields for them in the newly generated migration file. 
+
+In the example above, you are creating all of those fields along with a simple 'name' (string) field for your User table.
+
+
+
 ## LEGACY SETUP FOR RAILS 6
 
 (Note Legacy Step #5 is necessary for BOTH Rails 6 and Rails 7.)
@@ -404,17 +422,27 @@ end
 ```
 
 
-### `--nest=`
+### `--nested=`
+
+This object is nested within another tree of objects, and there is a nested route in your routes.rb file
+
+resources :invoices do
+  resource :lines do
+end
+
 
-pass `--nest=` to denote a nested resources
+`rails generate hot_glue:scaffold Line --nested=invoice`
 
 
-`rails generate hot_glue:scaffold Line --nest=invoice`
+Example #1: Invoice has many  :lines and line belongs_to :invoice
 
-In this example, it is presumed that the current user has_many :invoices, and that invoices have many :lines
 
+For multi-level nesting use slashes to separate your levels of nesting. 
+
+`rails generate hot_glue:scaffold Charge --nested=invoice`
+`rails generate hot_glue:scaffold Charge --nest=invoice/line`
 
-For multi-level nesting use slashes to separate your levels of nesting. Remember, you should match what you have in your routes.rb file.
+Remember, you should match what you have in your routes.rb file.
 
 ```
 resources :invoices do
@@ -424,13 +452,10 @@ resources :invoices do
 end
 
 ```
-In this example, it is presumed that the current user has_many :invoices, and that invoices have many :lines, and that lines have many :charges
 
+For non-Gd controllers, your auth root will be used as the starting point when loading the objects from the URL if this object is nested.
 
-To generate scaffold:
-`rails generate hot_glue:scaffold Charge --nest=invoice/line`
-
-The order of the nest should match the nested resources you have in your own app.  In particular, you auth root will be used as the starting point when loading the objects from the URL:
+(For Gd controllers the root object will be loaded directly from the ActiveRecord object.)
 
 In the example above, @invoice will be loaded from
 
@@ -444,11 +469,14 @@ Then, finally the @charge will be loaded
 
 `@charge = @line.charges.find(params[:id])`
 
-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).
+This is "starfish access control" or "poor man's access control."  It works when the current user has several things they can manage, and by extension can manage children of those things.  
+
+
+## Optional Nesting
 
-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).
+**God controllers only ** have a special build feature where they can be specified to be optionally nested. 
 
-Your customers can delete their own objects by default (may be a good idea or a bad idea for you). If you don't want that, you should strip out the delete actions off the controllers.
+When build as optionally nested, 
 
 
 ### `--auth=`
@@ -623,69 +651,6 @@ You will need to build scaffolding with the same name for the related object as
 On the list view, the object you are currently building will be built with a sub-view list of the objects related from the given line.
 
 
-### `--alt-controller-name`
-
-Normally a controller a has a natural name based on the model (the Thing model produces a `ThingsController`).
-
-Within any given namespace, you can have only one natural controller for that model, of course, because all the controllers exist at the namespace directory even when they are nested.
-
-For example, let's say you have an Admin dashboard with User has_many :invoices
-
-Your routes file will nest your invoices within your users (for whatever namespace you are building)
-
-```
-namespace :admin do
-    resources :users do
-      resources :invoices 
-    end
-end
-```
-
-Therefore, your namespace can typically only view that model in one context. If that context is nested (using `--nest` exists at a nested route), it can only be used in the context of that nest (which probably requires one or more parent objects to be in the nested route of your URL).
-
-You should preserve this naming convention, and stay within those guides so your nested routes work when this object is nested within another object's view. (For the context of that or any namespace.)
-
-Alternative controller names let you specify a controller name that is nameed _something else_ but still edits the given object/table.
-
-In the example above, you'd add another top-level route in the same namespace called "all_X".
-
-For example, 
-
-**config/routes.rb**
-```
-namespace :admin do
-    resources :users do
-      resources :invoices 
-    end
-    resources :all_invoices
-end
-```
-
-Then you'd build normal nested scaffold like so: 
-
-```
-rails generate hot_glue:scaffold User --namespace=admin --gd
-
-rails generate hot_glue:scaffold Invoice --namespace=admin --nest=users --gd
-
-```
-You'd build another Invoices controller like this:
-
-```
-rails generate hot_glue:scaffold Invoice --namespace=admin --alt-controller-name=AllInvoices --gd
-```
-
-Note that all three builds here are in the `admin` namespace (so build controllers at `app/controllers/admin/`) and ALSO use Gd mode. 
-
-If you extend the example conceptually you build things like "UnpaidInvoices" or "RecentInvoices" which would, for example, build contextual views for the admin user. 
-
-The difference between the one kind of Invoices controller and the other is that, in this example, the InvoicesController (the natural one) is always nested to the user. So if you ever want to know about invoices in the context of a user, that's exactly what you use.
-
-The other one, `AllInvoicesController` or `UnpaidInvoicesController` will provide the admin a view of invoices **out of the context** of the user object. 
-
-
-
-
 
 
 ## FLAGS (Options with no values)
@@ -779,6 +744,8 @@ Obviously, the created controller will always have this base controller as its s
 
 # VERSION HISTORY
 
+#### 2022-01-25 - v0.4.7 - 
+
 #### 2022-01-11 - v0.4.5 - buttons on smarty layouts take up 1 bootstrap column each; fixes confirmation alert for delete buttons
 
 #### 2022-01-01 - v0.4.3 and 0.4.4 - adding fully email based license; no activation codes required
@@ -856,9 +823,9 @@ SETUP:
 • if you can't get through see https://stackoverflow.com/questions/68050807/gem-install-mimemagic-v-0-3-10-fails-to-install-on-big-sur/68170982#68170982
 
 
-The dummy sandbox is found at `spec/dummy`
+The dummy sandbox is found at `spec/Dummy`
 
-The dummy sandbox lives as mostly checked- into the repository, **except** the folders where the generated code goes (`spec/dummy/app/views/`, `spec/dummy/app/controllers/`, `spec/dummy/specs/` are excluded from Git)
+The dummy sandbox lives as mostly checked- into the repository, **except** the folders where the generated code goes (`spec/Dummy/app/views/`, `spec/Dummy/app/controllers/`, `spec/Dummy/specs/` are excluded from Git)
 
 When you run the **internal specs**, which you can do **at the root of this repo** using the command `rspec`, a set of specs will run to assert the generators are erroring when they are supposed to and producing code when they are supposed to.
 
@@ -867,15 +834,16 @@ The DUMMY testing DOES NOT test the actual functionality of the output code (it
 
 # DATABASE
 
-`cd spec/dummy`
+`cd spec/Dummy`
 `rails db:drop`
 `rails db:create`
 `rails db:migrate`
 `RAILS_ENV=test rails db:migrate`
 
-`cd ../..`
 
-take note that when running the spec at the root of the repo you are initializing the Dummy app, which will use the 
-SQLite database in spec/dummy/database/
+being able to run `rake spec` at the root of this repo is acheived using
+```
+ln -s  spec/dummy/db/schema.rb db/schema.rb
+```
 
 

data/config/database.yml

@@ -1,86 +1,11 @@
-# PostgreSQL. Versions 9.3 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On macOS with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On macOS with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # https://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
 development:
-  <<: *default
-  database: Dummy_development
-
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
-  # the same name as the operating system user running Rails.
-  #username: Dummy
-
-  # The password associated with the postgres role (username).
-  #password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
+  adapter: sqlite3
+  database: ../spec/dummy/db/development.sqlite3
+  pool: 5
+  timeout: 5000
 
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  <<: *default
-  database: Dummy_test
-
-# As with config/credentials.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password or a full connection URL as an environment
-# variable when you boot the app. For example:
-#
-#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
-#
-# If the connection URL is provided in the special DATABASE_URL environment
-# variable, Rails will automatically merge its configuration values on top of
-# the values provided in this file. Alternatively, you can specify a connection
-# URL environment variable explicitly:
-#
-#   production:
-#     url: <%= ENV['MY_APP_DATABASE_URL'] %>
-#
-# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full overview on how database connection configuration can be specified.
-#
-production:
-  <<: *default
-  database: Dummy_production
-  username: Dummy
-  password: <%= ENV['DUMMY_DATABASE_PASSWORD'] %>
+  adapter: sqlite3
+  database: ../spec/dummy/db/test.sqlite3
+  pool: 5
+  timeout: 5000

data/db/schema.rb

@@ -0,0 +1 @@
+db/spec/dummy/db/schema.rb

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

@@ -1,12 +1,20 @@
 module  HotGlue
   class ErbTemplate < TemplateBase
 
+
+
+    def add_spaces_each_line(text, num_spaces)
+      add_spaces = " " * num_spaces
+      text.lines.collect{|line| add_spaces + line}.join("")
+    end
+
+
     # include GeneratorHelper
     attr_accessor :singular
 
     def field_output(col, type = nil, width, col_identifier )
       "  <%= f.text_field :#{col.to_s}, value: @#{@singular}.#{col.to_s}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}' %>\n "+
-      "  <label class='form-text' >#{col.to_s.humanize}</label>\n"
+      "\n"
     end
 
 
@@ -31,8 +39,7 @@ module  HotGlue
         lines = 5
       end
 
-      "<%= f.text_area :#{col.to_s}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}' %>" +
-        "<label class='form-text'>#{col.to_s.humanize}</label>"
+      "<%= f.text_area :#{col.to_s}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}' %>"
     end
 
     def list_column_headings(*args)
@@ -59,23 +66,20 @@ module  HotGlue
       show_only = args[0][:show_only]
       singular_class = args[0][:singular_class]
       col_identifier = args[0][:col_identifier]
+      ownership_field  = args[0][:ownership_field]
 
 
       # TODO: CLEAN ME
       @singular = args[0][:singular]
       singular = @singular
 
-      col_spaces_prepend = "    "
-
-
       result = layout_columns.map{ |column|
-        "<div class='#{col_identifier}' >" +
+        "  <div class='#{col_identifier}' >" +
 
           column.map { |col|
 
           field_result = if show_only.include?(col)
-            "<%= @#{singular}.#{col.to_s} %>" +
-            "<label class='form-text'>#{col.to_s.humanize}</label>"
+            "<%= @#{singular}.#{col.to_s} %>"
           else
             type = eval("#{singular_class}.columns_hash['#{col}']").type
             limit = eval("#{singular_class}.columns_hash['#{col}']").limit
@@ -88,16 +92,18 @@ module  HotGlue
                   assoc_name = col.to_s.gsub("_id","")
                   assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
                   if assoc.nil?
-                    exit_message= "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+                    exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
                     exit
                   end
+
+                  is_owner = col.to_s == ownership_field
                   display_column = HotGlue.derrive_reference_name(assoc.class_name)
-                  "<%= 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>"
+
+                  # TODO: add is_owner && check if this nested arg is optional
+                  (is_owner ? "<% unless #{assoc_name} %>\n" : "") +  "  <%= f.collection_select(:#{col.to_s}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>\n" + (is_owner ? "<% end %>" : "")
 
                 else
-                  "<%= 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>"
+                  "<%= f.text_field :#{col.to_s}, value: #{singular}.#{col.to_s}, class: 'form-control', size: 4, type: 'number' %>"
 
                 end
               when :string
@@ -131,18 +137,22 @@ module  HotGlue
                   ""
               when :enum
                 enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col.to_s}'}[0].sql_type")
-                "<%= f.collection_select(:#{col.to_s},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
-  <label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
-              end
-           end
+                "<%= f.collection_select(:#{col.to_s},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>"
+            end
+
+          end
 
           if (type == :integer) && col.to_s.ends_with?("_id")
             field_error_name = col.to_s.gsub("_id","")
           else
             field_error_name = col.to_s
           end
-           "<span class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{ 'style="display: inherit;"'}  >" + field_result + "</span>"
-          }.join("<br />\n") + "</div>"
+
+          add_spaces_each_line( "\n  <span class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{ 'style="display: inherit;"'}  >\n" +
+            add_spaces_each_line(field_result + "\n<label class='small form-text text-muted'>#{col.to_s.humanize}</label>", 4) +
+            "\n  </span>\n  <br />", 2)
+
+          }.join("") + "\n  </div>"
       }.join("\n")
       return result
     end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -41,7 +41,10 @@ module HotGlue
     class_option :singular, type: :string, default: nil
     class_option :plural, type: :string, default: nil
     class_option :singular_class, type: :string, default: nil
-    class_option :nest, type: :string, default: ""
+    class_option :nest, type: :string, default: nil # DEPRECATED —— DO NOT USE
+    class_option :nested, type: :string, default: ""
+
+
     class_option :namespace, type: :string, default: nil
     class_option :auth, type: :string, default: nil
     class_option :auth_identifier, type: :string, default: nil
@@ -70,7 +73,7 @@ module HotGlue
     class_option :markup, type: :string, default: nil # deprecated -- use in app config instead
     class_option :layout, type: :string, default: nil # if used here it will override what is in the config
     class_option :no_list_labels, type: :boolean, default: false
-    class_option :alt_controller_name, type: :string, default: nil
+    class_option :before_list_labels, type: :boolean, default: false
 
     def initialize(*meta_args)
       super
@@ -148,27 +151,27 @@ module HotGlue
       @namespace = options['namespace'] || nil
 
 
-      @alt_controller_name = options['alt_controller_name']
-      use_controller_name = @alt_controller_name || plural.titleize.gsub(" ", "")
+      use_controller_name =  plural.titleize.gsub(" ", "")
 
-      @controller_build_name = (( @namespace.titleize + "::" if @namespace) || "") + use_controller_name + "Controller"
+      @controller_build_name = (( @namespace.titleize.gsub(" ","") + "::" if @namespace) || "") + use_controller_name + "Controller"
       @controller_build_folder = use_controller_name.underscore
+      @controller_build_folder_singular = singular
 
       if ! @controller_build_folder.ends_with?("s")
         raise "can't build with controller name #{@controller_build_folder} because it doesn't end with an 's'"
       end
 
-      if @alt_controller_name
-        @controller_build_folder_singular = @controller_build_folder.gsub(/s$/,'')
-      else
-        @controller_build_folder_singular = singular
-      end
-
       @auth = options['auth'] || "current_user"
       @auth_identifier = options['auth_identifier'] || (! @god && @auth.gsub("current_", "")) || nil
 
 
-      @nest = (!options['nest'].empty? && options['nest']) || nil
+
+      if options['nest']
+        raise "STOP: the flag --nest has been replaced with --nested; please re-run using the --nested flag"
+
+      end
+
+      @nested = (!options['nested'].empty? && options['nested']) || nil
 
       @singular_class = @singular.titleize.gsub(" ", "")
       @exclude_fields = []
@@ -204,7 +207,6 @@ module HotGlue
       @smart_layout = options['smart_layout']
 
 
-
       @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
       @downnest = options['downnest'] || false
 
@@ -220,13 +222,18 @@ module HotGlue
       end
 
       # when in self auth, the object is the same as the authenticated object
+
       if @auth && auth_identifier == @singular
         @self_auth = true
       end
 
+      if @self_auth && !@no_create
+        raise "This controller appears to be the same as the authentication object but in this context you cannot build a new/create action; please re-run with --no-create flag"
+      end
+
       @nested_args = []
-      if !@nest.nil?
-        @nested_args = @nest.split("/")
+      if ! @nested.nil?
+        @nested_args = @nested.split("/")
         @nested_args_plural = {}
         @nested_args.each do |a|
           @nested_args_plural[a] = a + "s"
@@ -266,13 +273,16 @@ module HotGlue
 
       if !@ujs_syntax
         @ujs_syntax = !defined?(Turbo::Engine)
-        puts "You did not specify ujs_syntax and so I default it to #{@ujs_syntax}"
       end
       @reference_name = HotGlue.derrive_reference_name(singular_class)
 
       identify_object_owner
       setup_fields
 
+      if  (@columns - @show_only - (@object_owner_sym.empty? ? [] : [@ownership_field.to_sym])).empty?
+        @no_field_form = true
+      end
+
       buttons_width = ((!@no_edit && 1) || 0) + ((!@no_delete && 1) || 0) + @magic_buttons.count
 
       builder = HotGlue::Layout::Builder.new({
@@ -297,30 +307,16 @@ module HotGlue
 
         if assoc
           @ownership_field = assoc.name.to_s + "_id"
-        elsif !@nest
+        elsif ! @nested_args.any?
           exit_message = "*** Oops: It looks like is no association from current_#{@object_owner_sym} to a class called #{@singular_class}. If your user is called something else, pass with flag auth=current_X where X is the model for your users as lowercase. Also, be sure to implement current_X as a method on your controller. (If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for auth_identifier.) To make a controller that can read all records, specify with --god."
 
         else
-          exit_message = "*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym} \n
-maybe add `belongs_to :#{@object_owner_sym}` to #{singular_class}\n
-(If your user is called something else, pass with flag auth=current_X where X is the model for your auth object as lowercase.
-Also, be sure to implement current_X as a method on your controller. If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for --auth-identifier flag)
 
-To make a controller that can read all records, specify with --god."
-
-          if @god
-            exit_message << "does #{singular_class} have a relOops: Gd mode could not find the association(#{@object_owner_sym}). Something is wrong."
+          if eval(singular_class + ".reflect_on_association(:#{@object_owner_sym.to_s})").nil? && !eval(singular_class + ".reflect_on_association(:#{@object_owner_sym.to_s.singularize})").nil?
+            exit_message = "*** Oops: you tried to nest #{singular_class} within a route for `#{@object_owner_sym}` but I can't find an association for this relationship. Did you mean `#{@object_owner_sym.to_s.singularize}` (singular) instead?"
           else
-
-            @auth_check = eval(@auth_identifier.titleize)
-            @nested_args.each do |arg|
-
-              if ! @auth_check.reflect_on_association("#{arg}s".to_sym)
-                exit_message <<  "...  your nesting chain does not have a association for #{arg}s on #{@auth_check}  something is wrong."
-              end
-            end
+            exit_message = "*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym}  maybe add `belongs_to :#{@object_owner_sym}` to #{singular_class}\n (If your user is called something else, pass with flag auth=current_X where X is the model for your auth object as lowercase.  Also, be sure to implement current_X as a method on your controller. If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for --auth-identifier flag). To make a controller that can read all records, specify with --god."
           end
-          puts "\n" + exit_message
           raise(HotGlue::Error, exit_message)
         end
       end
@@ -520,7 +516,7 @@ To make a controller that can read all records, specify with --god."
     end
 
     def path_helper_args
-      if @nested_args.any? && @nest
+      if @nested_args.any? && @nested
         [(@nested_args).collect{|a| "#{a}"} , singular].join(",")
       else
         singular
@@ -528,7 +524,7 @@ To make a controller that can read all records, specify with --god."
     end
 
     def path_helper_singular
-      if @nest
+      if @nested
         "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{@controller_build_folder_singular}_path"
       else
         "#{@namespace+"_" if @namespace}#{@controller_build_folder_singular}_path"
@@ -536,7 +532,7 @@ To make a controller that can read all records, specify with --god."
     end
 
     def path_helper_plural
-      if ! @nest
+      if ! @nested
         "#{@namespace+"_" if @namespace}#{@controller_build_folder}_path"
       else
         "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{plural}_path"
@@ -545,7 +541,7 @@ To make a controller that can read all records, specify with --god."
 
     def path_arity
       res = ""
-      if @nested_args.any? && @nest
+      if @nested_args.any? && @nested
         res << nested_objects_arity + ", "
       end
       res << "@" + singular
@@ -585,7 +581,7 @@ To make a controller that can read all records, specify with --god."
 
     def nest_assignments_operator(top_level = false, leading_comma = false)
       if @nested_args.any?
-        "#{', ' + "\n     " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
+        "#{", " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
       else
         ""
       end
@@ -779,7 +775,8 @@ To make a controller that can read all records, specify with --god."
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
-        col_identifier:  col_identifier
+        col_identifier:  col_identifier,
+        ownership_field: @ownership_field
       )
     end
 
@@ -820,8 +817,8 @@ To make a controller that can read all records, specify with --god."
     end
 
     def controller_descends_from
-      if defined?(@namespace.titlecase + "::BaseController")
-        @namespace.titlecase + "::BaseController"
+      if defined?(@namespace.titlecase.gsub(" ", "") + "::BaseController")
+        @namespace.titlecase.gsub(" ", "") + "::BaseController"
       else
         "ApplicationController"
       end

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

@@ -4,50 +4,51 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
   <% unless @auth_identifier == '' || @god %>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 %>
+
+    if auth_identifier == arg
+      this_scope = auth_object
+    elsif nest_chain.empty?
+      this_scope =  "#{@auth ? auth_object : class_name}.#{arg}s"
+    else
+      this_scope = "#{nest_chain.last}.#{arg}s"
+    end
+
+     nest_chain << arg %>
   before_action :<%= arg %>
     <% } %><% end %>
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
   after_action -> { flash.discard }, if: -> { request.format.symbol ==  :turbo_stream }
-
-<% if no_devise_installed %>
-  # TODO: implement current_user or use Devise
-<% end %>
-
-  <% if @nested_args.any? %>
-  def <%= @nested_args[0] %>
-    <% if @god
-    next_object = nil
-     collect_objects = @nested_args.reverse.collect {|x|
-         if eval("#{next_object || class_name}.reflect_on_association(:#{x})").nil?
-           raise "***** Unable to find the association `#{x}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{x}` to the #{next_object || class_name} object?"
-         end
-         next_object = eval("#{next_object || class_name}.reflect_on_association(:#{x})").class_name
-     }
-     root_object = collect_objects.last
+<% if @nested_args.any? %>
+  def <%= @nested_args[0] %><% if @god
+       next_object = nil
+       collect_objects = @nested_args.reverse.collect {|x|
+           if eval("#{next_object || class_name}.reflect_on_association(:#{x})").nil?
+             raise "***** Unable to find the association `#{x}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{x}` to the #{next_object || class_name} object?"
+           end
+           next_object = eval("#{next_object || class_name}.reflect_on_association(:#{x})").class_name
+       }
+       root_object = collect_objects.last
      else
-       root_object = @auth + "." + @nested_args[0] + "s"
+       if @nested_args[0] == @auth_identifier
+         root_object = @auth
+       else
+         root_object = @auth + "." + @nested_args[0] + "s"
+       end
      end
-
-     %>
-    <% if !@god %> @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id])
-    <% else %> @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id]) <% end %>
+ %><% if !@god &&  @nested_args[0] == @auth_identifier %>
+    @<%= @nested_args[0] %> ||= <%= root_object %> <% elsif !@god %>
+    @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id]) <% else %>
+    @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id]) <% end %>
   end
   <% end %>
-
   <% if any_nested? %><% nest_chain = [@nested_args[0]]; this_scope = @nested_args[0] + 's'; %> <%   @nested_args[1..-1].each { |arg|
     this_scope =  "#{nest_chain.last}.#{arg}s"
     nest_chain << arg
     %>
   def <%= arg %>
     @<%= arg %> ||= <%= this_scope %>.find(params[:<%= arg %>_id])
-  end<% } %>
-
-  <% end %>
-
+  end<% } %> <% end %> <% if !@self_auth %>
 
-<% if !@self_auth %>
   def load_<%= singular_name %>
     @<%= singular_name %> = <%= object_scope.gsub("@",'') %>.find(params[:id])
   end
@@ -57,7 +58,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
 
   def load_all_<%= plural %>
+    <% if !@self_auth %>
     @<%= plural_name %> = <%= object_scope.gsub("@",'') %>.page(params[:page])
+    <% else %>
+    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id) # returns iterable even though this <%= singular_name %> is anly allowed access to themselves
+    <% end %>
   end
 
   def index
@@ -67,10 +72,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     end
   end
 
-<% if create_action %>  def new <% if ! @god %>
+<% if create_action %>  def new
+    <% if ! @god %>
     @<%= singular_name %> = <%= class_name  %>.new(<%= @object_owner_sym %>: <%= @object_owner_eval %>)
    <% else %>
-    @<%= singular_name %> = <%= class_name  %>.new
+    @<%= singular_name %> = <%= class_name  %>.new(<% if any_nested? %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)
    <% end %>
     respond_to do |format|
       format.html
@@ -78,8 +84,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
   def create
-    modified_params = modify_date_inputs_on_params(<%=singular_name %>_params.dup<% if !@object_owner_sym.empty? %>.merge!(<%= @object_owner_sym %>: <%= @object_owner_eval %> )<% end %> <%= @auth ? ', ' + @auth : '' %>)
-    @<%=singular_name %> = <%=class_name %>.create(modified_params)
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if ! @object_owner_sym.empty? %>.merge!(<%= @object_owner_sym %>: <%= @object_owner_eval %> )<% end %> <%= @auth ? ', ' + @auth : '' %>)
+    @<%=singular_name %> = <%= class_name %>.create(modified_params)
 
     if @<%= singular_name %>.save
       flash[:notice] = "Successfully created #{@<%= singular %>.<%= display_class %>}"

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

@@ -1,8 +1,9 @@
 <div class="row">
-  <%= all_form_fields %>
+<%= all_form_fields %>
 
   <div class="<%= @layout == "hotglue" ? 'scaffold-cell' : 'col-md-2' %>">
-    <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %>
+    <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %><% if @no_field_form %>
+    <\%= f.hidden_field "_________" %><% end %>
     <\%= f.submit "Save", class: "btn btn-primary pull-right" %>
   </div>
 </div>

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

@@ -3,6 +3,7 @@
   New <%= singular.titlecase %>
   </h3>
   <\%= form_with model:  <%= singular %>, url: <%= path_helper_plural %>(<%= nested_objects_arity %>), method: "post" do  |f| %>
-    <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form", locals: { <%=  singular %>:  <%= singular %>, f: f} %>
+    <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form",
+      locals: { <%=  singular %>: <%= singular %> <%= nest_assignments_operator(false,  true)  %>, f: f} %>
   <\% end %>
 <\% end %>

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

@@ -1 +1 @@
-<\%= render partial: "new_form", locals: {<%= singular %>: @<%=singular%>} %>
+<\%= render partial: "new_form", locals: {<%= singular %>: @<%=singular%><%= nest_assignments_operator(true,  true)  %>} %>

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".github/FUNDING.yml"
 - ".gitignore"
 - ".travis.yml"
@@ -139,7 +126,7 @@ files:
 - lib/hot-glue.rb
 - lib/hotglue/engine.rb
 - lib/hotglue/version.rb
-homepage: https://jfb.teachable.com/p/hot-glue-in-depth-tutorial?utm_source=rubygems.org&utm_campaign=rubygems_link
+homepage: https://jfbcodes.com/p/hot-glue-in-depth-tutorial?utm_source=rubygems.org&utm_campaign=rubygems_link
 licenses:
 - Commercial with free option
 metadata:

data/db/schema.rb

@@ -1,60 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# This file is the source Rails uses to define your schema when running `bin/rails
-# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
-# be faster and is potentially less error prone than running all of your
-# migrations from scratch. Old migrations may fail to apply correctly if those
-# migrations use external dependencies or application code.
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema.define(version: 2021_03_06_225506) do
-
-  create_table "abcs", force: :cascade do |t|
-    t.integer "xxx"
-    t.string "yyy"
-    t.integer "dfg_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
-
-  create_table "dfg", force: :cascade do |t|
-    t.integer "user_id"
-    t.string "name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
-
-  create_table "ghis", force: :cascade do |t|
-    t.integer "dfg_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
-
-  create_table "jkls", force: :cascade do |t|
-    t.integer "hgi_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
-
-  create_table "users", force: :cascade do |t|
-    t.string "email", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.index ["email"], name: "index_users_on_email", unique: true
-    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-  end
-
-  create_table "xyzs", force: :cascade do |t|
-    t.integer "nothing_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
-
-end