brick 1.0.34 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d1e2f8b6ff7ca3fa7fcd129c33de3dfe6e674b6da154b9a64e094c65a3a152a
-  data.tar.gz: 30e39f62458a46854f56b2a6decbfe5ea42a4bb5325e81ed76f21400aae8e252
+  metadata.gz: 34a23d1057771acea1beb9ea1ea2ff3d27e5983084bcd47f4c87686af77328d5
+  data.tar.gz: 44aea0d5fb92a361913ba4a17ebca62cf5be9aca5585fa9785b7c388c2652cee
 SHA512:
-  metadata.gz: 14c6bae09e34f53126e2003cbc7256c4b32f4a4219d42f1f7e94ca83211debf3704fa6c170cd6231d89e26eb168f282d1dea7eff7150ef1a013364aeb4eb65c3
-  data.tar.gz: 7f33aa5c89be2e8401f4cda0ea6cecb6e01639934a2df1e7b00bd88d065bf3cc9b748bebb1691d51c1b04114fba3b1739a7820c7614f4eb84d52494bd4cc769e
+  metadata.gz: e9124cbd0db47816db2dcbf59a76adcc0d4dcaea8f4ad02ea9ee99aace025c8914a7871c78a4a703f4daeced7dbaec12d52fdf56b6bc131c4c855be931d4f838
+  data.tar.gz: 671d0333b9a89870db67cdec05306311475724d674aab494c794baa0648736c873ea2aade170bdbc51642b96e4fe76a19f568bf31e724bd513230e1a78c69521

data/lib/brick/compatibility.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'active_record/version'
+
+# ActiveRecord before 4.0 didn't have #version
+unless ActiveRecord.respond_to?(:version)
+  module ActiveRecord
+    def self.version
+      ::Gem::Version.new(ActiveRecord::VERSION::STRING)
+    end
+  end
+end
+
+# In ActiveSupport older than 5.0, the duplicable? test tries to new up a BigDecimal,
+# and Ruby 2.6 and later deprecates #new.  This removes the warning from BigDecimal.
+# This compatibility needs to be put into place in the application's "config/boot.rb"
+# file by having the line "require 'brick/compatibility'" to be the last line in that
+# file.
+require 'bigdecimal'
+if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.6') &&
+   ActiveRecord.version < ::Gem::Version.new('5.0')
+  def BigDecimal.new(*args, **kwargs)
+    BigDecimal(*args, **kwargs)
+  end
+end

data/lib/brick/extensions.rb

@@ -203,7 +203,9 @@ module ActiveRecord
       model_underscore = name.underscore
       assoc_name = CGI.escapeHTML(assoc_name.to_s)
       model_path = Rails.application.routes.url_helpers.send("#{model_underscore.tr('/', '_').pluralize}_path".to_sym)
-      link = Class.new.extend(ActionView::Helpers::UrlHelper).link_to(name, model_path)
+      av_class = Class.new.extend(ActionView::Helpers::UrlHelper)
+      av_class.extend(ActionView::Helpers::TagHelper) if ActionView.version < ::Gem::Version.new('6.1')
+      link = av_class.link_to(name, model_path)
       model_underscore == assoc_name ? link : "#{assoc_name}-#{link}".html_safe
     end
 
@@ -409,7 +411,6 @@ module ActiveRecord
       hm_counts.each do |k, hm|
         associative = nil
         count_column = if hm.options[:through]
-          # binding.pry if associatives[hm.name].nil?
                          fk_col = (associative = associatives[hm.name]).foreign_key
                          hm.foreign_key
                        else
@@ -500,8 +501,9 @@ if ActiveSupport::Dependencies.respond_to?(:autoload_module!) # %%% Only works w
       alias _brick_autoload_module! autoload_module!
       def autoload_module!(*args)
         into, const_name, qualified_name, path_suffix = args
-        base_class_name = ::Brick.config.sti_namespace_prefixes&.fetch("::#{into.name}::", nil)
-        base_class_name = "::#{base_class_name}" unless base_class_name.start_with?('::')
+        if (base_class_name = ::Brick.config.sti_namespace_prefixes&.fetch("::#{into.name}::", nil))
+          base_class_name = "::#{base_class_name}" unless base_class_name.start_with?('::')
+        end
         if (base_class = base_class_name&.constantize)
           ::Brick.sti_models[qualified_name] = { base: base_class }
           # Build subclass and place it into the specially STI-namespaced module
@@ -777,9 +779,12 @@ class Object
               options = { through: through.to_sym }
               if relation[:fks].any? { |k, v| v[:assoc_name] == hmt_name }
                 hmt_name = "#{hmt_name.singularize}_#{fk.first[:assoc_name]}"
-                # binding.pry if relation[:fks].any? { |k, v| v[:assoc_name] == hmt_name }
-                options[:class_name] = fk.first[:inverse_table].singularize.camelize
-                options[:foreign_key] = fk.first[:fk].to_sym
+                # Was:
+                # options[:class_name] = fk.first[:inverse_table].singularize.camelize
+                # options[:foreign_key] = fk.first[:fk].to_sym
+                far_assoc = relations[fk.first[:inverse_table]][:fks].find { |_k, v| v[:assoc_name] == fk.last }
+                options[:class_name] = far_assoc.last[:inverse_table].singularize.camelize
+                options[:foreign_key] = far_assoc.last[:fk].to_sym
               end
               options[:source] = fk.last.to_sym unless hmt_name.singularize == fk.last
               code << "  has_many :#{hmt_name}#{options.map { |opt| ", #{opt.first}: #{opt.last.inspect}" }.join}\n"
@@ -942,7 +947,6 @@ class Object
               }
               s
             end
-            # binding.pry
             render inline: json.to_json, content_type: request.format
             return
           end
@@ -959,7 +963,8 @@ class Object
             return
           end
 
-          order = pk.each_with_object([]) { |pk_part, s| s << "#{model.table_name}.#{pk_part}" }
+          quoted_table_name = model.table_name.split('.').map { |x| "\"#{x}\"" }.join('.')
+          order = pk.each_with_object([]) { |pk_part, s| s << "#{quoted_table_name}.\"#{pk_part}\"" }
           ar_relation = order.present? ? model.order("#{order.join(', ')}") : model.all
           @_brick_params = ar_relation.brick_select(params, (selects = []), (bt_descrip = {}), (hm_counts = {}), (join_array = ::Brick::JoinArray.new))
           # %%% Add custom HM count columns
@@ -974,7 +979,8 @@ class Object
           @_brick_join_array = join_array
         end
 
