brick 1.0.118 → 1.0.120

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc284b8783ca27862ff567079ba680a238690e3779a57d705ee67a54ed016ab2
-  data.tar.gz: 812044a88cff33dbf4fe7dbfa37a80e91b1b1a94980091590f4665a123529e80
+  metadata.gz: faca98f57870f50ba6474325fa995fe70ac36b4efd4c58946553242afe7ccb86
+  data.tar.gz: 3dd28e3cb60b74bd99209da86e302b7301e0eb844e314e7c56dde43ed4475b7e
 SHA512:
-  metadata.gz: 9a5f82a5956b40beeaa8aeca2861672561ea552b3b21cb85ebf9b426a31bdbd4025f4c047131ae962cdefb31378c8845c9bea947a50dfc34cf497cd9b68ae6b9
-  data.tar.gz: 83e1c1399045dc67d6c5dcd98347d2c84a7dec4ac474b5cc09da43b86ce21859d01204844be75d6764a5653c7ea1c220f3887835d07f703c789a82b6311bfad0
+  metadata.gz: 3ccbfc86abb0a16f053ddbf0b43e0c96a6d70a9f2ab3cab95ea008d76bcba1572aaf87b5d6eb9a79a342c20b26b900c42a1dd178c6b478e6f0f8daf372bb9189
+  data.tar.gz: 464e92a80e820c66c8ed2517593440e0752bfc4b8d7fdf3667fd662291b6663e95e417f60281647529cea7c11c0d13a3fa5c22d69142c6b880db5ae077e632d3

data/lib/brick/extensions.rb

@@ -1846,11 +1846,12 @@ class Object
 
               instance_variable_set("@#{singular_table_name}".to_sym, (obj = find_obj))
               upd_params = send(params_name_sym)
-              if (json_cols = model.columns.select { |c| c.type == :json }.map(&:name)).present?
+              json_overrides = ::Brick.config.json_columns&.fetch(table_name, nil)
+              if (json_cols = model.columns.select { |c| c.type == :json || json_overrides&.include?(c.name) }.map(&:name)).present?
                 upd_hash = upd_params.to_h
                 json_cols.each do |c|
                   begin
-                    upd_hash[c] = JSON.parse(upd_hash[c]) # At least attempt to turn this into a parsed hash or array object
+                    upd_hash[c] = JSON.parse(upd_hash[c].tr('`', '"').gsub('^^br_btick__', '`'))
                   rescue
                   end
                 end

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

@@ -2,6 +2,39 @@
 
 module Brick
   module Rails
+    def self.display_binary(val)
+      @image_signatures ||= { (+"\xFF\xD8\xFF\xEE").force_encoding('ASCII-8BIT') => 'jpeg',
+                              (+"\xFF\xD8\xFF\xE0\x00\x10\x4A\x46\x49\x46\x00\x01").force_encoding('ASCII-8BIT') => 'jpeg',
+                              (+"\x89PNG\r\n\x1A\n").force_encoding('ASCII-8BIT') => 'png',
+                              '<svg' => 'svg+xml', # %%% Not yet very good detection for SVG
+                              (+'BM').force_encoding('ASCII-8BIT') => 'bmp',
+                              (+'GIF87a').force_encoding('ASCII-8BIT') => 'gif',
+                              (+'GIF89a').force_encoding('ASCII-8BIT') => 'gif' }
+
+      if val[0..1] == "\x15\x1C" # One of those goofy Microsoft OLE containers?
+        package_header_length = val[2..3].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+        # This will often be just FF FF FF FF
+        # object_size = val[16..19].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+        friendly_and_class_names = val[20...package_header_length].split("\0")
+        object_type_name_length = val[package_header_length + 8..package_header_length+11].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+        friendly_and_class_names << val[package_header_length + 12...package_header_length + 12 + object_type_name_length].strip
+        # friendly_and_class_names will now be something like:  ['Bitmap Image', 'Paint.Picture', 'PBrush']
+        real_object_size = val[package_header_length + 20 + object_type_name_length..package_header_length + 23 + object_type_name_length].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+        object_start = package_header_length + 24 + object_type_name_length
+        val = val[object_start...object_start + real_object_size]
+      end
+
+      if (signature = @image_signatures.find { |k, _v| val[0...k.length] == k })
+        if val.length < 500_000
+          "<img src=\"data:image/#{signature.last};base64,#{Base64.encode64(val)}\">"
+        else
+          "&lt;&nbsp;#{signature.last} image, #{val.length} bytes&nbsp;>"
+        end
+      else
+        "&lt;&nbsp;Binary, #{val.length} bytes&nbsp;>"
+      end
+    end
+
     # See http://guides.rubyonrails.org/engines.html
     class Engine < ::Rails::Engine
       JS_CHANGEOUT = "function changeout(href, param, value, trimAfter) {
