ransack 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026204df0f9ca612c6e56f7594088687e766d142b5dbd7c72c65998b28e43b7a
-  data.tar.gz: 499ad9c08f2a0192e3f3e10fb22955a14546aff315f2eb0500bf2ff8303ebf76
+  metadata.gz: c2eab955e89328399bcb163a575725ea51969653edb1edd66773b6f60554fd12
+  data.tar.gz: 1e6d34f5d87238a18c7ae2194cd0d5320d9460b97b8d8c30ec79d82de6aa139a
 SHA512:
-  metadata.gz: 0440a8d177d9e40c9237481ae6908b38a6986627d486849588fd71e212a5b769dbf39eda8f23e74b9f2eaec10ad4822afc84dcb3b7370ced035d031532cf5f10
-  data.tar.gz: a7fc0507b34ff03389504d92c9d79169768288201ad89f7fde2dbf6e4baa7cc103ae680ae2c42a24b723d63a8ffdb2e68e5eca307cba5d61868475ee067e316a
+  metadata.gz: 52c4a46725d9bb474fbb229c39d9638c730d77bd53211f00f639b78690fcd72aaaa2418b56704c30024c36c39ca7cebde0e86b76cba13704a26f4416791ad141
+  data.tar.gz: bd6880992a977511ea37df47d0828e8ee1e855dff39e2620eaed89bc043ffde2960e3006ebcc0609c9738af10faea6947a1db1f91f1f3eebc65b631d97137054

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 
-## Version 2.1.0 - 2018-10.-26
+## Unreleased
+
+## Version 2.1.1 - 2018-12-05
+
+* Add `arabic` translation
+  https://github.com/activerecord-hackery/ransack/pull/979
+
+* Deprecate #search
+  PR [975](https://github.com/activerecord-hackery/ransack/pull/975)
+
+## Version 2.1.0 - 2018-10-26
 
 * Add support for sorting by scopes
   PR [973](https://github.com/activerecord-hackery/ransack/pull/973)

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/activerecord-hackery/ransack.svg)](https://travis-ci.org/activerecord-hackery/ransack)
 [![Gem Version](https://badge.fury.io/rb/ransack.svg)](http://badge.fury.io/rb/ransack)
 [![Code Climate](https://codeclimate.com/github/activerecord-hackery/ransack/badges/gpa.svg)](https://codeclimate.com/github/activerecord-hackery/ransack)
+[![Backers on Open Collective](https://opencollective.com/ransack/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/ransack/sponsors/badge.svg)](#sponsors) 
 
 Ransack is a rewrite of [MetaSearch](https://github.com/activerecord-hackery/meta_search)
 created by [Ernie Miller](http://twitter.com/erniemiller)
@@ -933,3 +934,32 @@ directly related to bug reports, pull requests, or documentation improvements.
 * Spread the word on Twitter, Facebook, and elsewhere if Ransack's been useful
 to you. The more people who are using the project, the quicker we can find and
 fix bugs!
+
+## Contributors
+
+This project exists thanks to all the people who contribute. <img src="https://opencollective.com/ransack/contributors.svg?width=890&button=false" />
+
+
+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/ransack#backer)]
+
+<a href="https://opencollective.com/ransack#backers" target="_blank"><img src="https://opencollective.com/ransack/backers.svg?width=890"></a>
+
+
+## Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/ransack#sponsor)]
+
+<a href="https://opencollective.com/ransack/sponsor/0/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/1/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/2/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/3/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/4/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/5/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/6/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/7/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/8/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/9/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/9/avatar.svg"></a>
+
+

data/lib/polyamorous.rb

@@ -12,7 +12,8 @@ if defined?(::ActiveRecord)
   require 'polyamorous/swapping_reflection_class'
 
   ar_version = ::ActiveRecord::VERSION::STRING[0,3]
-  ar_version = ::ActiveRecord::VERSION::STRING[0,5] if ar_version >= '5.2'
+  ar_version = ::ActiveRecord::VERSION::STRING[0,5] if ar_version >= "5.2"
+  ar_version = "5.2.1" if ::ActiveRecord::VERSION::STRING >= "5.2.1"
 
   %w(join_association join_dependency).each do |file|
     require "polyamorous/activerecord_#{ar_version}_ruby_2/#{file}"

data/lib/ransack/adapters/active_record/base.rb

@@ -14,6 +14,7 @@ module Ransack
         end
 
         def ransack(params = {}, options = {})
+          ActiveSupport::Deprecation.warn("#search is deprecated and will be removed in 2.3, please use #ransack instead") if __callee__ == :search
           Search.new(self, params, options)
         end
 

data/lib/ransack/locale/ar.yml

@@ -0,0 +1,70 @@
+ar:
+  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/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/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/ransack/adapters/active_record/base_spec.rb

@@ -584,31 +584,31 @@ module Ransack
 
           context 'case insensitive sorting' do
             it 'allows sort by desc' do
-              search = Person.search(sorts: ['name_case_insensitive desc'])
+              search = Person.ransack(sorts: ['name_case_insensitive desc'])
               expect(search.result.to_sql).to match /ORDER BY LOWER(.*) DESC/
             end
 
             it 'allows sort by asc' do
-              search = Person.search(sorts: ['name_case_insensitive asc'])
+              search = Person.ransack(sorts: ['name_case_insensitive asc'])
               expect(search.result.to_sql).to match /ORDER BY LOWER(.*) ASC/
             end
           end
 
           context 'regular sorting' do
             it 'allows sort by desc' do
-              search = Person.search(sorts: ['name desc'])
+              search = Person.ransack(sorts: ['name desc'])
               expect(search.result.to_sql).to match /ORDER BY .* DESC/
             end
 
             it 'allows sort by asc' do
-              search = Person.search(sorts: ['name asc'])
+              search = Person.ransack(sorts: ['name asc'])
               expect(search.result.to_sql).to match /ORDER BY .* ASC/
             end
           end
 
           context 'sorting by a scope' do
             it 'applies the correct scope' do
-              search = Person.search(sorts: ['reverse_name asc'])
+              search = Person.ransack(sorts: ['reverse_name asc'])
               expect(search.result.to_sql).to include("ORDER BY REVERSE(name) ASC")
             end
           end

data/spec/ransack/helpers/form_helper_spec.rb

@@ -25,7 +25,7 @@ module Ransack
       describe '#sort_link with default search_key' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -38,7 +38,7 @@ module Ransack
       describe '#sort_url with default search_key' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -49,7 +49,7 @@ module Ransack
       describe '#sort_link with default search_key defined as symbol' do
         subject { @controller.view_context
           .sort_link(
-            Person.search({ sorts: ['name desc'] }, search_key: :people_search),
+            Person.ransack({ sorts: ['name desc'] }, search_key: :people_search),
             :name, controller: 'people'
           )
         }
@@ -59,7 +59,7 @@ module Ransack
       describe '#sort_url with default search_key defined as symbol' do
         subject { @controller.view_context
           .sort_url(
-            Person.search({ sorts: ['name desc'] }, search_key: :people_search),
+            Person.ransack({ sorts: ['name desc'] }, search_key: :people_search),
             :name, controller: 'people'
           )
         }
@@ -69,7 +69,7 @@ module Ransack
       describe '#sort_link desc through association table defined as symbol' do
         subject { @controller.view_context
           .sort_link(
-            Person.search({ sorts: 'comments_body asc' }),
+            Person.ransack({ sorts: 'comments_body asc' }),
             :comments_body,
             controller: 'people'
           )
@@ -82,7 +82,7 @@ module Ransack
       describe '#sort_url desc through association table defined as symbol' do
         subject { @controller.view_context
           .sort_url(
-            Person.search({ sorts: 'comments_body asc' }),
+            Person.ransack({ sorts: 'comments_body asc' }),
             :comments_body,
             controller: 'people'
           )
@@ -93,7 +93,7 @@ module Ransack
       describe '#sort_link through association table defined as a string' do
         subject { @controller.view_context
           .sort_link(
-            Person.search({ sorts: 'comments.body desc' }),
+            Person.ransack({ sorts: 'comments.body desc' }),
             'comments.body',
             controller: 'people'
           )
@@ -106,7 +106,7 @@ module Ransack
       describe '#sort_url through association table defined as a string' do
         subject { @controller.view_context
           .sort_url(
-            Person.search({ sorts: 'comments.body desc' }),
+            Person.ransack({ sorts: 'comments.body desc' }),
             'comments.body',
             controller: 'people'
           )
@@ -119,7 +119,7 @@ module Ransack
         specify {
           expect { @controller.view_context
             .sort_link(
-              Person.search(@controller.view_context.params[:q]),
+              Person.ransack(@controller.view_context.params[:q]),
               :name,
               controller: 'people'
             )
@@ -132,7 +132,7 @@ module Ransack
         specify {
           expect { @controller.view_context
             .sort_url(
-              Person.search(@controller.view_context.params[:q]),
+              Person.ransack(@controller.view_context.params[:q]),
               :name,
               controller: 'people'
             )
@@ -143,7 +143,7 @@ module Ransack
       describe '#sort_link with search_key defined as a string' do
         subject { @controller.view_context
           .sort_link(
-            Person.search(
+            Person.ransack(
               { sorts: ['name desc'] }, search_key: 'people_search'
             ),
             :name,
@@ -156,7 +156,7 @@ module Ransack
       describe '#sort_link with default_order defined with a string key' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name,
             controller: 'people',
             default_order: 'desc'
@@ -168,7 +168,7 @@ module Ransack
       describe '#sort_url with default_order defined with a string key' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name,
             controller: 'people',
             default_order: 'desc'
@@ -180,7 +180,7 @@ module Ransack
       describe '#sort_link with multiple search_keys defined as an array' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, 'email DESC'],
             controller: 'people'
           )
@@ -196,7 +196,7 @@ module Ransack
       describe '#sort_url with multiple search_keys defined as an array' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, 'email DESC'],
             controller: 'people'
           )
@@ -210,7 +210,7 @@ module Ransack
       describe '#sort_link with multiple search_keys does not break on nil values & ignores them' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', nil, 'email', nil])],
+            [:main_app, Person.ransack(sorts: ['name desc', nil, 'email', nil])],
             :name, [nil, :name, nil, 'email DESC', nil],
             controller: 'people'
           )
@@ -226,7 +226,7 @@ module Ransack
       describe '#sort_url with multiple search_keys does not break on nil values & ignores them' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc', nil, 'email', nil])],
+            [:main_app, Person.ransack(sorts: ['name desc', nil, 'email', nil])],
             :name, [nil, :name, nil, 'email DESC', nil],
             controller: 'people'
           )
@@ -240,7 +240,7 @@ module Ransack
       describe '#sort_link with multiple search_keys should allow a label to be specified' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, 'email DESC'],
             'Property Name',
             controller: 'people'
@@ -252,7 +252,7 @@ module Ransack
       describe '#sort_link with multiple search_keys should flip multiple fields specified without a direction' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, :email],
             controller: 'people'
           )
@@ -268,7 +268,7 @@ module Ransack
       describe '#sort_url with multiple search_keys should flip multiple fields specified without a direction' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, :email],
             controller: 'people'
           )
@@ -282,7 +282,7 @@ module Ransack
       describe '#sort_link with multiple search_keys and default_order specified as a string' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name, [:name, :email],
             controller: 'people',
             default_order: 'desc'
@@ -299,7 +299,7 @@ module Ransack
       describe '#sort_url with multiple search_keys and default_order specified as a string' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name, [:name, :email],
             controller: 'people',
             default_order: 'desc'
@@ -314,7 +314,7 @@ module Ransack
       describe '#sort_link with multiple search_keys and default_order specified as a symbol' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name, [:name, :email],
             controller: 'people',
             default_order: :desc
@@ -331,7 +331,7 @@ module Ransack
       describe '#sort_url with multiple search_keys and default_order specified as a symbol' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, :email],
             controller: 'people',
             default_order: :desc
@@ -346,7 +346,7 @@ module Ransack
       describe '#sort_link with multiple search_keys should allow multiple default_orders to be specified' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, :email],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
@@ -363,7 +363,7 @@ module Ransack
       describe '#sort_url with multiple search_keys should allow multiple default_orders to be specified' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, :email],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
@@ -378,7 +378,7 @@ module Ransack
       describe '#sort_link with multiple search_keys with multiple default_orders should not override a specified order' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, 'email desc'],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
@@ -395,7 +395,7 @@ module Ransack
       describe '#sort_url with multiple search_keys with multiple default_orders should not override a specified order' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, 'email desc'],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
@@ -410,7 +410,7 @@ module Ransack
       describe "#sort_link on polymorphic association should preserve association model name case" do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Note.search()],
+            [:main_app, Note.ransack],
             :notable_of_Person_type_name, "Notable",
             controller: 'notes'
           )
@@ -423,7 +423,7 @@ module Ransack
       describe "#sort_url on polymorphic association should preserve association model name case" do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Note.search()],
+            [:main_app, Note.ransack],
             :notable_of_Person_type_name, "Notable",
             controller: 'notes'
           )
@@ -439,7 +439,7 @@ module Ransack
 
           subject {
             @controller.view_context.sort_link(
-              Person.search(
+              Person.ransack(
                 { sorts: ['name desc'] },
                 search_key: 'people_search'
               ),
@@ -457,7 +457,7 @@ module Ransack
 
           subject {
             @controller.view_context.sort_url(
-              Person.search(
+              Person.ransack(
                 { sorts: ['name desc'] },
                 search_key: 'people_search'
               ),
@@ -473,7 +473,7 @@ module Ransack
           if: ::ActiveRecord::VERSION::MAJOR > 3 do
 
           describe 'with symbol q:, #sort_link should include search params' do
-            subject { @controller.view_context.sort_link(Person.search, :name) }
+            subject { @controller.view_context.sort_link(Person.ransack, :name) }
             let(:params) { ActionController::Parameters.new(
               { :q => { name_eq: 'TEST' }, controller: 'people' }
               ) }
@@ -488,7 +488,7 @@ module Ransack
           end
 
           describe 'with symbol q:, #sort_url should include search params' do
-            subject { @controller.view_context.sort_url(Person.search, :name) }
+            subject { @controller.view_context.sort_url(Person.ransack, :name) }
             let(:params) { ActionController::Parameters.new(
               { :q => { name_eq: 'TEST' }, controller: 'people' }
               ) }
@@ -503,7 +503,7 @@ module Ransack
           end
 
           describe "with string 'q', #sort_link should include search params" do
-            subject { @controller.view_context.sort_link(Person.search, :name) }
+            subject { @controller.view_context.sort_link(Person.ransack, :name) }
             let(:params) {
               ActionController::Parameters.new(
                 { 'q' => { name_eq: 'Test2' }, controller: 'people' }
@@ -519,7 +519,7 @@ module Ransack
           end
 
           describe "with string 'q', #sort_url should include search params" do
-            subject { @controller.view_context.sort_url(Person.search, :name) }
+            subject { @controller.view_context.sort_url(Person.ransack, :name) }
             let(:params) {
               ActionController::Parameters.new(
                 { 'q' => { name_eq: 'Test2' }, controller: 'people' }
@@ -539,7 +539,7 @@ module Ransack
       describe '#sort_link with hide order indicator set to true' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people',
             hide_indicator: true
@@ -552,7 +552,7 @@ module Ransack
       describe '#sort_link with hide order indicator set to false' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people',
             hide_indicator: false
@@ -572,7 +572,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people',
             hide_indicator: false
@@ -593,7 +593,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name asc'])],
+            [:main_app, Person.ransack(sorts: ['name asc'])],
             :name,
             controller: 'people',
             hide_indicator: false
@@ -614,7 +614,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -630,7 +630,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -655,7 +655,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search],
+            [:main_app, Person.ransack],
             :name,
             controller: 'people'
           )
@@ -681,7 +681,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -707,7 +707,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -719,7 +719,7 @@ module Ransack
       describe '#sort_link with a block' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           ) { 'Block label' }
@@ -729,14 +729,14 @@ module Ransack
 
       describe '#search_form_for with default format' do
         subject { @controller.view_context
-          .search_form_for(Person.search) {} }
+          .search_form_for(Person.ransack) {} }
         it { should match /action="\/people"/ }
       end
 
       describe '#search_form_for with pdf format' do
         subject {
           @controller.view_context
-          .search_form_for(Person.search, format: :pdf) {}
+          .search_form_for(Person.ransack, format: :pdf) {}
         }
         it { should match /action="\/people.pdf"/ }
       end
@@ -744,7 +744,7 @@ module Ransack
       describe '#search_form_for with json format' do
         subject {
           @controller.view_context
-          .search_form_for(Person.search, format: :json) {}
+          .search_form_for(Person.ransack, format: :json) {}
         }
         it { should match /action="\/people.json"/ }
       end
@@ -752,7 +752,7 @@ module Ransack
       describe '#search_form_for with an array of routes' do
         subject {
           @controller.view_context
-          .search_form_for([:admin, Comment.search]) {}
+          .search_form_for([:admin, Comment.ransack]) {}
         }
         it { should match /action="\/admin\/comments"/ }
       end
@@ -763,7 +763,7 @@ module Ransack
         end
         subject {
           @controller.view_context
-          .search_form_for(Person.search) { |f| f.text_field :name_eq }
+          .search_form_for(Person.ransack) { |f| f.text_field :name_eq }
         }
         it { should match /example_name_eq/ }
       end

data/spec/support/schema.rb

@@ -43,7 +43,7 @@ class Person < ActiveRecord::Base
     of_age ? where("age >= ?", 18) : where("age < ?", 18)
   }
 
-  scope :sort_by_reverse_name_asc, lambda { order("REVERSE(name) ASC") }
+  scope :sort_by_reverse_name_asc, lambda { order(Arel.sql("REVERSE(name) ASC")) }
   scope :sort_by_reverse_name_desc, lambda { order("REVERSE(name) DESC") }
 
   alias_attribute :full_name, :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -214,6 +214,7 @@ files:
 - lib/ransack/helpers.rb
 - lib/ransack/helpers/form_builder.rb
 - lib/ransack/helpers/form_helper.rb
+- lib/ransack/locale/ar.yml
 - lib/ransack/locale/az.yml
 - lib/ransack/locale/bg.yml
 - lib/ransack/locale/cs.yml