improve handling for aliases

lib/ransack/nodes/grouping.rb

@@ -50,24 +50,20 @@ def conditions=(conditions)
 
       def [](key)
         conditions.detect do |c|
-          matched_condition(c, key.to_s, named_condition?(key.to_s))
+          matched_condition(c, key)
         end
       end
 
       def []=(key, value)
         conditions.reject! do |c|
-          matched_condition(c, key.to_s, named_condition?(key.to_s))
+          matched_condition(c, key)
         end
 
         self.conditions << value
       end
 
-      def matched_condition(c, key, named = false)
-        named ? c.name == key : c.key == key
-      end
-
-      def named_condition?(key)
-        conditions.map(&:name).include?(key)
+      def matched_condition(c, key)
+        c.name == key.to_s
       end
 
       def values

spec/ransack/adapters/active_record/base_spec.rb

@@ -242,11 +242,22 @@ module ActiveRecord
           it 'return alias correctly from search' do
             s = Person.ransack(term_cont: 'atlo')
             expect(s.term_cont).to eq 'atlo'
-            expect(s.name_or_email_cont).to eq 'atlo'
+            expect(s.name_or_email_cont).to eq nil
 
             s = Person.ransack(daddy_cont: 'babi')
             expect(s.daddy_cont).to eq 'babi'
-            expect(s.parent_name_cont).to eq 'babi'
+            expect(s.parent_name_cont).to eq nil
+
+            s = Person.ransack(
+              term_cont: 'atlo',
+              name_or_email_cont: 'different'
+            )
+            expect(s.term_cont).to eq 'atlo'
+            expect(s.name_or_email_cont).to eq 'different'
+            expect(s.result.to_sql).to include('"people"."name" LIKE \'%different%\'')
+            expect(s.result.to_sql).to include('"people"."email" LIKE \'%different%\'')
+            expect(s.result.to_sql).to include('"people"."name" LIKE \'%atlo%\'')
+            expect(s.result.to_sql).to include('"people"."email" LIKE \'%atlo%\'')
           end
 
           it 'also works with associations' do