hot-glue 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea47eaaf1c1a9a92b6382e2dc41a5e9f119600cfd0f58bc8b8091c33e3ac48a
-  data.tar.gz: c9ebd867495aff539bbb53c7d1ecb09c5fd83cb00121a129eadfc96533647efc
+  metadata.gz: 0a29f1b4b001de5e14dbfc1ce046aae144d53f81eb5efecb05c88a69cad06b09
+  data.tar.gz: e4efb4c1d9d87cda11f835750475b6cfc86ea9daa4c25ce5cc08eebca1968d97
 SHA512:
-  metadata.gz: 2022393514c059339cc9e4c163962501a48609f317ab7d3f4be3a00e467637d6dbb14757dadf9312569dedc6372a43f427e28b6c3b2638067bdc25ca4d23fe3d
-  data.tar.gz: 7a19916224effd9ad2726baf944b110083978ee8328588301f89c4c2ae4791bfad8fcbf5f37b9dc5844153cfe39432933a47e1f890b121b78372e5cdedbc5afc
+  metadata.gz: 1b2b2f354390c5d2d0cef4fbd87dfee63de72b69112efc4e1c24c23037ca96f899d077b8876f81a6b8347787d3b997b1b5a7d08608c3039640003398c4974071
+  data.tar.gz: f933f8f06deff1d2f80632ed4b2e4d9ed5ff4d70246c8c99562a15b13ece0a75b3aa9fa86e27935de4555744ee6039183d960debd89eb9bc82f6f2937ab99730

data/README.md

@@ -44,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`
   
@@ -55,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`
@@ -88,12 +113,27 @@ Instantly get a simple CRUD interface
     end
     ```
 
-- Install Bootstrap
-    - Bootstrap with Sprockets (Rails 5 or 7 default — Rails 6 custom)
+## 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 RAILS 6 ONLY:
+    - Bootstrap with Webpack for FOR RAILS 7 :
+          
+- add to Gemfile
+- gem 'bootstrap', '~> 5.1.0'
+
+
+- completely delete the file `app/assets/application.css`
+- create new file where it was `app/assets/application.scss` with this contents (do not keep the contents of the old application.css file):
+
+``` 
+// Custom bootstrap variables must be set or imported *before* bootstrap.
+@import "bootstrap";
+```
+
+* You do not need jQuery for HotGlue to work *
+
+### Bootstrap with Webpack 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
@@ -106,16 +146,13 @@ Bootstrap with Webpack RAILS 6 ONLY:
     import 'require_bootstrap'
     ```
   
-Bootstrap with Webpack for FOR RAILS 7 :
- -- See this BLOG POST
-https://jasonfleetwoodboldt.com/stepping-up-rails/rails-7-with-webpacker-and-bootstrap/
 
 
 
-- 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
@@ -307,21 +344,30 @@ IMPORTANT: By default, all fields that begin with an underscore (`_`) are automa
 
 I would recommend this for fields you want globally non-editable by users in your app. For example, a counter cache or other field set only by a backend mechanism.
 
-### `--god` or `--gd`
+### `stimulus_syntax` (default is false for Rails <=6; true for Rails 7)
 
-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.
+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 " %>
 
-For example, FOR ADMIN CONTROLLERS ONLY, supply a auth_identifier and use `--god` flag. 
 
-In Gd mode, the objects are loaded directly from the base class (these controllers have full access)
 ```
-def load_thing
-    @thing = Thing.find(params[:id])
-end
+
+Your install script will output an additional stimulus controller:
+
+```
 
 ```
 
 
+
 ### `--markup` (default: 'erb')
 
 ERB is default. For HAML, `--markup=haml`. 
@@ -330,6 +376,21 @@ ERB is default. For HAML, `--markup=haml`.
 ## FLAGS (Options with no values)
 These options (flags) also uses `--` syntax but do not take any values. Everything is assumed (default) to be false unless specified.
 
+### `--god` or `--gd`
+
+Use this flag to create controllers with no root authentication. You can still use an auth_identifier, which can be useful for a meta-leval authentication to the controller.
+
+For example, FOR ADMIN CONTROLLERS ONLY, supply a auth_identifier and use `--god` flag.
+
+In Gd mode, the objects are loaded directly from the base class (these controllers have full access)
+```
+def load_thing
+    @thing = Thing.find(params[:id])
+end
+
+```
+
+
 ### `--specs-only`
 
 Produces ONLY the controller spec file, nothing else.
@@ -362,6 +423,10 @@ 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)

data/lib/generators/hot_glue/install_generator.rb

@@ -4,13 +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 "_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/erb.rb

@@ -36,10 +36,11 @@ module  HotGlue
 
         if show_only.include?(col)
 
-          "#{col_identifier}{class: \"form-group <%= 'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s}) %> \"}
-    = @#{singular}.#{col.to_s}
-    %label.form-text
-      #{col.to_s.humanize}\n"
+          "<div class=\"#{col_identifier} form-group <%= 'alert-danger' if #{singular}.errors.details.keys.include?(:#{col}) %>\">" +
+          "<%= @#{singular}.#{col.to_s} %>" +
+            "<label class='form-text'>#{col.to_s.humanize}</label>" +
+          "</div>"
+
         else
 
 
@@ -168,9 +169,8 @@ module  HotGlue
           end
         when :float
           width = (limit && limit < 40) ? limit : (40)
-          "#{col_identifer}
-  = #{singular}.#{col}"
-
+          "<div class='#{col_identifer}'>
+<%= #{singular}.#{col}%></div>"
         when :string
           width = (limit && limit < 40) ? limit : (40)
           "<div class='#{col_identifer}'>

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -55,6 +55,7 @@ module HotGlue
     class_option :big_edit, type: :boolean, default: false
     class_option :show_only, type: :string, default: ""
     class_option :markup, type: :string, default: "erb"
+     class_option :stimulus_syntax, type: :boolean, default: nil
 
 
 
@@ -80,6 +81,14 @@ module HotGlue
         raise(HotGlue::Error, "*** Oops: You seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. sorry.")
       end
 
+      if @stimulus_syntax.nil?
+        if Rails.version.split(".")[0].to_i >= 7
+          @stimulus_syntax = true
+        else
+          @stimulus_syntax = false
+        end
+      end
+
       if options['markup'] == "erb"
         @template_builder = HotGlue::ErbTemplate.new
       elsif options['markup'] == "slim"
@@ -645,9 +654,19 @@ module HotGlue
      end
    end
 
-    def paginate
-      @template_builder.paginate(plural: plural)
+   def paginate
+     @template_builder.paginate(plural: plural)
+   end
+
+  def delete_confirmation_syntax
+    if !@stimulus_syntax
+     "{confirm: 'Are you sure?'}"
+    else
+     "{controller: 'confirmable', 'confirm-message': \"Are you sure you want to delete \#{ @#{@singular}.#{ display_class } } \", 'action': 'confirmation#confirm'}"
     end
+  end
+
+
   private # thor does something fancy like sending the class all of its own methods during some strange run sequence
     # does not like public methods
 
@@ -655,7 +674,6 @@ module HotGlue
       [name, file_format].compact.join(".")
     end
   end
-
 end
 
 

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

@@ -68,7 +68,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       load_all_<%= plural %>
       respond_to do |format|
         format.turbo_stream
-        format.html { redirect_to <%= plural %>_path }
+        format.html { redirect_to <%= path_helper_plural %> }
       end
     else
       flash[:alert] = "Oops, your <%= singular_name %> could not be created."
@@ -113,7 +113,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     load_all_<%= plural %>
     respond_to do |format|
       format.turbo_stream
-      format.html { redirect_to <%= plural %>_path }
+      format.html { redirect_to <%= path_helper_plural %> }
     end
   end<% end %>
 

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

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

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails