hot-glue 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab4adde73436f151d09f4e21517d108adcfb47df5f6a0fd69153848fa695aeb
-  data.tar.gz: 8230d3d19dc1f0a4d731b0492f8ecf5d4a1dd17fb2a2ab9934c8c2884a67e000
+  metadata.gz: ea147399cbbc04e307d97c495a43e549b88bf99b44946a3392c0f0cf96d53f2d
+  data.tar.gz: 2d05eb14eaf6360b4df436ba453484a13abf9dc94c6ae472a205744aac10c50c
 SHA512:
-  metadata.gz: 5649e791538ab4401ff362bcab08809742b3000b2c6d59254d597737153ccbd9832137366af053936fcfcbfdaf6c5fa51904f81a86b762657ba14f7c8b67f35a
-  data.tar.gz: 8670d81ec27f0173d472d1507009b981493a997e9c7eeb8afaeb9a7fb701110ef8f90b90e6f462156675032446b4d1f443410c8195a923536a8ceee84e31d524
+  metadata.gz: 1e29fd08a71cbc94ac38c5502bd5436184100378206d24222c20320f62ec441dc8863972bdb7e8486b5f80e2859d4070cf4247da1b637d3132c1f188725c9503
+  data.tar.gz: e24788fc22a3ed4bb2e63f4ea982650b722e3c5cf34ed960bbe8fee4540cbaa3b3a843a315488e6c6797790757f42c6b5154cea395b7f0bbbd04cf02e747e1cb

data/lib/generators/hot_glue/install_generator.rb

@@ -29,12 +29,14 @@ module HotGlue
 
 
       print "(To purchase a license, please see https://heliosdev.shop/hot-glue-license) \n Please enter your license key: "
-      license_activation_key = STDIN.gets
+      license_activation_key = STDIN.gets.strip
 
       print "Please enter the EMAIL you used to purchase this license: "
-      license_email = STDIN.gets
+      license_email = STDIN.gets.strip
       app_name = Rails.application.class.module_parent_name
-      license_should_be = Digest::SHA1.hexdigest("HotGlueLicense--#{app_name}--#{license_email}")
+      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

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

@@ -168,17 +168,20 @@ module  HotGlue
       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 = (perc_width).floor
 
-      if @layout == "boostrap"
+      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
+
+
       columns.map { |col|
         type = eval("#{singular_class}.columns_hash['#{col}']").type
         limit = eval("#{singular_class}.columns_hash['#{col}']").limit
@@ -203,30 +206,30 @@ module  HotGlue
 
             display_column =  HotGlue.derrive_reference_name(assoc.class_name)
 
-            "<div class='#{col_identifer}' style='flex-basis: #{perc_width}%'>
+            "<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}'  style='flex-basis: #{perc_width}%'>
+            "<div class='#{col_identifer}'#{style_with_flex_basis}>
   <%= #{singular}.#{col}%></div>"
           end
         when :float
           width = (limit && limit < 40) ? limit : (40)
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'#{style_with_flex_basis}>
 <%= #{singular}.#{col}%></div>"
         when :string
           width = (limit && limit < 40) ? limit : (40)
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'#{style_with_flex_basis} >
   <%= #{singular}.#{col} %>
 </div>"
         when :text
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'#{style_with_flex_basis}>
   <%= #{singular}.#{col} %>
 </div>"
         when :datetime
 
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<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 %>
@@ -234,7 +237,7 @@ module  HotGlue
 <% end %>
 </div>"
         when :date
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% unless #{singular}.#{col}.nil? %>
     <%= #{singular}.#{col} %>
   <% else %>
@@ -242,7 +245,7 @@ module  HotGlue
   <% end %>
 </div>"
         when :time
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<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 %>
@@ -251,7 +254,7 @@ module  HotGlue
 </div>
 "
         when :boolean
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% if #{singular}.#{col}.nil? %>
       <span class='alert-danger'>MISSING</span>
   <% elsif #{singular}.#{col} %>
@@ -261,7 +264,7 @@ module  HotGlue
   <% end %>
 </div>
 "        when :enum
-"<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+"<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% if #{singular}.#{col}.nil? %>
       <span class='alert-danger'>MISSING</span>
   <% else %>
@@ -273,8 +276,4 @@ module  HotGlue
       }.join("\n")
     end
   end
-
-
-
-
 end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -724,7 +724,8 @@ module HotGlue
         columns: @columns,
         show_only: @show_only,
         singular_class: singular_class,
-        singular: singular
+        singular: singular,
+        layout: @layout
       )
     end
 

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

@@ -4,7 +4,8 @@
   <% 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 %>%" >
+<% downnest_style =  @layout == "hotglue" ? 'style="flex-basis: ' +  each_downnest_width + '%"' : "" %>
+  <div class="<%= @col_identifier %> scaffold-downnest" <%= downnest_style  %> >
   <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest %>/list", locals: {
     nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if nested_for}<% end %><%= @singular %>-#{<%= @singular %>.id}",
     <%= @singular %>: <%= @singular %><%= nest_assignments_operator(false, true) %>,
@@ -13,7 +14,8 @@
   <% end %>
 <% end %>
 
-<div class="<%= @col_identifier %> scaffold-line-buttons" style="flex-basis: <%= (100 - (column_width * @columns.count)).floor %>%;">
+<% button_style = @layout == "hotglue" ? 'style="flex-basis: ' +  (100 - (column_width * @columns.count)).floor +  '%;' : "" %>
+<div class="<%= @col_identifier %> scaffold-line-buttons" <%= button_style %>>
   <% 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.7'
+  VERSION = '0.3.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt