brick 1.0.162 → 1.0.164

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55c0fbbc54209abd96db599b62a47d8ad18358711c87f4ada1641080d394d6fb
-  data.tar.gz: 41c099baff51a4a6f28be3addbe52efea29880ec90421f9f44bab1dd189e3d60
+  metadata.gz: 954b8c68167f01f4c6c05b2a9e7f0956122001e72523c5c2222b7da97370f11c
+  data.tar.gz: 944590e83681412d1fe30133e3ce6407e7eda8636c4c1eb5d5baed12423d190e
 SHA512:
-  metadata.gz: f76a35dd8f968285a10875ff39ba3b42047a6daf1f2e27bb4d46df20d12a67419645c4ca12e957653d0c61e732da2ed33979d140dd9963c7d151809f10baeae9
-  data.tar.gz: 5f449f0ceb5aada8686eded1721c62924ced58cb153e6e0dda845c41469aae075c0cf96c89e643e6b454f874c4515431244a3583a3ba519f538a0b18e059cd35
+  metadata.gz: 2d12b53be830841e54f14ac6e860b0cc38a7ad830a8e83bb9ac4c35023f4b98d12b2e37efe9964b10c94bded717b4cedb8f32b51ce64d8d71020a654ec1357b4
+  data.tar.gz: a2474cf50a27f0af680bff905cfe58d27dc3b8e068babbf0d49d1238dde7b11ae33dd8b8a9601fec1e7e26cc6e12f116cc8bfe276705655c1f339b6d92b3af86

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}#{'#index' unless route.index('#')}"
           end
         end
 

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 162
+    TINY = 164
 
     # 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 = []
@@ -844,10 +864,10 @@ In config/initializers/brick.rb appropriate entries would look something like:
           schema_prefix = "#{schema_name}."
         end
 
-        next if !(resource_name = v.fetch(:resource, nil)) ||
-                existing_controllers.fetch(
-                  controller_prefix + (resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize),
-                  nil
+        resource_name = v.fetch(:resource, nil)
+        next if !resource_name ||
+                existing_controllers.key?(
+                  controller_prefix + (resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize)
                 )
 
         object_name = k.split('.').last # Take off any first schema part

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.162
+  version: 1.0.164
 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