From ba94e693851c1b1ad3a1ff673fca0210b114389a Mon Sep 17 00:00:00 2001
From: camelmasa <camelmasa@gmail.com>
Date: Fri, 1 Jul 2016 16:06:44 +0900
Subject: [PATCH] Fix value when several predicate.right

---
 .../active_record/ransack/nodes/condition.rb   | 18 ++++++++++++------
 .../adapters/active_record/base_spec.rb        |  4 ++--
 spec/support/schema.rb                         |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/ransack/adapters/active_record/ransack/nodes/condition.rb b/lib/ransack/adapters/active_record/ransack/nodes/condition.rb
index e97ac5def..03d3050ab 100644
--- a/lib/ransack/adapters/active_record/ransack/nodes/condition.rb
+++ b/lib/ransack/adapters/active_record/ransack/nodes/condition.rb
@@ -26,17 +26,23 @@ def format_predicate(attribute)
           arel_pred = arel_predicate_for_attribute(attribute)
           arel_values = formatted_values_for_attribute(attribute)
           predicate = attribute.attr.public_send(arel_pred, arel_values)
-          if casted_array_with_in_predicate?(predicate)
-            predicate.right[0] = format_values_for(predicate.right[0])
+
+          if in_predicate?(predicate)
+            predicate.right = predicate.right.map do |predicate|
+              casted_array?(predicate) ? format_values_for(predicate) : predicate
+            end
           end
+
           predicate
         end
 
-        def casted_array_with_in_predicate?(predicate)
+        def in_predicate?(predicate)
           return unless defined?(Arel::Nodes::Casted)
-          predicate.class == Arel::Nodes::In &&
-          predicate.right[0].respond_to?(:val) &&
-          predicate.right[0].val.is_a?(Array)
+          predicate.class == Arel::Nodes::In
+        end
+
+        def casted_array?(predicate)
+          predicate.respond_to?(:val) && predicate.val.is_a?(Array)
         end
 
         def format_values_for(predicate)
diff --git a/spec/ransack/adapters/active_record/base_spec.rb b/spec/ransack/adapters/active_record/base_spec.rb
index dde80297b..8e204f146 100644
--- a/spec/ransack/adapters/active_record/base_spec.rb
+++ b/spec/ransack/adapters/active_record/base_spec.rb
@@ -314,8 +314,8 @@ def self.simple_escaping?
 
           context 'searching on an `in` predicate with a ransacker' do
             it 'should function correctly when passing an array of ids' do
-              s = Person.ransack(array_users_in: true)
-              expect(s.result.count).to be > 0
+              s = Person.ransack(array_users_in: [1, 2])
+              expect(s.result.count).to be 2
             end
 
             it 'should function correctly when passing an array of strings' do
diff --git a/spec/support/schema.rb b/spec/support/schema.rb
index f5c46a66f..a523067d3 100644
--- a/spec/support/schema.rb
+++ b/spec/support/schema.rb
@@ -67,7 +67,7 @@ class Person < ActiveRecord::Base
   end
 
   ransacker :array_users,
-    formatter: proc { |v| Person.first(2).map(&:id) } do |parent|
+    formatter: proc { |v| Person.where(id: v).map(&:id) } do |parent|
     parent.table[:id]
   end