brick 1.0.163 → 1.0.165

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374d9798fdc763aaa0db8f80242d9e96723983180085ac0993bd5bf0d6a5eee3
-  data.tar.gz: 526d1c7f9340775ff44a6fd672c22b3f65e7409e2f366698a33b89c6e6f7c9e2
+  metadata.gz: b468405e9a44d6c7a2a42684eca03309905080c11b2a0b49c3823675308a7176
+  data.tar.gz: cfdb865f37b1b2e9aee8a88685ce48b61e465fcbda924a9089c20b361e1a9fa9
 SHA512:
-  metadata.gz: 775a1789c9193d9f3884e8cec1b036e3638863155c799c0d50fd6b49cb777161d1db3bc64b65504cb8d926db261f636dd0f8cdd9a7d687efadb5a8bc4a383b3b
-  data.tar.gz: 857bf99caa4faac87af448196679a098e2461e7f1ae46ff37c6653298f91ab5cce777e1caebd0771836b907b691a467bf51da6e90bbad060b7ccf4259c24eee9
+  metadata.gz: 53a1d6f0c6bbb01da0ee1288d8c74111322f5a9b15043f61b09270b215322cda34309a5ecdf88cff5cfdea307f8ed1cb92f7ed58bb3aceff1e58bc5e0052a09d
+  data.tar.gz: ce8128a98b0c645bcf8fd1002ec4329ac8b88efc42a112f158a3abcc33373205753b8476d262729ae9b1329d280a129f76f52d467d95c7be99ad3dd48e0b63bb

data/lib/brick/extensions.rb

@@ -481,6 +481,10 @@ module ActiveRecord
       relation.select(selects)
     end
 
+    def self.brick_where(*args)
+      (relation = all).brick_where(*args)
+    end
+
   private
 
     def self._brick_get_fks
@@ -989,6 +993,46 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
       [self.select(selects), descrip_cols]
     end
 
+    # Smart Brick #where that automatically adds the inner JOINs when you have a query like:
+    #   Customer.brick_where('orders.order_details.order_date' => '2005-1-1', 'orders.employee.first_name' => 'Nancy')
+    # Way to make it a more intrinsic part of ActiveRecord
+    # alias _brick_where! where!
+    # def where!(opts, *rest)
+    def brick_where(opts)
+      if opts.is_a?(Hash)
+        # && joins_values.empty? # Make sure we don't step on any toes if they've already specified JOIN things
+        ja = nil
+        opts.each do |k, v|
+          if k.is_a?(String) && (ref_parts = k.split('.')).length > 1
+            # JOIN in all the same ways as the pathing describes
+            linkage = (ja ||= ::Brick::JoinArray.new)
+            ref_parts[0..-3].each do |prefix_part|
+              linkage = linkage[prefix_part.to_sym]
+            end
+            linkage[ref_parts[-2].to_sym] = nil
+          end
+        end
+        if ja&.present?
+          if ActiveRecord.version < Gem::Version.new('4.2')
+            self.joins_values += ja # Same as:  joins!(ja)
+          else
+            self.joins!(ja)
+          end
+          (ast_tree = self.dup).arel.ast # Walk the AST tree so we can rewrite the prefixes accordingly
+          conditions = opts.each_with_object({}) do |v, s|
+            if (ref_parts = v.first.split('.')).length > 1 &&
+               (tbl = ast_tree.brick_links[ref_parts[0..-2].join('.')])
+              s["#{tbl}.#{ref_parts.last}"] = v.last
+            else
+              s[v.first] = v.last
+            end
+          end
+        end
+      end
+      # If you want it to be more intrinsic with ActiveRecord, do this instead:  super(conditions, *rest)
+      self.where!(conditions)
+    end
+
     # Accommodate when a relation gets queried for a model, and in that model it has an #after_initialize block
     # which references attributes that were not originally included as part of the select_values.
     def brick_(method, *args, brick_orig_relation: nil, **kwargs, &block)

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

@@ -2002,6 +2002,7 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
                 send(:root, action)
               end
             end
+            ::Brick.established_drf = "/#{::Brick.config.path_prefix}#{action[action.index('#')..-1]}"
           end
         end
 

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

@@ -66,8 +66,8 @@ module Brick::Rails::FormTags
                s << "title=\"#{col.comment}\" " if col.respond_to?(:comment) && !col.comment.blank?
                s << if (bt = bts[col_name])
                       # Allow sorting for any BT except polymorphics
-                      "x-order=\"#{bt.first.to_s + '"' unless bt[2]}>BT " +
-                      bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')
+                      x_order = "x-order=\"#{bt.first.to_s + '"'}" unless bt[2]
+                      "#{x_order}>BT #{bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')}"
                     else # Normal column
                       col_name_humanised = klass.human_attribute_name(col_name, { default: col_name })
                       "x-order=\"#{col_name + '"' if true}>#{col_name_humanised}"

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -107,7 +107,8 @@ module Brick
     end
 
     attr_accessor :default_schema, :db_schemas, :test_schema,
-                  :routes_done, :is_oracle, :is_eager_loading, :auto_models, :initializer_loaded
+                  :routes_done, :established_drf,
+                  :is_oracle, :is_eager_loading, :auto_models, :initializer_loaded
     ::Brick.auto_models = []
 
     def set_db_schema(params = nil)
@@ -808,8 +809,27 @@ In config/initializers/brick.rb appropriate entries would look something like:
       routeset_to_use = ::Rails.application.routes
       path_prefix = ::Brick.config.path_prefix
       existing_controllers = routeset_to_use.routes.each_with_object({}) do |r, s|
-        c = r.defaults[:controller]
-        s[c] = nil if c
+        if r.verb == 'GET' && (c = r.defaults[:controller])
+          path = r.path.ast.to_s
+          path = path[0..((path.index('(') || 0) - 1)]
+          # Skip adding this if it's the default_route_fallback set from the initializers/brick.rb file
+          next if "#{path}##{r.defaults[:action]}" == ::Brick.established_drf
+
+          # next unless [:index, :show, :new, :edit].incude?(a = r.defaults[:action])
+
+          # c_parts = c.split('/')
+          # while c_parts.length > 0
+          #   c_dotted = c_parts.join('.')
+          #   if (relation = ::Brick.relations[c_dotted]) # Does it match up with an existing Brick table / resource name?
+          #     puts path
+          #     puts "  #{c_dotted}##{r.defaults[:action]}"
+          #     s[c_dotted.tr('.', '/')] = nil
+          #     break
+          #   end
+          #   c_parts.shift
+          # end
+          s[c] = nil
+        end
       end
 
       tables = []

metadata

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