brick 1.0.131 → 1.0.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e9356edd43a6af6120f30bfbcd520383f3ae700e6ff04be11ebdd3493852ef4
-  data.tar.gz: a099075c53acc9bf29c718043cc619b5ab4f895366f9c7ddd14d53c8f7f432b8
+  metadata.gz: '08cc0b19ab0838b667534f4de64f3a7045bf395202a3602981a20ececdc91ab5'
+  data.tar.gz: 4b976489a05bb26c3702746700025c6bad3bb930fc129ae897bc9e1596a50901
 SHA512:
-  metadata.gz: 9f9df598bad9ce128a88f4fe364d568be8c38eee57e595024866d39a255b42f513a26adc68d64d14cdecd4b5d13fb7424935f17df7dbb41c3bda2ae31057a4c7
-  data.tar.gz: 845e5747a916a338ee494426e4ef0ac6fd5c65c3579df0210c8a80468887fac12103407acfbaee3659b3b45763f98ef0bd109935d70920b932b4fd41cc15fdc5
+  metadata.gz: 580db611d4ab9e2bf7ab0ed62a90940b90a4818619a9a91788802f017845c0aef3c8da1b01ea8a6a87c8e1af8378dc5c0d030396ebebba05d101b46ca0bd4495
+  data.tar.gz: fe876de91852b7213fa4d35b378935c7f18e18ae09ff5058f0d34b32dcb3c802a15d1c2cc79f63f7b5eac4177b7bbbeae43603e55499447cfee9e1d3556f64fa

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

@@ -3,7 +3,7 @@
 module Brick
   module Rails
     class << self
-      def display_value(col_type, val)
+      def display_value(col_type, val, lat_lng = nil)
         is_mssql_geography = nil
         # Some binary thing that really looks like a Microsoft-encoded WGS84 point?  (With the first two bytes, E6 10, indicating an EPSG code of 4326)
         if col_type == :binary && val && val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
@@ -61,14 +61,19 @@ module Brick
           ::Brick::Rails.display_binary(val)
         else
           if col_type
-            ::Brick::Rails::FormBuilder.hide_bcrypt(val, col_type == :xml)
+            if lat_lng
+              # Create a link to this style of Google maps URL:  https://www.google.com/maps/place/38.7071296+-121.2810649/@38.7071296,-121.2810649,12z
+              "<a href=\"https://www.google.com/maps/place/#{lat_lng.first}+#{lat_lng.last}/@#{lat_lng.first},#{lat_lng.last},12z\" target=\"blank\">#{val}</a>"
+            else
+              ::Brick::Rails::FormBuilder.hide_bcrypt(val, col_type == :xml)
+            end
           else
             '?'
           end
         end
       end
 
-      def display_binary(val)
+      def display_binary(val, max_size = 100_000)
         return unless val
 
         @image_signatures ||= { (+"\xFF\xD8\xFF\xEE").force_encoding('ASCII-8BIT') => 'jpeg',
@@ -94,15 +99,12 @@ module Brick
           val = val[object_start...object_start + real_object_size]
         end
 
-        if (signature = @image_signatures.find { |k, _v| val[0...k.length] == k }) ||
-           (val[0..3] == 'RIFF' && val[8..11] == 'WEBP' && (signature = 'webp'))
-          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
+        if ((signature = @image_signatures.find { |k, _v| val[0...k.length] == k }&.last) ||
+            (val[0..3] == 'RIFF' && val[8..11] == 'WEBP' && binding.local_variable_set(:signature, 'webp'))) &&
+           val.length < max_size
+          "<img src=\"data:image/#{signature.last};base64,#{Base64.encode64(val)}\">"
         else
-          "&lt;&nbsp;Binary, #{val.length} bytes&nbsp;>"
+          "&lt;&nbsp;#{signature ? "#{signature} image" : 'Binary'}, #{val.length} bytes&nbsp;>"
         end
       end
     end
@@ -1636,10 +1638,10 @@ end
     <tr><td colspan=\"2\">(No displayable fields)</td></tr>
   <% end %>
   </table>#{
-  "<%= binary = begin
-                  ::Brick::Rails.display_binary(obj&.blob&.download)&.html_safe
-                rescue
-                end %>" if model_name == 'ActiveStorage::Attachment'}
+  "<%= begin
+         ::Brick::Rails.display_binary(obj&.blob&.download, 500_000)&.html_safe
+       rescue
+       end %>" if model_name == 'ActiveStorage::Attachment'}
 <%  end %>
 
 #{unless args.first == 'new'
@@ -1674,7 +1676,7 @@ end
              collection = collection.instance_exec(&assoc.scopes.first) if assoc.scopes.present?
              if assoc.klass.name == 'ActiveStorage::Attachment'
                br_descrip = begin
-                              ::Brick::Rails.display_binary(obj.send(assoc.name)&.blob&.download)&.html_safe
+                              ::Brick::Rails.display_binary(obj.send(assoc.name)&.blob&.download, 500_000)&.html_safe
                             rescue
                             end
              end

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

@@ -139,8 +139,19 @@ module Brick::Rails::FormTags
           out << if @_brick_monetized_attributes&.include?(col_name)
                    val ? Money.new(val.to_i).format : ''
                  else
+                   lat_lng = if [:float, :decimal].include?(col.type) &&
+                                (
+                                  ((col_name == 'latitude' && obj.respond_to?('longitude') && (lng = obj.send('longitude')) && lng.is_a?(Numeric) && (lat = val)) ||
+                                   (col_name == 'longitude' && obj.respond_to?('latitude') && (lat = obj.send('latitude')) && lat.is_a?(Numeric) && (lng = val))
+                                  ) ||
+                                  ((col_name == 'lat' && obj.respond_to?('lng') && (lng = obj.send('lng')) && lng.is_a?(Numeric) && (lat = val)) ||
+                                   (col_name == 'lng' && obj.respond_to?('lat') && (lat = obj.send('lat')) && lat.is_a?(Numeric) && (lng = val))
+                                  )
+                                )
+                               [lat, lng]
+                             end
                    col_type = col&.sql_type == 'geography' ? col.sql_type : col&.type
-                   ::Brick::Rails.display_value(col_type || col&.sql_type, val).to_s
+                   ::Brick::Rails.display_value(col_type || col&.sql_type, val, lat_lng).to_s
                  end
         elsif cust_col
           data = cust_col.first.map { |cc_part| obj.send(cc_part.last) }

data/lib/brick/version_number.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.131
+  version: 1.0.132
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-16 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord