brick 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30eeeb5fb81003f790234885589b29f227b7f4f2d498accb07da5cd8ea425084
-  data.tar.gz: 1841386c2750c2aef744a7ee555b649e2fc0298367684d261faf64297b8430c0
+  metadata.gz: 7f1a45a5262526e69cf49f16773049eb348e3971bddf09ecf05927002a265019
+  data.tar.gz: e9566a423a19ab55d44522b44e8b4abfcc39e92335b6093fe782c6344644bbbe
 SHA512:
-  metadata.gz: 64c5747800aaa5469f2ff2b0be3ae5056fa383c6d246e7aff15b19eb4a588e15e72f5d1ecb384879b3b7f175cab28961fb4984e11d5994085b215f442d722389
-  data.tar.gz: ec3418092244d97b3006086aaf0484ee1ab4342cf2c16716239f7127c8e23056dc25e1714e51523bdb8f87fb6b88c322dabefb096fe7bf0b1f695568b636d4b8
+  metadata.gz: cb89dff96dccc7051bc854fe523b03f818255d81e4f2e2a65eb9808115e719b8bad98e38114f15ee79b32b1f035c95c364a74392948cd2e99f4030e6988e0217
+  data.tar.gz: cd5507fde2f1f23481696ab051d14f89e5e7e7d3fc2be97af947ff287313b7ada8ca7b4e3f9e0e54dc2ab7f14e7f39a3c18f78cf7fc995c58b3d60cf68487973

data/lib/brick/config.rb

@@ -66,12 +66,12 @@ module Brick
     end
 
     # Skip creating a has_many association for these
-    def skip_hms
-      @mutex.synchronize { @skip_hms }
+    def exclude_hms
+      @mutex.synchronize { @exclude_hms }
     end
 
-    def skip_hms=(skips)
-      @mutex.synchronize { @skip_hms = skips }
+    def exclude_hms=(skips)
+      @mutex.synchronize { @exclude_hms = skips }
     end
 
     # Associations to treat as a has_one

data/lib/brick/extensions.rb

@@ -629,7 +629,11 @@ module ActiveRecord::ConnectionHandling
       puts "\nClasses that can be built from views:"
       views.keys.each { |k| puts ActiveSupport::Inflector.singularize(k).camelize }
     end
-    # pp relations; nil
+    # Try to load the initializer pretty danged early
+    if File.exist?(brick_initialiser = Rails.root.join('config/initializers/brick.rb'))
+      load brick_initialiser
+      ::Brick.load_additional_references
+    end
 
     # relations.keys.each { |k| ActiveSupport::Inflector.singularize(k).camelize.constantize }
     # Layout table describes permissioned hierarchy throughout
@@ -708,7 +712,7 @@ module Brick
         # assoc_bt[:inverse_of] = primary_class.reflect_on_all_associations.find { |a| a.foreign_key == bt[1] }
       end
 
-      unless is_class || ::Brick.config.skip_hms&.any? { |skip| fk[0] == skip[0] && fk[1] == skip[1] && primary_table == skip[2] }
+      unless is_class || ::Brick.config.exclude_hms&.any? { |exclusion| fk[0] == exclusion[0] && fk[1] == exclusion[1] && primary_table == exclusion[2] }
         cnstr_name = "hm_#{cnstr_name}"
         if (assoc_hm = hms.fetch(cnstr_name, nil))
           assoc_hm[:fk] = assoc_hm[:fk].is_a?(String) ? [assoc_hm[:fk], fk[1]] : assoc_hm[:fk].concat(fk[1])

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

@@ -32,7 +32,7 @@ module Brick
         ::Brick.additional_references = app.config.brick.fetch(:additional_references, nil)
 
         # Skip creating a has_many association for these
-        ::Brick.skip_hms = app.config.brick.fetch(:skip_hms, nil)
+        ::Brick.exclude_hms = app.config.brick.fetch(:exclude_hms, nil)
 
         # Has one relationships
         ::Brick.has_ones = app.config.brick.fetch(:has_ones, nil)
@@ -76,33 +76,34 @@ module Brick
                 bts, hms = ::Brick.get_bts_and_hms(@_brick_model)
                 # Mark has_manys that go to an associative ("join") table so that they are skipped in the UI,
                 # as well as any possible polymorphic associations
