ransack 2.1.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2eab955e89328399bcb163a575725ea51969653edb1edd66773b6f60554fd12
-  data.tar.gz: 1e6d34f5d87238a18c7ae2194cd0d5320d9460b97b8d8c30ec79d82de6aa139a
+  metadata.gz: be6fda6bbab697d2f125847b2761df81991190d8d9799b5480ac2044441978a0
+  data.tar.gz: 9f39f157e148aa2c4638b8e9c7ab5a8b14221f315e880c04e5f76f3db2a1b473
 SHA512:
-  metadata.gz: 52c4a46725d9bb474fbb229c39d9638c730d77bd53211f00f639b78690fcd72aaaa2418b56704c30024c36c39ca7cebde0e86b76cba13704a26f4416791ad141
-  data.tar.gz: bd6880992a977511ea37df47d0828e8ee1e855dff39e2620eaed89bc043ffde2960e3006ebcc0609c9738af10faea6947a1db1f91f1f3eebc65b631d97137054
+  metadata.gz: 2fc2082431692f609ddb39171876ade4e1eb4ce715ad917f196db6714a1f55872852c61dec20a047bf48b31f9cab812417fb94f1e9ae9786771320cbd6bc54a4
+  data.tar.gz: ea1ed1a393fe699432f7012facf66e01b48725d73eb7c8956f17435b447ce745fb65c235425cc28079ba1b1c74d64ba758710f25793f738ea92a49f5409abb68

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 coverage/*
 .DS_Store
+.byebug_history

data/.travis.yml

@@ -3,9 +3,20 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.5
+  - 2.6.0
+
+services:
+  - mysql
 
 env:
+  - RAILS=6-0-stable DB=sqlite3
+  - RAILS=6-0-stable DB=mysql
+  - RAILS=6-0-stable DB=postgres
+
+  - RAILS=v6.0.0 DB=sqlite3
+  - RAILS=v6.0.0 DB=mysql
+  - RAILS=v6.0.0 DB=postgres
+
   - RAILS=5-2-stable DB=sqlite3
   - RAILS=5-2-stable DB=mysql
   - RAILS=5-2-stable DB=postgres
@@ -35,3 +46,4 @@ before_script:
 addons:
   code_climate:
     repo_token: 8b701c4364d51a0217105e08c06922d600cec3d9e60d546a89e3ddfe46e0664e
+  postgresql: "9.6"

data/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## Unreleased
 
+## 2.3.0 - 2019-08-18
+
+* Arabic translations PR [979](https://github.com/activerecord-hackery/ransack/pull/979)
+
+* Rails 6 PR [1027](https://github.com/activerecord-hackery/ransack/pull/1027)
+ *vrodokanakis*
+
+* Make polyamorous a separate gem PR [1002](https://github.com/activerecord-hackery/ransack/pull/1002)
+
+* Catalan translations PR[1007](https://github.com/activerecord-hackery/ransack/pull/1007)
+ *roslavych*
+
+* Don't escape period characters with wildcard searches in mysql2 PR [1013](https://github.com/activerecord-hackery/ransack/pull/1013)
+ *daflip*
+
+* Farsi translations PR [1030](https://github.com/activerecord-hackery/ransack/pull/1030)
+
+* Finnish translations PR [1049](https://github.com/activerecord-hackery/ransack/pull/1049)
+
+* Fix wrong table alias when using nested join. for ActiveRecord >= 5.2
+  PR [374](https://github.com/activerecord-hackery/ransack/pull/374)
+
+  *hiichan*
+
 ## Version 2.1.1 - 2018-12-05
 
 * Add `arabic` translation

data/Gemfile

@@ -3,7 +3,7 @@ gemspec
 
 gem 'rake'
 
-rails = ENV['RAILS'] || '5-0-stable'
+rails = ENV['RAILS'] || '6-0-stable'
 
 gem 'pry'
 
@@ -16,29 +16,21 @@ when /\// # A path
   gem 'activerecord', path: "#{rails}/activerecord", require: false
   gem 'actionpack', path: "#{rails}/actionpack"
 when /^v/ # A tagged version
-  git 'git://github.com/rails/rails.git', :tag => rails do
+  git 'https://github.com/rails/rails.git', :tag => rails do
     gem 'activesupport'
     gem 'activemodel'
     gem 'activerecord', require: false
     gem 'actionpack'
   end
-  if rails >= 'v5.2.0'
-    gem 'mysql2', '~> 0.4.4'
-  end
 else
-  git 'git://github.com/rails/rails.git', :branch => rails do
+  git 'https://github.com/rails/rails.git', :branch => rails do
     gem 'activesupport'
     gem 'activemodel'
     gem 'activerecord', require: false
     gem 'actionpack'
   end
-  if rails == '3-0-stable'
-    gem 'mysql2', '< 0.3'
-  end
-  if rails == '5-2-stable'
-    gem 'mysql2', '~> 0.4.4'
-  end
 end
+gem 'mysql2', '~> 0.5.2'
 
 group :test do
   # TestUnit was removed from Ruby 2.2 but still needed for testing Rails 3.x.

data/README.md

@@ -30,9 +30,13 @@ If you're viewing this at
 you're reading the documentation for the master branch with the latest features.
 [View documentation for the last release (2.0.0).](https://github.com/activerecord-hackery/ransack/tree/v2.0.0)
 
+## Rails 6 Support
+
+Rails 6 is right around the corner, but not yet released. Ransack master branch supports ```6.0.0.rc2```. Full Rails 6 support will be provided after the official Rails 6 release. See [this issue](https://github.com/activerecord-hackery/ransack/issues/1032) for details.
+
 ## Getting started
 
-Ransack is compatible with Rails 5.0, 5.1 and 5.2 on Ruby 2.2 and later.
+Ransack is compatible with Rails 6.0.0.rc2, 5.0, 5.1 and 5.2 on Ruby 2.2 and later.
 If you are using Rails <5.0 use the 1.8 line of Ransack.
 If you are using Ruby 1.8 or an earlier JRuby and run into compatibility
 issues, you can use an earlier version of Ransack, say, up to 1.3.0.
@@ -717,8 +721,6 @@ class Employee < ActiveRecord::Base
       %i(activated hired_since)
     end
   end
-
-  private_class_method :ransackable_scopes
 end
 
 Employee.ransack({ activated: true, hired_since: '2013-01-01' })

data/lib/ransack.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext'
 require 'ransack/configuration'
 require 'ransack/adapters'
+require 'polyamorous'
 
 Ransack::Adapters.object_mapper.require_constants
 

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

@@ -107,9 +107,15 @@ module Ransack
           base, joins =
           if ::ActiveRecord::VERSION::STRING > Constants::RAILS_5_2_0
             alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(self.klass.connection, @object.table.name, [])
+            constraints   = if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_0)
+              @join_dependency.join_constraints(@object.joins_values, alias_tracker)
+            else
+              @join_dependency.join_constraints(@object.joins_values, @join_type, alias_tracker)
+            end
+
             [
               Arel::SelectManager.new(@object.table),
-              @join_dependency.join_constraints(@object.joins_values, @join_type, alias_tracker)
+              constraints
             ]
           else
             [
@@ -163,7 +169,7 @@ module Ransack
         def build_correlated_subquery(association)
           join_constraints = extract_joins(association)
           join_root = join_constraints.shift
-          correlated_key = join_root.right.expr.left
+          correlated_key = extract_correlated_key(join_root)
           subquery = Arel::SelectManager.new(association.base_klass)
           subquery.from(join_root.left)
           subquery.project(correlated_key)
@@ -179,6 +185,20 @@ module Ransack
 
         private
 
+        def extract_correlated_key(join_root)
+          correlated_key = join_root.right.expr.left
+
+          if correlated_key.is_a? Arel::Nodes::And
+            correlated_key = correlated_key.left.left
+          elsif correlated_key.is_a? Arel::Nodes::Equality
+            correlated_key = correlated_key.left
+          elsif correlated_key.is_a? Arel::Nodes::Grouping
+            correlated_key = join_root.right.expr.right.left
+          else
+            correlated_key
+          end
+        end
+
         def get_parent_and_attribute_name(str, parent = @base)
           attr_name = nil
 
@@ -261,7 +281,11 @@ module Ransack
             end
           else
             alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(self.klass.connection, relation.table.name, join_list)
-            join_dependency = Polyamorous::JoinDependency.new(relation.klass, relation.table, association_joins)
+            join_dependency = if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_0)
+              Polyamorous::JoinDependency.new(relation.klass, relation.table, association_joins, Arel::Nodes::OuterJoin)
+            else
+              Polyamorous::JoinDependency.new(relation.klass, relation.table, association_joins)
+            end
             join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
             join_nodes.each do |join|
               join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
@@ -289,7 +313,15 @@ module Ransack
         end
 
         def build_association(name, parent = @base, klass = nil)
-          if ::ActiveRecord::VERSION::STRING < Constants::RAILS_5_2_0
+          if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_0)
+            jd = Polyamorous::JoinDependency.new(
+              parent.base_klass,
+              parent.table,
+              Polyamorous::Join.new(name, @join_type, klass),
+              @join_type
+            )
+            found_association = jd.instance_variable_get(:@join_root).children.last
+          elsif ::Gem::Version.new(::ActiveRecord::VERSION::STRING) < ::Gem::Version.new(Constants::RAILS_5_2_0)
             jd = Polyamorous::JoinDependency.new(
               parent.base_klass,
               Polyamorous::Join.new(name, @join_type, klass),
@@ -300,7 +332,7 @@ module Ransack
             alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(self.klass.connection, parent.table.name, [])
             jd = Polyamorous::JoinDependency.new(
               parent.base_klass,
-              parent.base_klass.arel_table,
+              parent.table,
               Polyamorous::Join.new(name, @join_type, klass),
               alias_tracker
             )
@@ -308,13 +340,12 @@ module Ransack
           else
             jd = Polyamorous::JoinDependency.new(
               parent.base_klass,
-              parent.base_klass.arel_table,
-              Polyamorous::Join.new(name, @join_type, klass),
+              parent.table,
+              Polyamorous::Join.new(name, @join_type, klass)
             )
             found_association = jd.instance_variable_get(:@join_root).children.last
           end
 
-
           @associations_pot[found_association] = parent
 
           # TODO maybe we dont need to push associations here, we could loop
@@ -325,14 +356,11 @@ module Ransack
           if ::ActiveRecord::VERSION::STRING > Constants::RAILS_5_2_0
             @join_dependency.send(:construct_tables!, jd.instance_variable_get(:@join_root))
           else
-            @join_dependency.send(
-              :construct_tables!, jd.instance_variable_get(:@join_root), found_association
-            )
+            @join_dependency.send(:construct_tables!, jd.instance_variable_get(:@join_root), found_association)
           end
 
           # Leverage the stashed association functionality in AR
           @object = @object.joins(jd)
-
           found_association
         end
 

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

@@ -102,8 +102,11 @@ module Ransack
     # replace % \ to \% \\
     def escape_wildcards(unescaped)
       case ActiveRecord::Base.connection.adapter_name
-      when "Mysql2".freeze, "PostgreSQL".freeze
-        # Necessary for PostgreSQL and MySQL
+      when "Mysql2".freeze
+        # Necessary for MySQL
+        unescaped.to_s.gsub(/([\\%_])/, '\\\\\\1')
+      when "PostgreSQL".freeze
+        # Necessary for PostgreSQL
         unescaped.to_s.gsub(/([\\%_.])/, '\\\\\\1')
       else
         unescaped

data/lib/ransack/adapters/active_record/ransack/nodes/condition.rb

@@ -43,7 +43,7 @@ module Ransack
 
         def in_predicate?(predicate)
           return unless defined?(Arel::Nodes::Casted)
-          predicate.class == Arel::Nodes::In
+          predicate.class == Arel::Nodes::In || predicate.class == Arel::Nodes::NotIn
         end
 
         def casted_array?(predicate)

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

@@ -2,7 +2,7 @@ module Ransack
   module Translate
 
     def self.i18n_key(klass)
-      klass.model_name.i18n_key.to_s.freeze
+      klass.model_name.i18n_key
     end
   end
 end

data/lib/ransack/constants.rb

@@ -48,6 +48,7 @@ module Ransack
     RAILS_5_1           = '5.1'.freeze
     RAILS_5_2           = '5.2'.freeze
     RAILS_5_2_0         = '5.2.0'.freeze
+    RAILS_6_0           = '6.0.0'.freeze
 
     RANSACK_SLASH_SEARCHES = 'ransack/searches'.freeze
     RANSACK_SLASH_SEARCHES_SLASH_SEARCH = 'ransack/searches/search'.freeze

data/lib/ransack/context.rb

@@ -64,26 +64,28 @@ module Ransack
 
     def traverse(str, base = @base)
       str ||= ''.freeze
-
-      if (segments = str.split(Constants::UNDERSCORE)).size > 0
+      segments = str.split(Constants::UNDERSCORE)
+      unless segments.empty?
         remainder = []
         found_assoc = nil
-        while !found_assoc && segments.size > 0 do
+        until found_assoc || segments.empty?
           # Strip the _of_Model_type text from the association name, but hold
           # onto it in klass, for use as the next base
           assoc, klass = unpolymorphize_association(
             segments.join(Constants::UNDERSCORE)
-            )
+          )
           if found_assoc = get_association(assoc, base)
             base = traverse(
               remainder.join(Constants::UNDERSCORE), klass || found_assoc.klass
-              )
+            )
           end
 
           remainder.unshift segments.pop
         end
-        raise UntraversableAssociationError,
-          "No association matches #{str}" unless found_assoc
+        unless found_assoc
+          raise(UntraversableAssociationError,
+                "No association matches #{str}")
+        end
       end
 
       klassify(base)
@@ -95,18 +97,17 @@ module Ransack
       path = []
       segments = str.split(Constants::UNDERSCORE)
       association_parts = []
-      if (segments = str.split(Constants::UNDERSCORE)).size > 0
-        while segments.size > 0 &&
-        !base.columns_hash[segments.join(Constants::UNDERSCORE)] &&
-        association_parts << segments.shift do
+      unless segments.empty?
+        while !segments.empty? &&
+              !base.columns_hash[segments.join(Constants::UNDERSCORE)] &&
+              association_parts << segments.shift
           assoc, klass = unpolymorphize_association(
             association_parts.join(Constants::UNDERSCORE)
-            )
-          if found_assoc = get_association(assoc, base)
-            path += association_parts
-            association_parts = []
-            base = klassify(klass || found_assoc)
-          end
+          )
+          next unless found_assoc = get_association(assoc, base)
+          path += association_parts
+          association_parts = []
+          base = klassify(klass || found_assoc)
         end
       end
 
@@ -127,7 +128,7 @@ module Ransack
 
     def ransackable_attribute?(str, klass)
       klass.ransackable_attributes(auth_object).include?(str) ||
-      klass.ransortable_attributes(auth_object).include?(str)
+        klass.ransortable_attributes(auth_object).include?(str)
     end
 
     def ransackable_association?(str, klass)

data/lib/ransack/helpers/form_helper.rb

@@ -145,7 +145,7 @@ module Ransack
         private
 
           def parameters_hash(params)
-            if ::ActiveRecord::VERSION::MAJOR == 5 && params.respond_to?(:to_unsafe_h)
+            if ::ActiveRecord::VERSION::MAJOR >= 5 && params.respond_to?(:to_unsafe_h)
               params.to_unsafe_h
             else
               params

data/lib/ransack/locale/az.yml

@@ -1,4 +1,4 @@
-tr:
+az:
   ransack:
     search: "axtar"
     predicate: "təsdiqlə"

data/lib/ransack/locale/ca.yml

@@ -0,0 +1,70 @@
+ca:
+  ransack:
+    search: "cercar"
+    predicate: "predicat"
+    and: "i"
+    or: "o"
+    any: "qualsevol"
+    all: "tots"
+    combinator: "combinador"
+    attribute: "atribut"
+    value: "valor"
+    condition: "condició"
+    sort: "ordenar"
+    asc: "ascendent"
+    desc: "descendent"
+    predicates:
+      eq: "és igual a"
+      eq_any: "és igual a qualsevol"
+      eq_all: "és igual a tots"
+      not_eq: "no és igual a"
+      not_eq_any: "no és igual a qualsevol"
+      not_eq_all: "no és igual a tots"
+      matches: "coincideix"
+      matches_any: "coincideix a qualsevol"
+      matches_all: "coincideix a tots"
+      does_not_match: "no coincideix"
+      does_not_match_any: "no coincideix amb cap"
+      does_not_match_all: "no coincideix amb tots"
+      lt: "menor que"
+      lt_any: "menor que qualsevol"
+      lt_all: "menor o igual a"
+      lteq: "menor que o igual a"
+      lteq_any: "menor o igual a qualsevol"
+      lteq_all: "menor o igual a tots"
+      gt: "major que"
+      gt_any: "major que qualsevol"
+      gt_all: "major que tots"
+      gteq: "major que o igual a"
+      gteq_any: "major que o igual a qualsevol"
+      gteq_all: "major que o igual a tots"
+      in: "en"
+      in_any: "en qualsevol"
+      in_all: "en tots"
+      not_in: "no en"
+      not_in_any: "no en qualsevol"
+      not_in_all: "no en tots"
+      cont: "conté"
+      cont_any: "conté qualsevol"
+      cont_all: "conté tots"
+      not_cont: "no conté"
+      not_cont_any: "no conté cap"
+      not_cont_all: "no conté tota"
+      start: "comença per"
+      start_any: "comença per qualsevol"
+      start_all: "comença per tot"
+      not_start: "no comença per"
+      not_start_any: "no comença per qualsevol"
+      not_start_all: "no comença per tot"
+      end: "acaba en"
+      end_any: "acaba en qualsevol"
+      end_all: "acaba en tot"
+      not_end: "no acaba en"
+      not_end_any: "no acaba en qualsevol"
+      not_end_all: "no acaba en tot"
+      'true': "és verdader"
+      'false': "és fals"
+      present: "és present"
+      blank: "està en blanc"
+      'null': "és nul"
+      not_null: "no és nul"