@@ -186,6 +219,21 @@ function linkSchemas() {
               end
             end
 
+            # class Fields::TextField
+            #   alias _original_initialize initialize
+            #   def initialize(id, **args, &block)
+            #     if instance_of?(::Avo::Fields::TextField) || instance_of?(::Avo::Fields::TextareaField)
+            #       args[:format_using] ||= ->(value) do
+            #         if value.is_a?(String) && value.encoding != Encoding::UTF_8
+            #           value = value.encode!("UTF-8", invalid: :replace, undef: :replace, replace: "?")
+            #         end
+            #         value
+            #       end
+            #     end
+            #     _original_initialize(id, **args, &block)
+            #   end
+            # end
+
             class App
               class << self
                 alias _brick_eager_load eager_load
@@ -451,6 +499,13 @@ window.addEventListener(\"popstate\", linkSchemas);
           end
         end
 
+        # Spina compatibility
+        if Object.const_defined?('Spina')
+          # Add JSON fields
+          (::Brick.config.json_columns['spina_accounts'] ||= []) << 'json_attributes' if ::Spina.const_defined?('Account')
+          (::Brick.config.json_columns['spina_pages'] ||= []) << 'json_attributes' if ::Spina.const_defined?('Page')
+        end
+
         # ====================================
         # Dynamically create generic templates
         # ====================================
@@ -916,7 +971,7 @@ def display_value(col_type, val)
       '(Add RGeo gem to parse geometry detail)'
     end
   when :binary
-    display_binary(val) if val
+    ::Brick::Rails.display_binary(val) if val
   else
     if col_type
       hide_bcrypt(val, col_type == :xml)
@@ -926,39 +981,6 @@ def display_value(col_type, val)
   end
 end
 
-def image_signatures
-  @image_signatures ||= { \"\\xFF\\xD8\\xFF\\xEE\".force_encoding('ASCII-8BIT') => 'jpeg',
-                          \"\\xFF\\xD8\\xFF\\xE0\\x00\\x10\\x4A\\x46\\x49\\x46\\x00\\x01\".force_encoding('ASCII-8BIT') => 'jpeg',
-                          \"\\x89PNG\\r\\n\\x1A\\n\".force_encoding('ASCII-8BIT') => 'png',
-                          '<svg' => 'svg+xml', # %%% Not yet very good detection for SVG
-                          'BM'.force_encoding('ASCII-8BIT') => 'bmp',
-                          'GIF87a'.force_encoding('ASCII-8BIT') => 'gif',
-                          'GIF89a'.force_encoding('ASCII-8BIT') => 'gif' }
-end
-def display_binary(val)
-  if val[0..1] == \"\\x15\\x1C\" # One of those goofy Microsoft OLE containers?
-    package_header_length = val[2..3].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
-    # This will often be just FF FF FF FF
-    # object_size = val[16..19].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
-    friendly_and_class_names = val[20...package_header_length].split(\"\\0\")
-    object_type_name_length = val[package_header_length + 8..package_header_length+11].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
-    friendly_and_class_names << val[package_header_length + 12...package_header_length + 12 + object_type_name_length].strip
-    # friendly_and_class_names will now be something like:  ['Bitmap Image', 'Paint.Picture', 'PBrush']
-    real_object_size = val[package_header_length + 20 + object_type_name_length..package_header_length + 23 + object_type_name_length].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
-    object_start = package_header_length + 24 + object_type_name_length
-    val = val[object_start...object_start + real_object_size]
-  end
-  if (signature = image_signatures.find { |k, _v| val[0...k.length] == k })
-    if val.length < 500_000
-      \"<img src=\\\"data:image/#\{signature.last};base64,#\{Base64.encode64(val)}\\\">\"
-    else
-      \"&lt;&nbsp;#\{signature.last} image, #\{val.length} bytes&nbsp;>\"
-    end
-  else
-    \"&lt;&nbsp;Binary, #\{val.length} bytes&nbsp;>\"
-  end
-end
-
 # Accommodate composite primary keys that include strings with forward-slash characters
 def slashify(*vals)
   vals.map { |val_part| val_part.is_a?(String) ? val_part.gsub('/', '^^sl^^') : val_part }
@@ -1551,8 +1573,11 @@ end
       # path_options << { '_brick_schema':  } if
       # url = send(:#\{model._brick_index(:singular)}_path, obj.#{pk})
       options = {}
-      options[:url] = send(\"#\{#{model_name}._brick_index(:singular)}_path\".to_sym, obj) if ::Brick.config.path_prefix
- %>
+      if ::Brick.config.path_prefix
+        path_helper = obj.new_record? ? #{model_name}._brick_index : #{model_name}._brick_index(:singular)
+        options[:url] = send(\"#\{path_helper}_path\".to_sym, obj)
+      end
+%>
   <br><br>
 <%= form_for(obj.becomes(#{model_name}), options) do |f| %>
   <table class=\"shadow\">
@@ -1660,16 +1685,23 @@ end
              if val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
                display_value('geography', val)
              else
-               display_binary(val)
+               ::Brick::Rails.display_binary(val)
              end.html_safe
            end %>
       <% when :primary_key
            is_revert = false %>
       <% when :json
-           is_includes_json = true %>
+           is_includes_json = true
+           if val.is_a?(String)
+             val_str = val
+           else
+             eheij = ActiveSupport::JSON::Encoding.escape_html_entities_in_json
+             ActiveSupport::JSON::Encoding.escape_html_entities_in_json = false if eheij
+             val_str = val.to_json
+             ActiveSupport::JSON::Encoding.escape_html_entities_in_json = eheij
+           end %>
         <%= # Because there are so danged many quotes in JSON, escape them specially by converting to backticks.
             # (and previous to this, escape backticks with our own goofy code of ^^br_btick__ )
-            val_str = val.is_a?(String) ? val : val.to_json # Clean up bogus JSON if necessary
             json_field = f.hidden_field k.to_sym, { class: 'jsonpicker', value: val_str.gsub('`', '^^br_btick__').tr('\"', '`').html_safe } %>
         <div id=\"_br_json_<%= f.field_id(k) %>\"></div>
       <% else %>
@@ -1797,7 +1829,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
           onChange: (function (inp2) {
             return function (updatedContent, previousContent, contentErrors, patchResult) {
               // console.log('onChange', updatedContent.json, updatedContent.text);
-              inp2.value = updatedContent.text || JSON.stringify(updatedContent.json);
+              inp2.value = (updatedContent.text || JSON.stringify(updatedContent.json)).replace(/`/g, \"\\^\\^br_btick__\").replace(/\"/g, '`');
             };
           })(inp)
         }

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

@@ -90,7 +90,7 @@ module Brick::Rails::FormTags
               # 0..62 because Postgres column names are limited to 63 characters
               obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, bt_id_col
             )
-            bt_txt = display_binary(bt_txt).html_safe if bt_txt&.encoding&.name == 'ASCII-8BIT'
+            bt_txt = ::Brick::Rails.display_binary(bt_txt).html_safe if bt_txt&.encoding&.name == 'ASCII-8BIT'
             bt_txt ||= "<span class=\"orphan\">&lt;&lt; Orphaned ID: #{val} >></span>" if val
             bt_id = bt_id_col&.map { |id_col| obj.respond_to?(id_sym = id_col.to_sym) ? obj.send(id_sym) : id_col }
             out << (bt_id&.first ? link_to(bt_txt, send("#{bt_class.base_class._brick_index(:singular)}_path".to_sym, bt_id)) : bt_txt || '')

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -268,7 +268,7 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # # FRIENDLY DSL
 
   # # A simple DSL is available to allow more user-friendly display of objects.  Normally a user object might be shown
-  # # as its first non-metadata column, or if that is not available then something like \"User #45\" where 45 is that
+  # # as its first non-metadata column, or if that is not available then something like \"User #42\" where 42 is that
   # # object's ID.  If there is no primary key then even that is not possible, so the object's .to_s method is called.
   # # To override these defaults and specify exactly what you want shown, such as first names and last names for a
   # # user, then you can use model_descrips like this, putting expressions with property references in square brackets:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.118
+  version: 1.0.120
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord