brick 1.0.113 → 1.0.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6cede45ed1fd983a2199fb279dffad0ecd02e51c7ed31cec6d46fccbc799e7c
-  data.tar.gz: 65eb5df73a7869b1bbe3ac128a69b4fda257e9dc098e77dc65c75d8f593756d7
+  metadata.gz: 5006a6dabf5c9e86965e57a40ae344f9d67c2fc5e76caec8a00e978117089062
+  data.tar.gz: 5bd0fef75e305514b4ef22e4930660cdbf9385c22b07ee92d6eb77a626a13943
 SHA512:
-  metadata.gz: 0e506c2b4d00a1402e232f48c9eb95fc1edfb201a4b2d46ce8fd2a29d0f6a62e5d954ba84dfad4ccab2ff2c5c972d32478873e1f5c7ddf19bdfcca24894b0d1e
-  data.tar.gz: ee7dd85c423043b10efb60075716e3464db2645ac642fa43f457cf1b05c98a52cb7645e58e3a8208be8fd94b3a4b74f6b7d5e3102d890d087542a04b7e8cc7ec
+  metadata.gz: b0621761d15baec575a9cd16fdb1b22e9a1d4784308c071d9878121ac841f6cf7419cb6fbcc210afad2ce98a69814c27279dc951a5d84750e7573e203d2f806a
+  data.tar.gz: ed4b5c992076b4f28c85ab8af48bab847ab80105f2999371475529219cc6b0053444dc722a700d686fc7ed7ea39d3d939cb448c43d798bde18a0b5cfd80be23e

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
 

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

@@ -245,7 +245,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                 @_name = name || ''
               end
               def to_s
-                @_name.html_safe + @vc.instance_variable_get(:@__vc_helpers)&.link_to_brick(nil,
+                @_name.to_s.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>
@@ -304,6 +304,26 @@ window.addEventListener(\"popstate\", linkSchemas);
           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'
+
+                  if (class_name = Object.const_get(v.fetch(:class_name, nil)))
+                    ::ActiveAdmin.register(class_name) { config.clear_batch_actions! }
+                  end
+                end
+                _brick_routes(*args)
+              end
+            end
+          end
+        end
+
         # ====================================
         # Dynamically create generic templates
         # ====================================
@@ -1365,7 +1385,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 +1457,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 = 114
 
     # 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
@@ -859,6 +864,14 @@ 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?("#{resource_name.camelize}Admin")
+            ::Trestle.resource(res_sym = k.to_sym) do
+              menu { item res_sym, icon: "fa fa-star" }
+            end
+          end
         end
 
         if ::Brick.config.add_status && instance_variable_get(:@set).named_routes.names.exclude?(:brick_status)

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.114
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord