ransack 2.1.1 → 2.4.2

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

@@ -13,6 +13,18 @@ module Ransack
         formatter: proc { |v| "%#{escape_wildcards(v)}%" }
         }
       ],
+      ['i_cont'.freeze, {
+        arel_predicate: 'matches'.freeze,
+        formatter: proc { |v| "%#{escape_wildcards(v.downcase)}%" },
+        case_insensitive: true
+        }
+      ],
+      ['not_i_cont'.freeze, {
+        arel_predicate: 'does_not_match'.freeze,
+        formatter: proc { |v| "%#{escape_wildcards(v.downcase)}%" },
+        case_insensitive: true
+        }
+      ],
       ['start'.freeze, {
         arel_predicate: 'matches'.freeze,
         formatter: proc { |v| "#{escape_wildcards(v)}%" }
@@ -85,7 +97,7 @@ module Ransack
         arel_predicate: proc { |v| v ? EQ : NOT_EQ },
         compounds: false,
         type: :boolean,
-        validator: proc { |v| BOOLEAN_VALUES.include?(v)},
+        validator: proc { |v| BOOLEAN_VALUES.include?(v) },
         formatter: proc { |v| nil }
         }
       ],
@@ -102,8 +114,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/context.rb

@@ -28,14 +28,10 @@ module Ransack
       @join_type = options[:join_type] || Polyamorous::OuterJoin
       @search_key = options[:search_key] || Ransack.options[:search_key]
       @associations_pot = {}
+      @tables_pot = {}
       @lock_associations = []
 
-      if ::ActiveRecord::VERSION::STRING >= Constants::RAILS_5_2
-        @base = @join_dependency.instance_variable_get(:@join_root)
-      else
-        @base = @join_dependency.join_root
-        @engine = @base.base_klass.arel_engine
-      end
+      @base = @join_dependency.instance_variable_get(:@join_root)
     end
 
     def bind_pair_for(key)

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

@@ -30,7 +30,7 @@ module Ransack
         def format_predicate(attribute)
           arel_pred = arel_predicate_for_attribute(attribute)
           arel_values = formatted_values_for_attribute(attribute)
-          predicate = attribute.attr.public_send(arel_pred, arel_values)
+          predicate = attr_value_for_attribute(attribute).public_send(arel_pred, arel_values)
 
           if in_predicate?(predicate)
             predicate.right = predicate.right.map do |pr|
@@ -43,16 +43,23 @@ 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)
-          predicate.respond_to?(:val) && predicate.val.is_a?(Array)
+          (predicate.respond_to?(:value) && predicate.value.is_a?(Array)) || # Rails 6.1
+            (predicate.respond_to?(:val) && predicate.val.is_a?(Array)) # Rails 5.2, 6.0
         end
 
         def format_values_for(predicate)
-          predicate.val.map do |value|
-            value.is_a?(String) ? Arel::Nodes.build_quoted(value) : value
+          value = if predicate.respond_to?(:value)
+                    predicate.value # Rails 6.1
+                  else
+                    predicate.val # Rails 5.2, 6.0
+                  end
+
+          value.map do |val|
+            val.is_a?(String) ? Arel::Nodes.build_quoted(val) : val
           end
         end
 

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/configuration.rb

@@ -33,7 +33,8 @@ module Ransack
       :up_arrow => '▼'.freeze,
       :down_arrow => '▲'.freeze,
       :default_arrow => nil,
-      :sanitize_scope_args => true
+      :sanitize_scope_args => true,
+      :postgres_fields_sort_option => nil
     }
 
     def configure
@@ -141,6 +142,21 @@ module Ransack
       self.options[:sanitize_scope_args] = boolean
     end
 
+    # The `NULLS FIRST` and `NULLS LAST` options can be used to determine
+    # whether nulls appear before or after non-null values in the sort ordering.
+    #
+    # User may want to configure it like this:
+    #
+    # Ransack.configure do |c|
+    #   c.postgres_fields_sort_option = :nulls_first # or :nulls_last
+    # end
+    #
+    # See this feature: https://www.postgresql.org/docs/13/queries-order.html
+    #
+    def postgres_fields_sort_option=(setting)
+      self.options[:postgres_fields_sort_option] = setting
+    end
+
     # By default, Ransack displays sort order indicator arrows in sort links.
     # The default may be globally overridden in an initializer file like
     # `config/initializers/ransack.rb` as follows:

data/lib/ransack/constants.rb

@@ -36,7 +36,7 @@ module Ransack
       'lt'.freeze, 'lteq'.freeze,
       'gt'.freeze, 'gteq'.freeze,
       'in'.freeze, 'not_in'.freeze
-      ].freeze
+    ].freeze
     A_S_I               = ['a'.freeze, 's'.freeze, 'i'.freeze].freeze
 
     EQ                  = 'eq'.freeze
@@ -45,12 +45,10 @@ module Ransack
     NOT_EQ_ALL          = 'not_eq_all'.freeze
     CONT                = 'cont'.freeze
 
-    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
+    RAILS_6_1           = '6.1.0'.freeze
 
     RANSACK_SLASH_SEARCHES = 'ransack/searches'.freeze
     RANSACK_SLASH_SEARCHES_SLASH_SEARCH = 'ransack/searches/search'.freeze
   end
 end
-

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.rb

@@ -1,2 +1,2 @@
 require 'ransack/helpers/form_builder'
-require 'ransack/helpers/form_helper'
+require 'ransack/helpers/form_helper'

data/lib/ransack/helpers/form_builder.rb

@@ -7,17 +7,11 @@ module ActionView::Helpers::Tags
   class Base
     private
     if defined? ::ActiveRecord
-      if ::ActiveRecord::VERSION::STRING < '5.2'
-        def value(object)
-          object.send @method_name if object # use send instead of public_send
-        end
-      else # rails/rails#29791
-        def value
-          if @allow_method_names_outside_object
-            object.send @method_name if object && object.respond_to?(@method_name, true)
-          else
-            object.send @method_name if object
-          end
+      def value
+        if @allow_method_names_outside_object
+          object.send @method_name if object && object.respond_to?(@method_name, true)
+        else
+          object.send @method_name if object
         end
       end
     end
@@ -51,9 +45,9 @@ module Ransack
       end
 
       def attribute_select(options = nil, html_options = nil, action = nil)
-        options = options || {}
-        html_options = html_options || {}
-        action = action || Constants::SEARCH
+        options ||= {}
+        html_options ||= {}
+        action ||= Constants::SEARCH
         default = options.delete(:default)
         raise ArgumentError, formbuilder_error_message(
           "#{action}_select") unless object.respond_to?(:context)

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"

data/lib/ransack/locale/es.yml

@@ -6,11 +6,11 @@ es:
     or: "o"
     any: "cualquier"
     all: "todos"
-    combinator: "combinado"
+    combinator: "combinador"
     attribute: "atributo"
     value: "valor"
     condition: "condición"
-    sort: "ordernar"
+    sort: "ordenar"
     asc: "ascendente"
     desc: "descendente"
     predicates:
@@ -19,12 +19,12 @@ es:
       eq_all: "es igual a todos"
       not_eq: "no es igual a"
       not_eq_any: "no es igual a cualquier"
-      not_eq_all: "no es iguala todos"
-      matches: "coincidir"
-      matches_any: "coincidir a cualquier"
-      matches_all: "coincidir a todos"
-      does_not_match: "no coincide"
-      does_not_match_any: "no coincide con ninguna"
+      not_eq_all: "no es igual a todos"
+      matches: "coincide con"
+      matches_any: "coincide con cualquier"
+      matches_all: "coincide con todos"
+      does_not_match: "no coincide con"
+      does_not_match_any: "no coincide con ninguno"
       does_not_match_all: "no coincide con todos"
       lt: "menor que"
       lt_any: "menor que cualquier"
@@ -48,23 +48,23 @@ es:
       cont_any: "contiene cualquier"
       cont_all: "contiene todos"
       not_cont: "no contiene"
-      not_cont_any: "no contiene ninguna"
-      not_cont_all: "no contiene toda"
+      not_cont_any: "no contiene ninguno"
+      not_cont_all: "no contiene todos"
       start: "comienza con"
       start_any: "comienza con cualquier"
-      start_all: "comienza con toda"
-      not_start: "no inicia con"
+      start_all: "comienza con todos"
+      not_start: "no comienza con"
       not_start_any: "no comienza con cualquier"
-      not_start_all: "no inicia con toda"
-      end: "termina con"
-      end_any: "termina con cualquier"
-      end_all: "termina con todo"
-      not_end: "no termina con"
-      not_end_any: "no termina con cualquier"
-      not_end_all: "no termina con todo"
+      not_start_all: "no comienza con todos"
+      end: "termina en"
+      end_any: "termina en cualquier"
+      end_all: "termina en todos"
+      not_end: "no termina en"
+      not_end_any: "no termina en cualquier"
+      not_end_all: "no termina en todos"
       'true': "es verdadero"
       'false': "es falso"
-      present: "es presente"
+      present: "está presente"
       blank: "está en blanco"
-      'null': "es nula"
-      not_null: "no es nula"
+      'null': "es nulo"
+      not_null: "no es nulo"

data/lib/ransack/locale/fa.yml

@@ -0,0 +1,70 @@
+fa:
+  ransack:
+    search: "جستجو"
+    predicate: "پیش فرض"
+    and: "و"
+    or: "یا"
+    any: "هر کدام"
+    all: "همه"
+    combinator: "ترکیب کننده"
+    attribute: "ویژگی"
+    value: "مقدار"
+    condition: "شرایط"
+    sort: "مرتب سازی"
+    asc: "صعودی"
+    desc: "نزولی"
+    predicates:
+      eq: "مساوی با"
+      eq_any: "مساوی با حداقل یکی"
+      eq_all: "مساوی با همه"
+      not_eq: "غیر مساوی با"
+      not_eq_any: "غیر مساوی با هیچ کدام"
+      not_eq_all: "غیر مساوی با همه"
+      matches: "مشابهات"
+      matches_any: "شبیه حداقل یکی"
+      matches_all: "شبیه همه"
+      does_not_match: "بدون شباهت"
+      does_not_match_any: "شبیه یکی هم نیست"
+      does_not_match_all: "شبیه هیچ کدام نیست"
+      lt: "کمتر از"
+      lt_any: "کمتر از حداقل یکی"
+      lt_all: "کمتر از همه"
+      lteq: "کمتر یا مساوی با"
+      lteq_any: "کمتر یا مساوی با حداقل یکی"
+      lteq_all: "کمتر یا مساوی با همه"
+      gt: "بیشتر از"
+      gt_any: "بیشتر از حداقل یکی"
+      gt_all: "بیشتر از همه"
+      gteq: "بیشتر یا مساوی با"
+      gteq_any: "بیشتر یا مساوی با حداقل یکی"
+      gteq_all: "بیشتر یا مساوی با همه"
+      in: "در"
+      in_any: "در حداقل یکی"
+      in_all: "در همه"
+      not_in: "نه در"
+      not_in_any: "نه حتی در یکی"
+      not_in_all: "در هیچ کدام"
+      cont: "حاوی"
+      cont_any: "حاوی حداقل یکی"
+      cont_all: "حاوی همه"
+      not_cont: "حاوی این نمیشود"
+      not_cont_any: "حاوی حتی یکی هم نمیشود"
+      not_cont_all: "حاوی هیچ کدام نمیشود"
+      start: "شروع می شود با"
+      start_any: "شروع می شود با حداقل یکی"
+      start_all: "شروع می شود با همه"
+      not_start: "شروع نمی شود با"
+      not_start_any: "شروع نمی شود با حتی یکی"
+      not_start_all: "شروع نمی شود با هیچ کدام"
+      end: "به پایان می رسد با"
+      end_any: "به پایان می رسد با حداقل یکی"
+      end_all: "به پایان می رسد با  همه"
+      not_end: "پایان نمی یابد با"
+      not_end_any: "پایان نمی یابد با حتی یکی"
+      not_end_all: "پایان نمی یابد با هیچ کدام"
+      'true': "درست است"
+      'false': "نادرست است"
+      present: "موجود است"
+      blank: "خالی است"
+      'null': "صفر است"
+      not_null: "صفر نیست"