hot-glue 0.6.3 → 0.6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54b2a13a1fb9740be4ca14f108d98b72d8f1250b6131389c5e1d2130f07578cb
-  data.tar.gz: 15010c5e7fb34e35503b5a43aa563159d52f19c0b36f690ff03d67b7f1468060
+  metadata.gz: 76d714abff8aa0f8fd8f763d80d281bfad48b73f22264721a65aa8c4113895cd
+  data.tar.gz: c86b9c53e75cb794a9798ed3b112358c8ee6af2928c0d435486f2988a6fc5e38
 SHA512:
-  metadata.gz: 7b4c9a3e48ea19199f95314a4f0bbff28ca7dfd5635c8ee34e3e2304944ad227d31cb359db1d7c4200f75336ebdb20133cfdb3c762cbe034590630e6d3051a0a
-  data.tar.gz: c6c26412000d4bfa3ee27571aa430a8cf7b1c6dc454c55254a618bd312a14f754088ddb2dd77cf485dd69f433d06fe985a6ba34242f3df47607f4a3955703653
+  metadata.gz: d794abf688a43ccd316547c35586938d6963c61e1194df2fd02efd434ab964f77f8eb5fba4f85a02f3d31ece2ad05a2282c1e31d07576048a3c4b88dbe1b62c3
+  data.tar.gz: f1ebd911e9da38b7631ee357a1863ed7706d4cd016ce665c70bca088ba6d537bc3e0264ecd64c0e957ca8973766d91d8fd24e76f4dc5739911859813604ea3b0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.2)
+    hot-glue (0.6.3.2)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -139,14 +139,14 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.4.7)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.5.8)
     nokogiri (1.13.9)

data/README.md

@@ -1606,7 +1606,11 @@ These automatic pickups for partials are detected at buildtime. This means that
 
 # VERSION HISTORY
 
-#### D2024-01-15 - v0.6.3
+#### 2024-01-16 - v0.6.3.1
+Adds support for boolean modified datetime search; now, when using a modify= to turn a datetime into a boolean, the search box behaves appropriately and shows a 3-way radio picker: all, falsy, truthy.
+(Only implemented for datetime)
+
+#### 2024-01-15 - v0.6.3
 
 ## Set Searching
 

data/app/helpers/hot_glue/controller_helper.rb

@@ -201,8 +201,16 @@ module HotGlue
     end
 
     def boolean_query_constructor(field, search)
-      unless search.blank?
-        ["#{field} = ?", search]
+      unless search == "-1"
+        ["#{field} IS #{search ? 'TRUE' : 'FALSE'}"]
+      else
+        nil
+      end
+    end
+
+    def boolean_modified_datetime_constructor(field,search)
+      unless search == '-1'
+        ["#{field} #{search == '0' ? 'IS NULL' : 'IS NOT NULL'}"]
       else
         nil
       end

data/lib/generators/hot_glue/fields/boolean_field.rb

@@ -75,6 +75,14 @@ class BooleanField < Field
     end
   end
 
+  def truthy_value
+    modify_as[:binary][:truthy] || 'Yes'
+  end
+
+  def falsy_value
+    modify_as[:binary][:falsy] || 'No'
+  end
+
   def label_class
     super + " form-check-label"
   end
@@ -82,26 +90,21 @@ class BooleanField < Field
 
 
   def search_field_output
-    "  <%= f.radio_button('q[0][#{name}_match]', '-1', checked: @q[\'0\']['#{name}_match']==-1  ? '' : 'checked', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
-      "  <%= f.label('q[0][#{name}_match]', value: '-1', for: 'q[0][#{name}_match]_-1'  ) %>\n" +
-
-      "  <%= f.radio_button('q[0][#{name}_match]', '0', checked: @q[\'0\']['#{name}_match']==0 ? '' : 'checked', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
-      "  <%= f.label('q[0][#{name}_match]_0', value: '#{modify_binary? && modify_as[:binary][:falsy] || 'No'}', for: 'q[0][#{name}_match]_0') %>\n" +
-      " <br /> <%= f.radio_button('q[0][#{name}_match]', '1',  checked: @q[\'0\']['#{name}_match']==1  ? 'checked' : '' , class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
-      "  <%= f.label('q[0][#{name}_match]_1', value: '#{modify_binary? && modify_as[:binary][:truthy] || 'Yes'}', for: 'q[0][#{name}_match]_1') %>\n"
-
-
-    # "<%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['contains', 'contains'], ['is exactly', 'is_exactly'], ['starts with', 'starts_with'], ['ends with', 'ends_with']], @q[\'0\']['#{name}_match'] ), {} , { class: 'form-control match' } %>"+
-    #   "<%= f.text_field 'q[0][#{name}_search]', value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 40, class: 'form-control', type: 'text' %>"
+    "  <%= f.radio_button('q[0][#{name}_match]', '-1', checked: @q[\'0\'][:#{name}_match]=='-1'  ? 'checked' : '', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('All', value: '-1', for: 'q[0][#{name}_match]_-1'  ) %>\n" +
+      "  <%= f.radio_button('q[0][#{name}_match]', '0', checked: @q[\'0\'][:#{name}_match]=='0' ? 'checked' : '', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('#{falsy_value}', value: '0', for: 'q[0][#{name}_match]_0') %>\n" +
+      " <br /> <%= f.radio_button('q[0][#{name}_match]', '1',  checked: @q[\'0\'][:#{name}_match]=='1'  ? 'checked' : '' , class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('#{truthy_value}', value: '1', for: 'q[0][#{name}_match]_1') %>\n"
   end
 
 
   def where_query_statement
