brick 1.0.148 → 1.0.149

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66301eacecd8c8f5dc5587f234ce373673a9d8544dad12e6ae27e0b1a99bed40
-  data.tar.gz: 226f44c9814fe1b47db39be49a3c35f499dd8795197523f74e8072de641d4cdd
+  metadata.gz: 91e6b3d87c423a90e6e6cf62a07235e185373d9bb60990579a13ccea83c6a645
+  data.tar.gz: 8670e080c676eb7c5be3bb62b7ce4e7a310e8d30c98c3d189d513bd9e06a2af3
 SHA512:
-  metadata.gz: ab20a8565d71699db3bb960dc82e8091072be169011f62beb505527e5946f406fde89dab610d26717d3be118fab0ee7daf38c774c6f0a92f9d655f54cba3d0d5
-  data.tar.gz: 2b2f29c67712b001bfe43a03b881eec48eee7cf73686fe54da8e4aa30e88af91f7b23f67e95620eccde2b171a44f4e117d0326451c5917c4ef699b6141344382
+  metadata.gz: 58ff4070f313c577b027f2c83babb99c2aeecaf0cfd05edbed89ed6e5a32485a9bdc8849e303d9eb16fa6f5824beb66e4dbf282843bc4e2b1a00c7ec13e0616a
+  data.tar.gz: 20cd0a6b43f267a653923a86ded57b041cbe49adbd1e239236faac18415eab0e8515490e0828dcc67f4d7e4f809efae9ff7249a1ab5d9a9626a8a24dced8d2d9

data/lib/brick/extensions.rb

@@ -95,7 +95,7 @@ module ActiveRecord
       return @_brick_primary_key if instance_variable_defined?(:@_brick_primary_key)
 
       pk = begin
-             primary_key.is_a?(String) ? [primary_key] : primary_key || []
+             primary_key.is_a?(String) ? [primary_key] : primary_key.dup || []
            rescue
              []
            end
@@ -907,7 +907,7 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
               s << v
             end
           else # String stuff (which defines a custom ORDER BY) just comes straight through
-            v = v.split('.').map { |x| _br_quoted_name(x) }.join('.')
+            # v = v.split('.').map { |x| _br_quoted_name(x) }.join('.')
             s << v
             # Avoid "PG::InvalidColumnReference: ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list" in Postgres
             selects << v if is_distinct
@@ -1695,7 +1695,7 @@ class Object
       when Symbol
         order_tbl[order_default] || order_default
       else
-        pk.map { |part| "#{table_name}.#{part}"}.join(', ') # If it's not a custom ORDER BY, just use the key
+        pk.map { |part| "#{table_name}.#{part}"} # If it's not a custom ORDER BY, just use the key
       end
     end
 

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

@@ -46,12 +46,12 @@ module Brick
               end
             end
             unless val_err || val.nil?
-              if (geometry = RGeo::WKRep::WKBParser.new.parse(val.pack('c*'))).is_a?(RGeo::Cartesian::PointImpl) &&
-                 !(geometry.y == 0.0 && geometry.x == 0.0)
-                # Create a POINT link to this style of Google maps URL:  https://www.google.com/maps/place/38.7071296+-121.2810649/@38.7071296,-121.2810649,12z
-                geometry = "<a href=\"https://www.google.com/maps/place/#{geometry.y}+#{geometry.x}/@#{geometry.y},#{geometry.x},12z\" target=\"blank\">#{geometry.to_s}</a>"
-              end
-              val = geometry
+              val = if ((geometry = RGeo::WKRep::WKBParser.new.parse(val.pack('c*'))).is_a?(RGeo::Cartesian::PointImpl) ||
+                        geometry.is_a?(RGeo::Geos::CAPIPointImpl)) &&
+                       !(geometry.y == 0.0 && geometry.x == 0.0)
+                      # Create a POINT 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/#{geometry.y}+#{geometry.x}/@#{geometry.y},#{geometry.x},12z\" target=\"blank\">#{geometry.to_s}</a>"
+                    end
             end
             val_err || val
           else
@@ -1760,14 +1760,17 @@ end
           <tr><td<%= ' class=\"orphan\"'.html_safe if err_msg %>><%= err_msg || '(none)' %></td></tr>
      <% else
           collection2.each do |br_#{hm_singular_name}| %>
-            <tr><td><%= br_descrip = if br_#{hm_singular_name}.respond_to?(descrip_cols&.first&.first&.last)
+            <tr><td><%= br_descrip = if (dc = descrip_cols&.first&.first&.last) && br_#{hm_singular_name}.respond_to?(dc)
                                        br_#{hm_singular_name}.brick_descrip(
                                          descrip_cols&.first&.map { |col| br_#{hm_singular_name}.send(col.last) }
                                        )
                                      else # If the HM association has a scope, might not have picked up our SELECT detail
                                        pks = (klass = br_#{hm_singular_name}.class).primary_key
-                                       pks = [pks] unless pks.is_a?(Array)
-                                       pks.map! { |pk| br_#{hm_singular_name}.send(pk).to_s }
+                                       pks = if pks.is_a?(Array)
+                                               pks.map { |pk| br_#{hm_singular_name}.send(pk).to_s }
+                                             else
+                                               [br_#{hm_singular_name}.send(pks).to_s]
+                                             end
                                        \"#\{klass.name} ##\{pks.join(', ')}\"
                                      end
                         link_to(br_descrip, #{hm.first.klass._brick_index(:singular)}_path(slashify(#{obj_br_pk}))) %></td></tr>

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

@@ -104,7 +104,7 @@ module Brick::Rails::FormBuilder
         out << "<div id=\"_br_json_#{self.field_id(method)}\"></div>"
       else
         is_revert = false
-        out << ::Brick::Rails.display_value(col_type, val).html_safe
+        out << (::Brick::Rails.display_value(col_type, val)&.html_safe || '')
       end
     end
     if is_revert

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 148
+    TINY = 149
 
     # 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.148
+  version: 1.0.149
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord