hot-glue 0.2.9E → 0.3.5

data/app/helpers/hot_glue/controller_helper.rb

@@ -61,7 +61,8 @@ module HotGlue
       # elsif self.class.ancestors.include?(ApplicationController)
       #   self.try(:current_timezone)
       else
-        raise "no method current_user is available; please implement/override the method current_timezone IN YOUR CONTROLLER"
+        puts "no method current_user is available; please implement/override the method current_timezone IN YOUR CONTROLLER"
+        exit
       end
     end
 

data/lib/generators/hot_glue/install_generator.rb

@@ -5,12 +5,41 @@ module HotGlue
   class InstallGenerator < Rails::Generators::Base
     hook_for :form_builder, :as => :scaffold
     class_option :markup, type: :string, default: "erb"
+    class_option :theme, type: :string, default: nil
+    class_option :layout, type: :string, default: "hotglue"
 
     source_root File.expand_path('templates', __dir__)
 
-
     def initialize(*args) #:nodoc:
       super
+      @layout = options['layout'] || "hotglue"
+      @theme =  options['theme']
+
+      if @layout == "hotglue" && options['theme'].nil?
+        puts "You have selected to install Hot Glue without a theme. You can either use the --layout=bootstrap to install NO HOT GLUE THEME, or to use a Hot Glue theme please choose: like_boostrap, like_menlo_park, like_cupertino, like_mountain_view, dark_knight"
+        exit
+      end
+
+      if @layout == 'boostrap'
+        puts "IMPORTANT: You have selected to install Hot Glue with Bootstrap layout (legacy). Be sure to always use ``--layout=bootstrap` when building your scaffold. No Hot Glue theme will be installed at this time.` "
+      end
+
+      ### INTERACTIVE LICENSING
+      #
+
+
+      print "(To purchase a license, please see https://heliosdev.shop/hot-glue-license) \n Please enter your license key: "
+      license_activation_key = STDIN.gets
+
+      print "Please enter the EMAIL you used to purchase this license: "
+      license_email = STDIN.gets
+      app_name = Rails.application.class.module_parent_name
+      license_should_be = Digest::SHA1.hexdigest("HotGlueLicense--#{app_name}--#{license_email}")
+      if (license_should_be != license_activation_key)
+        puts "Ooops... it seems that Hot Glue license is not valid. Please check 1) the email address you used for this license, 2) The app name you used to purchase this license, and 3) the activation key itself."
+        exit
+      end
+
       @markup = options['markup']
       if @markup == "haml"
         copy_file "haml/_flash_notices.haml", "#{'spec/dummy/' if Rails.env.test?}app/views/layouts/_flash_notices.haml"
@@ -70,6 +99,36 @@ module HotGlue
       end
 
 
+      if @layout == "hotglue"
+        theme_location = "themes/hotglue_scaffold_#{@theme}.scss"
+        theme_file = "hotglue_scaffold_#{@theme}.scss"
+
+        copy_file theme_location, "#{'spec/dummy/' if Rails.env.test?}app/assets/stylesheets/#{theme_file}"
+
+        application_scss = File.read("app/assets/stylesheets/application.scss")
+
+        if !application_scss.include?("@import '#{theme_file}';")
+        application_scss << ( "\n @import '#{theme_file}'; ")
+          File.write("app/assets/stylesheets/application.scss", application_scss)
+          puts "  HOTGLUE --> added to app/assets/stylesheets/application.scss: @import '#{theme_file}' "
+        else
+          puts "  HOTGLUE --> already found theme in app/assets/stylesheets/application.scss: @import '#{theme_file}' "
+        end
+      end
+
+
+
+      if !File.exists?("config/hot_glue.yml")
+
+        yaml = {layout: @layout,
+                markup: @markup,
+                license_activation_key: license_activation_key,
+                license_email: license_email}.to_yaml
+        File.write("#{'spec/dummy/' if Rails.env.test?}config/hot_glue.yml", yaml)
+
+      end
+
+
       if !File.exists?("spec/support/capybara_login.rb")
         copy_file "capybara_login.rb", "#{'spec/dummy/' if Rails.env.test?}spec/support/capybara_login.rb"
       end

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

@@ -5,8 +5,8 @@ module  HotGlue
     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 "+
+      "<div class='#{col_identifier} 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}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}' %>\n "+
       "  <label class='form-text' >#{col.to_s.humanize}</label>\n" +
       "</div>"
     end
@@ -33,7 +33,7 @@ module  HotGlue
       end
 
       "<div class=\"#{col_identifier} 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}' %>" +
+      "<%= f.text_area :#{col.to_s}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}' %>" +
         "<label class='form-text'>#{col.to_s.humanize}</label>"+
         "</div>"
 
@@ -41,8 +41,10 @@ module  HotGlue
 
     def list_column_headings(*args)
       columns = args[0][:columns]
+      column_width = args[0][:column_width]
+      col_identifier = args[0][:col_identifier]
 
-      columns.map(&:to_s).map{|col_name| "<div class='col'>#{col_name.humanize}</div>"}.join("\n")
+      columns.map(&:to_s).map{|col_name| "<div class='#{col_identifier}'  style='flex-basis: #{column_width}%'>#{col_name.humanize}</div>"}.join("\n")
     end
 
 
@@ -50,13 +52,15 @@ module  HotGlue
       columns = args[0][:columns]
       show_only = args[0][:show_only]
       singular_class = args[0][:singular_class]
+      col_identifier = args[0][:col_identifier]
+
 
       # TODO: CLEAN ME
       @singular = args[0][:singular]
       singular = @singular
 
 
-      col_identifier = "col"
+
       col_spaces_prepend = "    "
 
       res = columns.map { |col|
@@ -111,10 +115,7 @@ module  HotGlue
               text_area_output(col, 65536, col_identifier)
             end
           when :float
-            limit ||= 256
-            field_output(col, nil, limit, col_identifier)
-
-
+            field_output(col, nil, 5, col_identifier)
           when :datetime
 
 
@@ -166,11 +167,18 @@ module  HotGlue
       show_only = args[0][:show_only]
       singular_class = args[0][:singular_class]
       singular = args[0][:singular]
+      perc_width = args[0][:perc_width]
 
       columns_count = columns.count + 1
-      perc_width = (100/columns_count).floor
+      perc_width = (perc_width).floor
 
-      col_identifer = "col"
+      if @layout == "boostrap"
+        col_identifer = "col"
+
+      else
+        col_identifer = "scaffold-cell"
+
+      end
       columns.map { |col|
         type = eval("#{singular_class}.columns_hash['#{col}']").type
         limit = eval("#{singular_class}.columns_hash['#{col}']").limit
@@ -188,35 +196,37 @@ module  HotGlue
 
             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)
+              puts exit_message
+              exit
+              # raise(HotGlue::Error,exit_message)
             end
 
             display_column =  HotGlue.derrive_reference_name(assoc.class_name)
 
-            "<div class='#{col_identifer}'>
+            "<div class='#{col_identifer}' style='flex-basis: #{perc_width}%'>
   <%= #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe %>
 </div>"
 
           else
-            "<div class='#{col_identifer}'>
+            "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
   <%= #{singular}.#{col}%></div>"
           end
         when :float
           width = (limit && limit < 40) ? limit : (40)
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
 <%= #{singular}.#{col}%></div>"
         when :string
           width = (limit && limit < 40) ? limit : (40)
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
   <%= #{singular}.#{col} %>
 </div>"
         when :text
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
   <%= #{singular}.#{col} %>
 </div>"
         when :datetime
 
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
   <% unless #{singular}.#{col}.nil? %>
 <%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone) %>
 <% else %>
@@ -224,7 +234,7 @@ module  HotGlue
 <% end %>
 </div>"
         when :date
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
   <% unless #{singular}.#{col}.nil? %>
     <%= #{singular}.#{col} %>
   <% else %>
@@ -232,7 +242,7 @@ module  HotGlue
   <% end %>
 </div>"
         when :time
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
   <% unless #{singular}.#{col}.nil? %>
     <%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone) %>
    <% else %>
@@ -241,7 +251,7 @@ module  HotGlue
 </div>
 "
         when :boolean
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
   <% if #{singular}.#{col}.nil? %>
       <span class='alert-danger'>MISSING</span>
   <% elsif #{singular}.#{col} %>

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

@@ -159,7 +159,9 @@ module  HotGlue
 
           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)
+            puts exit_message
+            exit
+            # raise(HotGlue::Error,exit_message)
           end
 
           display_column =  HotGlue.derrive_reference_name(assoc.class_name)

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -55,13 +55,16 @@ module HotGlue
     class_option :no_paginate, type: :boolean, default: false
     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
     class_option :downnest, type: :string, default: nil
     class_option :nestable, type: :boolean, default: false
     class_option :magic_buttons, type: :string, default: nil
     class_option :display_list_after_update, type: :boolean, default: false
 
+    class_option :markup, type: :string, default: nil # deprecated -- use in app config instead
+    class_option :layout, type: :string, default: nil # deprecated -- use in app config instead
+
+
     def initialize(*meta_args)
       super
 