-        if model&.primary_key
+        is_pk_string = nil
+        if (pk_col = model&.primary_key)
           code << "  def show\n"
           code << (find_by_id = "    id = params[:id]&.split(/[\\/,_]/)
     id = id.first if id.is_a?(Array) && id.length == 1
@@ -982,7 +988,12 @@ class Object
           code << "  end\n"
           self.define_method :show do
             ::Brick.set_db_schema(params)
-            id = params[:id]&.split(/[\/,_]/)
+            id = if model.columns_hash[pk_col]&.type == :string
+                   is_pk_string = true
+                   params[:id]
+                 else
+                   params[:id]&.split(/[\/,_]/)
+                 end
             id = id.first if id.is_a?(Array) && id.length == 1
             instance_variable_set("@#{singular_table_name}".to_sym, model.find(id))
           end
@@ -1021,7 +1032,7 @@ class Object
               #   return
               end
 
-              id = params[:id]&.split(/[\/,_]/)
+              id = is_pk_string ? params[:id] : params[:id]&.split(/[\/,_]/)
               id = id.first if id.is_a?(Array) && id.length == 1
               instance_variable_set("@#{singular_table_name}".to_sym, (obj = model.find(id)))
               obj = obj.first if obj.is_a?(Array)
@@ -1047,19 +1058,15 @@ class Object
     end
 
     def _brick_get_hm_assoc_name(relation, hm_assoc)
-      if relation[:hm_counts][hm_assoc[:assoc_name]]&.> 1
-        # binding.pry if (same_name = relation[:fks].find { |x| x.last[:assoc_name] == hm_assoc[:assoc_name] && x.last != hm_assoc }) #&&
-                                    # x.last[:alternate_name] == hm_assoc[:alternate_name] })
-        # relation[:fks].any? { |k, v| v[:assoc_name] == new_alt_name }
+      if (relation[:hm_counts][hm_assoc[:assoc_name]]&.> 1) &&
+         hm_assoc[:alternate_name] != hm_assoc[:inverse][:assoc_name]
         plural = ActiveSupport::Inflector.pluralize(hm_assoc[:alternate_name])
-        # binding.pry if hm_assoc[:assoc_name] == 'issue_issue_duplicates'
         new_alt_name = (hm_assoc[:alternate_name] == name.underscore) ? "#{hm_assoc[:assoc_name].singularize}_#{plural}" : plural
         # uniq = 1
         # while same_name = relation[:fks].find { |x| x.last[:assoc_name] == hm_assoc[:assoc_name] && x.last != hm_assoc }
         #   hm_assoc[:assoc_name] = "#{hm_assoc_name}_#{uniq += 1}"
         # end
         # puts new_alt_name
-        # binding.pry if new_alt_name == 'issue_duplicates'
         # hm_assoc[:assoc_name] = new_alt_name
         [new_alt_name, true]
       else
@@ -1178,7 +1185,8 @@ module ActiveRecord::ConnectionHandling
       case ActiveRecord::Base.connection.adapter_name
       when 'PostgreSQL', 'SQLite' # These bring back a hash for each row because the query uses column aliases
         # schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-        ActiveRecord::Base.execute_sql(sql, ActiveRecord::Base.internal_metadata_table_name, ActiveRecord::Base.schema_migrations_table_name).each do |r|
+        ar_imtn = ActiveRecord.version >= ::Gem::Version.new('5.0') ? ActiveRecord::Base.internal_metadata_table_name : ''
+        ActiveRecord::Base.execute_sql(sql, ActiveRecord::Base.schema_migrations_table_name, ar_imtn).each do |r|
           # If Apartment gem lists the table as being associated with a non-tenanted model then use whatever it thinks
           # is the default schema, usually 'public'.
           schema_name = if ::Brick.config.schema_behavior[:multitenant]
@@ -1364,7 +1372,7 @@ module Brick
                         is_schema = if ::Brick.config.schema_behavior[:multitenant]
                                       # If Apartment gem lists the primary table as being associated with a non-tenanted model
                                       # then use 'public' schema for the primary table
-                                      if apartment&.excluded_models.include?(fk[4].singularize.camelize)
+                                      if apartment && apartment&.excluded_models.include?(fk[4].singularize.camelize)
                                         fk[3] = Apartment.default_schema
                                         true
                                       end
@@ -1446,7 +1454,6 @@ module Brick
                   else
                     fk[1]
                   end
-                  # binding.pry if inv_tbl == 'issue_issue_duplicates' # inverse_table goofed?
         assoc_hm = hms[hm_cnstr_name] = { is_bt: false, fk: fk[2], assoc_name: for_tbl.pluralize, alternate_name: bt_assoc_name,
                                           inverse_table: inv_tbl, inverse: assoc_bt }
         assoc_hm[:polymorphic] = true if is_polymorphic

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

@@ -216,12 +216,17 @@ input[type=submit] {
 <% def is_bcrypt?(val)
   val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
 end
-def hide_bcrypt(val)
+def hide_bcrypt(val, max_len = 200)
   if is_bcrypt?(val)
     '(hidden)'
-  elsif val.is_a?(String) && val.encoding.name != 'UTF-8'
-    val[0..1000].force_encoding('UTF-8')
   else
+    if val.is_a?(String)
+      if val.length > max_len
+        val = val[0...max_len]
+        val << '...'
+      end
+      val.force_encoding('UTF-8') unless val.encoding.name == 'UTF-8'
+    end
     val
   end
 end %>"
@@ -250,40 +255,44 @@ end %>"
 var schemaSelect = document.getElementById(\"schema\");
 var tblSelect = document.getElementById(\"tbl\");
 var brickSchema;
-if (schemaSelect) {
-  brickSchema = changeout(location.href, \"_brick_schema\");
-  if (brickSchema) {
-    [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
+
+// This PageTransitionEvent fires when the page first loads, as well as after any other history
+// transition such as when using the browser's Back and Forward buttons.
+window.addEventListener(\"pageshow\", function() {
+  if (schemaSelect) { // First drop-down is only present if multitenant
+    brickSchema = changeout(location.href, \"_brick_schema\");
+    if (brickSchema) {
+      [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
+    }
+    schemaSelect.value = brickSchema || \"public\";
+    schemaSelect.focus();
+    schemaSelect.addEventListener(\"change\", function () {
+      // If there's an ID then remove it (trim after selected table)
+      location.href = changeout(location.href, \"_brick_schema\", this.value, tblSelect.value);
+    });
   }
-  schemaSelect.value = brickSchema || \"public\";
-  schemaSelect.focus();
-  schemaSelect.addEventListener(\"change\", function () {
-    // If there's an ID then remove it (trim after selected table)
-    location.href = changeout(location.href, \"_brick_schema\", this.value, tblSelect.value);
-  });
-}
-[... document.getElementsByTagName(\"FORM\")].forEach(function (form) {
-  if (brickSchema)
-    form.action = changeout(form.action, \"_brick_schema\", brickSchema);
-  form.addEventListener('submit', function (ev) {
-    [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
-      if (select.value === \"^^^brick_NULL^^^\")
-        select.value = null;
+  [... document.getElementsByTagName(\"FORM\")].forEach(function (form) {
+    if (brickSchema)
+      form.action = changeout(form.action, \"_brick_schema\", brickSchema);
+    form.addEventListener('submit', function (ev) {
+      [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
+        if (select.value === \"^^^brick_NULL^^^\")
+          select.value = null;
+      });
+      return true;
     });
-    return true;
   });
-});
 
-if (tblSelect) {
-  tblSelect.value = changeout(location.href)[0];
-  if (tblSelect.selectedIndex < 0) tblSelect.value = changeout(location.href)[1];
-  tblSelect.addEventListener(\"change\", function () {
-    var lhr = changeout(location.href, null, this.value);
-    if (brickSchema)
-      lhr = changeout(lhr, \"_brick_schema\", schemaSelect.value);
-    location.href = lhr;
-  });
-}
+  if (tblSelect) { // Always present
+    tblSelect.value = changeout(location.href)[schemaSelect ? 1 : 0];
+    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, trimAfter) {
   var hrefParts = href.split(\"?\");
@@ -366,7 +375,6 @@ function changeout(href, param, value, trimAfter) {
 
   async function updateSignInStatus(isSignedIn) {
     if (isSignedIn) {
-      console.log(\"turds!\");
       await gapi.client.sheets.spreadsheets.create({
         properties: {
           title: #{table_name.inspect},
@@ -455,7 +463,6 @@ function changeout(href, param, value, trimAfter) {
                  ::Brick.config.metadata_columns.include?(k) || poly_cols.include?(k) || k.start_with?('_brfk_') || (k.start_with?('_br_') && (k.length == 63 || k.end_with?('_ct'))) %>
       <td>
       <% if (bt = bts[k]) %>
-        <%# binding.pry # Postgres column names are limited to 63 characters %>
         <% if bt[2] # Polymorphic?
              bt_class = #{obj_name}.send(\"#\{bt.first\}_type\")
              base_class = (::Brick.existing_stis[bt_class] || bt_class).constantize.base_class.name.underscore
@@ -464,6 +471,7 @@ function changeout(href, param, value, trimAfter) {
                            send(\"#\{base_class\}_path\".to_sym, poly_id)) if poly_id %><%
            else
              bt_txt = (bt_class = bt[1].first.first).brick_descrip(
+               # 0..62 because Postgres column names are limited to 63 characters
                #{obj_name}, (descrips = @_brick_bt_descrip[bt.first][bt_class])[0..-2].map { |z| #{obj_name}.send(z.last[0..62]) }, (bt_id_col = descrips.last)
              )
              bt_id = #{obj_name}.send(*bt_id_col) if bt_id_col&.present? %>
@@ -546,7 +554,7 @@ function changeout(href, param, value, trimAfter) {
     <% else case #{model_name}.column_for_attribute(k).type
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly? %>
-          <%= hide_bcrypt(val) %>
+          <%= hide_bcrypt(val, 1000) %>
         <% else %>
           <div class=\"wide-input\"><%= f.text_field k.to_sym %></div>
         <% end %>

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1,25 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_record/version'
-
-# ActiveRecord before 4.0 didn't have #version
-unless ActiveRecord.respond_to?(:version)
-  module ActiveRecord
-    def self.version
-      ::Gem::Version.new(ActiveRecord::VERSION::STRING)
-    end
-  end
-end
-
-# In ActiveSupport older than 5.0, the duplicable? test tries to new up a BigDecimal,
-# and Ruby 2.6 and later deprecates #new.  This removes the warning from BigDecimal.
-require 'bigdecimal'
-if (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.6') &&
-   ActiveRecord.version < ::Gem::Version.new('5.0')
-  def BigDecimal.new(*args, **kwargs)
-    BigDecimal(*args, **kwargs)
-  end
-end
+require 'brick/compatibility'
 
 # Allow ActiveRecord 4.0 and 4.1 to work with newer Ruby (>= 2.4) by avoiding a "stack level too deep"
 # error when ActiveSupport tries to smarten up Numeric by messing with Fixnum and Bignum at the end of:
@@ -45,8 +26,8 @@ end
 require 'brick/util'
 
 # Allow ActiveRecord < 3.2 to work with Ruby 2.7 and later
-if ActiveRecord.version < ::Gem::Version.new('3.2') &&
-   ruby_version >= ::Gem::Version.new('2.7')
+if (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.7') &&
+   ActiveRecord.version < ::Gem::Version.new('3.2')
   # Remove circular reference for "now"
   ::Brick::Util._patch_require(
     'active_support/values/time_zone.rb', '/activesupport',
@@ -132,7 +113,6 @@ module Brick
       associatives = hms.each_with_object({}) do |hmt, s|
         if (through = hmt.last.options[:through])
           skip_hms[through] = nil
-          # binding.pry if hmt.first == :issue_issues
           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}"

data/lib/generators/brick/install_generator.rb

@@ -18,7 +18,8 @@ module Brick
     desc 'Generates an initializer file for configuring Brick'
 
     def create_initializer_file
-      unless File.exist?(filename = 'config/initializers/brick.rb')
+      is_brick_file = File.exist?(filename = 'config/initializers/brick.rb')
+      if is_brick_file && ::Brick.config.schema_behavior[:multitenant] || !is_brick_file
         # See if we can make suggestions for additional_references and polymorphic associations
         resembles_fks = Hash.new { |h, k| h[k] = [] }
         possible_polymorphics = {}
@@ -223,7 +224,10 @@ module Brick
 # # Database schema to use when analysing existing data, such as deriving a list of polymorphic classes in the case that
 # # it wasn't originally specified.
 # Brick.schema_behavior = :namespaced
-# Brick.schema_behavior = { multitenant: { schema_to_analyse: 'engineering' } }
+#{Brick.config.schema_behavior ? "Brick.schema_behavior = { multitenant: { schema_to_analyse: #{
+  Brick.config.schema_behavior[:multitenant][:schema_to_analyse].inspect}" :
+"# Brick.schema_behavior = { multitenant: { schema_to_analyse: 'engineering'"
+} } }
 
 # # Polymorphic associations are set up by providing a model name and polymorphic association name#{poly}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.34
+  version: 1.0.35
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -214,6 +214,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/brick.rb
+- lib/brick/compatibility.rb
 - lib/brick/config.rb
 - lib/brick/extensions.rb
 - lib/brick/frameworks/cucumber.rb