hot-glue 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd135c9fa591539fefc73e5a5c9bd546cb926d155a8ddc670fb58d4b22335c7e
-  data.tar.gz: fa992b698844c364585c50961fc44942664cfe0c031829ef6967d8ac00695062
+  metadata.gz: 6fbadc4071a06e16784758f6e235240633748cb4261c91fe54960311db08a24c
+  data.tar.gz: c9e8d53f5b94cf5890e4dc79648ee30e030b12c19ee9e1c70537aa2cc6a3a7a5
 SHA512:
-  metadata.gz: 037bdcb495e668e76763cd97a5b11781dbd5ab43c998f7ebcdc66e018586207185e95cb4707f1ade4a82391a2cd1c1fa537b9d7f299a87f531bcb461e41f3bc9
-  data.tar.gz: 2cb4bf43bf3ac0aa7ea9101255056982e410d12f15226eaceb4385919865082f700c3ab9aa2b45e1ce71f90b6e757e1663db3139b0673215246ba73ee5949cac
+  metadata.gz: 07a355f3810b4cccbbab4c868e08e028c92ca39f363e0b7051582b7dece1c40acb5a59f0ecb284cf8c7688a5bdc122f20660a5435a21988e41820412d948c360
+  data.tar.gz: 431b04bf111bb990c5853a4b5bf9f5aaee316ec91aac833a0232ba15c2da33be41b1800aeb164d174da9431ad663ce96b63ee8f80c238e69f565fbb80152cb7e

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.4.3)
+    hot-glue (0.4.5)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
-      rails (> 5.1, <= 7)
+      rails (> 5.1)
       sass-rails
 
 GEM
@@ -91,7 +91,7 @@ GEM
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
     ffaker (2.20.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (1.8.10)

data/{LICENCE → LICENSE}

@@ -1,3 +1,7 @@
+© 2022 Jason Fleetwood-Boldt. All Rights Reserved
+This software is 'fauxpen source,' which means you can think of it like 'free' as in speech but not 'free' as in beer....
+
+It is definitely 'free' as in Britney.
 
 FOR HOBBYISTS/STUDENTS/TEACHERS/INDIVIDUALS/NON-PROFITS:
 
@@ -7,14 +11,14 @@ Any users of this software agree to work to
 1) dismantle systemic racism
 2) seek justice for black, brown, transgender people, women, and
 3) work towards LGBTQIAA+ representation and inclusion
-
-FOR ALL OTHERS:
-
-TO PURCHASE A LICENSE PLEASE VISIT
-https://heliosdev.shop/hot-glue-license
-
 Organizations using this software agree to center the narratives of black, brown, transgender, and non-advantaged people in the world.
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+Just sign the pledge at https://heliosdev.shop/hot-glue-license and your email will be granted lifetime usage access.
+
+TO PURCHASE A COMMERCIAL USAGE LICENSE PLEASE VISIT
+https://heliosdev.shop/hot-glue-license
 
+OR JUST BUY THE TUTORIAL (all purchases come with lifetime license)
+https://jfb.teachable.com/p/hot-glue-in-depth-tutorial

data/README.md

@@ -576,30 +576,30 @@ IMPORTANT: By default, all fields that begin with an underscore (`_`) are automa
 
 I would recommend this for fields you want globally non-editable by users in your app. For example, a counter cache or other field set only by a backend mechanism.
 
-### `--stimulus_syntax=true` or `--stimulus_syntax=false`
-(for Rails <=6, default is false. For Rails 7, default is true.)
+### `--ujs_syntax=true` (Default is set automatically based on whether you have turbo-rails installed)
 
-Stimulus is only used for the delete button's confirmation dialog.
+If you are pre-Turbo (UJS), your delete buttons will come out like this:
+`data: {'confirm': 'Are you sure you want to delete....?'}`
 
-If you don't have stimulus syntax enabled, your delete buttons have this. This will confirm the delete with a simple alert if you have UJS enabled.
+If you are Turbo (Rails 7 or Rails 6 with proactive Turbo-Rails install), your delete button will be:
+`data: {'turbo-confirm': 'Are you sure you want to delete....?'}`
 
-```
-{confirm: 'Are you sure?'}
-```
+If you specify the flag, you preference will be used. If you leave the flag off, Hot Glue will detect the presence of Turbo-Rails in your app. 
 
-If you do have Stimulus syntax enabled, your delete buttons will look like so:
-```
-    ## TODO: fix this
-```
+**WARNING**: If you created a new Rails app since October 2021 and you have the yanked turbo-rails Gems on your local machine, 
+you will have some bugs with the delete buttons and also not be on the latest version of turbo-rails.
 
+Make sure to uninstall the yanked 7.1.0 and 7.1.1 from your machine with `gem uninstall turbo-rails`
+and also fix any Rails apps created since October 2021 by fixing the Gemfile. Details here:
+https://stackoverflow.com/questions/70671324/new-rails-7-turbo-app-doesnt-show-the-data-turbo-confirm-alert-messages-dont-f
 
 
-### `--magic-buttons` (Version 0.4.0 only)
+### `--magic-buttons` 
 If you pass a list of magic buttons (separated by commas), they will appear in the button area on your list.
 
-It will be assumed there will be cooresponding bang methods on your models.
+It will be assumed there will be corresponding bang methods on your models.
 
-The band methods can respond in one of four ways:
+The bang (`!`) methods can respond in one of four ways:
 
 • With true, in which case a generic success message will be shown in the flash notice (“Approved” or “Rejected” in this case)
 
@@ -711,8 +711,9 @@ Obviously, the created controller will always have this base controller as its s
 
 # VERSION HISTORY
 
+#### 2022-01-01 - v0.4.3 and 0.4.4 - adding fully email based license; no activation codes required
 
-#### 2022-12-30 - v0.4.2
+#### 2022-12-30 - v0.4.2 -- Smart layouts introduced
 
 #### 2021-12-15 - v0.4.1
 
@@ -720,7 +721,6 @@ Obviously, the created controller will always have this base controller as its s
 
 #### 2021-12-12 - v0.3.9 - Magic Buttons
 
-
 #### 2021-12-11 - v0.3.5 - Downnesting
 
 

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

@@ -3,13 +3,15 @@
 module HotGlue
   module Layout
     class Builder
-      attr_reader :include_setting, :downnest_children, :no_edit, :no_delete, :columns, :smart_layout
+      attr_reader :include_setting, :downnest_children, :buttons_width, :columns, :smart_layout
 
       def initialize(params)
         @include_setting = params[:include_setting]
         @downnest_children = params[:downnest_children]
-        @no_edit = params[:no_edit]
-        @no_delete = params[:no_delete]
+
+        @buttons_width = params[:buttons_width]
+
+        @no_buttons = @buttons_width == 0
         @columns = params[:columns]
         @smart_layout = params[:smart_layout]
       end
@@ -23,7 +25,7 @@ module HotGlue
           portals:  {
 
           },
-          buttons: { size: ''}
+          buttons: { size: @buttons_width}
         }
 
         downnest_children.each do |child|
@@ -32,9 +34,8 @@ module HotGlue
 
         # smart layout: 2 columns per field; 4 column for EACH downnested portals, 2 column for buttons
         how_many_downnest = downnest_children.size
-        button_column_size = (no_edit && no_delete) ? 0 : 2
 
-        bootstrap_columns = (12-button_column_size)
+        bootstrap_columns = (12-@buttons_width )
         bootstrap_columns = bootstrap_columns - (how_many_downnest*4)
         available_columns = (bootstrap_columns / 2).floor # bascially turns the 12-column grid into a 6-column grid
 
@@ -55,7 +56,7 @@ module HotGlue
 
           if columns.size > available_columns
             each_col_can_have = (columns.size.to_f / available_columns.to_f).round
-            # byebug
+
             layout_object[:columns][:container] = (0..available_columns-1).collect { |x|
               columns.slice(0+(x*each_col_can_have),each_col_can_have)
             }
@@ -71,6 +72,7 @@ module HotGlue
           layout_object[:columns][:container] = columns.collect{|col| [col]}
 
         else
+
           (0..available_columns-1).each do |int|
             layout_object[:columns][:container][int] = []
           end

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

@@ -15,11 +15,12 @@ module  HotGlue
       path_helper_args = args[0][:path_helper_args]
       singular = args[0][:singular]
       magic_buttons = args[0][:magic_buttons]
