hot-glue 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf1a3b7bd321bbf889e50829d778303457eaa91c2da5687874c80f9accd7ebd
-  data.tar.gz: da4973256fefbfe4677175d0c497f37ab76438ac00541af49cc871bd8cf3da63
+  metadata.gz: 4ea47eaaf1c1a9a92b6382e2dc41a5e9f119600cfd0f58bc8b8091c33e3ac48a
+  data.tar.gz: c9ebd867495aff539bbb53c7d1ecb09c5fd83cb00121a129eadfc96533647efc
 SHA512:
-  metadata.gz: e943beb926810ae2e073ec19a7e619d6eb782c05fc54e0a9da5a643098b3d36fb066ab20e459bc12d27d8f93902cc9279772443ac22e31d41514e1274b7b597e
-  data.tar.gz: 9965599b55592b44969060284664179cc3e10d5a098eec598c42b775205a3c5f84e5309018665c0f6660063af6c698c2584dcf89c7303eeba8c85d9571676a89
+  metadata.gz: 2022393514c059339cc9e4c163962501a48609f317ab7d3f4be3a00e467637d6dbb14757dadf9312569dedc6372a43f427e28b6c3b2638067bdc25ca4d23fe3d
+  data.tar.gz: 7a19916224effd9ad2726baf944b110083978ee8328588301f89c4c2ae4791bfad8fcbf5f37b9dc5844153cfe39432933a47e1f890b121b78372e5cdedbc5afc

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.2.0)
+    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)
 

data/README.md

@@ -88,10 +88,13 @@ Instantly get a simple CRUD interface
     end
     ```
 
-- Install Bootstrap (optional)
-
-Bootstrap with Webpack: 
-  - change `stylesheet_link_tag` to `stylesheet_pack_tag` in your application layout
+- Install Bootstrap
+    - Bootstrap with Sprockets (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:
+- change `stylesheet_link_tag` to `stylesheet_pack_tag` in your application layout
   - run `yarn add bootstrap`
   - create a new file at `app/javascript/require_bootstrap.scss` with this content
     ```
@@ -102,11 +105,12 @@ Bootstrap with Webpack:
     ```
     import 'require_bootstrap'
     ```
-    
-Bootstrap with Sprockets:
-  - use bootstrap-rubygem gem 
-  - see README for bootstrap-rubygem to install
   
+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
   (or only use --gd mode, see below)

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

@@ -1,6 +1,7 @@
 module  HotGlue
   class ErbTemplate < TemplateBase
 
+    # include GeneratorHelper
     attr_accessor :singular
 
     def field_output(col, type = nil, width, col_identifier )
@@ -35,7 +36,7 @@ module  HotGlue
 
         if show_only.include?(col)
 
-          "#{col_identifier}{class: \"form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+          "#{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"
@@ -56,15 +57,14 @@ module  HotGlue
                 exit_message= "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
                 exit
               end
-              display_column = derrive_reference_name(assoc.class_name)
+              display_column = HotGlue.derrive_reference_name(assoc.class_name)
 
