ransack 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e7ffa826fc3c1a2a916cc9b110bf232dbc994a51ff82472756709870fda224b
-  data.tar.gz: ebb0692d5d5a77bb8453f95a9880796b36eea92f946270cd7bf81c2f7ef17125
+  metadata.gz: f378bb864b0b4cb10cfe0f8a10959010fc31de18b161be838354d0c7e91aa451
+  data.tar.gz: d4bee8f5d8181cad27191fb7c0e88a5407e6fed26b203aa2f9ae297f26b8ad90
 SHA512:
-  metadata.gz: de93968c12dd7d01bdac595d9930f3ade8563ac33cad4b071dfddc97eb57b530e0a971463db88db6c6b7abd1f93ae981ca0074fe656c860319b8d876430dd887
-  data.tar.gz: 4d965f3bcb30285e20c26ab96d823f970f76bb7c36032c2e0eecbe7f6192f5a59079ea27ca63dc50111e9cc197dcc839837f356967c280a9b30bfcbece13a36d
+  metadata.gz: c1a09e345fb112d740bbd0e47ce0a0fd5d2ae843313306b1c9b4e55967a5a26383144c3df8515fe86d7730cb703c3fdfc5d95a70a6f34cda40e6a327937d7cad
+  data.tar.gz: cb5661601b8f4457d0369499e1dc61ee6b09c4c4035b413a25302f9d671deb28a9ba7356a3fcdfe1bce37f4393a6e5fdc606a65bc46c534e6a9d46504aab77a4

data/.github/workflows/test.yml

@@ -13,13 +13,13 @@ jobs:
       fail-fast: false
       matrix:
         rails:
+          - 7-2-stable
           - v7.1.0
           - v7.0.3
           - v6.1.6
         ruby:
           - 3.2.2
           - 3.1.4
-          - 3.0.6
     env:
       DB: sqlite3
       RAILS: ${{ matrix.rails }}
@@ -39,13 +39,13 @@ jobs:
       fail-fast: false
       matrix:
         rails:
+          - 7-2-stable
           - v7.1.0
           - v7.0.3
           - v6.1.6
         ruby:
           - 3.2.2
           - 3.1.4
-          - 3.0.6
     env:
       DB: mysql
       RAILS: ${{ matrix.rails }}
@@ -74,13 +74,13 @@ jobs:
       fail-fast: false
       matrix:
         rails:
+          - 7-2-stable
           - v7.1.0
           - v7.0.3
           - v6.1.6
         ruby:
           - 3.2.2
           - 3.1.4
-          - 3.0.6
     env:
       DB: postgres
       RAILS: ${{ matrix.rails }}

data/CHANGELOG.md

@@ -2,30 +2,36 @@
 
 ## Unreleased
 
-## 🚀 Features
+## 4.2.0 - 2023-10-23
+
+* Add Rails 7.2 support by @robinator and @gregmolnar
+
+## 4.1.0 - 2023-10-23
+
+### 🚀 Features
 
 * Add Rails 7.1.0 support by @yuki24 in https://github.com/activerecord-hackery/ransack/pull/1439
 
-## 🐛 Bug Fixes
+### 🐛 Bug Fixes
 
 * Fix wrong table aliases in Rails 6.1 by @oneiros in https://github.com/activerecord-hackery/ransack/pull/1447
 
-## 💦 Compatibility
+### 💦 Compatibility
 
 * Drop Ruby 2.7 support by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1449
 
-## 📝  Documentation
+### 📝  Documentation
 
 * Update blog post link by @meg-gutshall in https://github.com/activerecord-hackery/ransack/pull/1425
 * Add namespaced example of Polymorphic search by @craigmcnamara in https://github.com/activerecord-hackery/ransack/pull/1422
 * Update sorting example to be self-contained by @kinduff in https://github.com/activerecord-hackery/ransack/pull/1442
 
-## 💅 Polish
+### 💅 Polish
 
 * Minor updates for Rails 7.1 by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1448
 * Don't mention Ruby compatibility in contribution instructions by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1452
 
-## 🏠 Internal
+### 🏠 Internal
 
 * Bump @sideway/formula from 3.0.0 to 3.0.1 in /docs by @dependabot in https://github.com/activerecord-hackery/ransack/pull/1417
 * Bump webpack from 5.74.0 to 5.76.1 in /docs by @dependabot in https://github.com/activerecord-hackery/ransack/pull/1412
@@ -41,7 +47,7 @@
 
 ### 💥 Breaking Changes
 
-* **[SECURITY]** Require explict allowlisting of attributes and associations by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1400
+* **[SECURITY]** Require explicit allowlisting of attributes and associations by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1400
 * Remove Polyamorous entrypoint by @scarroll32 in https://github.com/activerecord-hackery/ransack/pull/1370
 * Remove dead MongoDB code by @scarroll32 in https://github.com/activerecord-hackery/ransack/pull/1345
 

data/Gemfile

@@ -15,7 +15,7 @@ rails_version = case rails
                 end
 
 gem 'faker'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.4'
 gem 'pg'
 gem 'pry'
 gem 'byebug'

data/README.md

@@ -13,7 +13,7 @@ There are advanced searching solutions around, like ElasticSearch or Algolia. **
 
 Ready to move beyond the basics? Use **advanced features** like i18n and extensive configuration options.
 
-Ransack is supported for Rails 7.0, 6.1 on Ruby 3.0 and later.
+Ransack is supported for Rails 7.2, 7.1, 7.0, 6.1 on Ruby 3.1 and later.
 
 ## Installation
 

data/docs/yarn.lock

@@ -3669,21 +3669,21 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-body-parser@1.20.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
-  integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
     http-errors "2.0.0"
     iconv-lite "0.4.24"
     on-finished "2.4.1"
-    qs "6.10.3"
-    raw-body "2.5.1"
+    qs "6.11.0"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -4146,6 +4146,11 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
+content-type@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
 convert-source-map@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
@@ -4158,10 +4163,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
 
 copy-text-to-clipboard@^3.0.1:
   version "3.0.1"
@@ -4851,16 +4856,16 @@ execa@^5.0.0:
     strip-final-newline "^2.0.0"
 
 express@^4.17.3:
-  version "4.18.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf"
-  integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.0"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -4876,7 +4881,7 @@ express@^4.17.3:
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
     proxy-addr "~2.0.7"
-    qs "6.10.3"
+    qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
     send "0.18.0"
@@ -7153,10 +7158,10 @@ pure-color@^1.2.0:
   resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e"
   integrity sha512-QFADYnsVoBMw1srW7OVKEYjG+MbIa49s54w1MA1EDY6r2r/sTcKKYqRX1f4GYvnXP7eN/Pe9HFcX+hwzmrXRHA==
 
-qs@6.10.3:
-  version "6.10.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
-  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
   dependencies:
     side-channel "^1.0.4"
 
@@ -7194,10 +7199,10 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"

data/lib/polyamorous/activerecord/join_association_7_2.rb

@@ -0,0 +1,55 @@
+module Polyamorous
+  module JoinAssociationExtensions
+    # Same as #join_constraints, but instead of constructing tables from the
+    # given block, uses the ones passed
+    def join_constraints_with_tables(foreign_table, foreign_klass, join_type, alias_tracker, tables)
+      joins = []
+      chain = []
+
+      reflection.chain.each.with_index do |reflection, i|
+        table = tables[i]
+
+        @table ||= table
+        chain << [reflection, table]
+      end
+
+      base_klass.with_connection do |connection|
+        # The chain starts with the target table, but we want to end with it here (makes
+        # more sense in this context), so we reverse
+        chain.reverse_each do |reflection, table|
+          klass = reflection.klass
+
+          join_scope = reflection.join_scope(table, foreign_table, foreign_klass)
+
+          unless join_scope.references_values.empty?
+            join_dependency = join_scope.construct_join_dependency(
+              join_scope.eager_load_values | join_scope.includes_values, Arel::Nodes::OuterJoin
+            )
+            join_scope.joins!(join_dependency)
+          end
+
+          arel = join_scope.arel(alias_tracker.aliases)
+          nodes = arel.constraints.first
+
+          if nodes.is_a?(Arel::Nodes::And)
+            others = nodes.children.extract! do |node|
+              !Arel.fetch_attribute(node) { |attr| attr.relation.name == table.name }
+            end
+          end
+
+          joins << table.create_join(table, table.create_on(nodes), join_type)
+
+          if others && !others.empty?
+            joins.concat arel.join_sources
+            append_constraints(connection, joins.last, others)
+          end
+
+          # The current table in this iteration becomes the foreign table in the next
+          foreign_table, foreign_klass = table, klass
+        end
+
+        joins
+      end
+    end
+  end
+end

data/lib/polyamorous/polyamorous.rb

@@ -11,9 +11,12 @@ if defined?(::ActiveRecord)
   require 'polyamorous/join'
   require 'polyamorous/swapping_reflection_class'
 
-  ar_version = ::ActiveRecord::VERSION::STRING[0, 3]
-  %w(join_association join_dependency reflection).each do |file|
-    require "polyamorous/activerecord_#{ar_version}_ruby_2/#{file}"
+  require 'polyamorous/activerecord/join_association'
+  require 'polyamorous/activerecord/join_dependency'
+  require 'polyamorous/activerecord/reflection'
+
+  if ::ActiveRecord.version > ::Gem::Version.new("7.1")
+    require "polyamorous/activerecord/join_association_7_2"
   end
 
   ActiveRecord::Reflection::AbstractReflection.send(:prepend, Polyamorous::ReflectionExtensions)

data/lib/ransack/adapters/active_record/context.rb

@@ -110,7 +110,7 @@ module Ransack
         #
         def join_sources
           base, joins = begin
-            alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(self.klass.connection, @object.table.name, [])
+            alias_tracker = @object.alias_tracker
             constraints   = @join_dependency.join_constraints(@object.joins_values, alias_tracker, @object.references_values)
 
             [
@@ -278,7 +278,7 @@ module Ransack
 
           join_list = join_nodes + convert_join_strings_to_ast(relation.table, string_joins)
 
-          alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(self.klass.connection, relation.table.name, join_list)
+          alias_tracker = relation.alias_tracker(join_list)
           join_dependency = Polyamorous::JoinDependency.new(relation.klass, relation.table, association_joins, Arel::Nodes::OuterJoin)
           join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
           join_nodes.each do |join|

data/lib/ransack/context.rb

@@ -152,16 +152,16 @@ module Ransack
     end
 
     def ransackable_alias(str)
-      klass._ransack_aliases.fetch(str, str)
+      klass._ransack_aliases.fetch(str, klass._ransack_aliases.fetch(str.to_sym, str))
     end
 
     def ransackable_attribute?(str, klass)
-      klass.ransackable_attributes(auth_object).include?(str) ||
-        klass.ransortable_attributes(auth_object).include?(str)
+      klass.ransackable_attributes(auth_object).any? { |s| s.to_sym == str.to_sym } ||
+        klass.ransortable_attributes(auth_object).any? { |s| s.to_sym == str.to_sym }
     end
 
     def ransackable_association?(str, klass)
-      klass.ransackable_associations(auth_object).include? str
+      klass.ransackable_associations(auth_object).any? { |s| s.to_sym == str.to_sym }
     end
 
     def ransackable_scope?(str, klass)

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '4.1.0'
+  VERSION = '4.2.0'
 end

data/lib/ransack.rb

@@ -21,6 +21,7 @@ require 'ransack/ransacker'
 require 'ransack/translate'
 require 'ransack/active_record'
 require 'ransack/context'
+require 'ransack/version'
 
 ActiveSupport.on_load(:action_controller) do
   require 'ransack/helpers'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -140,15 +140,10 @@ files:
 - docs/static/logo/ransack.png
 - docs/static/logo/ransack.svg
 - docs/yarn.lock
-- lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_6.1_ruby_2/reflection.rb
-- lib/polyamorous/activerecord_7.0_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_7.0_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_7.0_ruby_2/reflection.rb
-- lib/polyamorous/activerecord_7.1_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_7.1_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_7.1_ruby_2/reflection.rb
+- lib/polyamorous/activerecord/join_association.rb
+- lib/polyamorous/activerecord/join_association_7_2.rb
+- lib/polyamorous/activerecord/join_dependency.rb
+- lib/polyamorous/activerecord/reflection.rb
 - lib/polyamorous/join.rb
 - lib/polyamorous/polyamorous.rb
 - lib/polyamorous/swapping_reflection_class.rb
@@ -249,34 +244,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Object-based searching for Active Record.
-test_files:
-- spec/blueprints/articles.rb
-- spec/blueprints/comments.rb
-- spec/blueprints/notes.rb
-- spec/blueprints/people.rb
-- spec/blueprints/tags.rb
-- spec/console.rb
-- spec/helpers/polyamorous_helper.rb
-- spec/helpers/ransack_helper.rb
-- spec/polyamorous/activerecord_compatibility_spec.rb
-- spec/polyamorous/join_association_spec.rb
-- spec/polyamorous/join_dependency_spec.rb
-- spec/polyamorous/join_spec.rb
-- spec/ransack/adapters/active_record/base_spec.rb
-- spec/ransack/adapters/active_record/context_spec.rb
-- spec/ransack/configuration_spec.rb
-- spec/ransack/helpers/form_builder_spec.rb
-- spec/ransack/helpers/form_helper_spec.rb
-- spec/ransack/nodes/condition_spec.rb
-- spec/ransack/nodes/grouping_spec.rb
-- spec/ransack/nodes/value_spec.rb
-- spec/ransack/predicate_spec.rb
-- spec/ransack/search_spec.rb
-- spec/ransack/translate_spec.rb
-- spec/spec_helper.rb
-- spec/support/en.yml
-- spec/support/schema.rb
+test_files: []

data/lib/polyamorous/activerecord_7.0_ruby_2/join_association.rb

@@ -1 +0,0 @@
-require 'polyamorous/activerecord_6.1_ruby_2/join_association'

data/lib/polyamorous/activerecord_7.0_ruby_2/join_dependency.rb

@@ -1 +0,0 @@
-require 'polyamorous/activerecord_6.1_ruby_2/join_dependency'

data/lib/polyamorous/activerecord_7.0_ruby_2/reflection.rb

@@ -1 +0,0 @@
-require 'polyamorous/activerecord_6.1_ruby_2/reflection'

data/lib/polyamorous/activerecord_7.1_ruby_2/join_association.rb

@@ -1 +0,0 @@
-require 'polyamorous/activerecord_6.1_ruby_2/join_association'

data/lib/polyamorous/activerecord_7.1_ruby_2/join_dependency.rb

@@ -1 +0,0 @@
-require 'polyamorous/activerecord_6.1_ruby_2/join_dependency'

data/lib/polyamorous/activerecord_7.1_ruby_2/reflection.rb

@@ -1 +0,0 @@
-require 'polyamorous/activerecord_6.1_ruby_2/reflection'