hot-glue 0.5.7 → 0.5.9.1

data/app/helpers/hot_glue/controller_helper.rb

@@ -79,11 +79,14 @@ module HotGlue
       hawk_schema.each do |hawk_key,hawk_definition|
         hawk_root = hawk_definition[0]
         # hawk_scope = hawk_definition[1]
-        begin
-          eval("hawk_root").find(modified_params[hawk_key.to_s])
-        rescue ActiveRecord::RecordNotFound => e
-          @hawk_alarm << "You aren't allowed to set #{hawk_key.to_s} to #{modified_params[hawk_key.to_s]}. "
-          modified_params.tap { |hs| hs.delete(hawk_key.to_s) }
+
+        unless modified_params[hawk_key.to_s].blank?
+          begin
+            eval("hawk_root").find(modified_params[hawk_key.to_s])
+          rescue ActiveRecord::RecordNotFound => e
+            @hawk_alarm << "You aren't allowed to set #{hawk_key.to_s} to #{modified_params[hawk_key.to_s]}. "
+            modified_params.tap { |hs| hs.delete(hawk_key.to_s) }
+          end
         end
       end
       modified_params
@@ -95,4 +98,4 @@ module HotGlue
       Time.now.strftime("%z").to_i/100
     end
   end
-end
+end

data/lib/generators/hot_glue/direct_upload_install_generator.rb

@@ -0,0 +1,47 @@
+
+
+module HotGlue
+  class DirectUploadInstallGenerator < Rails::Generators::Base
+
+
+    source_root File.expand_path('templates', __dir__)
+
+
+
+    def initialize(*args) #:nodoc:
+      super
+      if Gem::Specification.sort_by{ |g| [g.name.downcase, g.version] }.group_by{ |g| g.name }['importmap-rails'] # impomrtmaps
+        file_contents = File.read("app/javascript/application.js")
+
+        if !file_contents.include?("//= require activestorage")
+          file_contents << "//= require activestorage"
+          File.write("app/javascript/application.js", file_contents)
+          puts "  HOTGLUE --> added to app/javascript/application.js: `//= require activestorage"
+        else
+          puts "  HOTGLUE --> app/javascript/application.js already contains `//= require activestorage`"
+        end
+
+      elsif Gem::Specification.sort_by{ |g| [g.name.downcase, g.version] }.group_by{ |g| g.name }['jsbundling-rails']
+
+
+        file_contents = File.read("app/javascript/application.js")
+
+        if !file_contents.include?("ActiveStorage.start()")
+          file_contents << "import * as ActiveStorage from \"@rails/activestorage\"
+ActiveStorage.start()"
+          File.write("app/javascript/application.js", file_contents)
+          puts "  HOTGLUE --> added to app/javascript/application.js: `ActiveStorage.start()"
+        else
+          puts "  HOTGLUE --> app/javascript/application.js already contains `ActiveStorage.start()`"
+        end
+
+
+      else
+        puts "  HOTGLUE --> could not detect either importmap-rails or jsbundling-rails app"
+      end
+    end
+  end
+end
+
+
+

data/lib/generators/hot_glue/dropzone_install_generator.rb

@@ -0,0 +1,39 @@
+module HotGlue
+  class DropzoneInstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('templates', __dir__)
+
+    def initialize(*args) #:nodoc:
+      super
+      system("./bin/rails generate stimulus Dropzone")
+      copy_file "javascript/dropzone_controller.js", "app/javascript/controllers/dropzone_controller.js"
+      puts "HOT GLUE --> copying dropzone stimulus controller into app/javascript/controllers/dropzone_controller.js"
+
+
+      if File.exist?("app/assets/stylesheets/application.bootstrap.scss")
+        scss_file = "app/assets/stylesheets/application.bootstrap.scss"
+      elsif File.exist?("app/assets/stylesheets/application.scss")
+        scss_file = "app/assets/stylesheets/application.scss"
+      else
+        raise "Could not detect your stylesheet, aborting..."
+      end
+
+      file_contents = File.read(scss_file)
+
+      if !file_contents.include?("@import \"dropzone/dist/dropzone\"")
+        file_contents << "\n@import \"dropzone/dist/dropzone\";\n@import \"dropzone/dist/basic\";"
+
+
+        File.write(scss_file, file_contents)
+
+        puts "  HOTGLUE --> added to #{scss_file}: @import dropzone ... "
+      else
+        puts "  HOTGLUE --> #{scss_file} already contains @import dropzone"
+      end
+
+
+    end
+  end
+end
+
+
+

