ransack 2.3.0 → 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 }
         }
       ],

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|
@@ -47,12 +47,19 @@ module Ransack
         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/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,13 +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/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/locale/sk.yml

@@ -0,0 +1,70 @@
+sk:
+  ransack:
+    search: "vyhľadávanie"
+    predicate: "predikát"
+    and: "a"
+    or: "alebo"
+    any: "akýkoľvek"
+    all: "každý"
+    combinator: "kombinátor"
+    attribute: "atribút"
+    value: "hodnota"
+    condition: "podmienka"
+    sort: "poradie"
+    asc: "vzostupne"
+    desc: "zostupne"
+    predicates:
+      eq: "sa rovná"
+      eq_any: "sa rovná akémukoľvek"
+      eq_all: "sa rovná všetkým"
+      not_eq: "sa nerovná"
+      not_eq_any: "sa nerovná akémukoľvek"
+      not_eq_all: "sa nerovná všetkým"
+      matches: "zodpovedá"
+      matches_any: "zodpovedá akémukoľvek"
+      matches_all: "zodpovedá všetkým"
+      does_not_match: "nezodpovedá"
+      does_not_match_any: "nezodpovedá akémukoľvek"
+      does_not_match_all: "nezodpovedá všetkým"
+      lt: "menší ako"
+      lt_any: "menší ako akýkoľvek"
+      lt_all: "menší ako všetky"
+      lteq: "menší alebo rovný"
+      lteq_any: "menší alebo rovný akémukoľvek"
+      lteq_all: "menší alebo rovný všetkým"
+      gt: "väčší ako"
+      gt_any: "väčší ako akýkoľvek"
+      gt_all: "väčší ako všetky"
+      gteq: "väčší alebo rovný"
+      gteq_any: "väčší alebo rovný akémukoľvek"
+      gteq_all: "väčší alebo rovný všetkým"
+      in: "v"
+      in_any: "v akejkoľvek"
+      in_all: "vo všetkých"
+      not_in: "nie je v"
+      not_in_any: "nie je v akejkoľvek"
+      not_in_all: "nie je vo všetkých"
+      cont: "obsahuje"
+      cont_any: "obsahuje akúkoľvek"
+      cont_all: "obsahuje všetky"
+      not_cont: "neobsahuje"
+      not_cont_any: "neobsahuje akúkoľvek"
+      not_cont_all: "neobsahuje všetky"
+      start: "začína na"
+      start_any: "začína s akoukoľvek"
+      start_all: "začína so všetkými"
+      not_start: "nezačíná s"
+      not_start_any: "nezačíná s akoukoľvek"
+      not_start_all: "nezačíná so všetkými"
+      end: "končí s"
+      end_any: "končí s akoukoľvek"
+      end_all: "končí so všetkými"
+      not_end: "nekončí s"
+      not_end_any: "nekončí s akoukoľvek"
+      not_end_all: "nekončí so všetkými"
+      'true': "je pravdivé"
+      'false': "nie je pravdivé"
+      present: "je vyplnené"
+      blank: "je prázdne"
+      'null': "je null"
+      not_null: "nie je null"

data/lib/ransack/nodes/attribute.rb

@@ -30,7 +30,7 @@ module Ransack
 
       def type
         if ransacker
-          return ransacker.type
+          ransacker.type
         else
           context.type_for(self)
         end

data/lib/ransack/nodes/condition.rb

@@ -127,7 +127,6 @@ module Ransack
       alias :m= :combinator=
       alias :m :combinator
 
-
       # == build_attribute
       #
       #  This method was originally called from Nodes::Grouping#new_condition
@@ -255,6 +254,13 @@ module Ransack
         end
       end
 
+      def attr_value_for_attribute(attr)
+        return attr.attr if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+
+        predicate.case_insensitive ? attr.attr.lower : attr.attr
+      rescue
+        attr.attr
+      end
 
       def default_type
         predicate.type || (attributes.first && attributes.first.type)

data/lib/ransack/nodes/grouping.rb

@@ -108,7 +108,7 @@ module Ransack
       alias :g= :groupings=
 
       def method_missing(method_id, *args)
-        method_name = method_id.to_s
+        method_name = method_id.to_s.dup
         writer = method_name.sub!(/\=$/, ''.freeze)
         if attribute_method?(method_name)
           if writer

data/lib/ransack/nodes/sort.rb

@@ -9,7 +9,7 @@ module Ransack
       class << self
         def extract(context, str)
           return unless str
-          attr, direction = str.split(/\s+/,2)
+          attr, direction = str.split(/\s+/, 2)
           self.new(context).build(name: attr, dir: direction)
         end
       end

data/lib/ransack/nodes/value.rb

@@ -50,7 +50,7 @@ module Ransack
           y, m, d = *[val].flatten
           m ||= 1
           d ||= 1
-          Date.new(y,m,d) rescue nil
+          Date.new(y, m, d) rescue nil
         end
       end
 

data/lib/ransack/predicate.rb

@@ -1,7 +1,7 @@
 module Ransack
   class Predicate
     attr_reader :name, :arel_predicate, :type, :formatter, :validator,
-                :compound, :wants_array
+                :compound, :wants_array, :case_insensitive
 
     class << self
 
@@ -42,6 +42,7 @@ module Ransack
       @compound = opts[:compound]
       @wants_array = opts.fetch(:wants_array,
         @compound || Constants::IN_NOT_IN.include?(@arel_predicate))
+      @case_insensitive = opts[:case_insensitive]
     end
 
     def eql?(other)

data/lib/ransack/search.rb

@@ -18,6 +18,7 @@ module Ransack
       params = params.to_unsafe_h if params.respond_to?(:to_unsafe_h)
       if params.is_a? Hash
         params = params.dup
+        params = params.transform_values { |v| v.is_a?(String) ? v.strip : v }
         params.delete_if { |k, v| [*v].all?{ |i| i.blank? && i != false } }
       else
         params = {}
@@ -29,6 +30,7 @@ module Ransack
         )
       @scope_args = {}
       @sorts ||= []
+      @ignore_unknown_conditions = options[:ignore_unknown_conditions] == false ? false : true
       build(params.with_indifferent_access)
     end
 
@@ -44,7 +46,7 @@ module Ransack
           base.send("#{key}=", value)
         elsif @context.ransackable_scope?(key, @context.object)
           add_scope(key, value)
-        elsif !Ransack.options[:ignore_unknown_conditions]
+        elsif !Ransack.options[:ignore_unknown_conditions] || !@ignore_unknown_conditions
           raise ArgumentError, "Invalid search term #{key}"
         end
       end

data/lib/ransack/translate.rb

@@ -50,7 +50,7 @@ module Ransack
 
         defaults << options.delete(:default) if options[:default]
         options.reverse_merge! count: 1, default: defaults
-        I18n.translate(defaults.shift, options.merge(interpolations))
+        I18n.translate(defaults.shift, **options.merge(interpolations))
       end
 
       def association(key, options = {})
@@ -67,7 +67,7 @@ module Ransack
           end
         defaults << context.traverse(key).model_name.human
         options = { :count => 1, :default => defaults }
-        I18n.translate(defaults.shift, options)
+        I18n.translate(defaults.shift, **options)
       end
 
       private
@@ -83,7 +83,7 @@ module Ransack
         options = { count: 1, default: defaults }
         interpolations = build_interpolations(associated_class)
 
-        I18n.translate(defaults.shift, options.merge(interpolations))
+        I18n.translate(defaults.shift, **options.merge(interpolations))
       end
 
       def default_attribute_name

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '2.3.0'
+  VERSION = '2.4.2'
 end

data/ransack.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 $:.push File.expand_path("../lib", __FILE__)
 require "ransack/version"
 
@@ -6,36 +7,20 @@ Gem::Specification.new do |s|
   s.name        = "ransack"
   s.version     = Ransack::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ernie Miller", "Ryan Bigg", "Jon Atack","Sean Carroll"]
-  s.email       = ["ernie@erniemiller.org", "radarlistener@gmail.com", "jonnyatack@gmail.com","sfcarroll@gmail.com"]
+  s.authors     = ["Ernie Miller", "Ryan Bigg", "Jon Atack", "Sean Carroll"]
+  s.email       = ["ernie@erniemiller.org", "radarlistener@gmail.com", "jonnyatack@gmail.com", "sfcarroll@gmail.com"]
   s.homepage    = "https://github.com/activerecord-hackery/ransack"
   s.summary     = %q{Object-based searching for Active Record and Mongoid (currently).}
   s.description = %q{Ransack is the successor to the MetaSearch gem. It improves and expands upon MetaSearch's functionality, but does not have a 100%-compatible API.}
-  s.required_ruby_version = '>= 1.9'
+  s.required_ruby_version = '>= 2.6'
   s.license     = 'MIT'
 
-  s.add_dependency 'actionpack', '>= 5.0'
-  s.add_dependency 'activerecord', '>= 5.0'
-  s.add_dependency 'activesupport', '>= 5.0'
+  s.add_dependency 'activerecord', '>= 5.2.4'
+  s.add_dependency 'activesupport', '>= 5.2.4'
   s.add_dependency 'i18n'
-  s.add_dependency 'polyamorous', Ransack::VERSION.to_s
-  s.add_development_dependency 'rspec', '~> 3'
-  s.add_development_dependency 'machinist', '~> 1.0.6'
-  s.add_development_dependency 'faker', '~> 0.9.5'
-  s.add_development_dependency 'sqlite3', ::Gem::Version.new(ENV['RAILS'].gsub(/^v/, '')) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
-  s.add_development_dependency 'pg', '~> 0.21'
-  s.add_development_dependency 'mysql2', '0.3.20'
-  s.add_development_dependency 'pry', '0.10'
-  s.add_development_dependency 'byebug'
 
   s.files         = `git ls-files`.split("\n")
-
-  s.test_files    = `git ls-files -- {test,spec,features}/*`
-                    .split("\n")
-
-  s.executables   = `git ls-files -- bin/*`
-                    .split("\n")
-                    .map { |f| File.basename(f) }
-
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end

data/spec/blueprints/articles.rb

@@ -2,4 +2,4 @@ Article.blueprint do
   person
   title
   body
-end
+end

data/spec/blueprints/comments.rb

@@ -2,4 +2,4 @@ Comment.blueprint do
   article
   person
   body
-end
+end

data/spec/blueprints/notes.rb

@@ -2,4 +2,4 @@ Note.blueprint do
   note
   notable_type { "Article" }
   notable_id
-end
+end