brick 1.0.113 → 1.0.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6cede45ed1fd983a2199fb279dffad0ecd02e51c7ed31cec6d46fccbc799e7c
-  data.tar.gz: 65eb5df73a7869b1bbe3ac128a69b4fda257e9dc098e77dc65c75d8f593756d7
+  metadata.gz: 6e92e1445b603e8611ad927b8864b6ff04fd819d2f2243051d109d0894838e0d
+  data.tar.gz: b76bc7adf85927a5ff4988027a0d7ff1d40b84d4a80531d23390867bcca0fc5e
 SHA512:
-  metadata.gz: 0e506c2b4d00a1402e232f48c9eb95fc1edfb201a4b2d46ce8fd2a29d0f6a62e5d954ba84dfad4ccab2ff2c5c972d32478873e1f5c7ddf19bdfcca24894b0d1e
-  data.tar.gz: ee7dd85c423043b10efb60075716e3464db2645ac642fa43f457cf1b05c98a52cb7645e58e3a8208be8fd94b3a4b74f6b7d5e3102d890d087542a04b7e8cc7ec
+  metadata.gz: 9caa3d9fdbc5229123058ec526482bf4c6926c42a44012d974a26d4f94f6f0e2f1dd2040ee76b1fbec21e431ea479694030365a1982878c6100245a607803260
+  data.tar.gz: 0e09bb3d9556bc8b4a442eccc9f19a374684c901dc0f9769030313ebdc57248f31a994e5deb7dbde394f066187b961eab169545e3466ab0851cb6df7636c62f1

data/lib/brick/config.rb

@@ -213,6 +213,14 @@ module Brick
       @mutex.synchronize { @polymorphics = polys }
     end
 
+    def json_columns
+      @mutex.synchronize { @json_columns ||= {} }
+    end
+
+    def json_columns=(cols)
+      @mutex.synchronize { @json_columns = cols }
+    end
+
     def model_descrips
       @mutex.synchronize { @model_descrips ||= {} }
     end

data/lib/brick/extensions.rb

@@ -274,7 +274,7 @@ module ActiveRecord
       tbl_parts.unshift(::Brick.config.path_prefix) if ::Brick.config.path_prefix
       index = tbl_parts.map(&:underscore).join(separator)
       # Rails applies an _index suffix to that route when the resource name is singular
-      index << '_index' if mode != :singular && index == index.singularize
+      index << '_index' if mode != :singular && separator == '_' && index == index.singularize
       index
     end
 
@@ -972,7 +972,10 @@ Module.class_exec do
                   end
     # puts "#{self.name} - #{args.first}"
     desired_classname = (self == Object || !name) ? requested : "#{name}::#{requested}"
-    if ((is_defined = self.const_defined?(args.first)) && (possible = self.const_get(args.first)) && possible.name == desired_classname) ||
+    if ((is_defined = self.const_defined?(args.first)) && (possible = self.const_get(args.first)) &&
+        # Reset `possible` if it's a controller request that's not a perfect match
+        # Was:  (possible = nil)  but changed to #local_variable_set in order to suppress the "= should be ==" warning
+        (possible.name == desired_classname || (is_controller && binding.local_variable_set(:possible, nil)))) ||
        # Try to require the respective Ruby file
        ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
                     (self != Object && ActiveSupport::Dependencies.search_for_file((desired_classname = requested).underscore))
@@ -983,7 +986,7 @@ Module.class_exec do
        # then return what we've found.
        (is_defined && !::Brick.is_eager_loading) # Used to also have:   && possible != self
       if (!brick_root && (filename || possible.instance_of?(Class))) ||
-         (possible.instance_of?(Module) && possible.module_parent == self) ||
+         (possible.instance_of?(Module) && possible&.module_parent == self) ||
          (possible.instance_of?(Class) && possible == self) # Are we simply searching for ourselves?
         return possible
       end

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

@@ -82,6 +82,15 @@ function linkSchemas() {
   }
 };
 "
+      BRICK_SVG = "<svg version=\"1.1\" style=\"display: inline; padding-left: 0.5em;\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"
+  viewBox=\"0 0 58 58\" height=\"1.4em\" xml:space=\"preserve\">
+<g>
+  <polygon style=\"fill:#C2615F;\" points=\"58,15.831 19.106,35.492 0,26.644 40,6\"/>
+  <polygon style=\"fill:#6D4646;\" points=\"19,52 0,43.356 0,26.644 19,35\"/>
+  <polygon style=\"fill:#894747;\" points=\"58,31.559 19,52 19,35 58,15.831\"/>
+</g>
+</svg>
+".html_safe
 
       # paths['app/models'] << 'lib/brick/frameworks/active_record/models'
       config.brick = ActiveSupport::OrderedOptions.new
@@ -245,16 +254,8 @@ window.addEventListener(\"popstate\", linkSchemas);
                 @_name = name || ''
               end
               def to_s
-                @_name.html_safe + @vc.instance_variable_get(:@__vc_helpers)&.link_to_brick(nil,
-                  "<svg version=\"1.1\" style=\"display: inline; padding-left: 0.5em;\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"
-  viewBox=\"0 0 58 58\" height=\"1.4em\" xml:space=\"preserve\">
-<g>
-  <polygon style=\"fill:#C2615F;\" points=\"58,15.831 19.106,35.492 0,26.644 40,6\"/>
-  <polygon style=\"fill:#6D4646;\" points=\"19,52 0,43.356 0,26.644 19,35\"/>
-  <polygon style=\"fill:#894747;\" points=\"58,31.559 19,52 19,35 58,15.831\"/>
-</g>
-</svg>
-".html_safe,
+                @_name.to_s.html_safe + @vc.instance_variable_get(:@__vc_helpers)&.link_to_brick(nil,
+                  BRICK_SVG,
                   { title: "#{@_name} in Brick" }
                 )
               end
@@ -298,12 +299,59 @@ window.addEventListener(\"popstate\", linkSchemas);
                     )
                 nil
               else # This is either a non-Avo request or a proper Avo request, so carry on
-                _brick_url_for(options, *args)
+                begin
+                  _brick_url_for(options, *args)
+                rescue
+                  # Last-ditch effort in case we were in yet a different RouteSet
+                  unless (rar = ::Rails.application.routes) == self
+                    rar.url_for(options, *args)
+                  end
+                end
               end
             end
           end
         end # Avo compatibility
 
+        # ActiveAdmin compatibility
+        if Object.const_defined?('ActiveAdmin') && ::ActiveAdmin.application&.site_title.present?
+          ::ActiveAdmin.class_exec do
+            class << self
+              ActiveAdmin.load!
+              alias _brick_routes routes
+              def routes(*args)
+                ::Brick.relations.each do |k, v|
+                  next if k == 'active_admin_comments'
+
+                  begin
+                    if (class_name = Object.const_get(v.fetch(:class_name, nil)))
+                      ::ActiveAdmin.register(class_name) { config.clear_batch_actions! }
+                    end
+                  rescue
+                  end
+                end
+                _brick_routes(*args)
+              end
+            end
+          end
+          ::ActiveAdmin::Views::TitleBar.class_exec do
+            alias _brick_build_title_tag build_title_tag
+            def build_title_tag
+              if klass = begin
+                           aa_id = helpers.instance_variable_get(:@current_tab)&.id
+                           ::Brick.relations.fetch(aa_id, nil)&.fetch(:class_name, nil)&.constantize
+                         rescue
+                         end
+                h2((@title + link_to_brick(nil,
+                  BRICK_SVG, # This would do well to be sized a bit smaller
+                  { title: "#{@_name} in Brick" }
+                )).html_safe)
+              else
+                _brick_build_title_tag # Revert to the original
+              end
+            end
+          end
+        end
+
         # ====================================
         # Dynamically create generic templates
         # ====================================
@@ -1365,7 +1413,7 @@ erDiagram
 <% end %>
 </table>
 <%
-if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)) %><%=
+if (description = (relation = Brick.relations[tbl_name = #{model_name}.table_name])&.fetch(:description, nil)) %><%=
   description %><br><%
 end
 %><%= link_to '(See all #{obj_name.pluralize})', #{@_brick_model._brick_index}_path %>
@@ -1437,7 +1485,13 @@ end
             \"<span class=\\\"orphan\\\">Orphaned ID: #\{val}</span>\".html_safe
           end %>
     <% else
-      col_type = col&.sql_type == 'geography' ? col.sql_type : col&.type
+      col_type = if ::Brick.config.json_columns[tbl_name]&.include?(k)
+                   :json
+                 elsif col&.sql_type == 'geography'
+                   col.sql_type
+                 else
+                   col&.type
+                 end
       case (col_type ||= col&.sql_type)
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly?

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -458,6 +458,11 @@ module Brick
       Brick.config.polymorphics = polys || {}
     end
 
+    # @api public
+    def json_columns=(cols)
+      Brick.config.json_columns = cols
+    end
+
     # DSL templates for individual models to provide prettier descriptions of objects
     # @api public
     def model_descrips=(descrips)
@@ -529,7 +534,7 @@ module Brick
 You might be missing an STI namespace prefix entry for these tables:  #{missing_stis.keys.join(', ')}.
 In config/initializers/brick.rb appropriate entries would look something like:
   Brick.sti_namespace_prefixes = {"
-            puts missing_stis.map { |_k, missing_sti| "\n    '::#{missing_sti}' => 'SomeParentModel'" }.join(',')
+            puts missing_stis.map { |_k, missing_sti| "\n    '#{missing_sti}' => 'SomeParentModel'" }.join(',')
             puts "  }
 (Just trade out SomeParentModel with some more appropriate one.)"
           end
@@ -655,7 +660,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
   module RouteSet
     def finalize!
       routeset_to_use = ::Rails.application.routes
-      return super unless self == routeset_to_use
+      return super if self != routeset_to_use || ::Brick.routes_done
 
       path_prefix = ::Brick.config.path_prefix
       existing_controllers = routes.each_with_object({}) do |r, s|
@@ -859,6 +864,17 @@ In config/initializers/brick.rb appropriate entries would look something like:
               end
             end
           end
+
+          # Trestle compatibility
+          if Object.const_defined?('Trestle') && ::Trestle.config.options&.key?(:site_title) &&
+             !Object.const_defined?("#{(res_name = resource_name.tr('/', '_')).camelize}Admin")
+            begin
+              ::Trestle.resource(res_sym = res_name.to_sym, model: class_name&.constantize) do
+                menu { item res_sym, icon: "fa fa-star" }
+              end
+            rescue
+            end
+          end
         end
 
         if ::Brick.config.add_status && instance_variable_get(:@set).named_routes.names.exclude?(:brick_status)
@@ -907,7 +923,6 @@ In config/initializers/brick.rb appropriate entries would look something like:
             end
           end
 
-          ::Brick.routes_done = true
           puts "\n" if tables.present? || views.present?
           if tables.present?
             puts "Classes that can be built from tables:#{' ' * (table_class_length - 38)}  Path:"
@@ -921,6 +936,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
           end
         end
       end
+      ::Brick.routes_done = true
       super
     end
   end
@@ -963,6 +979,21 @@ module ::Rails
   end
 end
 
+# # Support for when a table or view is named just 's'
+# ActiveSupport::Inflector.class_eval do
+#   class << self
+#     alias _brick_singularize singularize
+#     def singularize(word, locale = :en)
+#       if word.present? && ((ret = _brick_singularize(word, locale)).empty? || ret[-1] == '/')
+#         # puts word
+#         # binding.pry if ret.empty? || ret[-1] == '/'
+#         ret << 's'
+#       end
+#       ret
+#     end
+#   end
+# end
+
 # Major compatibility fixes for ActiveRecord < 4.2
 # ================================================
 ActiveSupport.on_load(:active_record) do

data/lib/generators/brick/install_generator.rb

@@ -261,6 +261,10 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # # Designated by <table name>.<column name>
   # Brick.not_nullables = ['users.name']
 
+  # # String or text columns which for editing purposes should be treated as JSON.  Format for the hash is:
+  # # { table_name => [column names] }
+  # Brick.json_columns = { 'users' => ['info'] }
+
   # # FRIENDLY DSL
 
   # # A simple DSL is available to allow more user-friendly display of objects.  Normally a user object might be shown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.113
+  version: 1.0.115
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord