hot-glue 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fe831af428ff123db3490a3a376cadb40c1acd01f10f8926213dced0b78abaa
-  data.tar.gz: 5091fd12e7ca86865891e6f4fbaa5ad36b78951f2dd99d1819eb5eab8e32a2a7
+  metadata.gz: aab4adde73436f151d09f4e21517d108adcfb47df5f6a0fd69153848fa695aeb
+  data.tar.gz: 8230d3d19dc1f0a4d731b0492f8ecf5d4a1dd17fb2a2ab9934c8c2884a67e000
 SHA512:
-  metadata.gz: 35ecea29e077ad022c227ad994f0dd98fea31e849eef0158e578aa6be8d1b3cd212d124285193169f3fd23f7643a24ee327f5b2edb47837069f6db44de122d5a
-  data.tar.gz: 7fa9b3bc28743cf2c0989a47705335b9270d42c208c6b8317a9efac6d7a7de4c6d1a873c9550c7d056e9a2f85003f2c521ce7c0d5a30b6f3535e1057299e2119
+  metadata.gz: 5649e791538ab4401ff362bcab08809742b3000b2c6d59254d597737153ccbd9832137366af053936fcfcbfdaf6c5fa51904f81a86b762657ba14f7c8b67f35a
+  data.tar.gz: 8670d81ec27f0173d472d1507009b981493a997e9c7eeb8afaeb9a7fb701110ef8f90b90e6f462156675032446b4d1f443410c8195a923536a8ceee84e31d524

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.2.9E)
+    hot-glue (0.3.5)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1, <= 7.0.0)

data/lib/generators/hot_glue/install_generator.rb

@@ -52,85 +52,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\" ] "
-        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() ] "
+      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
-        File.write("app/javascript/packs/application.js", app_js_contents)
-
+      rescue StandardError => e
+        puts "WARNING: error writing to app/javascript/packs/application.js --- #{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
 
-      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
+      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 ! 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'`  "
+        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("spec/rails_helper.rb", rails_helper_contents)
+
+      rescue StandardError => e
+        puts "WARNING: error writing to spec/rails_helper --- #{e.message}"
       end
-      File.write("spec/rails_helper.rb", rails_helper_contents)
 
 
-      application_layout_contents = File.read("app/views/layouts/application.html.erb")
+      begin
+        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' %>`  "
+        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 @layout == "hotglue"
-        theme_location = "themes/hotglue_scaffold_#{@theme}.scss"
-        theme_file = "hotglue_scaffold_#{@theme}.scss"
+      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}"
+          copy_file theme_location, "#{'spec/dummy/' if Rails.env.test?}app/assets/stylesheets/#{theme_file}"
 
-        application_scss = File.read("app/assets/stylesheets/application.scss")
+          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}' "
+          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
 
 
 
-      if !File.exists?("config/hot_glue.yml")
+      begin
 
-        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)
+        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

@@ -261,7 +261,7 @@ module  HotGlue
   <% end %>
 </div>
 "        when :enum
-                                                                                                         "<div class='#{col_identifer}'>
+"<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
   <% if #{singular}.#{col}.nil? %>
       <span class='alert-danger'>MISSING</span>
   <% else %>

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -796,7 +796,7 @@ module HotGlue
     def controller_magic_button_update_actions
       @magic_buttons.collect{ |magic_button|
         "    @#{singular}.#{magic_button}! if #{singular}_params[:#{magic_button}]"
-        }.join("\n")
+        }.join("\n") + "\n"
     end
 
     def controller_update_params_tap_away_magic_buttons

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

@@ -2,6 +2,7 @@
 
 <% if @downnest_children.any? %>
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
+
   <% @downnest_children.each do |downnest| %>
   <div class="<%= @col_identifier %> scaffold-downnest" style="flex-basis: <%= each_downnest_width %>%" >
   <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest %>/list", locals: {
@@ -12,7 +13,7 @@
   <% end %>
 <% end %>
 
-<div class="<%= @col_identifier %> scaffold-line-buttons" style="flex-basis: 150px;">
+<div class="<%= @col_identifier %> scaffold-line-buttons" style="flex-basis: <%= (100 - (column_width * @columns.count)).floor %>%;">
   <% if destroy_action %>
     <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), html: {style: "display: inline-block;"}, method: :delete do |f| %>
       <\%= f.submit "Delete".html_safe, data: <%= delete_confirmation_syntax  %>, class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.3.5'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,7 +174,7 @@ post_install_message: |
   ---------------------------------------------
   Welcome to Hot Glue - A Scaffold Building Companion for Hotwire + Turbo-Rails
 
-  To purchase a license, please visit https://heliosdev.shop/hot-glue-licens
+  To purchase a license, please visit https://heliosdev.shop/hot-glue-license
   ---------------------------------------------
 rdoc_options: []
 require_paths: