ransack 1.7.0 → 1.8.0

data/lib/ransack/locale/da.yml

@@ -0,0 +1,70 @@
+da:
+  ransack:
+    search: "søg"
+    predicate: "predicate"
+    and: "og"
+    or: "eller"
+    any: "anhver"
+    all: "alle"
+    combinator: "kombinering"
+    attribute: "attribut"
+    value: "værdi"
+    condition: "betingelse"
+    sort: "sorter"
+    asc: "opstigende"
+    desc: "faldende"
+    predicates:
+      eq: "lig med"
+      eq_any: "lig med enhver"
+      eq_all: "lig med alle"
+      not_eq: "ikke lig med"
+      not_eq_any: "ikke lig med nogen"
+      not_eq_all: "ikke lig med alle"
+      matches: "matcher"
+      matches_any: "matcher enhver"
+      matches_all: "matcher alle"
+      does_not_match: "matcher ikke"
+      does_not_match_any: "matcher ikke nogen"
+      does_not_match_all: "matcher ikke alle"
+      lt: "mindre end"
+      lt_any: "mindre end nogen"
+      lt_all: "mindre end alle"
+      lteq: "mindre end eller lig med"
+      lteq_any: "mindre end eller lig med nogen"
+      lteq_all: "mindre end eller lig med alle"
+      gt: "større end"
+      gt_any: "større end nogen"
+      gt_all: "større end alle"
+      gteq: "større end eller lig med"
+      gteq_any: "større end eller lig med nogen"
+      gteq_all: "større end eller lig med alle"
+      in: "i"
+      in_any: "i nogen"
+      in_all: "i alle"
+      not_in: "ikke i"
+      not_in_any: "ikke i nogen"
+      not_in_all: "ikke i alle"
+      cont: "indeholder"
+      cont_any: "indeholder nogen"
+      cont_all: "indeholder alle"
+      not_cont: "indeholder ikke"
+      not_cont_any: "indeholder ikke nogen"
+      not_cont_all: "indeholder ikke alle"
+      start: "starter med"
+      start_any: "starter med nogen"
+      start_all: "starter med alle"
+      not_start: "starter ikke med"
+      not_start_any: "starter ikke med nogen"
+      not_start_all: "starter ikke med alle"
+      end: "slutter med"
+      end_any: "slutter med nogen"
+      end_all: "slutter med alle"
+      not_end: "slutter ikke med"
+      not_end_any: "slutter ikke med nogen"
+      not_end_all: "slutter ikke med alle"
+      'true': "er sand"
+      'false': "er falsk"
+      present: "er til stede"
+      blank: "er blank"
+      'null': "er nul"
+      not_null: "er ikke nul"

data/lib/ransack/locale/id.yml

@@ -0,0 +1,70 @@
+id:
+  ransack:
+    search: "cari"
+    predicate: "predikat"
+    and: "dan"
+    or: "atau"
+    any: "apapun"
+    all: "semua"
+    combinator: "kombinasi"
+    attribute: "atribut"
+    value: "data"
+    condition: "kondisi"
+    sort: "urutan"
+    asc: "ascending"
+    desc: "descending"
+    predicates:
+      eq: "sama dengan"
+      eq_any: "sama beberapa dengan"
+      eq_all: "sama seluruhnya dengan"
+      not_eq: "tidak sama dengan"
+      not_eq_any: "tidak sama beberapa dengan"
+      not_eq_all: "tidak semua seluruhnya dengan"
+      matches: "mirip"
+      matches_any: "mirip beberapa dengan"
+      matches_all: "mirip semua dengan"
+      does_not_match: "tidak mirip dengan"
+      does_not_match_any: "tidak mirip beberapa dengan"
+      does_not_match_all: "tidak mirip semua dengan"
+      lt: "kurang dari"
+      lt_any: "kurang beberapa dengan"
+      lt_all: "kurang seluruhnya dengan"
+      lteq: "kurang lebih"
+      lteq_any: "kurang lebih beberapa dengan"
+      lteq_all: "kurang lebih semua dengan"
+      gt: "lebih besar daripada"
+      gt_any: "lebih besar beberapa dengan"
+      gt_all: "lebih besar semua dengan"
+      gteq: "lebih besar atau sama dengan"
+      gteq_any: "beberapa lebih besar atau sama dengan"
+      gteq_all: "semua lebih besar atau sama dengan"
+      in: "di"
+      in_any: "di beberapa"
+      in_all: "di semua"
+      not_in: "tidak di"
+      not_in_any: "tidak di beberapa"
+      not_in_all: "tidak semua di"
+      cont: "mengandung"
+      cont_any: "mengandung beberapa"
+      cont_all: "mengandung semua"
+      not_cont: "tidak mengandung"
+      not_cont_any: "tidak mengandung beberapa"
+      not_cont_all: "tidak mengandung semua"
+      start: "diawali dengan"
+      start_any: "diawali beberapa dengan"
+      start_all: "diawali semua dengan"
+      not_start: "tidak diawali dengan"
+      not_start_any: "tidak diawali beberapa dengan"
+      not_start_all: "tidak diawali semua dengan"
+      end: "diakhiri dengan"
+      end_any: "diakhiri beberapa dengan"
+      end_all: "diakhiri semua dengan"
+      not_end: "tidak diakhiri dengan"
+      not_end_any: "tidak diakhiri dengan beberapa"
+      not_end_all: "tidak diakhiri dengan semua"
+      'true': "bernilai benar"
+      'false': "bernilai salah"
+      present: "ada"
+      blank: "kosong"
+      'null': "null"
+      not_null: "tidak null"

data/lib/ransack/locale/ja.yml

@@ -0,0 +1,70 @@
+ja:
+  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: "は無効ではない"

data/lib/ransack/locale/pt-BR.yml

@@ -0,0 +1,70 @@
+pt-BR:
+  ransack:
+    search: "pesquisar"
+    predicate: "predicado"
+    and: "e"
+    or: "ou"
+    any: "algum"
+    all: "todos"
+    combinator: "combinador"
+    attribute: "atributo"
+    value: "valor"
+    condition: "condição"
+    sort: "classificar"
+    asc: "ascendente"
+    desc: "descendente"
+    predicates:
+      eq: "igual"
+      eq_any: "igual a algum"
+      eq_all: "igual a todos"
+      not_eq: "não é igual a"
+      not_eq_any: "não é igual a algum"
+      not_eq_all: "não é igual a todos"
+      matches: "corresponde"
+      matches_any: "corresponde a algum"
+      matches_all: "corresponde a todos"
+      does_not_match: "não corresponde"
+      does_not_match_any: "não corresponde a algum"
+      does_not_match_all: "não corresponde a todos"
+      lt: "menor que"
+      lt_any: "menor que algum"
+      lt_all: "menor que todos"
+      lteq: "menor ou igual a"
+      lteq_any: "menor ou igual a algum"
+      lteq_all: "menor ou igual a todos"
+      gt: "maior que"
+      gt_any: "maior que algum"
+      gt_all: "maior que todos"
+      gteq: "maior que ou igual a"
+      gteq_any: "maior que ou igual a algum"
+      gteq_all: "maior que ou igual a todos"
+      in: "em"
+      in_any: "em algum"
+      in_all: "em todos"
+      not_in: "não em"
+      not_in_any: "não em algum"
+      not_in_all: "não em todos"
+      cont: "contém"
+      cont_any: "contém algum"
+      cont_all: "contém todos"
+      not_cont: "não contém"
+      not_cont_any: "não contém algum"
+      not_cont_all: "não contém todos"
+      start: "começa com"
+      start_any: "começa com algum"
+      start_all: "começa com todos"
+      not_start: "não começa com"
+      not_start_any: "não começa com algum"
+      not_start_all: "não começa com algum"
+      end: "termina com"
+      end_any: "termina com algum"
+      end_all: "termina com todos"
+      not_end: "não termina com"
+      not_end_any: "não termina com algum"
+      not_end_all: "não termina com todos"
+      'true': "é verdadeiro"
+      'false': "é falso"
+      present: "está presente"
+      blank: "está em branco"
+      'null': "é nulo"
+      not_null: "não é nulo"

data/lib/ransack/locale/{zh.yml → zh-CN.yml}

@@ -1,4 +1,4 @@
-zh:
+zh-CN:
   ransack:
     search: "搜索"
     predicate: "基于(predicate)"

data/lib/ransack/locale/zh-TW.yml

@@ -0,0 +1,70 @@
+zh-TW:
+  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': "為 null"
+      not_null: "不為 null"

data/lib/ransack/nodes.rb

@@ -3,6 +3,6 @@ require 'ransack/nodes/node'
 require 'ransack/nodes/attribute'
 require 'ransack/nodes/value'
 require 'ransack/nodes/condition'
-Ransack::Adapters.require_nodes
+Ransack::Adapters.object_mapper.require_nodes
 require 'ransack/nodes/sort'
 require 'ransack/nodes/grouping'

data/lib/ransack/nodes/attribute.rb

@@ -16,7 +16,6 @@ module Ransack
 
       def name=(name)
         @name = name
-        context.bind(self, name) unless name.blank?
       end
 
       def valid?
@@ -25,6 +24,10 @@ module Ransack
         .include?(attr_name.split('.').last)
       end
 
+      def associated_collection?
+        parent.respond_to?(:reflection) && parent.reflection.collection?
+      end
+
       def type
         if ransacker
           return ransacker.type

data/lib/ransack/nodes/bindable.rb

@@ -27,14 +27,26 @@ module Ransack
 
       private
 
-        def get_arel_attribute
-          if ransacker
-            ransacker.attr_from(self)
-          else
-            context.table_for(parent)[attr_name]
-          end
+      def get_arel_attribute
+        if ransacker
+          ransacker.attr_from(self)
+        else
+          get_attribute
         end
+      end
 
+      def get_attribute
+        if is_alias_attribute?
+          context.table_for(parent)[parent.base_klass.attribute_aliases[attr_name]]
+        else
+          context.table_for(parent)[attr_name]
+        end
+      end
+
+      def is_alias_attribute?
+        Ransack::SUPPORTS_ATTRIBUTE_ALIAS &&
+        parent.base_klass.attribute_aliases.key?(attr_name)
+      end
     end
   end
 end

data/lib/ransack/nodes/condition.rb

@@ -9,9 +9,10 @@ module Ransack
 
       class << self
         def extract(context, key, values)
-          attributes, predicate = extract_attributes_and_predicate(key, context)
+          attributes, predicate, combinator =
+            extract_values_for_condition(key, context)
+
           if attributes.size > 0 && predicate
-            combinator = key.match(/_(or|and)_/) ? $1 : nil
             condition = self.new(context)
             condition.build(
               :a => attributes,
@@ -31,20 +32,34 @@ module Ransack
 
         private
 
-        def extract_attributes_and_predicate(key, context = nil)
-          str = key.dup
-          name = Predicate.detect_and_strip_from_string!(str)
-          predicate = Predicate.named(name)
-          unless predicate || Ransack.options[:ignore_unknown_conditions]
-            raise ArgumentError, "No valid predicate for #{key}"
-          end
-          if context.present? && context.attribute_method?(str)
-            attributes = [str]
-          else
-            attributes = str.split(/_and_|_or_/)
+          def extract_values_for_condition(key, context = nil)
+            str = key.dup
+            name = Predicate.detect_and_strip_from_string!(str)
+            predicate = Predicate.named(name)
+
+            unless predicate || Ransack.options[:ignore_unknown_conditions]
+              raise ArgumentError, "No valid predicate for #{key}"
+            end
+
+            if context.present?
+              str = context.ransackable_alias(str)
+            end
+
+            combinator =
+            if str.match(/_(or|and)_/)
+              $1
+            else
+              nil
+            end
+
+            if context.present? && context.attribute_method?(str)
+              attributes = [str]
+            else
+              attributes = str.split(/_and_|_or_/)
+            end
+
+            [attributes, predicate, combinator]
           end
-          [attributes, predicate]
-        end
       end
 
       def valid?
@@ -64,14 +79,12 @@ module Ransack
       def attributes=(args)
         case args
         when Array
-          args.each do |attr|
-            attr = Attribute.new(@context, attr)
-            self.attributes << attr if attr.valid?
+          args.each do |name|
+            build_attribute(name)
           end
         when Hash
           args.each do |index, attrs|
-            attr = Attribute.new(@context, attrs[:name], attrs[:ransacker_args])
-            self.attributes << attr if attr.valid?
+            build_attribute(attrs[:name], attrs[:ransacker_args])
           end
         else
           raise ArgumentError,
@@ -114,9 +127,13 @@ module Ransack
       alias :m= :combinator=
       alias :m :combinator
 
-      def build_attribute(name = nil)
-        Attribute.new(@context, name).tap do |attribute|
-          self.attributes << attribute
+      def build_attribute(name = nil, ransacker_args = [])
+        Attribute.new(@context, name, ransacker_args).tap do |attribute|
+          @context.bind(attribute, attribute.name)
+          self.attributes << attribute if attribute.valid?
+          if predicate && !negative?
+            @context.lock_association(attribute.parent)
+          end
         end
       end
 
@@ -168,6 +185,10 @@ module Ransack
 
       def predicate_name=(name)
         self.predicate = Predicate.named(name)
+        unless negative?
+          attributes.each { |a| context.lock_association(a.parent) }
+        end
+        @predicate
       end
       alias :p= :predicate_name=
 
@@ -196,15 +217,20 @@ module Ransack
           val = predicate.format(val)
           val
         end
-        predicate.wants_array ? formatted : formatted.first
+        if predicate.wants_array
+          formatted
+        else
+          formatted.first
+        end
       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
-            )
+          unless predicate.wants_array
+            values = values.first
+          end
+          predicate.arel_predicate.call(values)
         else
           predicate.arel_predicate
         end
@@ -224,10 +250,14 @@ module Ransack
         ]
         .reject { |e| e[1].blank? }
         .map { |v| "#{v[0]}: #{v[1]}" }
-        .join(Constants::COMMA_SPACE)
+        .join(', '.freeze)
         "Condition <#{data}>"
       end
 
+      def negative?
+        predicate.negative?
+      end
+
       private
 
       def valid_combinator?