hot-glue 0.2.9E → 0.3.9

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,43 @@ 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.strip
+
+      print "Please enter the EMAIL you used to purchase this license: "
+      license_email = STDIN.gets.strip
+      app_name = Rails.application.class.module_parent_name
+      license_should_be = Digest::SHA1.hexdigest("HOT-GLUE-LICENSE--#{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"
@@ -23,55 +54,112 @@ module HotGlue
         copy_file "confirmable.js", "#{'spec/dummy/' if Rails.env.test?}app/javascript/controllers/confirmable.js"
       end
 
-      if Rails.version.split(".")[0].to_i == 6
-        app_js_contents = File.read("app/javascript/packs/application.js")
-        if app_js_contents.include?("import Turbolinks from \"turbolinks\"")
-          app_js_contents.gsub!("import Turbolinks from \"turbolinks\"", "import { Turbo } from \"@hotwired/turbo-rails\"")
-          puts "  HOTGLUE --> fixed packs/application.js: swapping old Turbolinks syntas for new Turbo-Rails syntax [ import { Turbo } from \"@hotwired/turbo-rails\" ] "
+
+      begin
+        if Rails.version.split(".")[0].to_i == 6
+          app_js_contents = File.read("app/javascript/packs/application.js")
+          if app_js_contents.include?("import Turbolinks from \"turbolinks\"")
+            app_js_contents.gsub!("import Turbolinks from \"turbolinks\"", "import { Turbo } from \"@hotwired/turbo-rails\"")
+            puts "  HOTGLUE --> fixed packs/application.js: swapping old Turbolinks syntas for new Turbo-Rails syntax [ import { Turbo } from \"@hotwired/turbo-rails\" ] "
+          end
+
+          if app_js_contents.include?("Turbolinks.start()")
+            app_js_contents.gsub!("Turbolinks.start()", "Turbo.start()")
+            puts "  HOTGLUE --> fixed packs/application.js: swapping old Turbolinks syntas for new Turbo-Rails syntax[ Turbolinks.start() ] "
+          end
+          File.write("app/javascript/packs/application.js", app_js_contents)
+        end
+      rescue StandardError => e
+        puts "WARNING: error writing to app/javascript/packs/application.js --- #{e.message}"
+      end
+
+
+
+      begin
+        rails_helper_contents = File.read("spec/rails_helper.rb")
+        if !rails_helper_contents.include?("Capybara.default_driver =")
+          rails_helper_contents << "\nCapybara.default_driver = :selenium_chrome_headless "
+          puts "  HOTGLUE --> added to spec/rails_helper.rb: `Capybara.default_driver = :selenium_chrome_headless`  "
+        end
+
+        if !rails_helper_contents.include?("include FactoryBot::Syntax::Methods")
+          rails_helper_contents.gsub!("RSpec.configure do |config|", "RSpec.configure do |config| \n
+    config.include FactoryBot::Syntax::Methods
+  ")
+          puts "  HOTGLUE --> added to spec/rails_helper.rb: `config.include FactoryBot::Syntax::Methods`  "
         end
 
-        if app_js_contents.include?("Turbolinks.start()")
-          app_js_contents.gsub!("Turbolinks.start()", "Turbo.start()")
-          puts "  HOTGLUE --> fixed packs/application.js: swapping old Turbolinks syntas for new Turbo-Rails syntax[ Turbolinks.start() ] "
+        if ! rails_helper_contents.include?("require 'support/capybara_login.rb'")
+          rails_helper_contents.gsub!("require 'rspec/rails'","require 'rspec/rails' \nrequire 'support/capybara_login.rb'")
+          puts "  HOTGLUE --> added to spec/rails_helper.rb: `require 'support/capybara_login.rb'`  "
         end
-        File.write("app/javascript/packs/application.js", app_js_contents)
+        File.write("spec/rails_helper.rb", rails_helper_contents)
 
+      rescue StandardError => e
+        puts "WARNING: error writing to spec/rails_helper --- #{e.message}"
       end
 
 
-      rails_helper_contents = File.read("spec/rails_helper.rb")
-      if !rails_helper_contents.include?("Capybara.default_driver =")
-        rails_helper_contents << "\nCapybara.default_driver = :selenium_chrome_headless "
-        puts "  HOTGLUE --> added to spec/rails_helper.rb: `Capybara.default_driver = :selenium_chrome_headless`  "
-      end
+      begin
+        application_layout_contents = File.read("app/views/layouts/application.html.erb")
 
-      if !rails_helper_contents.include?("include FactoryBot::Syntax::Methods")
-        rails_helper_contents.gsub!("RSpec.configure do |config|", "RSpec.configure do |config| \n
-  config.include FactoryBot::Syntax::Methods
-")
-        puts "  HOTGLUE --> added to spec/rails_helper.rb: `config.include FactoryBot::Syntax::Methods`  "
+        if !application_layout_contents.include?("render partial: 'layouts/flash_notices'")
+          application_layout_contents.gsub!("<body>", "<body>\n
+  <%= render partial: 'layouts/flash_notices' %>
+  ")
+          File.write("app/views/layouts/application.html.erb", application_layout_contents)
+          puts "  HOTGLUE --> added to app/views/layouts/application.html.erb: `<%= render partial: 'layouts/flash_notices' %>`  "
+        end
+      rescue StandardError => e
+        puts "WARNING: error writing to app/views/layouts/application.html.erb --- #{e.message}"
       end
 
-      if ! rails_helper_contents.include?("require 'support/capybara_login.rb'")
-        rails_helper_contents.gsub!("require 'rspec/rails'","require 'rspec/rails' \nrequire 'support/capybara_login.rb'")
-        puts "  HOTGLUE --> added to spec/rails_helper.rb: `require 'support/capybara_login.rb'`  "
+
+      begin
+        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
+      rescue StandardError => e
+        puts "WARNING: error writing to app/assets/stylesheets/application.scss --- #{e.message}"
       end
-      File.write("spec/rails_helper.rb", rails_helper_contents)
 
 
-      application_layout_contents = File.read("app/views/layouts/application.html.erb")
 
-      if !application_layout_contents.include?("render partial: 'layouts/flash_notices'")
-        application_layout_contents.gsub!("<body>", "<body>\n
-<%= render partial: 'layouts/flash_notices' %>
-")
-        File.write("app/views/layouts/application.html.erb", application_layout_contents)
-        puts "  HOTGLUE --> added to app/views/layouts/application.html.erb: `<%= render partial: 'layouts/flash_notices' %>`  "
+      begin
+
+        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
+      rescue StandardError => e
+        puts "WARNING: error writing to config/hot_glue.yml --- #{e.message}"
       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"
+      begin
+        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
+      rescue StandardError => e
+        puts "WARNING: error writing to spec/support/capybara_login.rb --- #{e.message}"
       end
     end
   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
@@ -21,7 +21,7 @@ module  HotGlue
       magic_buttons.collect{ |button_name|
         "<%= form_with model: #{singular}, url: #{path_helper_singular}(#{path_helper_args}) do |f| %>
       <%= f.hidden_field :#{button_name}, value: \"#{button_name}\" %>
-    <%= f.submit '#{button_name.titleize}'.html_safe, data: {confirm: 'Are you sure you want to #{button_name} this #{singular}?'}, class: '#{singular}-button btn btn-primary ' %>
+    <%= f.submit '#{button_name.titleize}'.html_safe, disabled: (schedule.respond_to?(:#{button_name}able?) && ! schedule.#{button_name}able? ), data: {confirm: 'Are you sure you want to #{button_name} this #{singular}?'}, class: '#{singular}-button btn btn-primary ' %>
     <% end %>"
       }.join("\n")
     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,14 @@ module  HotGlue
 
     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")
+      column_width = args[0][:column_width]
+      col_identifier = args[0][:col_identifier]
+      if @layout == "hotglue"
+        col_style = " style='flex-basis: #{column_width}%'"
+      else
+        col_style = ""
+      end
+      columns.map(&:to_s).map{|col_name| "<div class='#{col_identifier}'" + col_style +">#{col_name.humanize}</div>"}.join("\n")
     end
 
 
@@ -50,13 +56,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 +119,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 +171,21 @@ module  HotGlue
       show_only = args[0][:show_only]
       singular_class = args[0][:singular_class]
       singular = args[0][:singular]
+      perc_width = args[0][:perc_width]
+      layout = args[0][:layout]
 
       columns_count = columns.count + 1
-      perc_width = (100/columns_count).floor
+      perc_width = (perc_width).floor
+
+      if layout == "bootstrap"
+        col_identifer = "col"
+        style_with_flex_basis = ""
+      else
+        style_with_flex_basis = " style='flex-basis: #{perc_width}%'"
+        col_identifer = "scaffold-cell"
+      end
+
 
-      col_identifer = "col"
       columns.map { |col|
         type = eval("#{singular_class}.columns_hash['#{col}']").type
         limit = eval("#{singular_class}.columns_hash['#{col}']").limit
@@ -188,35 +203,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_with_flex_basis}>
   <%= #{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_with_flex_basis}>
   <%= #{singular}.#{col}%></div>"
           end
         when :float
           width = (limit && limit < 40) ? limit : (40)
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'#{style_with_flex_basis}>
 <%= #{singular}.#{col}%></div>"
         when :string
           width = (limit && limit < 40) ? limit : (40)
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'#{style_with_flex_basis} >
   <%= #{singular}.#{col} %>
 </div>"
         when :text
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'#{style_with_flex_basis}>
   <%= #{singular}.#{col} %>
 </div>"
         when :datetime
 
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% unless #{singular}.#{col}.nil? %>
 <%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone) %>
 <% else %>
@@ -224,7 +241,7 @@ module  HotGlue
 <% end %>
 </div>"
         when :date
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% unless #{singular}.#{col}.nil? %>
     <%= #{singular}.#{col} %>
   <% else %>
@@ -232,7 +249,7 @@ module  HotGlue
   <% end %>
 </div>"
         when :time
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% unless #{singular}.#{col}.nil? %>
     <%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone) %>
    <% else %>
@@ -241,7 +258,7 @@ module  HotGlue
 </div>
 "
         when :boolean
-          "<div class='#{col_identifer}'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% if #{singular}.#{col}.nil? %>
       <span class='alert-danger'>MISSING</span>
   <% elsif #{singular}.#{col} %>
@@ -251,7 +268,7 @@ module  HotGlue
   <% end %>
 </div>
 "        when :enum
-                                                                                                         "<div class='#{col_identifer}'>
+"<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% if #{singular}.#{col}.nil? %>
       <span class='alert-danger'>MISSING</span>
   <% else %>
@@ -263,8 +280,4 @@ module  HotGlue
       }.join("\n")
     end
   end
-
-
-
-
 end

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)