hot-glue 0.6.3.1 → 0.6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f159816e4a57c69d46d17fc9de3a1d01cfc5119f9a3533ad4b0b41889dd721
-  data.tar.gz: 6acd304e907a2b1518b9e243a04e5d937ab14a1bb4697b455480c2697eb5c031
+  metadata.gz: 76d714abff8aa0f8fd8f763d80d281bfad48b73f22264721a65aa8c4113895cd
+  data.tar.gz: c86b9c53e75cb794a9798ed3b112358c8ee6af2928c0d435486f2988a6fc5e38
 SHA512:
-  metadata.gz: d44841aef402fa110552d2418a3a266bde9ff5e4ad161c8974cf16c192300aa335db9bd7471a8d2dafe166ead5254f7914c20f0a26d4e125122f2d10e12fd547
-  data.tar.gz: b072b894e68efcd0dd88beeab4b09048fae8cd2f5591bf99e8ec4f94006b36ece8117344b20b371942c5dcf7c6aa17e26aea1991a4b3243f9fe0633b648cc195
+  metadata.gz: d794abf688a43ccd316547c35586938d6963c61e1194df2fd02efd434ab964f77f8eb5fba4f85a02f3d31ece2ad05a2282c1e31d07576048a3c4b88dbe1b62c3
+  data.tar.gz: f1ebd911e9da38b7631ee357a1863ed7706d4cd016ce665c70bca088ba6d537bc3e0264ecd64c0e957ca8973766d91d8fd24e76f4dc5739911859813604ea3b0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.3)
+    hot-glue (0.6.3.2)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)

data/app/helpers/hot_glue/controller_helper.rb

@@ -201,8 +201,8 @@ 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

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,22 +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.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('No', 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('Yes', 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

@@ -61,12 +61,12 @@ class DateTimeField < Field
       "\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.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('No', value: '0', for: 'q[0][#{name}_match]_0') %>\n" +
-      "  <%= 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('Yes', 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

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

@@ -96,25 +96,26 @@ module  HotGlue
       res << "<div class=\"#{@layout_strategy.row_classes} search--#{@plural}\">"
 
       res << columns.map{ |column|
-        if (column & @search_fields.collect(&:to_sym )).size > 0
-          "  <div class='#{column_classes} search-cell--#{singular}--#{column.join("-")}' >" +
-          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)
-            end
+        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 />", 2)
+          end
+        }.compact.join("\n")
+
+        "  <div class='#{column_classes} search-cell--#{singular}--#{column.join("-")}' >" +
+          cols_result + "</div>"
 
-          }.join("\n")
-        end
       }.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/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.1'
+    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.1
+  version: 0.6.3.2
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails