hot-glue 0.5.8 → 0.5.9.1

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

@@ -12,15 +12,28 @@
       <% unless @no_list_heading %>
         <div class="<%= @layout_strategy.row_classes %> <%= @layout_strategy.row_heading_classes %>">
           <%= list_column_headings %>
+
           <% if @downnest_object.any? %>
-            <%= @layout_strategy.downnest_column_style  %>
-            <% @downnest_object.each do |downnest,i| %>
-              <div class=" scaffold-col-heading <%= @layout_strategy.downnest_portal_column_width(downnest) %> <%= @layout_strategy.downnest_column_style %>">
-                <strong>
-                  <%=  downnest.titleize  %>
-                </strong>
+            <% if !@stacked_downnesting %>
+              <%= @layout_strategy.downnest_column_style  %>
+              <% @downnest_object.each do |downnest,i| %>
+                <div class=" scaffold-col-heading <%= @layout_strategy.downnest_portal_column_width(downnest) %> <%= @layout_strategy.downnest_column_style %>">
+                  <strong>
+                    <%= downnest.titleize %>
+                  </strong>
+                </div>
+              <% end %>
+            <% else %>
+              <div class=" scaffold-col-heading  <%= @layout_strategy.downnest_portal_stacked_column_width  %> <%= @layout_strategy.downnest_column_style %>">
+              <%= @layout_strategy.downnest_column_style  %>
+              <% @downnest_object.each do |downnest,i| %>
+                  <strong>
+                    <%= downnest.titleize %>
+                  </strong>
+              <% end %>
               </div>
             <% end %>
+
           <% end %>
 
           <div class=' scaffold-col-heading scaffold-col-heading-buttons <%= @layout_strategy.column_classes_for_column_headings %>' <%= @layout_strategy.button_column_style %>>

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

@@ -1,16 +1,17 @@
 <%= all_line_fields %>
 
+
+
 <% if @downnest_children.any? %>
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
-
+  <% if @stacked_downnesting %><div class="<%= @layout_strategy.downnest_portal_stacked_column_width  %> scaffold-downnest" ><% end %>
   <% @downnest_object.each do |downnest, size| %>
-
     <% downnest_object =  eval("#{singular_class}.reflect_on_association(:#{downnest})") %>
     <% if downnest_object.nil?; raise "no relationship for downnested portal `#{downnest}` found on `#{singular_class}`; please check relationship for has_many :#{downnest}"; end; %>
     <% downnest_class = downnest_object.class_name %>
     <% downnest_object_name = eval("#{downnest_class}.table_name") %>
     <% downnest_style = @layout_strategy.downnest_style %>
-    <div class="<%= @layout_strategy.downnest_portal_column_width(downnest)  %> scaffold-downnest" <%= downnest_style  %> >
+    <% if !@stacked_downnesting %><div class="<%= @layout_strategy.downnest_portal_column_width(downnest)  %> scaffold-downnest" <%= downnest_style  %> ><% end %>
   <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {
         <%= @singular %>: <%= @singular %>,
         <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>
@@ -18,8 +19,9 @@
       .merge({nested_for: "<% if @nested_set.any? %>#{nested_for + "__" if defined?(nested_for)}<% end %><%= @singular %>-#{<%= @singular %>.id}"})
       <%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}} : {} )"}.join("\n") %>
     \%>
-  </div>
+    <% if !@stacked_downnesting %></div><% end %>
   <% end %>
+  <% if @stacked_downnesting %></div><% end %>
 <% end %>
 
 <%= @layout_strategy.button_style %>

data/lib/generators/hot_glue/templates/javascript/dropzone_controller.js

@@ -0,0 +1,191 @@
+import Dropzone from "dropzone";
+import { Controller } from "@hotwired/stimulus"
+import { DirectUpload } from "@rails/activestorage";
+
+export default class extends Controller {
+  static targets = ["input"];
+
+  connect() {
+    this.dropZone = this.createDropZone(this);
+    this.hideFileInput();
+    this.bindEvents();
+    Dropzone.autoDiscover = false; // necessary quirk for Dropzone error in console
+  }
+
+  // helpers
+  getMetaValue(name) {
+    const element = this.findElement(document.head, `meta[name="${name}"]`);
+    if (element) {
+      return element.getAttribute("content");
+    }
+  }
+
+  findElement(root, selector) {
+    if (typeof root == "string") {
+      selector = root;
+      root = document;
+    }
+    return root.querySelector(selector);
+  }
+
+  toArray(value) {
+    if (Array.isArray(value)) {
+      return value;
+    } else if (Array.from) {
+      return Array.from(value);
+    } else {
+      return [].slice.call(value);
+    }
+  }
+
+
+  hideFileInput() {
+    this.inputTarget.disabled = true;
+    this.inputTarget.style.display = "none";
+  }
+
+  bindEvents() {
+    this.dropZone.on("addedfile", file => {
+      setTimeout(() => {
+        if (file.accepted) {
+          const duc = new DirectUploadProcessor(this, this.url(), file)
+          duc.start();
+        }
+      }, 500);
+    });
+
+    this.dropZone.on("removedfile", file => {
+      if(file.controller) {
+        file.controller.hiddenInput.parentNode.removeChild(file.controller.hiddenInput);
+      }
+    });
+
+    this.dropZone.on("canceled", file => {
+      file.controller && file.controller.xhr.abort();
+    });
+  }
+
+  url() {
+    return this.inputTarget.getAttribute("data-direct-upload-url");
+  }
+
+  createDropZone() {
+
+    return new Dropzone(this.element, {
+      url: this.url(),
+      headers: this.headers,
+      maxFiles: this.maxFiles,
+      maxFilesize: this.maxFileSize,
+      acceptedFiles: this.acceptedFiles,
+      addRemoveLinks: this.addRemoveLinks,
+      autoQueue: false
+    });
+  }
+
+  get headers() {
+    return { "X-CSRF-Token": this.getMetaValue("csrf-token") };
+  }
+
+  get maxFiles() {
+    return this.data.get("maxFiles") || 1;
+  }
+
+  get maxFileSize() {
+    return this.data.get("maxFileSize") || 256;
+  }
+
+  get acceptedFiles() {
+    return this.data.get("acceptedFiles");
+  }
+
+  get addRemoveLinks() {
+    return this.data.get("addRemoveLinks") || true;
+  }
+}
+
+class DirectUploadProcessor {
+  constructor(source, url, file) {
+    this.directUpload = createDirectUpload(file, url, this);
+    this.source = source;
+    this.file = file;
+    this.url = url;
+  }
+
+  insertAfter(el, referenceNode) {
+    return referenceNode.parentNode.insertBefore(el, referenceNode.nextSibling);
+  }
+
+  start() {
+    this.file.controller = this;
+    this.hiddenInput = this.createHiddenInput();
+    this.directUpload.create((error, attributes) => {
+      if (error) {
+
+        this.hiddenInput.remove();
+        this.emitDropzoneError(error);
+      } else {
+        this.hiddenInput.value = attributes.signed_id;
+        this.emitDropzoneSuccess();
+      }
+    });
+  }
+
+  createHiddenInput() {
+    const input = document.createElement("input");
+    input.type = "hidden";
+    input.name = this.source.inputTarget.name;
+    this.insertAfter(input, this.source.inputTarget);
+    return input;
+  }
+
+  directUploadWillStoreFileWithXHR(xhr) {
+    this.bindProgressEvent(xhr);
+    this.emitDropzoneUploading();
+  }
+
+  bindProgressEvent(xhr) {
+    this.xhr = xhr;
+    this.xhr.upload.addEventListener("progress", event =>
+      this.uploadRequestDidProgress(event)
+    );
+  }
+
+  findElement(root, selector) {
+    if (typeof root == "string") {
+      selector = root;
+      root = document;
+    }
+    return root.querySelector(selector);
+  }
+
+  uploadRequestDidProgress(event) {
+    const element = this.source.element;
+    const progress = (event.loaded / event.total) * 100;
+    this.findElement(
+      this.file.previewTemplate,
+      ".dz-upload"
+    ).style.width = `${progress}%`;
+  }
+
+  emitDropzoneUploading() {
+    this.file.status = Dropzone.UPLOADING;
+    this.source.dropZone.emit("processing", this.file);
+  }
+
+  emitDropzoneError(error) {
+    this.file.status = Dropzone.ERROR;
+    this.source.dropZone.emit("error", this.file, error);
+    this.source.dropZone.emit("complete", this.file);
+  }
+
+  emitDropzoneSuccess() {
+    this.file.status = Dropzone.SUCCESS;
+    this.source.dropZone.emit("success", this.file);
+    this.source.dropZone.emit("complete", this.file);
+  }
+}
+
+function createDirectUpload(file, url, controller) {
+  return new DirectUpload(file, url, controller);
+}
+

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

@@ -12,7 +12,7 @@ describe 'interaction for <%= controller_class_name %>' do
     item1_addOns << "#{display_class}: FFaker::Name.name"
    end
 
-  item1_addOns << ", " + @columns.map { |col|
+  item1_addOns << ", " + (@columns - @attachments.keys.collect(&:to_sym)).map { |col|
   type = eval("#{singular_class}.columns_hash['#{col}']").type
   case type
   when :string
@@ -53,13 +53,15 @@ describe 'interaction for <%= controller_class_name %>' do
 <%= objest_nest_factory_setup %> <% unless @god || @existing_content.include?("login_as")%>
   before do
     login_as(<%= @auth %>)
-  end <% end %>
-
+  end <% end %> <% if any_datetime_fields? %>
+  let(:current_timezone) {
+    <%= @auth_identifier %>.try(:timezone) || Time.now.strftime("%z").to_i/100
+  }<% end %>
   describe "index" do
     it "should show me the list" do
       visit <%= path_helper_plural %>
 <%=
-@columns.map { |col|
+(@columns - @attachments.keys.collect(&:to_sym)).map { |col|
   type = eval("#{singular_class}.columns_hash['#{col}']").type
 
   case type
@@ -77,13 +79,13 @@ describe 'interaction for <%= controller_class_name %>' do
     if(eval("#{singular_class}.respond_to?(:#{col}_labels)"))
      "      " + "expect(page).to have_content(#{singular_class}.#{col}_labels[#{singular}#{1}.#{col}])"
     else
-     "      " + "expect(page).to have_content(new_#{col})"
+     "      " + "expect(page).to have_content(#{singular}1.#{col})"
     end
 
   when :boolean
     "      " + ["expect(page).to have_content(#{singular}#{1}.#{col} ? 'YES' : 'NO')"].join("\n      ")
   else
-        "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
   end
 
 }.join("\n")
@@ -101,7 +103,7 @@ describe 'interaction for <%= controller_class_name %>' do
       expect(page).to have_content("Successfully created")
 <%="      " +
 
-  (@columns - @show_only).map { |col|
+  ((@columns - @attachments.keys.collect(&:to_sym)) - @show_only).map { |col|
     type = eval("#{singular_class}.columns_hash['#{col}']").type
 
     case type
@@ -144,7 +146,7 @@ describe 'interaction for <%= controller_class_name %>' do
 <%= test_capybara_block(:update) %>
       click_button "Save"
       within("turbo-frame#<%= @namespace %>__#{dom_id(<%= singular %>1)} ") do
-<%= (@columns - @show_only).map { |col|
+<%= ((@columns - @attachments.keys.collect(&:to_sym)) - @show_only).map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
 
       if type == :uuid || (type == :integer && col.to_s.ends_with?("_id"))
@@ -157,8 +159,14 @@ describe 'interaction for <%= controller_class_name %>' do
 
       elsif type == :enum && eval("#{singular_class}.respond_to?(:#{col}_labels)")
        "        expect(page).to have_content(#{singular_class}.#{col}_labels[new_#{col}])"
+      elsif type == :string && eval("#{singular_class}.respond_to?(:devise_modules)") &&
+           #devise confirmable makes email updates go into unconfirmed_email
+           eval("#{singular_class}.devise_modules.include?(:confirmable)") && col.to_s == "email"
+            "        expect(page).to have_content(#{ singular }1.#{col.to_s})"
+      elsif type == :datetime
+            "        expect(page).to have_content(new_#{col.to_s}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone))"
       else
-      '        expect(page).to have_content(new_' + col.to_s + ')'
+            "        expect(page).to have_content(new_#{col.to_s})"
       end
     }.compact.join("\n")
     %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.8'
+    CURRENT = '0.5.9.1'
   end
 end

data/script/clean_generated_code

@@ -18,7 +18,7 @@ rm -rf dummy/app/views/users/*
 rm -rf dummy/app/views/humans/*
 rm -rf dummy/app/views/pets/*
 
-/bin/rm -rf dummy/spec/system/
+/bin/rm -rf dummy/spec/features/
 
 
 # !("application_controller.rb"|"welcome_controller.rb")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,6 +75,8 @@ files:
 - config/database.yml
 - config/hot_glue.yml
 - db/schema.rb
+- lib/generators/hot_glue/direct_upload_install_generator.rb
+- lib/generators/hot_glue/dropzone_install_generator.rb
 - lib/generators/hot_glue/install_generator.rb
 - lib/generators/hot_glue/layout/builder.rb
 - lib/generators/hot_glue/layout_strategy/base.rb
@@ -117,6 +119,7 @@ files:
 - lib/generators/hot_glue/templates/haml/index.haml
 - lib/generators/hot_glue/templates/haml/new.haml
 - lib/generators/hot_glue/templates/haml/update.turbo_stream.haml
+- lib/generators/hot_glue/templates/javascript/dropzone_controller.js
 - lib/generators/hot_glue/templates/system_spec.rb.erb
 - lib/generators/hot_glue/templates/themes/hotglue_scaffold_dark_knight.scss
 - lib/generators/hot_glue/templates/themes/hotglue_scaffold_like_bootstrap.scss
@@ -131,9 +134,9 @@ homepage: https://heliosdev.shop/p/hot-glue?utm_source=rubygems.org&utm_campaign
 licenses:
 - Nonstandard
 metadata:
-  source_code_uri: https://github.com/jasonfb/hot-glue
+  source_code_uri: https://github.com/hot-glue-for-rails/hot-glue
   homepage: https://heliosdev.shop/hot-glue
-  funding: https://tekduds.com
+  funding: https://school.jasonfleetwoodboldt.com/8188
 post_install_message: |
   ---------------------------------------------
   Welcome to Hot Glue - A Scaffold Building Companion for Hotwire + Turbo-Rails