ransack 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f794e84fb4595e61da2a692b091c475698170fda
-  data.tar.gz: 3c74ff882fc59a32b25c83155c0e7ab4922b013c
+  metadata.gz: 1ed8cd2219b1b16fb129d708c135405bcc3cd1e1
+  data.tar.gz: 08ee652b2fcbbf30f40ee7d7370d9d3fb4a97207
 SHA512:
-  metadata.gz: f70a119cfb73857c715feafa11ed85ad862f4439653e266586e2bcccf6523c5374229483f273e7aa5d2a8ecc8973a1b3cab221393d6cb5e240723db1d63b16ff
-  data.tar.gz: d16a78c96996d5b28ff151ea89a6eb1729743c185e6a88d002b25f03b8326e7fa395fe523a885a02298867e65c80d3a7ad190c3e16e14a89f70314b25db6d03d
+  metadata.gz: 3e1fb6f045a7f24db09af20e541d502f70793adea5f1ae5518f5ebdac9f22e8d60c884693a2858c35bf08b577ef32f6fafd412d046c2450d7b5b23935088bdd5
+  data.tar.gz: c4886f5a0a91bd50df8336eb7cbe971ffdeae7cd36b4a3441d509676267f7236c1c3d10602c8fb7cd780ff0873216566240b27001012a77beecaca1cd21c0d27

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## Version 1.6.1 - 2015-01-14
+
+*   Fix a regression with using `in` predicates caused by PR [#488](https://github.com/activerecord-hackery/ransack/pull/488)). Add a test.
+
+*   README improvements to clarify `sort_link` syntax with associations and
+    Ransack#search vs #ransack.
+
+*   Default the Gemfile to Rails 4-2-stable.
+
+    *Jon Atack*
+
+
 ## Version 1.6.0 - 2015-01-12
 ### Added
 
@@ -89,6 +101,7 @@
 
     *Jon Atack*
 
+
 ## Version 1.5.1 - 2014-10-30
 ### Fixed
 

data/Gemfile

@@ -3,7 +3,7 @@ gemspec
 
 gem 'rake'
 
-rails = ENV['RAILS'] || 'master'
+rails = ENV['RAILS'] || '4-2-stable'
 
 if rails == 'master'
   gem 'arel', github: 'rails/arel'

data/README.md

@@ -27,7 +27,7 @@ instead.
 If you're viewing this at
 [github.com/activerecord-hackery/ransack](https://github.com/activerecord-hackery/ransack),
 you're reading the documentation for the master branch with the latest features.
-[View documentation for the last release (1.6.0).](https://github.com/activerecord-hackery/ransack/tree/v.1.6.0)
+[View documentation for the last release (1.6.0).](https://github.com/activerecord-hackery/ransack/tree/v1.6.1)
 
 ## Getting started
 
@@ -265,17 +265,18 @@ construct much more complex search forms, such as the one on the
 
 ### Ransack #search method
 
-Ransack will try to to make `#search` available in your models, but in the case
-that `#search` has already been defined, you can always use the default
-`#ransack` method. For example, the following would be equivalent:
+Ransack will try to 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:
 
 ```ruby
 Article.ransack(params[:q])
 Article.search(params[:q])
 ```
 
-Users have reported issues of name conflicts with other gems, so `#search` may
-possibly be deprecated in the next major version of Ransack (2.0).
+Users have reported issues of `#search` name conflicts with other gems, so
+the `#search` method alias might be deprecated in the next major version of
+Ransack (2.0). It's advisable to use the default `#ransack` instead.
 
 For now, if Ransack's `#search` method conflicts with the name of another
 method named `search` in your code or another gem, you may resolve it either by
@@ -293,7 +294,7 @@ Ransack::Adapters::ActiveRecord::Base.class_eval('remove_method :search')
 You can easily use Ransack to search for objects in `has_many` and `belongs_to`
 associations.
 
-Given you have these associations ...
+Given these associations...
 
 ```ruby
 class Employee < ActiveRecord::Base
@@ -316,7 +317,7 @@ class Supervisor < ActiveRecord::Base
 end
 ```
 
-... and a controller ...
+... and a controller...
 
 ```ruby
 class SupervisorsController < ApplicationController
@@ -327,7 +328,7 @@ class SupervisorsController < ApplicationController
 end
 ```
 
-... you might set up your form like this ...
+... you might set up your form like this...
 
 ```erb
 <%= search_form_for @q do |f| %>
@@ -350,6 +351,11 @@ end
 <% end %>
 ```
 
+Please note that in a sort link, the association is expressed as an SQL string
+(`'employees.last_name'`) with a pluralized table name, instead of the symbol
+`:employee_last_name` syntax with a class#underscore table name used for
+Ransack objects elsewhere.
+
 ### Using Ransackers to add custom search functions via Arel
 
 The main premise behind Ransack is to provide access to

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

@@ -24,7 +24,7 @@ module Ransack
 
       private
 
-        # FIXME: Improve this edge case patch for Arel >= 6.0 (Rails >= 4.2)
+        # TODO: Improve this edge case patch for Arel >= 6.0 (Rails >= 4.2)
         #        that adds several conditionals to handle changing Arel API.
         #        Related to Ransack issue #472 and pull requests #486-488.
         #
@@ -39,8 +39,7 @@ module Ransack
         def casted_array_with_in_predicate?(predicate)
           return unless defined?(Arel::Nodes::Casted)
           predicate.class == Arel::Nodes::In &&
-          predicate.right.is_a?(Array) &&
-          predicate.right[0].class == Arel::Nodes::Casted
+          predicate.right[0].val.is_a?(Array)
         end
 
     end

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

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

@@ -80,6 +80,14 @@ module Ransack
           end
         end
 
+        context "search on an `in` predicate with an array" do
+          it "should function correctly when passing an array of ids" do
+            array = Person.all.map(&:id)
+            s = Person.ransack(id_in: array)
+            expect(s.result.count).to eq array.size
+          end
+        end
+
         describe '#ransacker' do
           # For infix tests
           def self.sane_adapter?
@@ -161,16 +169,16 @@ module Ransack
             expect(s.result.to_a).to eq [p]
           end
 
-          context "search using an `in` predicate and an array passed to a ransacker" do
+          context "search on an `in` predicate with an array to a ransacker" do
             it "should function correctly when passing an array of ids" do
               s = Person.ransack(array_users_in: true)
-              expect(s.result.length).to be > 0
+              expect(s.result.count).to be > 0
             end
 
             it "should function correctly when passing an array of strings" do
               p = Person.create!(name: Person.first.id.to_s)
               s = Person.ransack(array_names_in: true)
-              expect(s.result.length).to be > 0
+              expect(s.result.count).to be > 0
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack