ransack 1.2.3 → 1.3.0

data/lib/ransack/locale/hu.yml

@@ -0,0 +1,70 @@
+hu:
+  ransack:
+    search: "keresés"
+    predicate: "állítás"
+    and: "és"
+    or: "vagy"
+    any: "bármely"
+    all: "mindegyik"
+    combinator: "combinator"
+    attribute: "attribute"
+    value: "érték"
+    condition: "feltétel"
+    sort: "rendezés"
+    asc: "növekvő"
+    desc: "csökkenő"
+    predicates:
+      eq: "egyenlő"
+      eq_any: "bármelyikkel egyenlő"
+      eq_all: "minddel egyenlő"
+      not_eq: "nem egyenlő"
+      not_eq_any: "nem egyenlő bármelyikkel"
+      not_eq_all: "nem egyenlő egyikkel sem"
+      matches: "egyezik"
+      matches_any: "bármelyikkel egyezik"
+      matches_all: "minddel egyezik"
+      does_not_match: "nem egyezik"
+      does_not_match_any: "nem egyezik semelyikkel"
+      does_not_match_all: "nem egyezik az összessel"
+      lt: "kisebb, mint"
+      lt_any: "bármelyiknél kisebb"
+      lt_all: "mindegyiknél kisebb"
+      lteq: "kisebb vagy egyenlő, mint"
+      lteq_any: "bármelyiknél kisebb vagy egyenlő"
+      lteq_all: "mindegyiknél kisebb vagy egyenlő"
+      gt: "nagyobb, mint"
+      gt_any: "bármelyiknél nagyobb"
+      gt_all: "mindegyiknél nagyobb"
+      gteq: "nagyobb vagy egyenlő, mint"
+      gteq_any: "bármelyiknél nagyobb vagy egyenlő"
+      gteq_all: "mindegyiknél nagyobb vagy egyenlő"
+      in: "értéke"
+      in_any: "értéke bármelyik"
+      in_all: "értéke mindegyik"
+      not_in: "nem ez az értéke"
+      not_in_any: "értéke egyik sem"
+      not_in_all: "értéke nem ezek az elemek"
+      cont: "tartalmazza"
+      cont_any: "bármelyiket tartalmazza"
+      cont_all: "mindet tartalmazza"
+      not_cont: "nem tartalmazza"
+      not_cont_any: "egyiket sem tartalmazza"
+      not_cont_all: "nem tartalmazza mindet"
+      start: "így kezdődik"
+      start_any: "bármelyikkel kezdődik"
+      start_all: "ezekkel kezdődik"
+      not_start: "nem így kezdődik"
+      not_start_any: "nem ezek egyikével kezdődik"
+      not_start_all: "nem ezekkel kezdődik"
+      end: "így végződik"
+      end_any: "bármelyikkel végződik"
+      end_all: "ezekkel végződik"
+      not_end: "nem úgy végződik"
+      not_end_any: "nem ezek egyikével végződik"
+      not_end_all: "nem ezekkel végződik"
+      'true': "igaz"
+      'false': "hamis"
+      present: "létezik"
+      blank: "üres"
+      'null': "null"
+      not_null: "nem null"

data/lib/ransack/locale/nl.yml

@@ -0,0 +1,70 @@
+nl:
+  ransack:
+    search: "zoeken"
+    predicate: "eigenschap"
+    and: "en"
+    or: "of"
+    any: "enig"
+    all: "alle"
+    combinator: "combinator"
+    attribute: "attribuut"
+    value: "waarde"
+    condition: "conditie"
+    sort: "sorteren"
+    asc: "oplopend"
+    desc: "aflopend"
+    predicates:
+      eq: "gelijk"
+      eq_any: "gelijk enig"
+      eq_all: "gelijk alle"
+      not_eq: "niet gelijk aan"
+      not_eq_any: "niet gelijk aan enig"
+      not_eq_all: "niet gelijk aan alle"
+      matches: "evenaart"
+      matches_any: "evenaart enig"
+      matches_all: "evenaart alle"
+      does_not_match: "evenaart niet"
+      does_not_match_any: "evenaart niet voor enig"
+      does_not_match_all: "evenaart niet voor alle"
+      lt: "kleiner dan"
+      lt_any: "kleiner dan enig"
+      lt_all: "kleiner dan alle"
+      lteq: "kleiner dan of gelijk aan"
+      lteq_any: "kleiner dan of gelijk aan enig"
+      lteq_all: "kleiner dan of gelijk aan alle"
+      gt: "groter dan"
+      gt_any: "groter dan enig"
+      gt_all: "groter dan alle"
+      gteq: "groter dan or equal to"
+      gteq_any: "groter dan or equal to enig"
+      gteq_all: "groter dan or equal to alle"
+      in: "in"
+      in_any: "in enig"
+      in_all: "in alle"
+      not_in: "niet in"
+      not_in_any: "niet in enig"
+      not_in_all: "niet in alle"
+      cont: "bevat"
+      cont_any: "bevat enig"
+      cont_all: "bevat alle"
+      not_cont: "bevat niet"
+      not_cont_any: "bevat niet enig"
+      not_cont_all: "bevat niet alle"
+      start: "start met"
+      start_any: "start met enig"
+      start_all: "start met alle"
+      not_start: "start niet met"
+      not_start_any: "start niet met enig"
+      not_start_all: "start niet met alle"
+      end: "eindigt met"
+      end_any: "eindigt met enig"
+      end_all: "eindigt met alle"
+      not_end: "eindigt niet met"
+      not_end_any: "eindigt niet met enig"
+      not_end_all: "eindigt niet met alle"
+      'true': "is waar"
+      'false': "is niet waar"
+      present: "is present"
+      blank: "is afwezig"
+      'null': "is null"
+      not_null: "is niet null"

data/lib/ransack/nodes/attribute.rb

@@ -5,8 +5,8 @@ module Ransack
 
       attr_reader :name
 
-      delegate :blank?, :present?, :==, to: :name
-      delegate :engine, to: :context
+      delegate :blank?, :present?, :==, :to => :name
+      delegate :engine, :to => :context
 
       def initialize(context, name = nil)
         super(context)

data/lib/ransack/nodes/condition.rb

@@ -10,20 +10,22 @@ module Ransack
       class << self
         def extract(context, key, values)
           attributes, predicate = extract_attributes_and_predicate(key)
-          if attributes.size > 0
+          if attributes.size > 0 && predicate
             combinator = key.match(/_(or|and)_/) ? $1 : nil
             condition = self.new(context)
             condition.build(
-              a: attributes,
-              p: predicate.name,
-              m: combinator,
-              v: predicate.wants_array ? Array(values) : [values]
+              :a => attributes,
+              :p => predicate.name,
+              :m => combinator,
+              :v => predicate.wants_array ? Array(values) : [values]
             )
             # TODO: Figure out what to do with multiple types of attributes,
-            # if anything.
-            # Tempted to go with "garbage in, garbage out" on this one
-            predicate.validate(condition.values, condition.default_type) ?
-              condition : nil
+            # if anything. Tempted to go with "garbage in, garbage out" here.
+            if predicate.validate(condition.values, condition.default_type)
+              condition
+            else
+              nil
+            end
           end
         end
 
@@ -33,7 +35,9 @@ module Ransack
           str = key.dup
           name = Predicate.detect_and_strip_from_string!(str)
           predicate = Predicate.named(name)
-          raise ArgumentError, "No valid predicate for #{key}" unless predicate
+          unless predicate || Ransack.options[:ignore_unknown_conditions]
+            raise ArgumentError, "No valid predicate for #{key}"
+          end
           attributes = str.split(/_and_|_or_/)
           [attributes, predicate]
         end
@@ -169,8 +173,9 @@ module Ransack
       def arel_predicate
         predicates = attributes.map do |attr|
           attr.attr.send(
-            predicate.arel_predicate, formatted_values_for_attribute(attr)
-            )
+            arel_predicate_for_attribute(attr),
+            formatted_values_for_attribute(attr)
+          )
         end
 
         if predicates.size > 1
@@ -203,6 +208,18 @@ module Ransack
         predicate.wants_array ? formatted : formatted.first
       end
 
+      def arel_predicate_for_attribute(attr)
+        if predicate.arel_predicate === Proc
+          values = casted_values_for_attribute(attr)
+          predicate.arel_predicate.call(
+            predicate.wants_array ? values : values.first
+            )
+        else
+          predicate.arel_predicate
+        end
+      end
+
+
       def default_type
         predicate.type || (attributes.first && attributes.first.type)
       end

data/lib/ransack/nodes/grouping.rb

@@ -9,7 +9,7 @@ module Ransack
       i18n_word :condition, :and, :or
       i18n_alias :c => :condition, :n => :and, :o => :or
 
-      delegate :each, to: :values
+      delegate :each, :to => :values
 
       def initialize(context, combinator = nil)
         super(context)
@@ -21,7 +21,9 @@ module Ransack
       end
 
       def translate(key, options = {})
-        super or Translate.attribute(key.to_s, options.merge(context: context))
+        super or Translate.attribute(
+          key.to_s, options.merge(:context => context)
+        )
       end
 
       def conditions
@@ -159,10 +161,8 @@ module Ransack
       end
 
       def inspect
-        data = [
-                ['conditions', conditions], ['combinator', combinator]
-               ].
-               reject { |e| e[1].blank? }
+        data = [['conditions', conditions], ['combinator', combinator]]
+               .reject { |e| e[1].blank? }
                .map { |v| "#{v[0]}: #{v[1]}" }
                .join(', ')
         "Grouping <#{data}>"

data/lib/ransack/nodes/node.rb

@@ -2,7 +2,7 @@ module Ransack
   module Nodes
     class Node
       attr_reader :context
-      delegate :contextualize, to: :context
+      delegate :contextualize, :to => :context
       class_attribute :i18n_words
       class_attribute :i18n_aliases
       self.i18n_words = []

data/lib/ransack/nodes/value.rb

@@ -2,7 +2,7 @@ module Ransack
   module Nodes
     class Value < Node
       attr_accessor :value
-      delegate :present?, :blank?, to: :value
+      delegate :present?, :blank?, :to => :value
 
       def initialize(context, value = nil)
         super(context)

data/lib/ransack/predicate.rb

@@ -45,12 +45,11 @@ module Ransack
       @arel_predicate = opts[:arel_predicate]
       @type = opts[:type]
       @formatter = opts[:formatter]
-      @validator = opts[:validator] || lambda {
-        |v| v.respond_to?(:empty?) ? !v.empty? : !v.nil?
-        }
+      @validator = opts[:validator] ||
+        lambda { |v| v.respond_to?(:empty?) ? !v.empty? : !v.nil? }
       @compound = opts[:compound]
-      @wants_array = opts[:wants_array] == true || @compound || ['in', 'not_in'].
-        include?(@arel_predicate)
+      @wants_array = opts[:wants_array] == true || @compound ||
+        ['in', 'not_in'].include?(@arel_predicate)
     end
 
     def eql?(other)

data/lib/ransack/ransacker.rb

@@ -3,7 +3,7 @@ module Ransack
 
     attr_reader :name, :type, :formatter, :args
 
-    delegate :call, to: :@callable
+    delegate :call, :to => :@callable
 
     def initialize(klass, name, opts = {}, &block)
       @klass, @name = klass, name

data/lib/ransack/search.rb

@@ -8,17 +8,19 @@ module Ransack
 
     attr_reader :base, :context
 
-    delegate :object, :klass, to: :context
+    delegate :object, :klass, :to => :context
     delegate :new_grouping, :new_condition,
              :build_grouping, :build_condition,
-             :translate, to: :base
+             :translate, :to => :base
 
     def initialize(object, params = {}, options = {})
       params = {} unless params.is_a?(Hash)
-      (params ||= {}).delete_if { |k, v| [*v].all?{|i| i.blank? && i != false } }
-      @context = Context.for(object, options)
+      (params ||= {})
+      .delete_if { |k, v| [*v].all? { |i| i.blank? && i != false } }
+      @context = options[:context] || Context.for(object, options)
       @context.auth_object = options[:auth_object]
-      @base = Nodes::Grouping.new(@context, 'and')
+      @base = Nodes::Grouping.new(@context, options[:grouping] || 'and')
+      @scope_args = {}
       build(params.with_indifferent_access)
     end
 
@@ -28,11 +30,14 @@ module Ransack
 
     def build(params)
       collapse_multiparameter_attributes!(params).each do |key, value|
-        case key
-        when 's', 'sorts'
+        if ['s', 'sorts'].include?(key)
           send("#{key}=", value)
-        else
-          base.send("#{key}=", value) if base.attribute_method?(key)
+        elsif base.attribute_method?(key)
+          base.send("#{key}=", value)
+        elsif @context.ransackable_scope?(key, @context.object)
+          add_scope(key, value)
+        elsif !Ransack.options[:ignore_unknown_conditions]
+          raise ArgumentError, "Invalid search term #{key}"
         end
       end
       self
@@ -57,7 +62,8 @@ module Ransack
       when String
         self.sorts = [args]
       else
-        raise ArgumentError, "Invalid argument (#{args.class}) supplied to sorts="
+        raise ArgumentError,
+        "Invalid argument (#{args.class}) supplied to sorts="
       end
     end
     alias :s= :sorts=
@@ -79,20 +85,40 @@ module Ransack
 
     def method_missing(method_id, *args)
       method_name = method_id.to_s
-      writer = method_name.sub!(/\=$/, '')
-      if base.attribute_method?(method_name)
+      getter_name = method_name.sub(/=$/, '')
+      if base.attribute_method?(getter_name)
         base.send(method_id, *args)
+      elsif @context.ransackable_scope?(getter_name, @context.object)
+        if method_name =~ /=$/
+          add_scope getter_name, args
+        else
+          @scope_args[method_name]
+        end
       else
         super
       end
     end
 
     def inspect
-      "Ransack::Search<class: #{klass.name}, base: #{base.inspect}>"
+      details = [
+        [:class, klass.name],
+        ([:scope, @scope_args] if @scope_args.present?),
+        [:base, base.inspect]
+      ].compact.map { |d| d.join(': ') }.join(', ')
+      "Ransack::Search<#{details}>"
     end
 
     private
 
+    def add_scope(key, args)
+      if @context.scope_arity(key) == 1
+        @scope_args[key] = args.is_a?(Array) ? args[0] : args
+      else
+        @scope_args[key] = args
+      end
+      @context.chain_scope(key, args)
+    end
+
     def collapse_multiparameter_attributes!(attrs)
       attrs.keys.each do |k|
         if k.include?("(")

data/lib/ransack/translate.rb

@@ -5,11 +5,11 @@ I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'locale', '*.yml')]
 module Ransack
   module Translate
     def self.word(key, options = {})
-      I18n.translate(:"ransack.#{key}", default: key.to_s)
+      I18n.translate(:"ransack.#{key}", :default => key.to_s)
     end
 
     def self.predicate(key, options = {})
-      I18n.translate(:"ransack.predicates.#{key}", default: key.to_s)
+      I18n.translate(:"ransack.predicates.#{key}", :default => key.to_s)
     end
 
     def self.attribute(key, options = {})
@@ -47,7 +47,7 @@ module Ransack
       end
 
       defaults << options.delete(:default) if options[:default]
-      options.reverse_merge! count: 1, default: defaults
+      options.reverse_merge! :count => 1, :default => defaults
       I18n.translate(defaults.shift, options.merge(interpolations))
     end
 
@@ -60,7 +60,7 @@ module Ransack
         [:"#{context.klass.i18n_scope}.models.#{i18n_key(context.klass)}"] :
         [:"ransack.associations.#{i18n_key(context.klass)}.#{key}"]
       defaults << context.traverse(key).model_name.human
-      options = { count: 1, default: defaults }
+      options = { :count => 1, :default => defaults }
       I18n.translate(defaults.shift, options)
     end
 
@@ -75,7 +75,7 @@ module Ransack
         :"ransack.attributes.#{
           i18n_key(associated_class || context.klass)
           }.#{attr_name}",
-        default: [
+        :default => [
           (
             if associated_class
               :"#{associated_class.i18n_scope}.attributes.#{
@@ -93,13 +93,12 @@ module Ransack
       if include_associations && associated_class
         defaults << '%{association_name} %{attr_fallback_name}'
         interpolations[:association_name] = association(
-          assoc_path,
-          context: context
+          assoc_path, :context => context
           )
       else
         defaults << '%{attr_fallback_name}'
       end
-      options = { count: 1, default: defaults }
+      options = { :count => 1, :default => defaults }
       I18n.translate(defaults.shift, options.merge(interpolations))
     end