ransack 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6c89a751336d525190857c926e5621b2f1bd911
-  data.tar.gz: b1f8e83f8d95332438067b02f9bfff030700c7e4
+  metadata.gz: d068e0ef0efe6ce1a4afdb11cc36361f94bbcf68
+  data.tar.gz: 2ab905dd3037f405cfc262e2440cbfa557c5a799
 SHA512:
-  metadata.gz: 0b631ba6e4bf53e1cc64b913669d374e925d3dda3beafa158162288712f3d4981b20e9b71af95e2d724c0919cb95ba86957ebb357ff0eacc31030c50e5c6b96d
-  data.tar.gz: f3a2d612e597d28f37fbca66ea1e160881402473d0649f2618946a31884bbaca92042edfa3b81bea66e2ad62a136ebd6702f9cf62f4604533ebe73238b405bfa
+  metadata.gz: 354a8a5fc605f5efb7da6d1b78544f93780293418ac9a4578ae395fb608dbd69d301d5a129fbc6cf20c46427427fbeba04b0f7ea040b54771aaecbd31cf174ac
+  data.tar.gz: 388a7b733a5460acd980703c6d918077fc27e4777f8acf0b2f3c72b696664c1ef9997c477de74a772ea776eb56521d65cda03bb7f190441575801a4d65b479d6

data/.travis.yml

@@ -3,11 +3,10 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.3.1
-  - 2.2.5
+  - 2.3.3
+  - 2.2.6
   - 2.1.10
   - 2.0
-  - 1.9
 
 env:
   - RAILS=5-0-stable DB=sqlite3
@@ -50,26 +49,26 @@ matrix:
     - rvm: 2.0
       env: RAILS=5-0-stable DB=postgres
 
-    - rvm: 1.9
-      env: RAILS=5-0-stable DB=sqlite3
-    - rvm: 1.9
-      env: RAILS=5-0-stable DB=mysql
-    - rvm: 1.9
-      env: RAILS=5-0-stable DB=postgres
+    - rvm: 2.0
+      env: RAILS=4-2-stable DB=sqlite3
+    - rvm: 2.0
+      env: RAILS=4-2-stable DB=mysql
+    - rvm: 2.0
+      env: RAILS=4-2-stable DB=postgres
 
   include:
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       env: RAILS=master DB=sqlite3
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       env: RAILS=master DB=mysql
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       env: RAILS=master DB=postgres
 
-    - rvm: 2.2.5
+    - rvm: 2.2.6
       env: RAILS=master DB=sqlite3
-    - rvm: 2.2.5
+    - rvm: 2.2.6
       env: RAILS=master DB=mysql
-    - rvm: 2.2.5
+    - rvm: 2.2.6
       env: RAILS=master DB=postgres
 
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,48 @@
 # Change Log
 