data/lib/generators/hot_glue/layout/builder.rb

@@ -6,13 +6,14 @@ module HotGlue
       attr_reader :include_setting,
                   :downnest_object,
                   :buttons_width, :columns,
-                  :smart_layout, :specified_grouping_mode
+                  :smart_layout, :specified_grouping_mode, :stacked_downnesting
 
       def initialize(include_setting: nil,
                      downnest_object: nil,
                      buttons_width: nil,
                      smart_layout: nil,
-                     columns: nil)
+                     columns: nil,
+                     stacked_downnesting: false)
         @include_setting = include_setting
         @downnest_object = downnest_object
         @buttons_width = buttons_width
@@ -21,6 +22,7 @@ module HotGlue
 
         @no_buttons = @buttons_width == 0
         @specified_grouping_mode = include_setting.include?(":")
+        @stacked_downnesting = stacked_downnesting
       end
 
       def construct
@@ -44,25 +46,31 @@ module HotGlue
 
         bootstrap_columns = (12 - @buttons_width )
 
-        bootstrap_columns = bootstrap_columns - (downnest_object.collect{|k,v| v}.sum)
+        if(!stacked_downnesting)
+          bootstrap_columns = bootstrap_columns - (downnest_object.collect{|k,v| v}.sum)
+        else
+          bootstrap_columns = bootstrap_columns - 4
+        end
 
         available_columns = (bootstrap_columns / 2).floor # bascially turns the 12-column grid into a 6-column grid
 
         if available_columns < 0
           raise "Cannot build layout with #{how_many_downnest} downnested portals"
         end
-
+        #
+        # if !stacked_downnesting
+        #
+        # else
+        #
+        # end
         downnest_children_width = []
-
         downnest_object.each do |child, size|
           layout_object[:portals][child] = {size:  size}
         end
 
-
         if smart_layout
           # automatic control
           #
-          layout_object[:columns][:button_columns] = 2
 
           if columns.size > available_columns
             if available_columns == 0

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

@@ -5,6 +5,7 @@ module LayoutStrategy
       @builder = scaffold_builder
     end
 
+    def button_applied_classes; end
     def column_classes_for_button_column; ""; end
     def button_classes; ""; end
     def button_column_style; "" ; end
@@ -23,6 +24,7 @@ module LayoutStrategy
       (col_width/(builder.columns.count)).to_i
     end
     def list_classes; ""; end
+    def magic_button_classes; ""; end
     def row_classes; ""; end
     def row_heading_classes; ""; end
     def page_begin; '<div> '; end

data/lib/generators/hot_glue/layout_strategy/bootstrap.rb

@@ -1,10 +1,19 @@
 class LayoutStrategy::Bootstrap < LayoutStrategy::Base
-  def button_classes
+  def button_classes # column classes
     " " + "col-sm-#{builder.layout_object[:columns][:button_columns]}"
   end
 
+  def button_applied_classes
+    "btn btn-sm"
+  end
+
+  def magic_button_classes
+    "btn-secondary"
+  end
+
+
   def column_classes_for_button_column
-    "col-md-#{builder.layout_object[:columns][:button_columns]}"
+    "col-md-#{builder.layout_object[:buttons][:size]}"
   end
 
 
@@ -17,7 +26,7 @@ class LayoutStrategy::Bootstrap < LayoutStrategy::Base
   end
 
   def container_name
-    "container-fluid"
+    "container"
   end
 
   def column_classes_for_line_fields
@@ -32,6 +41,10 @@ class LayoutStrategy::Bootstrap < LayoutStrategy::Base
     "col-sm-#{ builder.layout_object[:portals][downnest][:size] }"
   end
 
+  def downnest_portal_stacked_column_width
+    "col-sm-4"
+  end
+
   def page_begin
     '<div class="row"> <div class="col-md-12">'
   end