Fix simple find with multiple values for a single index

cschneid · Jul 2, 2010 · c4d1dd2 · c4d1dd2
1 parent 872c3a9
commit c4d1dd2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/ohm.rb b/lib/ohm.rb
@@ -271,8 +271,9 @@ def inspect
 
     class Index < Set
       def apply(operation, hash, glue)
-        if hash.keys.size == 1
-          return Set.new(keys(hash).first, Wrapper.wrap(model))
+        keys = keys(hash)
+        if keys.size == 1
+          return Set.new(keys.first, Wrapper.wrap(model))
         else
           super
         end

diff --git a/test/indices_test.rb b/test/indices_test.rb
@@ -159,9 +159,11 @@ def days
       @event1 = Event.create(:timeline => 1).update(:days => [1, 2])
       @event2 = Event.create(:timeline => 1).update(:days => [2, 3])
       @event3 = Event.create(:timeline => 2).update(:days => [3, 4])
+      @event4 = Event.create(:timeline => 2).update(:days => [1, 3])
     end
 
     should "intersect multiple sets of results" do
+      assert_equal [@event1], Event.find(:days => [1, 2]).all
       assert_equal [@event1], Event.find(:timeline => 1, :days => [1, 2]).all
       assert_equal [@event1], Event.find(:timeline => 1).find(:days => [1, 2]).all
     end