@@ -69,11 +72,18 @@ module HotGlue
         @the_object = eval(class_name)
       rescue StandardError => e
         message = "*** Oops: It looks like there is no object for #{class_name}. Please define the object + database table first."
-        raise(HotGlue::Error, message)
+        puts message
+        exit
+        # raise(HotGlue::Error, message)
       end
 
-      if @specs_only && @no_specs
-        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.")
+      if !options['spec_only'].nil? && !options['no_spec'].nil?
+        puts "*** 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 !options['exclude'].empty? && !options['include'].empty?
+        puts "*** Oops: You seem to have specified both --include and --exclude. Please use one or the other. Aborting."
+        exit
       end
 
       if @stimulus_syntax.nil?
@@ -84,17 +94,36 @@ module HotGlue
         end
       end
 
-      if options['markup'] == "erb"
+      if !options['markup'].nil?
+        puts "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
+        exit
+      end
+
+      if !options['markup'].nil?
+        puts "Using --layout flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
+        exit
+      end
+
+      yaml_from_config = YAML.load(File.read("config/hot_glue.yml"))
+      @markup =  yaml_from_config[:markup]
+
+      if  @markup == "erb"
         @template_builder = HotGlue::ErbTemplate.new
-      elsif options['markup'] == "slim"
+      elsif  @markup == "slim"
         puts "SLIM IS NOT IMPLEMENTED; please see https://github.com/jasonfb/hot-glue/issues/3"
         abort
         @template_builder = HotGlue::SlimTemplate.new
 
-      elsif options['markup'] == "haml"
+      elsif  @markup == "haml"
         @template_builder = HotGlue::HamlTemplate.new
       end
-      @markup =  options['markup']
+
+
+      @layout = yaml_from_config[:layout]
+
+      if !['hotglue', 'bootstrap'].include? @layout
+        raise "Invalid option #{@layout} in Hot glue config (config/hot_glue.yml). You must pass either hotglue (default) or bootstrap to config"
+      end
 
 
       args = meta_args[0]
@@ -138,7 +167,17 @@ module HotGlue
       @display_list_after_update = options['display_list_after_update'] || false
 
 
-      @downnest_relationship = options['downnest'] || false
+
+      @col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col"
+      @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
+
+      @downnest = options['downnest'] || false
+
+      @downnest_children = []
+
+      if @downnest
+        @downnest_children = @downnest.split(",")
+      end
 
 
       if @god
@@ -158,6 +197,7 @@ module HotGlue
           @nested_args_plural[a] = a + "s"
         end
       end
+      @nestable = @nested_args.any?
 
 
       @magic_buttons = []
@@ -168,7 +208,7 @@ module HotGlue
       @build_update_action = !@no_edit || !@magic_buttons.empty?
       # if the magic buttons are present, build the update action anyway
 
-      @nestable = options['nestable'] || false
+      # @nestable = options['nestable'] || false
 
       if @auth && ! @self_auth && @nested_args.none?
         @object_owner_sym = @auth.gsub("current_", "").to_sym
@@ -206,21 +246,19 @@ module HotGlue
 
         else
           if @god
-
-            exit_message= "*** Oops:  god mode could not find the association(?). something is wrong."
+            exit_message= "*** Oops: Gd mode could not find the association(#{@object_owner_sym}). 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."
+                exit_message = "*** Oops:  your nesting chain does not have a association for #{arg}s on #{@auth_check}  something is wrong."
               end
-              byebug
-              puts ""
             end
           end
+          puts exit_message
+          exit
 
-          raise(HotGlue::Error, exit_message)
         end
       end
     end
@@ -262,14 +300,18 @@ module HotGlue
               eval(assoc.class_name)
             rescue NameError => e
               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)
+              puts exit_message
+              exit
+              # raise(HotGlue::Error, exit_message)
 
             end
 
 
             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)
+              exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+              puts exit_message
+              exit
+              # raise(HotGlue::Error,exit_message)
             end
 
             assoc_class = eval(assoc.class_name)
@@ -282,7 +324,7 @@ module HotGlue
             }.any?
               # do nothing here
             else
-              exit_message= "*** Oops: Missing a label for #{assoc.class_name.upcase}. 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.upcase} 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)"
+              exit_message = "*** Oops: Missing a label for #{assoc.class_name.upcase}. 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.upcase} 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)
             end
           end
@@ -299,8 +341,6 @@ module HotGlue
       nil
     end
 
-
-
     def copy_controller_and_spec_files
       @default_colspan = @columns.size
       unless @specs_only
@@ -323,7 +363,18 @@ module HotGlue
     end
 
     def list_column_headings
-      @template_builder.list_column_headings(columns: @columns)
+      if @nested_args.any?
+        column_width = each_col * @columns.count
+
+        "<div class='#{@col_identifier}'  style='flex-basis: #{column_width}%'>"
+      else
+        @template_builder.list_column_headings(
+          column_width: each_col,
+          columns: @columns,
+          col_identifier: @col_identifier
+        )
+      end
+
 
     end
 
@@ -396,7 +447,7 @@ module HotGlue
     end
 
     def path_helper_args
-      if @nested_args.any? && @nestable
+      if @nested_args.any? && @nest
         [(@nested_args).collect{|a| "#{a}"} , singular].join(",")
       else
         singular
@@ -404,7 +455,7 @@ module HotGlue
     end
 
     def path_helper_singular
-      if @nestable
+      if @nest
         "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
       else
         "#{@namespace+"_" if @namespace}#{singular}_path"
@@ -412,7 +463,7 @@ module HotGlue
     end
 
     def path_helper_plural
-      if ! @nestable
+      if ! @nest
         "#{@namespace+"_" if @namespace}#{plural}_path"
       else
         "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{plural}_path"
@@ -421,7 +472,7 @@ module HotGlue
 
     def path_arity
       res = ""
-      if @nested_args.any? && @nestable
+      if @nested_args.any? && @nest
         res << nested_objects_arity + ", "
       end
       res << "@" + singular
@@ -461,7 +512,7 @@ module HotGlue
 
     def nest_assignments_operator(top_level = false, leading_comma = false)
       if @nested_args.any?
-        "#{', ' if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
+        "#{', ' + "\n     " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
       else
         ""
       end
@@ -487,7 +538,12 @@ module HotGlue
           "@" + @nested_args.last + ".#{plural}"
         end
       else
-        @singular_class
+        if @nested_args.none?
+          @singular_class
+        else
+          "@" + @nested_args.last + ".#{plural}"
+        end
+
       end
     end
 
@@ -553,8 +609,10 @@ module HotGlue
         formats.each do |format|
           source_filename = cc_filename_with_extensions("#{@markup}/#{view}", "#{@markup}")
           dest_filename = cc_filename_with_extensions("#{view}", "#{@markup}")
+
+
           dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
-                                    controller_file_path, dest_filename)
+                                    plural, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -568,7 +626,7 @@ module HotGlue
           source_filename = cc_filename_with_extensions( "#{@markup}/#{view}.turbo_stream.#{@markup}")
           dest_filename = cc_filename_with_extensions("#{view}", "turbo_stream.#{@markup}")
           dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
-                                    controller_file_path, dest_filename)
+                                    plural, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -626,16 +684,43 @@ module HotGlue
     end
 
     def all_form_fields
+
       @template_builder.all_form_fields(
         columns: @columns,
         show_only: @show_only,
         singular_class: singular_class,
-        singular: singular
+        singular: singular,
+        col_identifier:  @col_identifier
       )
     end
 
+    def column_width
+      @each_col ||= each_col
+    end
+
+    def each_col
+      (col_width/@columns.count).to_i
+    end
+
+    def col_width
+      downnest_size = case (@downnest_children.count)
+
+                      when 0
+                        downnest_size = 0
+                      when 1
+                        downnest_size = 40
+
+                      else
+                        downnest_size = 60
+
+                      end
+      100 - downnest_size - 5
+    end
+
     def all_line_fields
+
       @template_builder.all_line_fields(
+        perc_width: column_width,
         columns: @columns,
         show_only: @show_only,
         singular_class: singular_class,
@@ -720,6 +805,36 @@ module HotGlue
       }.join("")
     end
 
+
+    def nested_for_turbo_id_list_constructor
+      if @nested_args.none?
+        ""
+      else
+        "+ ('__' + nested_for)"
+      end
+    end
+
+    def nested_for_turbo_nested_constructor(top_level = true)
+      instance_symbol = "@" if top_level
+      instance_symbol = "" if !top_level
+      if @nested_args.none?
+        ""
+      else
+        "__" + @nested_args.collect{|a| "#{a}-" + '#{' + instance_symbol + a + '.id}'}.join("__")
+      end
+    end
+
+    def nested_for_assignments_constructor(top_level = true)
+      instance_symbol = "@" if top_level
+      instance_symbol = "" if !top_level
+      if @nested_args.none?
+        ""
+      else
+        ", \n    nested_for: \"" + @nested_args.collect{|a| "#{a}-" + '#{' + instance_symbol + a + ".id}"}.join("__") + "\""
+      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
     def cc_filename_with_extensions(name, file_format = format)