hot-glue 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 831970726374d97ef6b5380d122033384777a520ba5fcaeebc9ee79717b82ef1
-  data.tar.gz: f45f7a48e78a6bfd62973a11d5b55b24d7ba7a7979855940429ea00398e3ef1f
+  metadata.gz: 88c8ae8859f5a37ed898fb4047ab2a406c5eacbb766bcbf6dc2b43f5d419b751
+  data.tar.gz: 8685951b462a1b9c0f3e5920b193e057a15a2d497d103bf163702dfdbfa4f89f
 SHA512:
-  metadata.gz: 23fa8de6cc6460b36d3a867c502a708c6ea825575f25240d28f11f0c0f5a333fc6fe583fa95668d517555bbef96177407432a8c98ca41a29caeca82fa37e765a
-  data.tar.gz: a1c9db09d05ab741a85906e31b9cc5336c73f4108f550edbd14166d00f0623b65b1ea8c97a8b9c95c39de55a72bc006cb657ab3d5cddff17258983eb26183ccc
+  metadata.gz: 54f3cbd725a0ca775b688405d8f00b0aa5611a4bd2d2bbb0566bb72fcf8a1c532e3dc88684e55a0c63dd300c0f0f0f9549f5536b74fba36714f5c97a14467c18
+  data.tar.gz: 269fe5314a3acbc91591efea6b2f43e049244152bfb6e1c803b67c0d4b233a461cf2131fe4825a331e205c830ee7961ba78d7c6b617374291e8c9ebb63952735

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.0.8)
+    hot-glue (0.0.9)
       ffaker (~> 2.16)
       haml-rails (~> 2.0)
       kaminari (~> 1.2)

data/README.md

@@ -1,77 +1,118 @@
 # Hot Glue
 
-Hot Glue is an evolution of the best of the admin-style scaffold builders 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) being the most popular of those). It harnesses the power of Rails 6, Turbo-Rails, and Hotwire to deliver a lightning fast experience.
+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)). 
 
-As well, its premise is a little different than the configuration-heavy admin interface toolkits. 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. 
+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. 
 
-It gives users full control over objects they 'own' and by default it spits out functionality giving access to all fields. 
+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. 
 
-Hot Glue generates functionality that's quick and dirty. It let's you be crafty. As with a real glue gun, take care not to burn yourself while using it. 
+By default, it generates code that gives users full control over objects they 'own' and by default it spits out functionality giving access to all fields. 
 
-* Build plug-and-play scaffolding mixing HAML and turbo_stream responses
-* Automatically Reads Your Models (make them before building your scaffolding!)
-* CRUD, lists with pagination, (coming soon: sorting & searching)
-* Wonderful for prototyping.
-* Nest your routes model-by-model for built-in poor man's authentication.
+Hot Glue generates functionality that's quick and dirty. It let's you be crafty. As with a real hot glue gun, use with caution. 
+
+* Build plug-and-play scaffolding for any CRUD on any object
+* mixes HAML and turbo_stream responses
+* Everything edits-in-place (unless you use --big-edit, then it won't)  
+* 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)
 * Plays nicely with Devise, but you can implement your own current_user object instead.
-* Requires & uses Kaminari for pagination.
-* Create specs automatically along with the controllers (* rspec only for now).
+* Kaminari for pagination.
+* Create specs automatically along with the controllers.
 * Throw the scaffolding away when your app is ready to graduate to its next phase (or don't if you like it).
 
-## QUICK START (COMING SOON)
+## QUICK START
 
 It's really easy to get started by following along with this blog post that creates three simple tables (User, Event, and Format).
 
 Feel free to build your own tables when you get to the sections for building the 'Event' scaffold:
 
-https://blog.jasonfleetwoodboldt.com/hot-glue
+https://jasonfleetwoodboldt.com/hot-glue
 
 ## HOW EASY?
 
-
 ```
 rails generate hot_glue:scaffold Thing 
 ```
 
+Generate a quick scaffold to manage a table called `pronouns`
+![hot-glue-3](https://user-images.githubusercontent.com/59002/116405509-bdee2f00-a7fd-11eb-9723-4c6e22f81bd3.gif)
+
+
+
+Instantly get a simple CRUD interface
+
+![hot-glue-4](https://user-images.githubusercontent.com/59002/116405517-c2b2e300-a7fd-11eb-8423-d43e3afc9fa6.gif)
+
+
 ## TO INSTALL
 
-- Add Turbo-Rails to your Gemfile & bundle install 
+- Add `gem 'turbo-rails'` to your Gemfile & `bundle install`
   
 - Then install it with `rails turbo:install`
 
 - The Turbo install has switched your action cable settings from 'async' to Redis, so be sure to start a redis server
   
-- Add `hot_glue` to your Gemfile & `bundle install`
+- Add `gem 'hot-glue'` to your Gemfile & `bundle install`
   
-- Then install it with `rails generate hot_glue:install`
+- Run the hot-glue installation with `rails generate hot_glue:install`
 
 - Add to your `application.html.erb`
 ```
   <%= render partial: 'layouts/flash_notices' %>
 ```
 
+- 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`
+  configure Rspec to work with Factory Bot inside of `rails_helper.rb`
+    ```
+    RSpec.configure do |config|
+        // ... more rspec configuration (not shown)
+        config.include FactoryBot::Syntax::Methods
+    end
+    ```  
+
+  https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#rspec
+
+  - for a quick Capybara login, create a support helper in `spec/support/` and log-in as your user
+    ```
+    def login_as(account)
+      visit '/accounts/sign_in'
+      within("#new_account") do
+      fill_in 'Email', with: account.email
+      fill_in 'Password', with: 'password'
+      end
+      click_button 'Log in'
+    end
+    ```
+
 - Install Bootstrap (optional)
 
 Bootstrap with Webpack: 
   - change `stylesheet_link_tag` to `stylesheet_pack_tag` in your application layout
-  - `yarn add bootstrap`
-  - create a new file at `app/javascript/css/site.scss` with this content
+  - run `yarn add bootstrap`
+  - create a new file at `app/javascript/require_bootstrap.scss` with this content
     ```
     @import "~bootstrap/scss/bootstrap.scss";
     ```
     
   - add to `app/javascript/packs/application.js` 
     ```
-    import 'css/site'
+    import 'require_bootstrap'
     ```
     
 Bootstrap with Sprockets:
-  - use bootstrap-rails gem 
-    
+  - use bootstrap-rubygem gem 
+  - see README for bootstrap-rubygem to install
+  
 
 - Install Devise or implement your own authentication
+  (or only use --gd mode, see below)
 
-- Also recommended: font-awesome-sass
+- font-awesome
 
 
 ### First Argument
@@ -313,6 +354,8 @@ If you do not want inline editing of your list items but instead to fall back to
 
 # VERSION HISTORY
 
+#### 2021-04-28 - v0.1.0 - Very please to introduce full behavior specs, found in specs/system/, generated by default on all build code; also many fixes involving nesting and authentication"
+
 #### 2021-03-24 - v0.0.9 - fixes in the automatic field label detection; cleans up junk in spec output
 
 #### 2021-03-21 - v0.0.8 - show only flag; more specific spec coverage in generator spec
@@ -334,20 +377,12 @@ If you do not want inline editing of your list items but instead to fall back to
 #### 2021-02-23 - v0.0.0 - Port of my prior work from github.com/jasonfb/common_core_js
 
 
-# ACKNOWLEDGEMENTS
-
-### "POOR MAN"
-
-I hope one day I will leave this Earth a poor man (like my code) owning only the most simple structure for the simple form of my existence. Thanks for having educated me in this wisdom goes to my former mentor [@trak3r](https://github.com/trak3r)! 
-
 
 
 
 # HOW THIS GEM IS TESTED
 
-The testing of functionality-within-functionality is a little tricky and requires thinking outside the box.
-
-We have two kinds of "sandboxes": a DUMMY sandbox, and also a STRAWMAN sandbox
+We have one kind of "sandboxes": a DUMMY sandbox
 
 The dummy sandbox is found at `spec/dummy`
 
@@ -355,20 +390,5 @@ The dummy lives as mostly checked- into the repository, except the folders where
 
 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.
 
-
 The DUMMY testing DOES NOT test the actual functionality of the output code (it just tests the functionality of the generation process).
 
-For this reason, I've also added something I call STRAWMAN testing, which is a set of steps that does these things:
-
-The Strawman isn't in the repository, but if you build it locally, it will create itself into
-
-`spec/strawman/`
-
-1) Builds you a strawman sandbox app from scratch, using the native `rails new`
-2) Makes a few small modifications to the new app to support this gem
-3) Create two nonsense tables called OmnitableA and OmnitableB. Each omnitable has one of each kind of field (integer, text, string, date, time, etc)
-4) In this way, it is a "Noah's Arc" testing strategy: It will build you a fully functional app using all of the feature sets of the gem.
-5) The built app itself will contain its own specs
-6) You will then cd into `spec/strawman` and run `rspec`. This second test suite now runs to full test all of the *generated* code. 
-
-

data/db/migrate/20210306223305_create_ghis.rb

@@ -0,0 +1,9 @@
+class CreateGhis < ActiveRecord::Migration[6.1]
+  def change
+    create_table :ghis do |t|
+      t.integer :def_id
+
+      t.timestamps
+    end
+  end
+end

data/db/schema.rb

@@ -27,7 +27,7 @@ ActiveRecord::Schema.define(version: 2021_03_06_225506) do
     t.datetime "updated_at", precision: 6, null: false
   end
 
-  create_table "hgis", force: :cascade do |t|
+  create_table "ghis", force: :cascade do |t|
     t.integer "def_id"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -3,13 +3,35 @@ require 'ffaker'
 
 
 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
@@ -82,9 +104,12 @@ module HotGlue
       @singular = args.first.tableize.singularize # should be in form hello_world
       @plural = options['plural'] || @singular + "s" # supply to override; leave blank to use default
       @auth = options['auth'] || "current_user"
-      @auth_identifier = options['auth'] || (!@auth.nil? && @auth.gsub("current_", "")) || nil
-      @nest = options['auth'] || nil
+      @auth_identifier = options['auth_identifier'] || (!@auth.nil? && @auth.gsub("current_", "")) || nil
+
+
+      @nest = (!options['nest'].empty? && options['nest']) || nil
       @namespace = options['namespace'] || nil
+
       @singular_class = @singular.titleize.gsub(" ", "")
       @exclude_fields = []
       @exclude_fields += options['exclude'].split(",").collect(&:to_sym)
@@ -154,12 +179,25 @@ module HotGlue
 
         if assoc
           ownership_field = assoc.name.to_s + "_id"
+        elsif !@nest
+            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
-          # if @auth
-            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:  god mode could not find the association(?). something is wrong."
-          # end
+          if @god
+
+            exit_message= "*** Oops:  god mode could not find the association(?). something is wrong."
+          else
+            @auth_check = "current_user"
+            @nested_args.each do |arg|
+
+              if !@auth_check.method("#{arg}s")
+                exit_message= "*** Oops:  your nesting chain does not have a assocation for #{arg}s on #{@auth_check}  something is wrong."
+              end
+              byebug
+              puts ""
+            end
+          end
+
           raise(HotGlue::Error, exit_message)
         end
       end
@@ -197,7 +235,7 @@ module HotGlue
             begin
               eval(assoc.class_name)
             rescue NameError => e
-              exit_message = "*** Oops: The table #{singular_class} has an association for '#{assoc.name.to_s}', but I can't find an assoicated model for that association. TODO: Please implement a model for #{assoc.name.to_s} that belongs to #{singular_class} "
+              exit_message = "*** Oops: The model #{singular_class} is missing an association for #{assoc_name} or the model doesn't exist. TODO: Please implement a model for #{assoc_name.titlecase}; your model #{singular_class.titlecase} should have_many :#{assoc_name}s.  To make a controller that can read all records, specify with --god."
               raise(HotGlue::Error, exit_message)
 
             end
@@ -242,15 +280,18 @@ module HotGlue
 
       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 &&  defined?(controller_descends_from) == nil
-          template "base_controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "base_controller.rb")
+        if @namespace
+          begin
+            eval(controller_descends_from)
+            puts "   skipping   base controller #{controller_descends_from}"
+          rescue NameError => e
+            template "base_controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "base_controller.rb")
+          end
         end
       end
 
       unless @no_specs
-        template "request_spec.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}spec/request#{namespace_with_dash}", "#{plural}_spec.rb")
-        template "system_spec.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{namespace_with_dash}", "#{plural}_spec.rb")
-
+        template "system_spec.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
       end
 
       template "_errors.haml", File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}", "_errors.haml")
@@ -329,9 +370,9 @@ module HotGlue
     end
 
 
-    def path_helper_full
-      "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
-    end
+    # def path_helper_full
+    #   "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
+    # end
 
     def path_helper_args
       if @nested_args.any?
@@ -443,6 +484,9 @@ module HotGlue
     end
 
 
+
+
+
     def copy_view_files
       return if @specs_only
       haml_views.each do |view|
@@ -536,27 +580,11 @@ 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)
 
 
-            assoc_class = eval(assoc.class_name)
-
-            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
-
             "#{col_identifier}{class: \"form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{assoc_name.to_s})}\"}
-#{col_spaces_prepend}= f.collection_select(:#{col.to_s}, #{assoc_class}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control')
+#{col_spaces_prepend}= f.collection_select(:#{col.to_s}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control')
 #{col_spaces_prepend}%label.small.form-text.text-muted
 #{col_spaces_prepend}  #{col.to_s.humanize}"
 
@@ -636,25 +664,9 @@ module HotGlue
               exit_message =  "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
               raise(HotGlue::Error,exit_message)
             end
-            
-            assoc_class = eval(assoc.class_name)
 
-            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"
-            elsif assoc_class.respond_to?("number")
-              display_column = "number"
+            display_column =  derrive_reference_name(assoc.class_name)
 
-            else
-              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, 5) email, or 6) number 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
 
             "#{col_identifer}
   = #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe"
@@ -728,7 +740,7 @@ module HotGlue
       me = eval(singular_class)
 
       @display_class ||=
-        if me.column_names.include?("name")
+        if me.column_names.include?("name") || me.instance_methods(false).include?(:name)
           # note that all class object respond_to?(:name) with the name of their own class
           # this one is unique
           "name"
@@ -742,7 +754,6 @@ module HotGlue
           "email"
         elsif me.column_names.include?("number") || me.instance_methods(false).include?(:number)
           "number"
-
         else
           exit_message = "*** Oops: Can't find any column to use as the display label on #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, 5) email, or 6) number directly on your #{singular_class} 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)"
           raise(HotGlue::Error, exit_message)

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

@@ -5,6 +5,3 @@
   = form_with model: <%= singular %>, url: <%= path_helper_plural %>(<%= nested_objects_arity %>), method: "post" do  |f|
     = render partial: "<%=namespace_with_slash%><%= @plural %>/form", locals: {<%= singular %>: <%= singular %>, f: f}
 
-    .row
-      .col-md-12
-        = f.submit "Save", class: "btn btn-primary pull-right"

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

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

@@ -1,7 +1,6 @@
 class <%= controller_class_name %> < <%= controller_descends_from %>
 <% unless @auth_identifier == '' || @auth.nil? %>before_action :authenticate_<%= @auth_identifier %>!<% end %>
-<% if any_nested? %> <% @nested_args.each do |arg| %>
-  before_action :load_<%= arg %><% end %> <% end %>
+
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
   helper :hot_glue
   include HotGlue::ControllerHelper
@@ -11,22 +10,23 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 <% 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 %>def load_<%= arg %>
-    @<%= arg %> = <%= this_scope %>.find(params[:<%= arg %>_id])
+    this_scope =   nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "#{nest_chain.last}.#{arg}s"
+      nest_chain << arg %>
+  def <%= arg %>
+    @<%= arg %> ||= <%= this_scope %>.find(params[:<%= arg %>_id])
   end<% } %><% end %>
 
 <% if !@self_auth %>
   def load_<%= singular_name %>
-    @<%= singular_name %> = <%= object_scope %>.find(params[:id])
+    @<%= singular_name %> = <%= object_scope.gsub("@",'') %>.find(params[:id])
   end
   <% else %>
   def load_<%= singular_name %>
-    @<%= singular_name %> = <%= auth_object %>
+    @<%= singular_name %> = <%= auth_object.gsub("@",'') %>
   end<% end %>
 
   def load_all_<%= plural %>
-    <% if !@self_auth %>@<%= plural_name %> = <%= object_scope %><% if model_has_strings? %>.where(<%=class_name %>.arel_table[:email].matches("%#{@__general_string}%"))<% end %>.page(params[:page])
+    <% if !@self_auth %>@<%= plural_name %> = <%= object_scope.gsub("@",'') %><% if model_has_strings? %>.where(<%=class_name %>.arel_table[:email].matches("%#{@__general_string}%"))<% end %>.page(params[:page])
     <% else %>@<%= plural_name %> = [<%= auth_object %>]<% end %>
   end
 
@@ -81,8 +81,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
   def update
-    if !@<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>))
-        flash[:alert] = "<%= singular_name.titlecase %> could not be saved"
+    if @<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>))
+      flash[:notice] = "Saved #{@<%= singular %>.<%= display_class %>}"
+    else
+      flash[:alert] = "<%= singular_name.titlecase %> could not be saved."
     end
     respond_to do |format|
       format.turbo_stream

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

@@ -1,52 +1,147 @@
 require 'rails_helper'
 
 describe "interaction for <%= controller_class_name %>", type: :feature do
-  <% unless @auth.nil? %>  let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
-  let(:<%= singular %>) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
+  include HotGlue::ControllerHelper
+  <% unless @auth.nil? %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
 
-<%= objest_nest_factory_setup %>
+  let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
+  let!(:<%= singular %>2) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
+  let!(:<%= singular %>3) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
 
-  before(:each) do
+  <%= objest_nest_factory_setup %>
 
+  before(:each) do
+    login_as(<%= @auth %>)
   end
 
   describe "index" do
     it "should show me the list" do
+      visit <%= path_helper_plural %>
+
+<%=
+@columns.map { |col|
+  type = eval("#{singular_class}.columns_hash['#{col}']").type
+  # limit = eval("#{singular_class}.columns_hash['#{col}']").limit
+  # sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
+  #
+
+  case type
+  when :datetime
+    "      " + ["expect(page).to have_content(#{singular}#{rand(3)+1}.#{col}.in_time_zone(#{ @auth }.timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(#{ @auth }.timezone)  )"].join("\n      ")
+
+  else
+    "      " + ["expect(page).to have_content(#{singular}#{rand(3)+1}.#{col})"].join("\n      ")
 
-    end
   end
 
-  describe "new" do
-    it "should show form" do
+}.join("\n")
+     
+      %>
 
     end
   end
 
-  describe "create" do
-    it "should create a new <%= singular %>" do
+  describe "new & create" do
+    it "should create a new <%= singular.titlecase %>" do
+      visit <%= path_helper_plural %>
+      click_link "New <%= singular.titlecase %>"
+      expect(page).to have_selector(:xpath, './/h3[contains(., "New <%= singular.titlecase %>")]')
+
+<%=
+  @columns.map { |col|
+    type = eval("#{singular_class}.columns_hash['#{col}']").type
+    # limit = eval("#{singular_class}.columns_hash['#{col}']").limit
+    # sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
+    #
+
+    case type
+    when :datetime
+    when :integer
+      "      " + 'find("input#' + singular + '_' + col.to_s + '").fill_in(with: rand(10))'
+    else
+      "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
+      '      ' + 'find("input#' + singular + '_' + col.to_s + '").fill_in(with: new_' + col.to_s + ')'
+    end
 
+  }.join("\n")
+
+        %>
+      click_button "Save"
+      expect(page).to have_content("Successfully created")
+
+      <%=
+  @columns.map { |col|
+    type = eval("#{singular_class}.columns_hash['#{col}']").type
+
+    case type
+    when :datetime
+    when :integer
+    else
+      "expect(page).to have_content(new_#{col})"
     end
-  end
 
-  describe "edit" do
-    it "should return an editable form" do
+  }.join("\n")
+  %>
 
     end
   end
 
   describe "show" do
     it "should return a view form" do
+      visit <%= path_helper_plural %>
 
     end
   end
 
-  describe "update" do
-    it "should update" do
+  describe "edit & update" do
+    it "should return an editable form" 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) %>}")
+<%=
+    @columns.map { |col|
+      type = eval("#{singular_class}.columns_hash['#{col}']").type
+
+      case type
+      when :datetime
+      when :integer
+      else
+        "      " + "new_#{col.to_s} = Faker::Name.new \n" +
+
+        '      find("input[name=\'' + singular + '[' + col.to_s + ']\'").fill_in(with: new_' + col.to_s + ')'
+
+      end
+    }.join("\n")
+    %>
+      click_button "Save"
+      within("turbo-frame#<%= singular %>__#{<%= singular %>1.id} ") do
+
+
+<%=
+    @columns.map { |col|
+      type = eval("#{singular_class}.columns_hash['#{col}']").type
+      case type
+      when :datetime
+      when :integer
+      else
+        '        expect(page).to have_content(new_' + col.to_s + ')'
+      end
+    }.join("\n")
+    %>
+
+      end
     end
   end
 
   describe "destroy" do
     it "should destroy" do
+      visit <%= path_helper_plural %>
+      accept_alert do
+        find("a.delete-<%= singular %>-button[href='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}']").click
+      end
+      expect(page).to_not have_content(<%= singular %>1.email)
+      expect(<%= singular_class %>.where(id: <%= singular %>1.id).count).to eq(0)
     end
   end
 end

data/lib/generators/hot_glue/templates/update.turbo_stream.haml

@@ -3,3 +3,7 @@
   = render partial: 'line', locals: {<%= singular %>: @<%= singular %> <%= nested_assignments_with_leading_comma %> }
 
 
+= turbo_stream.replace "flash_notices" do
+  = render partial: "layouts/flash_notices"
+  - if @<%= singular %>.errors.any?
+    = render partial: "errors", locals: {resource: @<%= singular %>}

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,7 +115,7 @@ files:
 - config/database.yml
 - db/migrate/20210306212711_create_abcs.rb
 - db/migrate/20210306223300_create_defs.rb
-- db/migrate/20210306223305_create_hgis.rb
+- db/migrate/20210306223305_create_ghis.rb
 - db/migrate/20210306223309_create_jkls.rb
 - db/migrate/20210306223701_devise_create_users.rb
 - db/migrate/20210306225506_create_xyzs.rb
@@ -138,7 +138,6 @@ files:
 - lib/generators/hot_glue/templates/edit.turbo_stream.haml
 - lib/generators/hot_glue/templates/index.haml
 - lib/generators/hot_glue/templates/new.haml
-- lib/generators/hot_glue/templates/request_spec.rb.erb
 - lib/generators/hot_glue/templates/system_spec.rb.erb
 - lib/generators/hot_glue/templates/update.turbo_stream.haml
 - lib/hot-glue.rb

data/db/migrate/20210306223305_create_hgis.rb

@@ -1,9 +0,0 @@
-class CreateHgis < ActiveRecord::Migration[6.1]
-  def change
-    create_table :hgis do |t|
-      t.integer :def_id
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,110 +0,0 @@
-require 'rails_helper'
-
-describe <%= controller_class_name %> do
-  render_views
-  <% unless @auth.nil? %>  let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
-  let(:<%= singular %>) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
-
-<%= objest_nest_factory_setup %>
-
-  before(:each) do
-    @request.env["devise.mapping"] = Devise.mappings[:account]
-
-    sign_in <%= @auth %>, scope: :<%= @auth %>
-  end
-
-  describe "index" do
-    it "should respond" do
-      get :index, xhr: true, format: 'js', params: {
-          <%= objest_nest_params_by_id_for_specs %>
-      }
-    end
-  end
-
-  describe "new" do
-    it "should show form" do
-      get :new, xhr: true, format: 'js', params: {
-          <%= objest_nest_params_by_id_for_specs %>
-      }
-    end
-  end
-
-  describe "create" do
-    it "should create a new <%= singular %>" do
-      expect {
-        post :create, xhr: true, format: 'js', params: {
-          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-            <%= singular %>: {
-                <%= columns_spec_with_sample_data %>
-        }}
-      }.to change { <%= @singular_class %>.all.count }.by(1)
-      assert_response :ok
-    end
-
-    # it "should not create if there are errors" do
-    #   post :create, xhr: true, format: 'js',  params: {id: <%= singular %>.id,
-    #                                                    <%= singular %>: {skin_id: nil}}
-    #
-    #   expect(controller).to set_flash.now[:alert].to(/Oops, your <%= singular %> could not be saved/)
-    # end
-  end
-
-  describe "edit" do
-    it "should return an editable form" do
-      get :edit, xhr: true, format: 'js',  params: {
-          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-          id: <%= singular %>.id
-      }
-      assert_response :ok
-    end
-  end
-
-  describe "show" do
-    it "should return a view form" do
-      get :show, xhr: true, format: 'js',  params: {
-          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-          id: <%= singular %>.id
-        }
-      assert_response :ok
-    end
-  end
-
-  describe "update" do
-    it "should update" do
-      put :update, xhr: true, format: 'js',
-          params: {
-            <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-            id: <%= singular %>.id,
-            <%= singular %>: {
-                <%= columns_spec_with_sample_data %>
-            }}
-
-      assert_response :ok
-    end
-
-    # it "should not update if invalid" do
-    #   put :update, xhr: true, format: 'js',
-    #       params: {
-    #         id: <%= singular %>.id,
-    #         <%= singular %>: {
-    #           <%= columns_spec_with_sample_data %>
-    #       }}
-    #
-    #   assert_response :ok
-    #
-    #   expect(controller).to set_flash.now[:alert].to(/Oops, your <%= singular %> could not be saved/)
-    # end
-  end
-
-  describe "#destroy" do
-    it "should destroy" do
-      post :destroy, format: 'js', params: {
-          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-          id: <%= singular %>.id
-      }
-      assert_response :ok
-      expect(<%= @singular_class %>.count).to be(0)
-    end
-  end
-end
-