-    ".where('#{name} ILIKE ?', #{name}_query)"
+    ".where(#{name}_query)"
   end
 
   def load_all_query_statement
-    "#{name}_query = boolean_query_constructor(@q['0'][:#{name}_match], @q['0'][:#{name}_search])"
+    "#{name}_query = boolean_query_constructor(:#{name}, @q['0'][:#{name}_match])"
   end
 
   # def code_to_reset_match_if_search_is_blank

data/lib/generators/hot_glue/fields/date_time_field.rb

@@ -50,7 +50,9 @@ class DateTimeField < Field
   end
 
   def search_field_output
-    "      <div data-controller='date-range-picker' >"+
+    if !modify_binary?
+
+      "      <div data-controller='date-range-picker' >"+
       "\n        <%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['is on', 'is_on'], " +
       "\n         ['is between', 'is_between'], ['is on or after', 'is_on_or_after'], " +
       "\n         ['is before or on', 'is_before_or_on'], ['not on', 'not_on']], @q[\'0\']['#{name}_match'] ), {} ," +
@@ -58,14 +60,27 @@ class DateTimeField < Field
       "\n        <%= datetime_local_field 'q[0]', '#{name}_search_start', {value: @q[\'0\'][:#{name}_search_start], autocomplete: 'off', size: 40, class: 'form-control', placeholder: 'start', 'data-date-range-picker-target': 'start' } %>" +
       "\n        <%= datetime_local_field 'q[0]', '#{name}_search_end', {value: @q[\'0\'][:#{name}_search_end], autocomplete: 'off', size: 40, class: 'form-control', placeholder: 'end' , 'data-date-range-picker-target': 'end' } %>" +
       "\n      </div>"
+    else
+      "  <%= f.radio_button('q[0][#{name}_match]', '-1', checked: @q[\'0\'][:#{name}_match]=='-1' ? 'checked' : '', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('All', value: '-1', for: 'q[0][#{name}_match]_-1'  ) %>\n" +
+      "  <br /><%= f.radio_button('q[0][#{name}_match]', '0', checked: @q[\'0\'][:#{name}_match]=='0' ? 'checked' : '', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('#{modify_as[:binary][:falsy]}', value: '0', for: 'q[0][#{name}_match]_0') %>\n" +
+      "  <br /><%= f.radio_button('q[0][#{name}_match]', '1',  checked: @q[\'0\'][:#{name}_match]=='1' ? 'checked' : '', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('#{modify_as[:binary][:truthy]}', value: '1', for: 'q[0][#{name}_match]_1') %>\n" +
+        "<br />"
+    end
   end
 
 
   def where_query_statement
-    ".where(*#{name}_query)"
+    ".where(#{name}_query)"
   end
 
   def load_all_query_statement
-    "#{name}_query = date_query_constructor(:#{name}, @q['0'][:#{name}_match], @q['0'][:#{name}_search_start], @q['0'][:#{name}_search_end])"
+    if !modify_binary?
+      "#{name}_query = date_query_constructor(:#{name}, @q['0'][:#{name}_match], @q['0'][:#{name}_search_start], @q['0'][:#{name}_search_end])"
+    else
+      "#{name}_query = boolean_modified_datetime_constructor(:#{name}, @q['0'][:#{name}_match])"
+    end
   end
 end

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

@@ -92,26 +92,30 @@ module  HotGlue
       columns = layout_object[:columns][:container]
       column_classes = layout_strategy.column_classes_for_form_fields
 
-
       res =+ "<\%= form_with url: #{form_path}, method: :get, html: {'data-turbo-action': 'advance', 'data-controller': 'search-form'} do |f| %>"
       res << "<div class=\"#{@layout_strategy.row_classes} search--#{@plural}\">"
 
       res << columns.map{ |column|
-        "  <div class='#{column_classes} search-cell--#{singular}--#{column.join("-")}' >" +
-
-          column.map { |col|
+        cols_result = column.map { |col|
+          if @search_fields.collect(&:to_sym).include?(col)
             label_class = columns_map[col].label_class
             label_for = columns_map[col].label_for
             the_label = "\n<label class='#{label_class}' for='search-#{label_for}'>#{col.to_s.humanize}</label>"
             search_field_result =  columns_map[col].search_field_output
 
             add_spaces_each_line( "\n  <span class='' >\n" +
-             add_spaces_each_line( (form_labels_position == 'before' ? the_label || "" : "") +
-                                     +  " <br />\n" + search_field_result +
-                                     (form_labels_position == 'after' ? the_label : "")   , 4) +
-             "\n  </span>\n  <br /></div>", 2)
-          }.join("\n")
+                                    add_spaces_each_line( (form_labels_position == 'before' ? the_label || "" : "") +
+                                                            +  " <br />\n" + search_field_result +
+                                                            (form_labels_position == 'after' ? the_label : "")   , 4) +
+                                    "\n  </span>\n  <br />", 2)
+          end
+        }.compact.join("\n")
+
+        "  <div class='#{column_classes} search-cell--#{singular}--#{column.join("-")}' >" +
+          cols_result + "</div>"
+
       }.join("\n")
+      res << "</div>"
       res << "<div class='#{column_classes}'>"
       if @search_clear_button
         res << "<\%= f.button \"Clear\", name: nil, 'data-search-form-target': 'clearButton', class: 'btn btn-sm btn-secondary' %>"

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -513,6 +513,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @search = options['search']
     if @search == 'set'
       @search_fields = options['search_fields'].split(',') || @columns
+
       # within the set search we will take out any fields on the query list
       # or the field
       @search_query_fields = options['search_query_fields'].split(',') || []
@@ -1454,7 +1455,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     end
 
     if pundit
-      res << "@#{ plural_name } = policy_scope(#{ object_scope }).page(params[:page])#{ n_plus_one_includes }#{ ".per(per)" if @paginate_per_page_selector }"
+      res << "    @#{ plural_name } = policy_scope(#{ object_scope }).page(params[:page])#{ n_plus_one_includes }#{ ".per(per)" if @paginate_per_page_selector }"
     else
       if !@self_auth
         res << spaces(4) + "@#{ plural_name } = #{ object_scope.gsub("@",'') }#{ n_plus_one_includes }.page(params[:page])#{ ".per(per)" if @paginate_per_page_selector }"
@@ -1470,14 +1471,16 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         res << "@#{ plural_name } = #{ class_name }.all"
       else
         res << "@#{ plural_name } = #{ class_name }.where(id: #{ auth_object.gsub("@",'') }.id)#{ n_plus_one_includes }"
-        if @search_fields
-          res << @search_fields.collect{ |field|
-            @columns_map[field.to_sym].where_query_statement
-          }.join("\n")
-        end
+
         res << ".page(params[:page])#{ ".per(per)" if @paginate_per_page_selector }"
       end
     end
+    res << "\n"
+    if @search_fields
+      res << @search_fields.collect{ |field|
+        spaces(4) + "@#{plural_name} = @#{plural_name}" + @columns_map[field.to_sym].where_query_statement + " if #{field}_query"
+      }.join("\n")
+    end
     res
   end
 

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

@@ -77,7 +77,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
   def index <% if @search == "set" %>
-    @q = params[:q] ||  <%= {"0" => @search_fields.collect{|foo| {"#{foo}_match".to_sym => "", "#{foo}_search".to_sym => ""}}.reduce({}, :merge)  } %> <% end %><% if @search_fields %>
+    @q = params[:q] ||  <%= {"0" => @search_fields.collect{|foo|
+    {"#{foo}_match".to_sym => ((@columns_map[foo.to_sym].modify_as && @columns_map[foo.to_sym].modify_as[:binary]) ? "-1" : ""), "#{foo}_search".to_sym => ""}}.reduce({}, :merge)  } %> <% end %><% if @search_fields %>
 <%= @search_fields.collect{|field_name| @columns_map[field_name.to_sym].code_to_reset_match_if_search_is_blank}.compact.join("     \n") %><% end %>
     load_all_<%= plural %><% if @pundit %><% if @pundit %>
     authorize @<%= plural_name %><% end %>

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

@@ -42,7 +42,11 @@
       <% end %>
 
       <% if @search %>
+        <div class="card">
+          <div class="card-body">
         <%= @template_builder.search_input_area %>
+          </div>
+        </div>
       <% end %>
 
       <\% if <%= plural %>.empty? %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.3'
+    CURRENT = '0.6.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.3.2
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails