ransack 1.8.4 → 3.2.1

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: "صفر نیست"

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/nl.yml

@@ -35,9 +35,9 @@ nl:
       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"
+      gteq: "groter dan of gelijk aan"
+      gteq_any: "groter dan of gelijk aan enig"
+      gteq_all: "groter dan of gelijk aan alle"
       in: "in"
       in_any: "in enig"
       in_all: "in alle"
@@ -64,7 +64,7 @@ nl:
       not_end_all: "eindigt niet met alle"
       'true': "is waar"
       'false': "is niet waar"
-      present: "is present"
+      present: "is aanwezig"
       blank: "is afwezig"
       'null': "is null"
       not_null: "is niet null"

data/lib/ransack/locale/ru.yml

@@ -0,0 +1,70 @@
+ru:
+  ransack:
+    search: "Поиск"
+    predicate: "predicate"
+    and: "и"
+    or: "или"
+    any: "любое"
+    all: "все"
+    combinator: "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/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/locale/sv.yml

@@ -0,0 +1,70 @@
+sv:
+  ransack:
+    search: "sök"
+    predicate: "predikat"
+    and: "och"
+    or: "eller"
+    any: "vilken som"
+    all: "alla"
+    combinator: "kombinator"
+    attribute: "attribut"
+    value: "värde"
+    condition: "villkor"
+    sort: "sortera"
+    asc: "stigande"
+    desc: "fallande"
+    predicates:
+      eq: "lika med"
+      eq_any: "lika med vilket som"
+      eq_all: "lika med alla"
+      not_eq: "inte lika med"
+      not_eq_any: "inte lika med någon"
+      not_eq_all: "inte lika med alla"
+      matches: "matchar"
+      matches_any: "matchar någon"
+      matches_all: "matchar alla"
+      does_not_match: "matchar inte"
+      does_not_match_any: "matchar inte någon"
+      does_not_match_all: "matchar inte alla"
+      lt: "mindre än"
+      lt_any: "mindre än någon"
+      lt_all: "mindre än alla"
+      lteq: "mindre än eller lika med"
+      lteq_any: "mindre än eller lika med någon"
+      lteq_all: "mindre än eller lika med alla"
+      gt: "större än"
+      gt_any: "större än någon"
+      gt_all: "större än alla"
+      gteq: "större än eller lika med"
+      gteq_any: "större än eller lika med någon"
+      gteq_all: "större än eller lika med alla"
+      in: "i"
+      in_any: "i någon"
+      in_all: "i alla"
+      not_in: "inte i"
+      not_in_any: "inte i någon"
+      not_in_all: "inte i alla"
+      cont: "innehåller"
+      cont_any: "innehåller någon"
+      cont_all: "innehåller alla"
+      not_cont: "innehåller inte"
+      not_cont_any: "innehåller inte någon"
+      not_cont_all: "innehåller inte alla"
+      start: "börjar med"
+      start_any: "börjar med någon"
+      start_all: "börjar med alla"
+      not_start: "börjar inte med"
+      not_start_any: "börjar inte med någon"
+      not_start_all: "börjar inte med alla"
+      end: "slutar med"
+      end_any: "slutar med någon"
+      end_all: "slutar med alla"
+      not_end: "slutar inte med"
+      not_end_any: "slutar inte med någon"
+      not_end_all: "slutar inte med alla"
+      'true': "är sant"
+      'false': "är falskt"
+      present: "existerar"
+      blank: "är tom"
+      'null': "är null"
+      not_null: "är inte null"

data/lib/ransack/locale/tr.yml

@@ -0,0 +1,70 @@
+tr:
+  ransack:
+    search: "ara"
+    predicate: "doğrula"
+    and: "ve"
+    or: "veya"
+    any: "herhangi"
+    all: "hepsi"
+    combinator: "birleştirici"
+    attribute: "nitelik"
+    value: "değer"
+    condition: "şart"
+    sort: "sırala"
+    asc: "artan"
+    desc: "azalan"
+    predicates:
+      eq: "eşit"
+      eq_any: "herhangi birine eşit"
+      eq_all: "hepsine eşit"
+      not_eq: "eşit değil"
+      not_eq_any: "herhangi birine eşit değil"
+      not_eq_all: "hiçbirine eşit değil"
+      matches: "eşleşen"
+      matches_any: "herhangi biri ile eşleşen"
+      matches_all: "hepsi ile eşleşen"
+      does_not_match: "eşleşmeyen"
+      does_not_match_any: "herhangi biri ile eşleşmeyen"
+      does_not_match_all: "hiçbiri ile eşleşmeyen"
+      lt: "daha küçük"
+      lt_any: "herhangi birinden küçük"
+      lt_all: "hepsinden küçük"
+      lteq: "daha küçük veya eşit"
+      lteq_any: "daha küçük veya herhangi birine eşit"
+      lteq_all: "daha küçük veya hepsine eşit"
+      gt: "daha büyük "
+      gt_any: "herhangi birinden daha büyük"
+      gt_all: "hepsinden daha büyük"
+      gteq: "daha büyük veya eşit"
+      gteq_any: "daha büyük veya herhangi birine eşit"
+      gteq_all: "daha büyük veya hepsine eşit"
+      in: "içinde"
+      in_any: "herhangi birinde"
+      in_all: "hepsinde"
+      not_in: "içinde değil"
+      not_in_any: "herhangi birinde değil"
+      not_in_all: "hiçbirinde değil"
+      cont: "içeren"
+      cont_any: "herhangi birini içeren"
+      cont_all: "hepsini içeren"
+      not_cont: "içermeyen"
+      not_cont_any: "herhangi birini içermeyen"
+      not_cont_all: "hiçbirini birini içermeyen"
+      start: "ile başlayan"
+      start_any: "herhangi biriyle başlayan"
+      start_all: "hepsiyle başlayan"
+      not_start: "ile başlamayan"
+      not_start_any: "herhangi biriyle başlamayan"
+      not_start_all: "hiçbiriyle başlamayan"
+      end: "ile biten"
+      end_any: "herhangi biriyle biten"
+      end_all: "hepsi ile biten"
+      not_end: "ile bitmeyen"
+      not_end_any: "herhangi biriyle bitmeyen"
+      not_end_all: "hiçbiriyle bitmeyen"
+      'true': "doğru"
+      'false': "yanlış"
+      present: "mevcut"
+      blank: "boş"
+      'null': "geçersiz"
+      not_null: "geçerli"

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

@@ -50,18 +50,18 @@ zh-CN:
       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: "不以所有值结尾"
+      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': "等于true"
       'false': "等于false"
       present: "有值"

data/lib/ransack/nodes/attribute.rb

@@ -5,7 +5,7 @@ module Ransack
 
       attr_reader :name, :ransacker_args
 
-      delegate :blank?, :present?, :==, :to => :name
+      delegate :blank?, :present?, :to => :name
       delegate :engine, :to => :context
 
       def initialize(context, name = nil, ransacker_args = [])
@@ -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

@@ -49,11 +49,7 @@ module Ransack
       alias :c= :conditions=
 
       def [](key)
-        if condition = conditions.detect { |c| c.key == key.to_s }
-          condition
-        else
-          nil
-        end
+        conditions.detect { |c| c.key == key.to_s }
       end
 
       def []=(key, value)
@@ -68,7 +64,6 @@ module Ransack
       def respond_to?(method_id)
         super or begin
           method_name = method_id.to_s
-          writer = method_name.sub!(/\=$/, ''.freeze)
           attribute_method?(method_name) ? true : false
         end
       end
@@ -113,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
@@ -191,7 +186,7 @@ module Ransack
       end
 
       def strip_predicate_and_index(str)
-        string = str.split(/\(/).first
+        string = str[/(.+?)\(/, 1] || str.dup
         Predicate.detect_and_strip_from_string!(string)
         string
       end

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
@@ -31,8 +31,8 @@ module Ransack
       end
 
       def name=(name)
-        @name = name
-        context.bind(self, name)
+        @name = context.ransackable_alias(name) || name
+        context.bind(self, @name)
       end
 
       def dir=(dir)