+## Unreleased
+
+### Added
+
+*   Add a config option to customize the up and down arrows used for direction
+    indicators in Ransack sort links.
+    PR [#726](https://github.com/activerecord-hackery/ransack/pull/726).
+
+    *Garett Arrowood*
+
+*   Add ability to turn off sanitization of custom scope arguments.
+    PR [#742](https://github.com/activerecord-hackery/ransack/pull/742).
+
+    *Garett Arrowood*
+
+### Fixed
+
+*   Use class attributes properly so that inheritance is respected.
+    PR [#717](https://github.com/activerecord-hackery/ransack/pull/717).
+    This fixes two bugs:
+
+    1. In the Mongoid adapter, subclasses were not properly inheriting their
+       parents' Ransack aliases because each class defined its own set of
+       aliases.
+
+    2. In the Active Record adapter, Ransack aliases were defined in such a way
+       that the parent's (and grandparent's, etc.) aliases were overwritten by
+       the child, meaning that all aliases were ultimately kept on
+       `ActiveRecord::Base`. This had the unfortunate effect of enforcing
+       uniqueness of Ransack alias names across all models rather than per
+       model. Depending on the load order of models, earlier definitions of an
+       alias in other models were clobbered.
+
+    *Steve Richert (laserlemon)*
+
+*   Use `ActiveSupport.on_load` hooks to include Ransack in Active Record,
+    avoiding autoloading the constant too soon. PR
+    [#719](https://github.com/activerecord-hackery/ransack/pull/719). Reference:
+    [This comment in rails#23589]
+    (https://github.com/rails/rails/issues/23589#issuecomment-229247727).
+
+    *Yuji Yaginuma (y-yagi)*
+
 ## Version 1.8.2 - 2016-08-08
 ### Fixed
 

data/README.md

@@ -7,20 +7,21 @@
 [![Code Climate](https://codeclimate.com/github/activerecord-hackery/ransack/badges/gpa.svg)]
 (https://codeclimate.com/github/activerecord-hackery/ransack)
 
-Ransack is a rewrite of [MetaSearch]
-(https://github.com/activerecord-hackery/meta_search)
+Ransack is a rewrite of [MetaSearch](https://github.com/activerecord-hackery/meta_search)
 created by [Ernie Miller](http://twitter.com/erniemiller)
-and maintained by [Ryan Bigg](http://twitter.com/ryanbigg),
-[Jon Atack](http://twitter.com/jonatack) and a great group of [contributors]
-(https://github.com/activerecord-hackery/ransack/graphs/contributors).
+and developed/maintained for years by
+[Jon Atack](http://twitter.com/jonatack) and
+[Ryan Bigg](http://twitter.com/ryanbigg) with the help of a great group of
+[contributors](https://github.com/activerecord-hackery/ransack/graphs/contributors).
 While it supports many of the same features as MetaSearch, its underlying
 implementation differs greatly from MetaSearch,
 and backwards compatibility is not a design goal.
 
-Ransack enables the creation of both simple and
-[advanced](http://ransack-demo.herokuapp.com/users/advanced_search)
-search forms for your Ruby on Rails application (demo source code
-[here](https://github.com/activerecord-hackery/ransack_demo)).
+Ransack enables the creation of both
+[simple](http://ransack-demo.herokuapp.com) and
+[advanced](http://ransack-demo.herokuapp.com/users/advanced_search) search forms
+for your Ruby on Rails application
+([demo source code here](https://github.com/activerecord-hackery/ransack_demo)).
 If you're looking for something that simplifies query generation at the model
 or controller layer, you're probably not looking for Ransack (or MetaSearch,
 for that matter). Try [Squeel](https://github.com/activerecord-hackery/squeel)
@@ -56,11 +57,6 @@ branch:
 gem 'ransack', github: 'activerecord-hackery/ransack'
 ```
 
-If you are using Rails 5 or master and need pagination compatible with it and
-Ransack, there is a [Rails 5 version of the `will_paginate` gem here](https://github.com/jonatack/will_paginate).
-It is also optimized for Ruby 2.2+. To use it, in your Gemfile:
-`gem 'will_paginate', github: 'jonatack/will_paginate'`.
-
 ## Issues tracker
 
 * Before filing an issue, please read the [Contributing Guide](CONTRIBUTING.md).
@@ -82,8 +78,7 @@ If you're coming from MetaSearch, things to note:
   1. The default param key for search params is now `:q`, instead of `:search`.
   This is primarily to shorten query strings, though advanced queries (below)
   will still run afoul of URL length limits in most browsers and require a
-  switch to HTTP POST requests. This key is [configurable]
-  (https://github.com/activerecord-hackery/ransack/wiki/Configuration).
+  switch to HTTP POST requests. This key is [configurable](https://github.com/activerecord-hackery/ransack/wiki/Configuration).
 
   2. `form_for` is now `search_form_for`, and validates that a Ransack::Search
   object is passed to it.
@@ -93,7 +88,7 @@ If you're coming from MetaSearch, things to note:
   ActiveRecord::Relation in the case of the ActiveRecord adapter) via a call to
   `Ransack#result`.
 
-####In your controller
+#### In your controller
 
 ```ruby
 def index
@@ -114,13 +109,13 @@ def index
 end
 ```
 
-####In your view
+#### In your view
 
 The two primary Ransack view helpers are `search_form_for` and `sort_link`,
 which are defined in
 [Ransack::Helpers::FormHelper](lib/ransack/helpers/form_helper.rb).
 
-####Ransack's `search_form_for` helper replaces `form_for` for creating the view search form
+#### Ransack's `search_form_for` helper replaces `form_for` for creating the view search form
 
 ```erb
 <%= search_form_for @q do |f| %>
@@ -156,7 +151,7 @@ The `search_form_for` answer format can be set like this:
 <%= search_form_for(@q, format: :json) do |f| %>
 ```
 
-####Ransack's `sort_link` helper creates table headers that are sortable links
+#### Ransack's `sort_link` helper creates table headers that are sortable links
 
 ```erb
 <%= sort_link(@q, :name) %>
@@ -205,15 +200,23 @@ This example toggles the sort directions of both fields, by default
 initially sorting the `last_name` field by ascending order, and the
 `first_name` field by descending order.
 
-The sort link may be displayed without the order indicator arrow by passing
-`hide_indicator: true`:
 
-```erb
-<%= sort_link(@q, :name, hide_indicator: true) %>
+The sort link order indicator arrows may be globally customized by setting a
+`custom_arrows` option in an initializer file like
+`config/initializers/ransack.rb`:
+
+```ruby
+Ransack.configure do |c|
+  c.custom_arrows = {
+    up_arrow: '<i class="custom-up-arrow-icon"></i>',
+    down_arrow: 'U+02193'
+  }
+end
 ```
 
-Alternatively, all sort links may be displayed without the order indicator arrow
-by adding this to an initializer file like `config/initializers/ransack.rb`:
+All sort links may be displayed without the order indicator
+arrows by setting `hide_sort_order_indicators` to true in the initializer file.
+Note that this hides the arrows even if they were customized:
 
 ```ruby
 Ransack.configure do |c|
@@ -221,7 +224,14 @@ Ransack.configure do |c|
 end
 ```
 
-####Ransack's `sort_url` helper is like a `sort_link` but returns only the url
+Without setting it globally, individual sort links may be displayed without
+the order indicator arrow by passing `hide_indicator: true` in the sort link:
+
+```erb
+<%= sort_link(@q, :name, hide_indicator: true) %>
+```
+
+#### Ransack's `sort_url` helper is like a `sort_link` but returns only the url
 
 `sort_url` has the same API as `sort_link`:
 
@@ -275,11 +285,12 @@ end
 
 Once you've done so, you can make use of the helpers in [Ransack::Helpers::FormBuilder](lib/ransack/helpers/form_builder.rb) to
 construct much more complex search forms, such as the one on the
-[demo page](http://ransack-demo.heroku.com) (source code [here](https://github.com/activerecord-hackery/ransack_demo)).
+[demo app](http://ransack-demo.herokuapp.com/users/advanced_search)
+(source code [here](https://github.com/activerecord-hackery/ransack_demo)).
 
 ### Ransack #search method
 
-Ransack will try to to make the class method `#search` available in your
+Ransack will try to make the class method `#search` available in your
 models, but if `#search` has already been defined elsewhere, you can always use
 the default `#ransack` class method. So the following are equivalent:
 
@@ -395,13 +406,41 @@ query parameters in your URLs.
 <% end %>
 ```
 
+### Search Matchers
+
+List of all possible predicates
+
+* `*_eq` - equal
+* `*_not_eq` - not equal
+* `*_matches` - matches with `LIKE`, e.g. `q[email_matches]=%@gmail.com`
+* Also: `*_does_not_match`, `*_matches_any`, `*_matches_all`, `*_does_not_match_any`, `*_does_not_match_all`
+* `*_lt` - less than
+* `*_lteq` - less than or equal
+* `*_gt` - greater than
+* `*_gteq` - greater than or equal
+* `*_present` - not null and not empty, e.g. `q[name_present]=1` (SQL: `col is not null AND col != ''`)
+* `*_blank` - is null or empty. (SQL: `col is null OR col = ''`)
+* `*_null`, `*_not_null` - is null, is not null
+* `*_in` - match any values in array, e.g. `q[name_in][]=Alice&q[name_in][]=Bob`
+* `*_not_in` - match none of values in array
+* `*_lt_any`, `*_lteq_any`, `*_gt_any`, `*_gteq_any` - Compare to list of values, at least positive. (SQL: `col > value1 OR col > value2`)
+* `*_matches_any`, `*_does_not_match_any` - same as above but with `LIKE`
+* `*_lt_all`, `*_lteq_all`, `*_gt_all`, `*_gteq_all` - Compare to list of values, all positive. (SQL: `col > value1 AND col > value2`)
+* `*_matches_all`, `*_does_not_match_all` - same as above but with `LIKE`
+* `*_not_eq_all` - none of values in a set
+* `*_start`, `*_not_start`, `*_start_any`, `*_start_all`, `*_not_start_any`, `*_not_start_all` - start with, (SQL: `col LIKE 'value%'`)
+* `*_end`, `*_not_end`, `*_end_any`, `*_end_all`, `*_not_end_any`, `*_not_end_all` - end with, (SQL: `col LIKE '%value'`)
+* `*_cont`, `*_cont_any`, `*_cont_all`, `*_not_cont`, `*_not_cont_any`, `*_not_cont_all` - contains value, using `LIKE`
+* `*_true`, `*_false` - is true and is false
+
+(See full list: https://github.com/activerecord-hackery/ransack/blob/master/lib/ransack/locale/en.yml#L15 and [wiki](https://github.com/activerecord-hackery/ransack/wiki/Basic-Searching))
+
 ### Using Ransackers to add custom search functions via Arel
 
 The main premise behind Ransack is to provide access to
 **Arel predicate methods**. Ransack provides special methods, called
 _ransackers_, for creating additional search functions via Arel. More
-information about `ransacker` methods can be found [here in the wiki]
-(https://github.com/activerecord-hackery/ransack/wiki/Using-Ransackers).
+information about `ransacker` methods can be found [here in the wiki](https://github.com/activerecord-hackery/ransack/wiki/Using-Ransackers).
 Feel free to contribute working `ransacker` code examples to the wiki!
 
 ### Problem with DISTINCT selects
@@ -511,8 +550,7 @@ for an `auth_object` key in the options hash which can be used by your own
 overridden methods.
 
 Here is an example that puts all this together, adapted from
-[this blog post by Ernie Miller]
-(http://erniemiller.org/2012/05/11/why-your-ruby-class-macros-might-suck-mine-did/).
+[this blog post by Ernie Miller](http://erniemiller.org/2012/05/11/why-your-ruby-class-macros-might-suck-mine-did/).
 In an `Article` model, add the following `ransackable_attributes` class method
 (preferably private):
 
@@ -613,7 +651,21 @@ Employee.ransack({ salary_gt: 100_000 }, { auth_object: current_user })
 In Rails 3 and 4, if the `true` value is being passed via url params or some
 other mechanism that will convert it to a string, the true value may not be
 passed to the ransackable scope unless you wrap it in an array
-(i.e. `activated: ['true']`). This is currently resolved in Rails 5 :smiley:
+(i.e. `activated: ['true']`). Ransack will take care of changing 'true' into a
+boolean. This is currently resolved in Rails 5 :smiley:
+
+However, perhaps you have `user_id: [1]` and you do not want Ransack to convert
+1 into a boolean. (Values sanitized to booleans can be found in the
+[constants.rb](https://github.com/activerecord-hackery/ransack/blob/master/lib/ransack/constants.rb#L28)).
+To turn this off, and handle type conversions yourself, set
+`sanitize_custom_scope_booleans` to false in an initializer file like
+config/initializers/ransack.rb:
+
+```ruby
+Ransack.configure do |c|
+  c.sanitize_custom_scope_booleans = false
+end
+```
 
 Scopes are a recent addition to Ransack and currently have a few caveats:
 First, a scope involving child associations needs to be defined in the parent
@@ -622,8 +674,7 @@ argument are not easily usable yet, because the array currently needs to be
 wrapped in an array to function (see
 [this issue](https://github.com/activerecord-hackery/ransack/issues/404)),
 which is not compatible with Ransack form helpers. For this use case, it may be
-better for now to use [ransackers]
-(https://github.com/activerecord-hackery/ransack/wiki/Using-Ransackers) instead,
+better for now to use [ransackers](https://github.com/activerecord-hackery/ransack/wiki/Using-Ransackers) instead,
 where feasible. Pull requests with solutions and tests are welcome!
 
 ### Grouping queries by OR instead of AND
@@ -747,9 +798,8 @@ en:
 
 ## Mongoid
 
-Ransack now works with Mongoid in the same way as Active Record, except that
-with Mongoid, associations are not currently supported. A demo app may be found
-[here](http://ransack-mongodb-demo.herokuapp.com/) and the demo source code is
+Ransack works with Mongoid in the same way as Active Record, except that with
+Mongoid, associations are not currently supported. Demo source code may be found
 [here](https://github.com/Zhomart/ransack-mongodb-demo). A `result` method
 called on a `ransack` search returns a `Mongoid::Criteria` object:
 

data/lib/ransack.rb

@@ -7,13 +7,6 @@ Ransack::Adapters.object_mapper.require_constants
 module Ransack
   extend Configuration
   class UntraversableAssociationError < StandardError; end;
-
-  SUPPORTS_ATTRIBUTE_ALIAS =
-  begin
-    ActiveRecord::Base.respond_to?(:attribute_aliases)
-  rescue NameError
-    false
-  end
 end
 
 Ransack.configure do |config|

data/lib/ransack/adapters/active_record.rb

@@ -1,5 +1,15 @@
 require 'ransack/adapters/active_record/base'
-ActiveRecord::Base.extend Ransack::Adapters::ActiveRecord::Base
+
+ActiveSupport.on_load(:active_record) do
+  extend Ransack::Adapters::ActiveRecord::Base
+
+  Ransack::SUPPORTS_ATTRIBUTE_ALIAS =
+  begin
+    ActiveRecord::Base.respond_to?(:attribute_aliases)
+  rescue NameError
+    false
+  end
+end
 
 require 'ransack/adapters/active_record/context'
 

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

@@ -23,7 +23,8 @@ module Ransack
         end
 
         def ransack_alias(new_name, old_name)
-          self._ransack_aliases.store(new_name.to_s, old_name.to_s)
+          self._ransack_aliases = _ransack_aliases.merge new_name.to_s =>
+            old_name.to_s
         end
 
         # Ransackable_attributes, by default, returns all column names

data/lib/ransack/adapters/active_record/ransack/nodes/condition.rb

@@ -7,9 +7,14 @@ module Ransack
           association = attribute.parent
           if negative? && attribute.associated_collection?
             query = context.build_correlated_subquery(association)
-            query.where(format_predicate(attribute).not)
             context.remove_association(association)
-            Arel::Nodes::NotIn.new(context.primary_key, Arel.sql(query.to_sql))
+            if self.predicate_name == 'not_null' && self.value
+              query.where(format_predicate(attribute))
+              Arel::Nodes::In.new(context.primary_key, Arel.sql(query.to_sql))
+            else
+              query.where(format_predicate(attribute).not)
+              Arel::Nodes::NotIn.new(context.primary_key, Arel.sql(query.to_sql))
+            end
           else
             format_predicate(attribute)
           end

data/lib/ransack/adapters/mongoid.rb

@@ -11,3 +11,5 @@ when /^3\.2\./
 else
   require 'ransack/adapters/mongoid/context'
 end
+
+Ransack::SUPPORTS_ATTRIBUTE_ALIAS = false

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

@@ -8,6 +8,10 @@ module Ransack
         extend ActiveSupport::Concern
 
         included do
+          class_attribute :_ransackers
+          class_attribute :_ransack_aliases
+          self._ransackers ||= {}
+          self._ransack_aliases ||= {}
         end
 
         class ColumnWrapper < SimpleDelegator
@@ -33,22 +37,6 @@ module Ransack
         end
 
         module ClassMethods
-          def _ransack_aliases
-            @_ransack_aliases ||= {}
-          end
-
-          def _ransack_aliases=(value)
-            @_ransack_aliases = value
-          end
-
-          def _ransackers
-            @_ransackers ||= {}
-          end
-
-          def _ransackers=(value)
-            @_ransackers = value
-          end
-
           def ransack(params = {}, options = {})
             params = params.presence || {}
             Search.new(self, params ? params.delete_if {
@@ -58,7 +46,8 @@ module Ransack
           alias_method :search, :ransack
 
           def ransack_alias(new_name, old_name)
-            self._ransack_aliases.store(new_name.to_s, old_name.to_s)
+            self._ransack_aliases = _ransack_aliases.merge new_name.to_s =>
+              old_name.to_s
           end
 
           def ransacker(name, opts = {}, &block)

data/lib/ransack/configuration.rb

@@ -9,7 +9,10 @@ module Ransack
     self.options = {
       :search_key => :q,
       :ignore_unknown_conditions => true,
-      :hide_sort_order_indicators => false
+      :hide_sort_order_indicators => false,
+      :up_arrow => '▼'.freeze,
+      :down_arrow => '▲'.freeze,
+      :sanitize_scope_args => true
     }
 
     def configure
@@ -75,6 +78,43 @@ module Ransack
       self.options[:ignore_unknown_conditions] = boolean
     end
 
+    # By default, Ransack displays sort order indicator arrows with HTML codes:
+    #
+    #   up_arrow:   '▼'
+    #   down_arrow: '▲'
+    #
+    # One or both defaults may be globally overridden in an initializer file
+    # like `config/initializers/ransack.rb` as follows:
+    #
+    # Ransack.configure do |config|
+    #   # Globally set the up arrow to an icon and the down arrow to unicode.
+    #   config.custom_arrows = {
+    #     up_arrow:   '<i class="fa fa-long-arrow-up"></i>',
+    #     down_arrow: 'U+02193'
+    #   }
+    # end
+    #
+    def custom_arrows=(opts = {})
+      self.options[:up_arrow] = opts[:up_arrow].freeze if opts[:up_arrow]
+      self.options[:down_arrow] = opts[:down_arrow].freeze if opts[:down_arrow]
+    end
+
+    # Ransack sanitizes many values in your custom scopes into booleans.
+    # [1, '1', 't', 'T', 'true', 'TRUE'] all evaluate to true.
+    # [0, '0', 'f', 'F', 'false', 'FALSE'] all evaluate to false.
+    #
+    # This default may be globally overridden in an initializer file like
+    # `config/initializers/ransack.rb` as follows:
+    #
+    # Ransack.configure do |config|
+    #   # Accept my custom scope values as what they are.
+    #   config.sanitize_custom_scope_booleans = false
+    # end
+    #
+    def sanitize_custom_scope_booleans=(boolean)
+      self.options[:sanitize_scope_args] = boolean
+    end
+
     # By default, Ransack displays sort order indicator arrows in sort links.
     # The default may be globally overridden in an initializer file like
     # `config/initializers/ransack.rb` as follows:

data/lib/ransack/helpers/form_helper.rb

@@ -110,11 +110,11 @@ module Ransack
         end
 
         def up_arrow
-          '▼'.freeze
+          Ransack.options[:up_arrow]
         end
 
         def down_arrow
-          '▲'.freeze
+          Ransack.options[:down_arrow]
         end
 
         def name

data/lib/ransack/search.rb

@@ -123,12 +123,18 @@ module Ransack
     private
 
     def add_scope(key, args)
+      sanitized_args = if Ransack.options[:sanitize_scope_args]
+        sanitized_scope_args(args)
+      else
+        args
+      end
+
       if @context.scope_arity(key) == 1
         @scope_args[key] = args.is_a?(Array) ? args[0] : args
       else
-        @scope_args[key] = args.is_a?(Array) ? sanitized_scope_args(args) : args
+        @scope_args[key] = args.is_a?(Array) ? sanitized_args : args
       end
-      @context.chain_scope(key, sanitized_scope_args(args))
+      @context.chain_scope(key, sanitized_args)
     end
 
     def sanitized_scope_args(args)

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '1.8.2'
+  VERSION = '1.8.3'
 end

data/spec/mongoid/adapters/mongoid/base_spec.rb

@@ -65,6 +65,27 @@ module Ransack
             s = Person.ransack(term_cont: 'nomatch')
             expect(s.result.to_a).to eq []
           end
+
+          it 'makes aliases available to subclasses' do
+            yngwie = Musician.create!(name: 'Yngwie Malmsteen')
+
+            musicians = Musician.ransack(term_cont: 'ngw').result
+            expect(musicians).to eq([yngwie])
+          end
+
+          it 'handles naming collisions gracefully' do
+            frank = Person.create!(name: 'Frank Stallone')
+
+            people = Person.ransack(term_cont: 'allon').result
+            expect(people).to eq([frank])
+
+            Class.new(Article) do
+              ransack_alias :term, :title
+            end
+
+            people = Person.ransack(term_cont: 'allon').result
+            expect(people).to eq([frank])
+          end
         end
 
         describe '#ransacker' do
@@ -274,8 +295,6 @@ module Ransack
         end
 
         describe '#ransackable_associations' do
-          before { pending "not implemented for mongoid" }
-
           subject { Person.ransackable_associations }
 
           it { should include 'parent' }

data/spec/mongoid/configuration_spec.rb

@@ -36,17 +36,73 @@ module Ransack
     end
 
     it 'changes default search key parameter' do
-      # store original state so we can restore it later
-      before = Ransack.options.clone
+      default = Ransack.options.clone
 
-      Ransack.configure do |config|
-        config.search_key = :query
-      end
+      Ransack.configure { |c| c.search_key = :query }
 
       expect(Ransack.options[:search_key]).to eq :query
 
-      # restore original state so we don't break other tests
-      Ransack.options = before
+      Ransack.options = default
+    end
+
+    it 'should have default values for arrows' do
+      expect(Ransack.options[:up_arrow]).to eq '▼'
+      expect(Ransack.options[:down_arrow]).to eq '▲'
+    end
+
+    it 'changes the default value for the up arrow only' do
+      default, new_up_arrow = Ransack.options.clone, 'U+02191'
+
+      Ransack.configure { |c| c.custom_arrows = { up_arrow: new_up_arrow } }
+
+      expect(Ransack.options[:down_arrow]).to eq default[:down_arrow]
+      expect(Ransack.options[:up_arrow]).to eq new_up_arrow
+
+      Ransack.options = default
+    end
+
+    it 'changes the default value for the down arrow only' do
+      default, new_down_arrow  = Ransack.options.clone, '<i class="down"></i>'
+
+      Ransack.configure { |c| c.custom_arrows = { down_arrow: new_down_arrow } }
+
+      expect(Ransack.options[:up_arrow]).to eq default[:up_arrow]
+      expect(Ransack.options[:down_arrow]).to eq new_down_arrow
+
+      Ransack.options = default
+    end
+
+    it 'changes the default value for both arrows' do
+      default        = Ransack.options.clone
+      new_up_arrow   = '<i class="fa fa-long-arrow-up"></i>'
+      new_down_arrow = 'U+02193'
+
+      Ransack.configure do |c|
+        c.custom_arrows = { up_arrow: new_up_arrow, down_arrow: new_down_arrow }
+      end
+
+      expect(Ransack.options[:up_arrow]).to eq new_up_arrow
+      expect(Ransack.options[:down_arrow]).to eq new_down_arrow
+
+      Ransack.options = default
+    end
+
+    it 'consecutive arrow customizations respect previous customizations' do
+      default = Ransack.options.clone
+
+      Ransack.configure { |c| c.custom_arrows = { up_arrow: 'up' } }
+      expect(Ransack.options[:down_arrow]).to eq default[:down_arrow]
+
+      Ransack.configure { |c| c.custom_arrows = { down_arrow: 'DOWN' } }
+      expect(Ransack.options[:up_arrow]).to eq 'up'
+
+      Ransack.configure { |c| c.custom_arrows = { up_arrow: '<i>U-Arrow</i>' } }
+      expect(Ransack.options[:down_arrow]).to eq 'DOWN'
+
+      Ransack.configure { |c| c.custom_arrows = { down_arrow: 'down arrow-2' } }
+      expect(Ransack.options[:up_arrow]).to eq '<i>U-Arrow</i>'
+
+      Ransack.options = default
     end
 
     it 'adds predicates that take arrays, overriding compounds' do
@@ -76,8 +132,10 @@ module Ransack
           )
         end
 
-        expect(Ransack.predicates['test_in_predicate'].wants_array).to eq true
-        expect(Ransack.predicates['test_not_in_predicate'].wants_array).to eq true
+        expect(Ransack.predicates['test_in_predicate'].wants_array)
+        .to eq true
+        expect(Ransack.predicates['test_not_in_predicate'].wants_array)
+        .to eq true
       end
 
       it 'explicitly does not want array for in/not_in predicates' do
@@ -94,8 +152,10 @@ module Ransack
           )
         end
 
-        expect(Ransack.predicates['test_in_predicate_no_array'].wants_array).to eq false
-        expect(Ransack.predicates['test_not_in_predicate_no_array'].wants_array).to eq false
+        expect(Ransack.predicates['test_in_predicate_no_array'].wants_array)
+        .to eq false
+        expect(Ransack.predicates['test_not_in_predicate_no_array'].wants_array)
+        .to eq false
       end
     end
   end

data/spec/mongoid/search_spec.rb

@@ -433,7 +433,6 @@ module Ransack
       end
 
       context 'with joins' do
-        before { pending 'not implemented for mongoid' }
         it 'allows chaining to access nested conditions' do
           @s.groupings = [
             { :m => 'or', :name_eq => 'Ernie', :children_name_eq => 'Ernie' }

data/spec/mongoid/support/schema.rb

@@ -63,6 +63,9 @@ class Person
   end
 end
 
+class Musician < Person
+end
+
 class Article
   include Mongoid::Document
 

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

@@ -65,25 +65,31 @@ module Ransack
               expect(s.result.to_sql).to (include 'age > 18')
             end
 
-            # TODO: Implement a way to pass true/false values like 0 or 1 to
-            # scopes (e.g. with `in` / `not_in` predicates), without Ransack
-            # converting them to true/false boolean values instead.
-
-            # it 'passes true values to scopes', focus: true  do
-            #   s = Person.ransack('over_age' => 1)
-            #   expect(s.result.to_sql).to (include 'age > 1')
-            # end
-
-            # it 'passes false values to scopes', focus: true  do
-            #   s = Person.ransack('over_age' => 0)
-            #   expect(s.result.to_sql).to (include 'age > 0')
-            # end
-
             it 'chains scopes' do
               s = Person.ransack('over_age' => 18, 'active' => true)
               expect(s.result.to_sql).to (include 'age > 18')
               expect(s.result.to_sql).to (include 'active = 1')
             end
+
+            context "with sanitize_custom_scope_booleans set to false" do
+              before(:all) do
+                Ransack.configure { |c| c.sanitize_custom_scope_booleans = false }
+              end
+
+              after(:all) do
+                Ransack.configure { |c| c.sanitize_custom_scope_booleans = true }
+              end
+
+              it 'passes true values to scopes' do
+                s = Person.ransack('over_age' => 1)
+                expect(s.result.to_sql).to (include 'age > 1')
+              end
+
+              it 'passes false values to scopes'  do
+                s = Person.ransack('over_age' => 0)
+                expect(s.result.to_sql).to (include 'age > 0')
+              end
+            end
           end
 
           it 'does not raise exception for string :params argument' do
@@ -190,6 +196,27 @@ module Ransack
             s = Person.ransack(daddy_eq: 'Drake')
             expect(s.result.to_a).to eq []
           end
+
+          it 'makes aliases available to subclasses' do
+            yngwie = Musician.create!(name: 'Yngwie Malmsteen')
+
+            musicians = Musician.ransack(term_cont: 'ngw').result
+            expect(musicians).to eq([yngwie])
+          end
+
+          it 'handles naming collisions gracefully' do
+            frank = Person.create!(name: 'Frank Stallone')
+
+            people = Person.ransack(term_cont: 'allon').result
+            expect(people).to eq([frank])
+
+            Class.new(Article) do
+              ransack_alias :term, :title
+            end
+
+            people = Person.ransack(term_cont: 'allon').result
+            expect(people).to eq([frank])
+          end
         end
 
         describe '#ransacker' do

data/spec/ransack/configuration_spec.rb

@@ -3,9 +3,7 @@ require 'spec_helper'
 module Ransack
   describe Configuration do
     it 'yields Ransack on configure' do
-      Ransack.configure do |config|
-        expect(config).to eq Ransack
-      end
+      Ransack.configure { |config| expect(config).to eq Ransack }
     end
 
     it 'adds predicates' do
@@ -38,17 +36,73 @@ module Ransack
     end
 
     it 'changes default search key parameter' do
-      # store original state so we can restore it later
-      before = Ransack.options.clone
+      default = Ransack.options.clone
 
-      Ransack.configure do |config|
-        config.search_key = :query
-      end
+      Ransack.configure { |c| c.search_key = :query }
 
       expect(Ransack.options[:search_key]).to eq :query
 
-      # restore original state so we don't break other tests
-      Ransack.options = before
+      Ransack.options = default
+    end
+
+    it 'should have default values for arrows' do
+      expect(Ransack.options[:up_arrow]).to eq '▼'
+      expect(Ransack.options[:down_arrow]).to eq '▲'
+    end
+
+    it 'changes the default value for the up arrow only' do
+      default, new_up_arrow = Ransack.options.clone, 'U+02191'
+
+      Ransack.configure { |c| c.custom_arrows = { up_arrow: new_up_arrow } }
+
+      expect(Ransack.options[:down_arrow]).to eq default[:down_arrow]
+      expect(Ransack.options[:up_arrow]).to eq new_up_arrow
+
+      Ransack.options = default
+    end
+
+    it 'changes the default value for the down arrow only' do
+      default, new_down_arrow  = Ransack.options.clone, '<i class="down"></i>'
+
+      Ransack.configure { |c| c.custom_arrows = { down_arrow: new_down_arrow } }
+
+      expect(Ransack.options[:up_arrow]).to eq default[:up_arrow]
+      expect(Ransack.options[:down_arrow]).to eq new_down_arrow
+
+      Ransack.options = default
+    end
+
+    it 'changes the default value for both arrows' do
+      default        = Ransack.options.clone
+      new_up_arrow   = '<i class="fa fa-long-arrow-up"></i>'
+      new_down_arrow = 'U+02193'
+
+      Ransack.configure do |c|
+        c.custom_arrows = { up_arrow: new_up_arrow, down_arrow: new_down_arrow }
+      end
+
+      expect(Ransack.options[:up_arrow]).to eq new_up_arrow
+      expect(Ransack.options[:down_arrow]).to eq new_down_arrow
+
+      Ransack.options = default
+    end
+
+    it 'consecutive arrow customizations respect previous customizations' do
+      default = Ransack.options.clone
+
+      Ransack.configure { |c| c.custom_arrows = { up_arrow: 'up' } }
+      expect(Ransack.options[:down_arrow]).to eq default[:down_arrow]
+
+      Ransack.configure { |c| c.custom_arrows = { down_arrow: 'DOWN' } }
+      expect(Ransack.options[:up_arrow]).to eq 'up'
+
+      Ransack.configure { |c| c.custom_arrows = { up_arrow: '<i>U-Arrow</i>' } }
+      expect(Ransack.options[:down_arrow]).to eq 'DOWN'
+
+      Ransack.configure { |c| c.custom_arrows = { down_arrow: 'down arrow-2' } }
+      expect(Ransack.options[:up_arrow]).to eq '<i>U-Arrow</i>'
+
+      Ransack.options = default
     end
 
     it 'adds predicates that take arrays, overriding compounds' do
@@ -78,8 +132,10 @@ module Ransack
           )
         end
 
-        expect(Ransack.predicates['test_in_predicate'].wants_array).to eq true
-        expect(Ransack.predicates['test_not_in_predicate'].wants_array).to eq true
+        expect(Ransack.predicates['test_in_predicate'].wants_array)
+        .to eq true
+        expect(Ransack.predicates['test_not_in_predicate'].wants_array)
+        .to eq true
       end
 
       it 'explicitly does not want array for in/not_in predicates' do
@@ -96,8 +152,10 @@ module Ransack
           )
         end
 
-        expect(Ransack.predicates['test_in_predicate_no_array'].wants_array).to eq false
-        expect(Ransack.predicates['test_not_in_predicate_no_array'].wants_array).to eq false
+        expect(Ransack.predicates['test_in_predicate_no_array'].wants_array)
+        .to eq false
+        expect(Ransack.predicates['test_not_in_predicate_no_array'].wants_array)
+        .to eq false
       end
     end
   end

data/spec/ransack/helpers/form_helper_spec.rb

@@ -649,10 +649,57 @@ module Ransack
         it { should match /Full Name ▼/ }
       end
 
-      describe '#sort_link with config set to globally hide order indicators' do
+      describe '#sort_link with config set with custom up_arrow' do
+        before do
+          Ransack.configure { |c| c.custom_arrows = { up_arrow: "\u{1F446}" } }
+        end
+
+        after do
+          Ransack.configure { |c| c.custom_arrows = { up_arrow: "▼" } }
+        end
+
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(sorts: ['name desc'])],
+            :name,
+            controller: 'people',
+            hide_indicator: false
+          )
+        }
+
+        it { should match /Full Name \u{1F446}/ }
+      end
+
+      describe '#sort_link with config set with custom down_arrow' do
+        before do
+          Ransack.configure { |c| c.custom_arrows = { down_arrow: "\u{1F447}" } }
+        end
+
+        after do
+          Ransack.configure { |c| c.custom_arrows = { down_arrow: "▲" } }
+        end
+
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(sorts: ['name asc'])],
+            :name,
+            controller: 'people',
+            hide_indicator: false
+          )
+        }
+
+        it { should match /Full Name \u{1F447}/ }
+      end
+
+      describe '#sort_link with config set to hide arrows' do
         before do
           Ransack.configure { |c| c.hide_sort_order_indicators = true }
         end
+
+        after do
+          Ransack.configure { |c| c.hide_sort_order_indicators = false }
+        end
+
         subject { @controller.view_context
           .sort_link(
             [:main_app, Person.search(sorts: ['name desc'])],
@@ -660,13 +707,15 @@ module Ransack
             controller: 'people'
           )
         }
+
         it { should_not match /▼|▲/ }
       end
 
-      describe '#sort_link with config set to globally show order indicators' do
+      describe '#sort_link with config set to show arrows (default setting)' do
         before do
           Ransack.configure { |c| c.hide_sort_order_indicators = false }
         end
+
         subject { @controller.view_context
           .sort_link(
             [:main_app, Person.search(sorts: ['name desc'])],
@@ -674,9 +723,62 @@ module Ransack
             controller: 'people'
           )
         }
+
         it { should match /Full Name ▼/ }
       end
 
+      describe '#sort_link w/config to hide arrows + custom arrow, hides all' do
+        before do
+          Ransack.configure do |c|
+            c.hide_sort_order_indicators = true
+            c.custom_arrows = { down_arrow: 'down' }
+          end
+        end
+
+        after do
+          Ransack.configure do |c|
+            c.hide_sort_order_indicators = false
+            c.custom_arrows = { down_arrow: '▲' }
+          end
+        end
+
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(sorts: ['name desc'])],
+            :name,
+            controller: 'people'
+          )
+        }
+
+        it { should_not match /▼|down/ }
+      end
+
+      describe '#sort_link with config set to show arrows + custom arrow' do
+        before do
+          Ransack.configure do |c|
+            c.hide_sort_order_indicators = false
+            c.custom_arrows = { up_arrow: 'up-value' }
+          end
+        end
+
+        after do
+          Ransack.configure do |c|
+            c.hide_sort_order_indicators = false
+            c.custom_arrows = { up_arrow: '▼' }
+          end
+        end
+
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(sorts: ['name desc'])],
+            :name,
+            controller: 'people'
+          )
+        }
+
+        it { should match /▲|up-value/ }
+      end
+
       describe '#sort_link with a block' do
         subject { @controller.view_context
           .sort_link(

data/spec/ransack/predicate_spec.rb

@@ -329,6 +329,28 @@ module Ransack
         field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
         expect(@s.result.to_sql).to match /#{field} IS NULL/
       end
+
+      describe 'with association qeury' do
+        it 'generates a value IS NOT NULL query' do
+          @s.comments_id_not_null = true
+          sql = @s.result.to_sql
+          parent_field = "#{quote_table_name("people")}.#{quote_column_name("id")}"
+          expect(sql).to match /#{parent_field} IN/
+          field = "#{quote_table_name("comments")}.#{quote_column_name("id")}"
+          expect(sql).to match /#{field} IS NOT NULL/
+          expect(sql).not_to match /AND NOT/
+        end
+
+        it 'generates a value IS NULL query when assigned false' do
+          @s.comments_id_not_null = false
+          sql = @s.result.to_sql
+          parent_field = "#{quote_table_name("people")}.#{quote_column_name("id")}"
+          expect(sql).to match /#{parent_field} NOT IN/
+          field = "#{quote_table_name("comments")}.#{quote_column_name("id")}"
+          expect(sql).to match /#{field} IS NULL/
+          expect(sql).to match /AND NOT/
+        end
+      end
     end
 
     describe 'present' do

data/spec/support/schema.rb

@@ -127,6 +127,9 @@ class Person < ActiveRecord::Base
   end
 end
 
+class Musician < Person
+end
+
 class Article < ActiveRecord::Base
   belongs_to :person
   has_many :comments

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.6.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Object-based searching for Active Record and Mongoid (currently).