+      small_buttons = args[0][:small_buttons]
 
       magic_buttons.collect{ |button_name|
-        "<%= form_with model: #{singular}, url: #{path_helper_singular}(#{path_helper_args}) do |f| %>
+        "<%= form_with model: #{singular}, url: #{path_helper_singular}(#{path_helper_args}), html: {style: 'display: inline', , data: {turbo-confirm: 'Are you sure you want to #{button_name} this #{singular}?'}} do |f| %>
       <%= f.hidden_field :#{button_name}, value: \"#{button_name}\" %>
-    <%= f.submit '#{button_name.titleize}'.html_safe, disabled: (#{singular}.respond_to?(:#{button_name}able?) && ! #{singular}.#{button_name}able? ), 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: (#{singular}.respond_to?(:#{button_name}able?) && ! #{singular}.#{button_name}able? ), class: '#{singular}-button btn btn-primary #{"btn-sm" if small_buttons}' %>
     <% end %>"
       }.join("\n")
     end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -59,10 +59,12 @@ module HotGlue
     class_option :big_edit, type: :boolean, default: false
     class_option :show_only, type: :string, default: ""
 
-    class_option :stimulus_syntax, type: :boolean, default: nil # TODO: rename to ujs_syntax and default to false
+    class_option :ujs_syntax, type: :boolean, default: nil
 
     class_option :downnest, type: :string, default: nil
     class_option :magic_buttons, type: :string, default: nil
+    class_option :small_buttons, type: :boolean, default: nil
+
     class_option :display_list_after_update, type: :boolean, default: false
     class_option :smart_layout, type: :boolean, default: false
     class_option :markup, type: :string, default: nil # deprecated -- use in app config instead
@@ -218,6 +220,9 @@ module HotGlue
         @magic_buttons = options['magic_buttons'].split(',')
       end
 
+
+      @small_buttons = options['small_buttons'] || false
+
       @build_update_action = !@no_edit || !@magic_buttons.empty?
       # if the magic buttons are present, build the update action anyway
 
@@ -236,16 +241,23 @@ module HotGlue
         end
       end
 
+
+      @ujs_syntax = options['ujs_syntax']
+      if !@ujs_syntax
+        @ujs_syntax = !defined?(Turbo::Engine)
+        puts "You did not specify ujs_syntax and so I default it to #{@ujs_syntax}"
+      end
       @reference_name = HotGlue.derrive_reference_name(singular_class)
 
       identify_object_owner
       setup_fields
 
+      buttons_width = ((!@no_edit && 1) || 0) + ((!@no_delete && 1) || 0) + @magic_buttons.count
+
       builder = HotGlue::Layout::Builder.new({
                                               include_setting: options['include'],
                                               downnest_children: @downnest_children,
-                                              no_edit: @no_edit,
-                                              no_delete: @no_delete,
+                                              buttons_width: buttons_width,
                                               columns: @columns,
                                               smart_layout: @smart_layout
                                             })
@@ -617,7 +629,8 @@ module HotGlue
         path_helper_singular: path_helper_singular,
         path_helper_args: path_helper_args,
         singular: singular,
-        magic_buttons: @magic_buttons
+        magic_buttons: @magic_buttons,
+        small_buttons: @small_buttons
       )
     end
 
@@ -825,13 +838,13 @@ module HotGlue
      @template_builder.paginate(plural: plural)
     end
 
-    def delete_confirmation_syntax
-      if !@stimulus_syntax
-       "{confirm: 'Are you sure?'}"
-      else
-       "{controller: 'confirmable', 'confirm-message': \"Are you sure you want to delete \#{ #{@singular}.#{ display_class } } \", 'action': 'confirmation#confirm'}"
-      end
-    end
+    # def delete_confirmation_syntax
+    #   if !@stimulus_syntax
+    #    "{confirm: 'Are you sure?'}"
+    #   else
+    #    "{controller: 'confirmable', 'confirm-message': \"Are you sure you want to delete \#{ #{@singular}.#{ display_class } } \", 'action': 'confirmation#confirm'}"
+    #   end
+    # end
 
 
     def controller_magic_button_update_actions

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

@@ -22,7 +22,7 @@
 
       <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>
 
-      <div class=' scaffold-col-heading scaffold-col-heading-buttons<%= ' col-md-2' if @layout=="bootstrap" %>' <%= button_column_style %>>
+      <div class=' scaffold-col-heading scaffold-col-heading-buttons<%= " col-md-#{ @layout_object[:buttons][:size] }" if @layout=="bootstrap" %>' <%= button_column_style %>>
 
       </div>
     </div>

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

@@ -19,12 +19,12 @@
 <% end %>
 
 <% button_style = @layout == "hotglue" ? 'style="flex-basis: ' +  (100 - (column_width * @columns.count)).floor.to_s +  '%;"' : "" %>
-<div class="<%= @col_identifier %> scaffold-line-buttons <%= ' col-md-2' if @layout == "bootstrap" %>" <%= button_style %>>
+<div class="<%= @col_identifier %> scaffold-line-buttons <%= " col-md-#{ @layout_object[:buttons][:size] }" if @layout == "bootstrap" %>" <%= button_style %>>
   <%= magic_button_output %>
 
   <% 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" %>
+    <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), html: {data: {'<%= @ujs_syntax ? 'confirm' : 'turbo-confirm' %>': "Are you sure you want to delete #{ <%= @singular + "." + display_class %> }?"}, style: "display: inline-block;"}, method: :delete do |f| %>
+      <\%= f.submit "Delete".html_safe,  class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>
     <\% end %>
   <% end %>
 

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-01 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.1'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.1'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +78,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
-- LICENCE
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/config/manifest.js