brick 1.0.41 → 1.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4455ebfde80fe8a4bd51f19438171abae2614e0740adba98ab39184952843a01
-  data.tar.gz: d5157748c37564156fc2f823cc3c4753b536491aa2cf81175683c8241fb2a2b9
+  metadata.gz: a385c606282392cbefea1eaa045dc6a023bd05f56044013bc3835ef06a630b87
+  data.tar.gz: 261e21a2eb02ac1b199c831e1bba5eeec3add7b5faf0b2567fbb94a3252d817f
 SHA512:
-  metadata.gz: 2a649c78c3e597004b36d6c33f1cd812a712fcfd561dfe94994de28e489de81508f9fea30b0896b4447c4ce0ffd0877fb8c5d7e20a34011212fd797a3cbd02ca
-  data.tar.gz: 58ecdc4acb12abb77169a8fda8cb8146fceaedeacdf77f1cec992008f98b05412e3a9e2f5b6a9721880caa710ba94792a187d3587248eea4d9946d309c91be56
+  metadata.gz: 686a6ad73671511c36c6871e86fd6d02f7b8b48b2e1bacb033ec5348a85cedfc1c6848c92293e4144c0ca95ab79888c5993dcdbb7f440d93265a6c65b5c74a6b
+  data.tar.gz: 04e0cb25404beb9fead5d07ff3c76066bc23d097fb2a01c53b689737e1a5d70cfef94b432b89f45f61497074171bb171fae0064aef970c2c025f3ce05de23557

data/lib/brick/extensions.rb

@@ -905,10 +905,8 @@ class Object
         if plural_class_name == 'BrickGem'
           self.define_method :orphans do
             instance_variable_set(:@orphans, ::Brick.find_orphans(::Brick.set_db_schema(params)))
-            puts "BrickGemController #{action_name} #{params.inspect}"
-            # render inline: 'Brick gem!'
           end
-          return [new_controller_class, code + ' # BrickGem controller!']
+          return [new_controller_class, code + ' # BrickGem controller']
         end
 
         unless (is_swagger = plural_class_name == 'BrickSwagger') # && request.format == :json)
@@ -1061,10 +1059,11 @@ class Object
           if is_need_params
             code << "private\n"
             code << "  def #{params_name}\n"
-            code << "    params.require(:#{singular_table_name}).permit(#{model.columns_hash.keys.map { |c| c.to_sym.inspect }.join(', ')})\n"
+            code << "    params.require(:#{require_name = model.name.underscore.tr('/', '_')
+                             }).permit(#{model.columns_hash.keys.map { |c| c.to_sym.inspect }.join(', ')})\n"
             code << "  end\n"
             self.define_method(params_name) do
-              params.require(singular_table_name.to_sym).permit(model.columns_hash.keys)
+              params.require(require_name.to_sym).permit(model.columns_hash.keys)
             end
             private params_name
             # Get column names for params from relations[model.table_name][:cols].keys

data/lib/brick/frameworks/rails/engine.rb

@@ -112,7 +112,8 @@ module Brick
                               else
                                 hm_assoc.foreign_key
                               end
-                  if args.first == 'index'
+                  case args.first
+                  when 'index'
                     hms_columns << if hm_assoc.macro == :has_many
                                      set_ct = if skip_klass_hms.key?(assoc_name.to_sym)
                                                 'nil'
@@ -124,16 +125,16 @@ module Brick
                                      if hm_fk_name
 "<%= ct = #{set_ct}
      link_to \"#\{ct || 'View'\} #{assoc_name}\", #{hm_assoc.klass.name.underscore.tr('/', '_').pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)} }) unless ct&.zero? %>\n"
-                                     else
+                                     else # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
 "#{assoc_name}\n"
                                      end
                                    else # has_one
 "<%= obj = #{obj_name}.#{hm.first}; link_to(obj.brick_descrip, obj) if obj %>\n"
                                    end
-                  elsif args.first == 'show'
+                  when 'show', 'update'
                     hm_stuff << if hm_fk_name
                                   "<%= link_to '#{assoc_name}', #{hm_assoc.klass.name.underscore.tr('/', '_').pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
-                                else
+                                else # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
                                   assoc_name
                                 end
                   end
@@ -213,6 +214,9 @@ table tbody tr.active-row {
   color: #009879;
 }
 
+td.val {
+  display: block;
+}
 a.show-arrow {
   font-size: 1.5em;
   text-decoration: none;
@@ -226,11 +230,27 @@ a.big-arrow {
   overflow: hidden;
 }
 .wide-input input[type=text] {
-  width: 100%;
+  display: inline-block;
+  width: 90%;
 }
 .dimmed {
   background-color: #C0C0C0;
 }
+
+#revertTemplate {
+  display: none;
+}
+svg.revert {
+  display: none;
+  margin-left: 0.25em;
+}
+.wide-input > svg.revert {
+  float: right;
+}
+input+svg.revert {
+  top: 0.5em;
+}
+
 input[type=submit] {
   background-color: #004998;
   color: #FFF;
@@ -239,7 +259,10 @@ input[type=submit] {
   text-align: right;
 }
 </style>
-<% def is_bcrypt?(val)
+<%
+is_includes_dates = nil
+
+def is_bcrypt?(val)
   val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
 end
 def hide_bcrypt(val, max_len = 200)
@@ -328,7 +351,7 @@ function changeout(href, param, value, trimAfter) {
     var pathParts = hrefParts[hrefParts.length - 1].split(\"/\");
     if (value === undefined)
       // A couple possibilities if it's namespaced, starting with two parts in the path -- and then try just one
-      return [pathParts.slice(1, 3).join('/'), pathParts.slice(1, 2)];
+      return [pathParts.slice(1, 3).join('/'), pathParts.slice(1, 2)[0]];
     else
       return hrefParts[0] + \"://\" + pathParts[0] + \"/\" + value;
   }
@@ -478,7 +501,7 @@ if (headerTop) {
                          end
 # %%% Instead of our current "for Janet Leverling (Employee)" kind of link we previously had this code that did a "where x = 123" thing:
 #   (where <%= @_brick_params.each_with_object([]) { |v, s| s << \"#\{v.first\} = #\{v.last.inspect\}\" }.join(', ') %>)
-"#{css}
++"#{css}
 <p style=\"color: green\"><%= notice %></p>#{"
 <select id=\"schema\">#{schema_options}</select>" if ::Brick.config.schema_behavior[:multitenant] && ::Brick.db_schemas.length > 1}
 <select id=\"tbl\">#{table_options}</select>
@@ -504,8 +527,7 @@ if (headerTop) {
   <thead><tr>#{'<th></th>' if pk.present?}<%
      col_order = []
      @#{table_name}.columns.each do |col|
-       col_name = col.name
-       next if (#{(pk || []).inspect}.include?(col_name) && col.type == :integer && !bts.key?(col_name)) ||
+       next if (#{(pk || []).inspect}.include?(col_name = col.name) && col.type == :integer && !bts.key?(col_name)) ||
                ::Brick.config.metadata_columns.include?(col_name) || poly_cols.include?(col_name)
 
        col_order << col_name
@@ -518,12 +540,12 @@ if (headerTop) {
        else %><%=
          col_name %><%
        end
-  %></th><%
+    %></th><%
      end
      # Consider getting the name from the association -- h.first.name -- if a more \"friendly\" alias should be used for a screwy table name
   %>#{hms_headers.map do |h|
         if h.first.options[:through] && !h.first.through_reflection
-    "<th>#{h[1]} #{h[2]} %></th>"
+    "<th>#{h[1]} #{h[2]} %></th>" # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
         else
     "<th>#{h[1]} <%= link_to('#{h[2]}', #{h.first.klass.name.underscore.tr('/', '_').pluralize}_path) %></th>"
         end
@@ -569,7 +591,7 @@ if (headerTop) {
 #{script}"
                        when 'orphans'
                          if is_orphans
-"#{css}
++"#{css}
 <p style=\"color: green\"><%= notice %></p>#{"
 <select id=\"schema\">#{schema_options}</select>" if ::Brick.config.schema_behavior[:multitenant] && ::Brick.db_schemas.length > 1}
 <select id=\"tbl\">#{table_options}</select>
@@ -584,7 +606,14 @@ if (headerTop) {
                          end
 
                        when 'show', 'update'
-"#{css}
++"#{css}
+
+<svg id=\"revertTemplate\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"
+  width=\"32px\" height=\"32px\" viewBox=\"0 0 512 512\" xml:space=\"preserve\">
+<path id=\"revertPath\" fill=\"#2020A0\" d=\"M271.844,119.641c-78.531,0-148.031,37.875-191.813,96.188l-80.172-80.188v256h256l-87.094-87.094
+  c23.141-70.188,89.141-120.906,167.063-120.906c97.25,0,176,78.813,176,176C511.828,227.078,404.391,119.641,271.844,119.641z\" />
+</svg>
+
 <p style=\"color: green\"><%= notice %></p>#{"
 <select id=\"schema\">#{schema_options}</select>" if ::Brick.config.schema_behavior[:multitenant] && ::Brick.db_schemas.length > 1}
 <select id=\"tbl\">#{table_options}</select>
@@ -642,31 +671,39 @@ end
       <%= k %>
     <% end %>
     </th>
-    <td>
-    <% if bt
+    <td class=\"val\">
+    <% dt_pickers = { datetime: 'datetimepicker', timestamp: 'datetimepicker', time: 'timepicker', date: 'datepicker' }
+    if bt
       html_options = { prompt: \"Select #\{bt_name\}\" }
       html_options[:class] = 'dimmed' unless val %>
       <%= f.select k.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options %>
       <%= if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
             link_to('⇛', send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' })
           elsif val
-            \"Orphaned ID: #\{val}\"
-          end %>
-    <% else case #{model_name}.column_for_attribute(k).type
+            \"<span>Orphaned ID: #\{val}</span>\".html_safe
+          end %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
+    <% else case (col_type = #{model_name}.column_for_attribute(k).type)
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly? %>
           <%= hide_bcrypt(val, 1000) %>
         <% else %>
-          <div class=\"wide-input\"><%= f.text_field k.to_sym %></div>
+          <div class=\"wide-input\"><%= f.text_field k.to_sym %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg></div>
         <% end %>
       <% when :boolean %>
-        <%= f.check_box k.to_sym %>
-      <% when :integer, :decimal, :float, :date, :datetime, :time, :timestamp
+        <%= f.check_box k.to_sym %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
+      <% when :integer, :decimal, :float
          # What happens when keys are UUID?
          # Postgres naturally uses the +uuid_generate_v4()+ function from the uuid-ossp extension
          # If it's not yet enabled then:  enable_extension 'uuid-ossp'
          # ActiveUUID gem created a new :uuid type %>
-        <%= val %>
+        <%= if col_type == :integer
+              f.text_field k.to_sym, { pattern: '\\d*', class: 'check-validity' }
+            else
+              f.number_field k.to_sym
+            end %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
+      <% when *dt_pickers.keys
+           is_includes_dates = true %>
+        <%= f.text_field k.to_sym, { class: dt_pickers[col_type] } %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
       <% when :binary, :primary_key %>
       <% end %>
     <% end %>
@@ -682,6 +719,7 @@ end
   <% end %>
 
   #{hms_headers.each_with_object(+'') do |hm, s|
+    # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
     next if hm.first.options[:through] && !hm.first.through_reflection
 
     if (pk = hm.first.klass.primary_key)
@@ -707,6 +745,61 @@ end
 #{script}"
 
                        end
+              inline << "
+<% if is_includes_dates %>
+<link rel=\"stylesheet\" href=\"https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css\">
+<style>
+.flatpickr-calendar {
+  background: #A0FFA0;
+}
+</style>
+<script src=\"https://cdn.jsdelivr.net/npm/flatpickr\"></script>
+<script>
+flatpickr(\".datepicker\");
+flatpickr(\".datetimepicker\", {enableTime: true});
+</script>
+<% end %>
+<script>
+document.querySelectorAll(\"input, select\").forEach(function (inp) {
+  var origVal = getInpVal(),
+      prevVal = origVal;
+  var revert;
+  if ((revert = ((inp.tagName === \"SELECT\" && inp.nextElementSibling.nextElementSibling) ||
+       inp.nextElementSibling ||
+       inp.parentElement.nextElementSibling)) && revert.tagName.toLowerCase() === \"svg\")
+    revert.addEventListener(\"click\", function (e) {
+      if (inp.type === \"checkbox\")
+        inp.checked = origVal;
+      else
+        inp.value = origVal;
+        revert.style.display = \"none\";
+        if (!inp._flatpickr) inp.focus();
+    });
+  inp.addEventListener(inp.type === \"checkbox\" ? \"change\" : \"input\", function (e) {
+    if(inp.className.split(\" \").indexOf(\"check-validity\") > 0) {
+      if (inp.checkValidity()) {
+        prevVal = getInpVal();
+      } else {
+        inp.value = prevVal;
+      }
+    } else {
+      // If this is the result of changing an hour or minute, keep the calendar open.
+      // And if it was the result of selecting a date, the calendar can now close.
+      if (inp._flatpickr &&
+           // Test only for changes in the date portion of a date or datetime
+           ((giv = getInpVal()) && giv.split(' ')[0]) !== (prevVal && prevVal.split(' ')[0])
+         )
+        inp._flatpickr.close();
+      prevVal = getInpVal();
+    }
+    // Show or hide the revert button
+    if (revert) revert.style.display = getInpVal() === origVal ? \"none\" : \"inline-block\";
+  });
+  function getInpVal() {
+    return inp.type === \"checkbox\" ? inp.checked : inp.value;
+  }
+});
+</script>"
               # As if it were an inline template (see #determine_template in actionview-5.2.6.2/lib/action_view/renderer/template_renderer.rb)
               keys = options.has_key?(:locals) ? options[:locals].keys : []
               handler = ActionView::Template.handler_for_extension(options[:type] || 'erb')

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 41
+    TINY = 42
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.41
+  version: 1.0.42
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2022-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord