hot-glue 0.1.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b265c8c7f5e9fb424122d2d40eec712a7cb4f846f5daf581b75a8e4981790fa
-  data.tar.gz: 23e8b5857b4e8fa2391a46128a282a952355fe64c9097868b98bf8d462c9a35c
+  metadata.gz: 0a29f1b4b001de5e14dbfc1ce046aae144d53f81eb5efecb05c88a69cad06b09
+  data.tar.gz: e4efb4c1d9d87cda11f835750475b6cfc86ea9daa4c25ce5cc08eebca1968d97
 SHA512:
-  metadata.gz: 3a304db4b93d3edf92657178e0057830f224dda0e1b08c5957169d2e6f378ac6cc9137513e18001c38881d7f2594d2d608ba3de07ffa86291089c01cccecc462
-  data.tar.gz: 884d154c85a9688b66db56498f2f66dbda7356d06d2f5590e80c911f86e46fee5bcefc1809f6d5deb339b79fe95a95d45f823a89128105ec367f0d7b6c67a85d
+  metadata.gz: 1b2b2f354390c5d2d0cef4fbd87dfee63de72b69112efc4e1c24c23037ca96f899d077b8876f81a6b8347787d3b997b1b5a7d08608c3039640003398c4974071
+  data.tar.gz: f933f8f06deff1d2f80632ed4b2e4d9ed5ff4d70246c8c99562a15b13ece0a75b3aa9fa86e27935de4555744ee6039183d960debd89eb9bc82f6f2937ab99730

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.1.1)
+    hot-glue (0.2.2)
       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)
 
@@ -84,11 +84,11 @@ GEM
       warden (~> 1.2.3)
     erubi (1.10.0)
     erubis (2.7.0)
-    ffaker (2.18.0)
-    ffi (1.15.3)
+    ffaker (2.19.0)
+    ffi (1.15.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    haml (5.2.1)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     haml-rails (2.0.1)
@@ -169,7 +169,7 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    ruby_parser (3.16.0)
+    ruby_parser (3.17.0)
       sexp_processor (~> 4.15, >= 4.15.1)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -193,7 +193,7 @@ GEM
     temple (0.8.2)
     thor (1.1.0)
     tilt (2.0.10)
-    turbo-rails (0.5.11)
+    turbo-rails (0.7.11)
       rails (>= 6.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -206,6 +206,7 @@ GEM
 
 PLATFORMS
   -darwin-20
+  ruby
 
 DEPENDENCIES
   byebug

data/README.md

@@ -1,4 +1,3 @@
-# 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)). 
 
@@ -45,8 +44,20 @@ 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)
 
-## TO INSTALL
+- Install Turbo `rails turbo:install` (?)
+
+- Add `gem 'hot-glue'` to your Gemfile & `bundle install`
+  `rails generate hot_glue:install --markup=erb`
+
+- Add to your `application.html.erb`
+```
+  <%= render partial: 'layouts/flash_notices' %>
+```
+
+
+## TO INSTALL (RAILS 6)
 
 - Add `gem 'turbo-rails'` to your Gemfile & `bundle install`
   
@@ -56,14 +67,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`
@@ -89,10 +113,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";
+```
 
-Bootstrap with Webpack: 
-  - change `stylesheet_link_tag` to `stylesheet_pack_tag` in your application layout
+* You do not need jQuery for HotGlue to work *
+
+### 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
     ```
@@ -103,16 +145,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
@@ -304,11 +344,43 @@ 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.
 
+### `stimulus_syntax` (default is false for Rails <=6; true for Rails 7)
+
+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:
+
+```
+
+```
+
+
+
+### `--markup` (default: 'erb')
+
+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. 
+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)
 ```
@@ -318,8 +390,6 @@ end
 
 ```
 
-## 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.
 
 ### `--specs-only`
 
@@ -353,9 +423,17 @@ If you do not want inline editing of your list items but instead to fall back to
 
 
 # VERSION HISTORY
+#### 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)
 
-#### - v0.1.1 - 
+#### 2021-06-28 - v0.1.2 - fixes problem with namespaces on path helpers
 
+#### 2021-05-09 (yanked) - v0.1.1 -  add cancellation buttons
 
 #### 2021-04-28 - v0.1.0 - Very pleased to introduce full behavior specs, found in specs/system/, generated by default on all build code; also many fixes involving nesting and authentication"
 

data/app/helpers/hot_glue/controller_helper.rb

@@ -43,7 +43,7 @@ module HotGlue
                                     type: 'time',
                                     value: date_to_current_timezone(value, timezone))
 
-      res << timezonize(tz)
+      res << timezonize(timezone)
       res
     end
 

data/lib/generators/hot_glue/install_generator.rb

@@ -4,15 +4,20 @@ 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 "hot_glue.js", "#{'spec/dummy/' if Rails.env.test?}app/javascript/hot_glue.js"
-      # copy_file "hot_glue.scss", "#{'spec/dummy/' if Rails.env.test?}app/assets/stylesheets/hot_glue.scss"
-      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
     end
   end
 end

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

@@ -0,0 +1,7 @@
+module  HotGlue
+  class TemplateBase
+    def initialize()
+    end
+
+  end
+end

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

@@ -0,0 +1,227 @@
+module  HotGlue
+  class ErbTemplate < TemplateBase
+
+    # include GeneratorHelper
+    attr_accessor :singular
+
+    def field_output(col, type = nil, width, col_identifier )
+      "<div class='col form-group <%='alert-danger' if @#{singular}.errors.details.keys.include?(:#{col.to_s})%>' > \n" +
+      "  <%= f.text_field :#{col.to_s}, value: @#{@singular}.#{col.to_s}, size: #{width}, class: 'form-control', type: '#{type}' %>\n "+
+      "  <label class='form-text' >#{col.to_s.humanize}</label>\n" +
+      "</div>"
+    end
+
+    def list_column_headings(*args)
+      columns = args[0][:columns]
+
+      columns.map(&:to_s).map{|col_name| "<div class='col'>#{col_name.humanize}</div>"}.join("\n")
+    end
+
+
+    def all_form_fields(*args)
+
+      columns = args[0][:columns]
+      show_only = args[0][:show_only]
+      singular_class = args[0][:singular_class]
+
+      # TODO: CLEAN ME
+      @singular = args[0][:singular]
+      singular = @singular
+
+
+      col_identifier = "col"
+      col_spaces_prepend = "    "
+
+      res = columns.map { |col|
+
+        if show_only.include?(col)
+
+          "<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
+
+
+          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 :integer
+            # look for a belongs_to on this object
+            if col.to_s.ends_with?("_id")
+              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
+              end
+              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') %>
+<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}) %> \" >
+<%= 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>"
+
+            end
+          when :string
+            limit ||= 256
+            if limit <= 256
+              field_output(col, nil, limit, col_identifier)
+            else
+              text_area_output(col, limit, col_identifier)
+            end
+
+          when :text
+            limit ||= 256
+            if limit <= 256
+              field_output(col, nil, limit, col_identifier)
+            else
+              text_area_output(col, limit, col_identifier)
+            end
+          when :float
+            limit ||= 256
+            field_output(col, nil, limit, col_identifier)
+
+
+          when :datetime
+
+
+            "<div class='col form-group <%='alert-danger' if @#{singular}.errors.details.keys.include?(:#{col.to_s})%>' > \n" +
+"<%= datetime_field_localized(f, :#{col.to_s}, #{singular}.#{col.to_s}, '#{ col.to_s.humanize }', #{@auth ? @auth+'.timezone' : 'nil'}) %>" +
+              "</div>"
+          when :date
+            "<div class='col form-group <%='alert-danger' if @#{singular}.errors.details.keys.include?(:#{col.to_s})%>' > \n" +
+              "<%= date_field_localized(f, :#{col.to_s}, #{singular}.#{col.to_s}, '#{ col.to_s.humanize  }', #{@auth ? @auth+'.timezone' : 'nil'}) %>" +
+              "</div>"
+          when :time
+            "<div class='col form-group <%='alert-danger' if @#{singular}.errors.details.keys.include?(:#{col.to_s})%>' > \n" +
+              "<%= time_field_localized(f, :#{col.to_s}, #{singular}.#{col.to_s},  '#{ col.to_s.humanize  }', #{@auth ? @auth+'.timezone' : 'nil'}) %>" +
+              "</div>"
+
+          when :boolean
+            "<div class='col form-group <%='alert-danger' if @#{singular}.errors.details.keys.include?(:#{col.to_s})%>' > \n" +
+              "  <span>#{col.to_s.humanize}</span>" +
+              "  <%= f.radio_button(:#{col.to_s},  '0', checked: #{singular}.#{col.to_s}  ? '' : 'checked') %>\n" +
+              "  <%= f.label(:#{col.to_s}, value: 'No', for: '#{singular}_#{col.to_s}_0') %>\n" +
+              "  <%= 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>"
+          end
+        end
+      }.join("\n")
+      return res
+    end
+
+
+
+    def paginate(*args)
+      plural = args[0][:plural]
+
+      "<% if #{plural}.respond_to?(:total_pages) %><%= paginate(#{plural}) %> <% end %>"
+    end
+
+    def all_line_fields(*args)
+      columns = args[0][:columns]
+      show_only = args[0][:show_only]
+      singular_class = args[0][:singular_class]
+      singular = args[0][:singular]
+
+      columns_count = columns.count + 1
+      perc_width = (100/columns_count).floor
+
+      col_identifer = "col"
+      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 :integer
+          # look for a belongs_to on this object
+          if col.to_s.ends_with?("_id")
+
+            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}'"
+              raise(HotGlue::Error,exit_message)
+            end
+
+            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 %>
+</div>"
+
+          else
+            "<div class='#{col_identifer}'>
+  <%= #{singular}.#{col}%></div>"
+          end
+        when :float
+          width = (limit && limit < 40) ? limit : (40)
+          "<div class='#{col_identifer}'>
+<%= #{singular}.#{col}%></div>"
+        when :string
+          width = (limit && limit < 40) ? limit : (40)
+          "<div class='#{col_identifer}'>
+  <%= #{singular}.#{col} %>
+</div>"
+        when :text
+          "<div class='#{col_identifer}'>
+  <%= #{singular}.#{col} %>
+</div>"
+        when :datetime
+
+          "<div class='#{col_identifer}'>
+  <% unless #{singular}.#{col}.nil? %>
+<%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone) %>
+<% else %>
+<span class='alert-danger'>MISSING</span>
+<% end %>
+</div>"
+        when :date
+          "<div class='#{col_identifer}'>
+  <% unless #{singular}.#{col}.nil? %>
+    <%= #{singular}.#{col} %>
+  <% else %>
+  <span class='alert-danger'>MISSING</span>
+  <% end %>
+</div>"
+        when :time
+          "<div class='#{col_identifer}'>
+  <% unless #{singular}.#{col}.nil? %>
+    <%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone) %>
+   <% else %>
+  <span class='alert-danger'>MISSING</span>
+  <% end %>
+</div>
+"
+        when :boolean
+          "<div class='#{col_identifer}'>
+  <% if #{singular}.#{col}.nil? %>
+      <span class='alert-danger'>MISSING</span>
+  <% elsif #{singular}.#{col} %>
+    YES
+  <% else %>
+    NO
+  <% end %>
+</div>
+"
+        end #end of switch
+      }.join("\n")
+    end
+  end
+
+
+
+end