-
-              "<div class='#{col_identifier} form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{assoc_name.to_s})}>
-<%= f.collection_select(:#{col.to_s}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control')
+              "<div class='#{col_identifier} form-group <%= 'alert-danger' if #{singular}.errors.details.keys.include?(:#{assoc_name.to_s}) %>' >
+<%= f.collection_select(:#{col.to_s}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
 <label class='small form-text text-muted'>#{col.to_s.humanize}</label></div>"
 
             else
-              "<div class=\"#{col_identifier} form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col})}\" >
+              "<div class=\"#{col_identifier} form-group <%= 'alert-danger' if #{singular}.errors.details.keys.include?(:#{col}) %> \" >
 <%= f.text_field :#{col.to_s}, value: #{singular}.#{col.to_s}, class: 'form-control', size: 4, type: 'number' %>
 <label class='small form-text text-muted'>#{col.to_s.humanize}</label></div>"
 
@@ -156,8 +156,7 @@ module  HotGlue
               raise(HotGlue::Error,exit_message)
             end
 
-            display_column =  derrive_reference_name(assoc.class_name)
-
+            display_column =  HotGlue.derrive_reference_name(assoc.class_name)
 
             "<div class='#{col_identifer}'>
   <%= #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe %>

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

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

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -10,56 +10,32 @@ module HotGlue
   class Error < StandardError
   end
 
-  module GeneratorHelper
-    def derrive_reference_name thing_as_string
-      assoc_class = eval(thing_as_string)
-
-      if assoc_class.respond_to?("name")
-        display_column = "name"
-      elsif assoc_class.respond_to?("to_label")
-        display_column = "to_label"
-      elsif assoc_class.respond_to?("full_name")
-        display_column = "full_name"
-      elsif assoc_class.respond_to?("display_name")
-        display_column = "display_name"
-      elsif assoc_class.respond_to?("email")
-        display_column = "email"
-      else
-        raise("this should have been caught by the checker in the initializer")
-        # puts "*** Oops: Can't find any column to use as the display label for the #{assoc.name.to_s} association on the #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, or 5) email directly on your #{assoc.class_name} model (either as database field or model methods), then RERUN THIS GENERATOR. (If more than one is implemented, the field to use will be chosen based on the rank here, e.g., if name is present it will be used; if not, I will look for a to_label, etc)"
-      end
-      display_column
-    end
-
-
-    def text_area_output(col, field_length, col_identifier )
-      lines = field_length % 40
-      if lines > 5
-        lines = 5
-      end
-
-      "#{col_identifier}{class: \"form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
-    = f.text_area :#{col.to_s}, class: 'form-control', cols: 40, rows: '#{lines}'
-    %label.form-text
-      #{col.to_s.humanize}\n"
-    end
-
-
-
-
+  def self.derrive_reference_name(thing_as_string)
+    assoc_class = eval(thing_as_string)
+
+    if assoc_class.respond_to?("name")
+      display_column = "name"
+    elsif assoc_class.respond_to?("to_label")
+      display_column = "to_label"
+    elsif assoc_class.respond_to?("full_name")
+      display_column = "full_name"
+    elsif assoc_class.respond_to?("display_name")
+      display_column = "display_name"
+    elsif assoc_class.respond_to?("email")
+      display_column = "email"
+    else
+      raise("this should have been caught by the checker in the initializer")
+      # puts "*** Oops: Can't find any column to use as the display label for the #{assoc.name.to_s} association on the #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, or 5) email directly on your #{assoc.class_name} model (either as database field or model methods), then RERUN THIS GENERATOR. (If more than one is implemented, the field to use will be chosen based on the rank here, e.g., if name is present it will be used; if not, I will look for a to_label, etc)"
+    end
+    display_column
   end
 
-
   class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
-    hook_for :form_builder, :as => :scaffold
+     hook_for :form_builder, :as => :scaffold
 
     source_root File.expand_path('templates', __dir__)
     attr_accessor :path, :singular, :plural, :singular_class, :nest_with
 
-
-    include GeneratorHelper
-
-
     class_option :singular, type: :string, default: nil
     class_option :plural, type: :string, default: nil
     class_option :singular_class, type: :string, default: nil
@@ -188,6 +164,8 @@ module HotGlue
         end
       end
 
+      @reference_name = HotGlue.derrive_reference_name(singular_class)
+
       identify_object_owner
       setup_fields
     end
@@ -301,7 +279,6 @@ module HotGlue
 
     def copy_controller_and_spec_files
       @default_colspan = @columns.size
-
       unless @specs_only
         template "controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
         if @namespace
@@ -432,13 +409,13 @@ module HotGlue
 
     def new_path_name
 
-      base =      "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{singular}_path"
+      base =   "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{singular}_path"
       if @nested_args.any?
         base += "(" + @nested_args.collect { |arg|
           "@#{arg}.id"
         }.join(", ") + ")"
-
       end
+      base
     end
 
     def nested_assignments

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

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

data/lib/hotglue/version.rb

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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +102,7 @@ dependencies:
         version: '2.16'
 description: Simple, plug & play Rails scaffold building companion for Turbo-Rails
   and Hotwire
-email: tech@datatravels.com
+email: code@jasonfb.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -162,7 +168,7 @@ files:
 - lib/hot-glue.rb
 - lib/hotglue/engine.rb
 - lib/hotglue/version.rb
-homepage: https://blog.jasonfleetwoodboldt.com/hot-glue/
+homepage: https://jasonfleetwoodboldt.com/hot-glue/
 licenses:
 - Nonstandard
 metadata: