ransack 2.1.1 → 2.4.2

data/lib/ransack/locale/fi.yml

@@ -0,0 +1,71 @@
+fi:
+  ransack:
+    search: "haku"
+    predicate: "predikaatti"
+    and: "ja"
+    or: "tai"
+    any: "jokin"
+    all: "kaikki"
+    combinator: "kombinaattori"
+    attribute: "attribuutti"
+    value: "arvo"
+    condition: "ehto"
+    sort: "järjestys"
+    asc: "nouseva"
+    desc: "laskeva"
+    predicates:
+      eq: "sama kuin"
+      eq_any: "sama kuin jokin"
+      eq_all: "sama kuin kaikki"
+      not_eq: "eri kuin"
+      not_eq_any: "eri kuin jokin"
+      not_eq_all: "eri kuin kaikki"
+      matches: "täsmää"
+      matches_any: "täsmää jonkun kanssa"
+      matches_all: "täsmää kaikkien kanssa"
+      does_not_match: "ei täsmää"
+      does_not_match_any: "ei täsmää minkään kanssa"
+      does_not_match_all: "ei täsmää kaikkien kanssa"
+      lt: "vähemmän kuin"
+      lt_any: "vähemmän kuin jokin"
+      lt_all: "vähemmän kuin mikään"
+      lteq: "vähemmän tai sama kuin"
+      lteq_any: "vähemmän tai sama kuin jokin"
+      lteq_all: "vähemmän tai sama kuin mikään"
+      gt: "suurempi kuin"
+      gt_any: "suurempi kuin jokin"
+      gt_all: "suurempi kuin mikään"
+      gteq: "suurempi tai yhtä suuri kuin"
+      gteq_any: "suurempi tai yhtä suuri kuin jokin"
+      gteq_all: "suurempi tai yhtä suuri kuin mikään"
+      in: "kohteessa"
+      in_any: "jossakin kohteessa"
+      in_all: "kaikissa kohteissa"
+      not_in: "ei kohteessa"
+      not_in_any: "ei jossakin kohteista"
+      not_in_all: "ei missään kohteista"
+      cont: "sisältää"
+      cont_any: "sisältää jonkin"
+      cont_all: "sisältää kaikki"
+      not_cont: "ei sisällä"
+      not_cont_any: "ei sisällä jotakin"
+      not_cont_all: "ei sisällä mitään"
+      start: "alkaa"
+      start_any: "alkaa jollakin"
+      start_all: "alkaa kaikilla"
+      not_start: "ei ala"
+      not_start_any: "ei ala jollakin"
+      not_start_all: "ei ala millään"
+      end: "päättyy"
+      end_any: "päättyy jollakin"
+      end_all: "päättyy millään"
+      not_end: "ei pääty"
+      not_end_any: "ei pääty jollakin"
+      not_end_all: "ei pääty millään"
+      'true': "on tosi"
+      'false': "ei ole tosi"
+      present: "on läsnä"
+      blank: "on tyhjä"
+      'null': "on määrittämätön"
+      not_null: "on määritetty"
+

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

@@ -6,151 +6,151 @@ I18n.load_path += Dir[
 
 module Ransack
   module Translate
-    def self.word(key, options = {})
-      I18n.translate(:"ransack.#{key}", :default => key.to_s)
-    end
-
-    def self.predicate(key, options = {})
-      I18n.translate(:"ransack.predicates.#{key}", :default => key.to_s)
-    end
-
-    def self.attribute(key, options = {})
-      unless context = options.delete(:context)
-        raise ArgumentError, "A context is required to translate attributes"
+    class << self
+      def word(key, options = {})
+        I18n.translate(:"ransack.#{key}", default: key.to_s)
       end
 
-      original_name = key.to_s
-      base_class = context.klass
-      base_ancestors = base_class.ancestors.select {
-        |x| x.respond_to?(:model_name)
-      }
-      attributes_str = original_name.dup # will be modified by ⬇
-      predicate = Predicate.detect_and_strip_from_string!(attributes_str)
-      attribute_names = attributes_str.split(/_and_|_or_/)
-      combinator = attributes_str.match(/_and_/) ? :and : :or
-      defaults = base_ancestors.map do |klass|
-        "ransack.attributes.#{i18n_key(klass)}.#{original_name}".to_sym
+      def predicate(key, options = {})
+        I18n.translate(:"ransack.predicates.#{key}", default: key.to_s)
       end
 
-      translated_names = attribute_names.map do |name|
-        attribute_name(context, name, options[:include_associations])
-      end
+      def attribute(key, options = {})
+        unless context = options.delete(:context)
+          raise ArgumentError, "A context is required to translate attributes"
+        end
 
-      interpolations = {
-        :attributes => translated_names.join(" #{Translate.word(combinator)} ")
-      }
+        original_name = key.to_s
+        base_class = context.klass
+        base_ancestors = base_class.ancestors.select {
+          |x| x.respond_to?(:model_name)
+        }
+        attributes_str = original_name.dup # will be modified by ⬇
+        predicate = Predicate.detect_and_strip_from_string!(attributes_str)
+        attribute_names = attributes_str.split(/_and_|_or_/)
+        combinator = attributes_str =~ /_and_/ ? :and : :or
+        defaults = base_ancestors.map do |klass|
+          "ransack.attributes.#{i18n_key(klass)}.#{original_name}".to_sym
+        end
 
-      if predicate
-        defaults << "%{attributes} %{predicate}".freeze
-        interpolations[:predicate] = Translate.predicate(predicate)
-      else
-        defaults << "%{attributes}".freeze
-      end
+        translated_names = attribute_names.map do |name|
+          attribute_name(context, name, options[:include_associations])
+        end
 
-      defaults << options.delete(:default) if options[:default]
-      options.reverse_merge! :count => 1, :default => defaults
-      I18n.translate(defaults.shift, options.merge(interpolations))
-    end
+        interpolations = {
+          attributes: translated_names.join(" #{Translate.word(combinator)} ")
+        }
 
-    def self.association(key, options = {})
-      unless context = options.delete(:context)
-        raise ArgumentError, "A context is required to translate associations"
+        if predicate
+          defaults << "%{attributes} %{predicate}".freeze
+          interpolations[:predicate] = Translate.predicate(predicate)
+        else
+          defaults << "%{attributes}".freeze
+        end
+
+        defaults << options.delete(:default) if options[:default]
+        options.reverse_merge! count: 1, default: defaults
+        I18n.translate(defaults.shift, **options.merge(interpolations))
       end
 
-      defaults =
-        if key.blank?
-          [:"ransack.models.#{i18n_key(context.klass)}",
-           :"#{context.klass.i18n_scope}.models.#{i18n_key(context.klass)}"]
-        else
-          [:"ransack.associations.#{i18n_key(context.klass)}.#{key}"]
+      def association(key, options = {})
+        unless context = options.delete(:context)
+          raise ArgumentError, "A context is required to translate associations"
         end
-      defaults << context.traverse(key).model_name.human
-      options = { :count => 1, :default => defaults }
-      I18n.translate(defaults.shift, options)
-    end
 
-  private
+        defaults =
+          if key.blank?
+            [:"ransack.models.#{i18n_key(context.klass)}",
+             :"#{context.klass.i18n_scope}.models.#{i18n_key(context.klass)}"]
+          else
+            [:"ransack.associations.#{i18n_key(context.klass)}.#{key}"]
+          end
+        defaults << context.traverse(key).model_name.human
+        options = { :count => 1, :default => defaults }
+        I18n.translate(defaults.shift, **options)
+      end
 
-    def self.attribute_name(context, name, include_associations = nil)
-      @context, @name = context, name
-      @assoc_path = context.association_path(name)
-      @attr_name = @name.sub(/^#{@assoc_path}_/, ''.freeze)
-      associated_class = @context.traverse(@assoc_path) if @assoc_path.present?
-      @include_associated = include_associations && associated_class
+      private
 
-      defaults = default_attribute_name << fallback_args
-      options = { :count => 1, :default => defaults }
-      interpolations = build_interpolations(associated_class)
+      def attribute_name(context, name, include_associations = nil)
+        @context, @name = context, name
+        @assoc_path = context.association_path(name)
+        @attr_name = @name.sub(/^#{@assoc_path}_/, ''.freeze)
+        associated_class = @context.traverse(@assoc_path) if @assoc_path.present?
+        @include_associated = include_associations && associated_class
 
-      I18n.translate(defaults.shift, options.merge(interpolations))
-    end
+        defaults = default_attribute_name << fallback_args
+        options = { count: 1, default: defaults }
+        interpolations = build_interpolations(associated_class)
 
-    def self.default_attribute_name
-      ["ransack.attributes.#{i18n_key(@context.klass)}.#{@name}".to_sym]
-    end
+        I18n.translate(defaults.shift, **options.merge(interpolations))
+      end
 
-    def self.fallback_args
-      if @include_associated
-        '%{association_name} %{attr_fallback_name}'.freeze
-      else
-        '%{attr_fallback_name}'.freeze
+      def default_attribute_name
+        ["ransack.attributes.#{i18n_key(@context.klass)}.#{@name}".to_sym]
       end
-    end
 
-    def self.build_interpolations(associated_class)
-      {
-        :attr_fallback_name => attr_fallback_name(associated_class),
-        :association_name   => association_name
-      }
-      .reject { |_, value| value.nil? }
-    end
+      def fallback_args
+        if @include_associated
+          '%{association_name} %{attr_fallback_name}'.freeze
+        else
+          '%{attr_fallback_name}'.freeze
+        end
+      end
 
-    def self.attr_fallback_name(associated_class)
-      I18n.t(
-        :"ransack.attributes.#{fallback_class(associated_class)}.#{@attr_name}",
-        :default => default_interpolation(associated_class)
+      def build_interpolations(associated_class)
+        {
+          attr_fallback_name: attr_fallback_name(associated_class),
+          association_name: association_name
+        }.reject { |_, value| value.nil? }
+      end
+
+      def attr_fallback_name(associated_class)
+        I18n.t(
+          :"ransack.attributes.#{fallback_class(associated_class)}.#{@attr_name}",
+          default: default_interpolation(associated_class)
         )
-    end
+      end
 
-    def self.fallback_class(associated_class)
-      i18n_key(associated_class || @context.klass)
-    end
+      def fallback_class(associated_class)
+        i18n_key(associated_class || @context.klass)
+      end
 
-    def self.association_name
-      association(@assoc_path, :context => @context) if @include_associated
-    end
+      def association_name
+        association(@assoc_path, context: @context) if @include_associated
+      end
 
-    def self.default_interpolation(associated_class)
-      [
-        associated_attribute(associated_class),
-        ".attributes.#{@attr_name}".to_sym,
-        @attr_name.humanize
-      ]
-      .flatten
-    end
+      def default_interpolation(associated_class)
+        [
+          associated_attribute(associated_class),
+          ".attributes.#{@attr_name}".to_sym,
+          @attr_name.humanize
+        ].flatten
+      end
 
-    def self.associated_attribute(associated_class)
-      if associated_class
-        translated_attribute(associated_class)
-      else
-        translated_ancestor_attributes
+      def associated_attribute(associated_class)
+        if associated_class
+          translated_attribute(associated_class)
+        else
+          translated_ancestor_attributes
+        end
       end
-    end
 
-    def self.translated_attribute(associated_class)
-      key = "#{associated_class.i18n_scope}.attributes.#{
+      def translated_attribute(associated_class)
+        key = "#{associated_class.i18n_scope}.attributes.#{
         i18n_key(associated_class)}.#{@attr_name}"
-      ["#{key}.one".to_sym, key.to_sym]
-    end
+        ["#{key}.one".to_sym, key.to_sym]
+      end
 
-    def self.translated_ancestor_attributes
-      @context.klass.ancestors
-      .select { |ancestor| ancestor.respond_to?(:model_name) }
-      .map { |ancestor| translated_attribute(ancestor) }
-    end
+      def translated_ancestor_attributes
+        @context.klass.ancestors
+          .select { |ancestor| ancestor.respond_to?(:model_name) }
+          .map { |ancestor| translated_attribute(ancestor) }
+      end
 
-    def self.i18n_key(klass)
-      raise "not implemented"
+      def i18n_key(klass)
+        raise "not implemented"
+      end
     end
   end
 end