-                skip_hms = {}
+                exclude_hms = {}
                 associatives = hms.each_with_object({}) do |hmt, s|
                   if (through = hmt.last.options[:through])
-                    skip_hms[through] = nil
+                    exclude_hms[through] = nil
                     s[hmt.first] = hms[through] # End up with a hash of HMT names pointing to join-table associations
                   elsif hmt.last.inverse_of.nil?
                     puts "SKIPPING #{hmt.last.name.inspect}"
                     # %%% If we don't do this then below associative.name will find that associative is nil
-                    skip_hms[hmt.last.name] = nil
+                    exclude_hms[hmt.last.name] = nil
                   end
                 end
 
                 schema_options = ::Brick.db_schemas.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
+                table_options = ::Brick.relations.keys.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
                 hms_columns = +'' # Used for 'index'
                 hms_headers = hms.each_with_object([]) do |hm, s|
-                  next if skip_hms.key?(hm.last.name)
+                  next if exclude_hms.key?((hm_assoc = hm.last).name)
 
                   if args.first == 'index'
-                    hm_fk_name = if hm.last.options[:through]
-                                   associative = associatives[hm.last.name]
+                    hm_fk_name = if hm_assoc.options[:through]
+                                   associative = associatives[hm_assoc.name]
                                    "'#{associative.name}.#{associative.foreign_key}'"
                                  else
-                                   hm.last.foreign_key
+                                   hm_assoc.foreign_key
                                  end
-                    hms_columns << if hm.last.macro == :has_many
+                    hms_columns << if hm_assoc.macro == :has_many
 "<td>
-  <%= link_to \"#\{#{obj_name}.#{hm.first}.count\} #{hm.first}\", #{hm.last.klass.name.underscore.pluralize}_path({ #{hm_fk_name}: #{obj_name}.#{pk} }) unless #{obj_name}.#{hm.first}.count.zero? %>
+  <%= link_to \"#\{#{obj_name}.#{hm.first}.count\} #{hm.first}\", #{hm_assoc.klass.name.underscore.pluralize}_path({ #{hm_fk_name}: #{obj_name}.#{pk} }) unless #{obj_name}.#{hm.first}.count.zero? %>
 </td>\n"
                                    else # has_one
 "<td>
@@ -110,7 +111,7 @@ module Brick
 </td>\n"
                                    end
                   end
-                  s << [hm.last, "H#{hm.last.macro == :has_one ? 'O' : 'M'}#{'T' if hm.last.options[:through]} #{hm.first}"]
+                  s << [hm_assoc, "H#{hm_assoc.macro == :has_one ? 'O' : 'M'}#{'T' if hm_assoc.options[:through]} #{hm.first}"]
                 end
 
                 css = "<style>
@@ -155,10 +156,20 @@ table tbody tr.active-row {
 }
 
 a.show-arrow {
+  font-size: 1.5em;
+  text-decoration: none;
+}
+a.big-arrow {
   font-size: 2.5em;
   text-decoration: none;
 }
-</style>"
+</style>
+<% def is_bcrypt?(val)
+  val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
+end
+def hide_bcrypt(val)
+  is_bcrypt?(val) ? '(hidden)' : val
+end %>"
 
                 script = "<script>
 var schemaSelect = document.getElementById(\"schema\");
@@ -173,8 +184,28 @@ if (schemaSelect) {
     location.href = changeout(location.href, \"_brick_schema\", this.value);
   });
 }
+
+var tblSelect = document.getElementById(\"tbl\");
+if (tblSelect) {
+  tblSelect.value = changeout(location.href);
+  tblSelect.addEventListener(\"change\", function () {
+    var lhr = changeout(location.href, null, this.value);
+    if (brickSchema)
+      lhr = changeout(lhr, \"_brick_schema\", schemaSelect.value);
+    location.href = lhr;
+  });
+}
+
 function changeout(href, param, value) {
   var hrefParts = href.split(\"?\");
+  if (param === undefined || param === null) {
+    hrefParts = hrefParts[0].split(\"://\");
+    var pathParts = hrefParts[hrefParts.length - 1].split(\"/\");
+    if (value === undefined)
+      return pathParts[1];
+    else
+      return hrefParts[0] + \"://\" + pathParts[0] + \"/\" + value;
+  }
   var params = hrefParts.length > 1 ? hrefParts[1].split(\"&\") : [];
   params = params.reduce(function (s, v) { var parts = v.split(\"=\"); s[parts[0]] = parts[1]; return s; }, {});
   if (value === undefined) return params[param];
@@ -188,6 +219,7 @@ function changeout(href, param, value) {
 "#{css}
 <p style=\"color: green\"><%= notice %></p>#{"
 <select id=\"schema\">#{schema_options}</select>" if ::Brick.db_schemas.length > 1}
+<select id=\"tbl\">#{table_options}</select>
 <h1>#{model_name.pluralize}</h1>
 <% if @_brick_params&.present? %><h3>where <%= @_brick_params.each_with_object([]) { |v, s| s << \"#\{v.first\} = #\{v.last.inspect\}\" }.join(', ') %></h3><% end %>
 <table id=\"#{table_name}\">
@@ -209,7 +241,7 @@ function changeout(href, param, value) {
   <tbody>
   <% @#{table_name}.each do |#{obj_name}| %>
   <tr>#{"
-    <td><%= link_to '⇛', #{obj_name}_path(#{obj_name}.#{pk}), { class: 'show-arrow' } %></td>" if pk }
+    <td><%= link_to '⇛', #{obj_name}_path(#{obj_name}.#{pk}), { class: 'big-arrow' } %></td>" if pk }
     <% #{obj_name}.attributes.each do |k, val| %>
       <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) %>
       <td>
@@ -218,9 +250,9 @@ function changeout(href, param, value) {
         # send(\"#\{bt_obj_class = bt[1].name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym))
         # Otherwise we get stuff like:
         # ActionView::Template::Error (undefined method `vehicle_path' for #<ActionView::Base:0x0000000033a888>) %>
-        <%= bt_obj = bt[1].find_by(bt.last => val); link_to(bt_obj.brick_descrip, send(\"#\{bt_obj_class = bt[1].name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym))) if bt_obj %>
+        <%= bt_obj = bt[1].find_by(bt[2] => val); link_to(bt_obj.brick_descrip, send(\"#\{bt_obj_class = bt[1].name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym))) if bt_obj %>
       <% else %>
-        <%= val %>
+        <%= hide_bcrypt(val) %>
       <% end %>
       </td>
     <% end %>
@@ -237,40 +269,51 @@ function changeout(href, param, value) {
   "#{css}
     <p style=\"color: green\"><%= notice %></p>#{"
     <select id=\"schema\">#{schema_options}</select>" if ::Brick.db_schemas.length > 1}
+    <select id=\"tbl\">#{table_options}</select>
     <h1>#{model_name}: <%= (obj = @#{obj_name}.first).brick_descrip %></h1>
     <%= link_to '(See all #{obj_name.pluralize})', #{table_name}_path %>
+  <%= form_for obj do |f| %>
   <table>
   <% bts = { #{bts.each_with_object([]) { |v, s| s << "#{v.first.inspect} => [#{v.last.first.inspect}, #{v.last[1].name}, #{v.last[1].primary_key.inspect}]"}.join(', ')} }
       @#{obj_name}.first.attributes.each do |k, val| %>
     <tr>
     <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) %>
     <th class=\"show-field\">
-    <% if (bt = bts[k]) %>
+    <% if (bt = bts[k])
+      # Add a final member in this array with descriptive options to be used in <select> drop-downs
+      # %%% Only do this if the user has permissions to edit this bt field
+      bt << bt[1].order(:#{pk}).map { |obj| [obj.brick_descrip, obj.#{pk}] } if bt.length < 4 %>
       BT <%= \"#\{bt.first\}-\" unless bt[1].name.underscore == bt.first.to_s %><%= bt[1].name %>
     <% else %>
       <%= k %>
     <% end %>
     </th>
     <td>
-    <% if (bt = bts[k]) %>
-      <%= bt_obj = bt[1].find_by(bt.last => val); link_to(bt_obj.brick_descrip, send(\"#\{bt_obj_class = bt[1].name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym))) if bt_obj %>
+    <% if (bt = bts[k]) # bt_obj.brick_descrip %>
+      <%= f.select k.to_sym, bt[3], {}, prompt: 'Select #{model_name}' %>
+      <%= bt_obj = bt[1].find_by(bt[2] => val); link_to('⇛', send(\"#\{bt_obj_class = bt[1].name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym)), { class: 'show-arrow' }) if bt_obj %>
+    <% elsif is_bcrypt?(val) %>
+      <%= hide_bcrypt(val) %>
     <% else %>
-      <%= val %>
+      <%= f.text_field k.to_sym %>
     <% end %>
     </td>
     </tr>
   <% end %>
   </table>
+  <% end %>
 
   #{hms_headers.map do |hm|
     next unless (pk = hm.first.klass.primary_key)
   "<table id=\"#{hm_name = hm.first.name.to_s}\">
     <tr><th>#{hm.last}</th></tr>
-    <% if (collection = @#{obj_name}.first.#{hm_name}).empty? %>
+    <% collection = @#{obj_name}.first.#{hm_name}
+    collection = collection.is_a?(ActiveRecord::Associations::CollectionProxy) ? collection.order(#{pk.inspect}) : [collection]
+    if collection.empty? %>
       <tr><td>(none)</td></tr>
     <% else %>
-      <% collection.order(#{pk.inspect}).uniq.each do |#{hm_singular_name = hm_name.singularize.underscore}| %>
-        <tr><td><%= link_to(#{hm_singular_name}.brick_descrip, #{hm_singular_name}_path(#{hm_singular_name}.#{pk})) %></td></tr>
+      <% collection.uniq.each do |#{hm_singular_name = hm_name.singularize.underscore}| %>
+        <tr><td><%= link_to(#{hm_singular_name}.brick_descrip, #{hm.first.klass.name.underscore}_path(#{hm_singular_name}.#{pk})) %></td></tr>
       <% end %>
     <% end %>
   </table>" end.join}
@@ -295,12 +338,9 @@ function changeout(href, param, value) {
           end
         end
 
-        # Additional references (virtual foreign keys)
-        if (ars = ::Brick.config.additional_references)
-          ars.each do |fk|
-            ::Brick._add_bt_and_hm(fk[0..2])
-          end
-        end
+        # Just in case it hadn't been done previously when we tried to load the brick initialiser,
+        # go make sure we've loaded additional references (virtual foreign keys).
+        ::Brick.load_additional_references
 
         # Find associative tables that can be set up for has_many :through
         ::Brick.relations.each do |_key, tbl|

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -208,12 +208,12 @@ module Brick
     # Skip creating a has_many association for these
     # (Uses the same exact three-part format as would define an additional_reference)
     # @api public
-    def skip_hms=(skips)
+    def exclude_hms=(skips)
       if skips
         skips = skips.call if skips.is_a?(Proc)
         skips = skips.to_a unless skips.is_a?(Array)
         skips = [skips] unless skips.empty? || skips.first.is_a?(Array)
-        Brick.config.skip_hms = skips
+        Brick.config.exclude_hms = skips
       end
     end
 
@@ -244,6 +244,18 @@ module Brick
       Brick.config.sti_namespace_prefixes = snp
     end
 
+    # Load additional references (virtual foreign keys)
+    # This is attempted early if a brick initialiser file is found, and then again as a failsafe at the end of our engine's initialisation
+    # %%% Maybe look for differences the second time 'round and just add new stuff instead of entirely deferring
+    def load_additional_references
+      return if @_additional_references_loaded
+
+      if (ars = ::Brick.config.additional_references)
+        ars.each { |fk| ::Brick._add_bt_and_hm(fk[0..2]) }
+        @_additional_references_loaded = true
+      end
+    end
+
 
     # Returns Brick's `::Gem::Version`, convenient for comparisons. This is
     # recommended over `::Brick::VERSION::STRING`.

data/lib/generators/brick/install_generator.rb

@@ -114,7 +114,7 @@ module Brick
 # # Skip creating a has_many association for these
 # # (Uses the same exact three-part format as would define an additional_reference)
 # # Say for instance that we didn't care to display the favourite colours that users have:
-# Brick.skip_hms = [['users', 'favourite_colour_id', 'colours']]
+# Brick.exclude_hms = [['users', 'favourite_colour_id', 'colours']]
 
 # # By default primary tables involved in a foreign key relationship will indicate a \"has_many\" relationship pointing
 # # back to the foreign table.  In order to represent a \"has_one\" association instead, an override can be provided

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord