pose 0.2.1 → 0.2.2

data/lib/pose/version.rb

@@ -1,3 +1,3 @@
 module Pose
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/pose.rb

@@ -135,6 +135,7 @@ module Pose
       # Turn 'classes' into an array.
       classes = [classes].flatten
       classes_names = classes.map &:name
+      classes_names = classes_names[0] if classes_names.size == 1
 
       # Get the ids of the results.
       result_classes_and_ids = {}
@@ -144,7 +145,6 @@ module Pose
         query = PoseAssignment.joins(:pose_word) \
                               .where(:pose_words => {:text.matches => "#{query_word}%"},
                                      :posable_type => classes_names)
-        query = query.limit(limit) if limit
         query.each do |pose_assignment|
           current_word_classes_and_ids[pose_assignment.posable_type] << pose_assignment.posable_id
         end
@@ -158,6 +158,13 @@ module Pose
         end
       end
 
+      # Truncate id lists to the given limits.
+      if limit
+        result_classes_and_ids.each do |class_name, ids|
+          ids.slice! 0, limit
+        end
+      end
+
       # Load the results by id.
       {}.tap do |result|
         result_classes_and_ids.each do |class_name, ids|

data/spec/pose_assignment_spec.rb

@@ -6,12 +6,12 @@ describe PoseAssignment do
     PoseAssignment.delete_all
   end
   
-  describe "cleanup_class_index" do
+  describe "delete_class_index" do
     
     before :each do
       Factory :pose_assignment, :posable_id => 1, :posable_type => 'PosableOne'
       Factory :pose_assignment, :posable_id => 2, :posable_type => 'PosableTwo'
-      PoseAssignment.cleanup_class_index PosableOne
+      PoseAssignment.delete_class_index PosableOne
     end
     
     it "deletes all PoseAssignments for the given class" do

data/spec/pose_spec.rb

@@ -135,7 +135,6 @@ describe Pose do
     end
   end
 
-
   describe 'root_word' do
 
     it 'converts words into singular' do
@@ -197,7 +196,6 @@ describe Pose do
     end
   end
 
-
   describe 'search' do
     
     it 'works' do
@@ -210,64 +208,84 @@ describe Pose do
       result[PosableOne][0].should == pos1
     end
     
-    it 'returns an empty array if nothing matches' do
-      pos1 = PosableOne.create :text => 'one'
+    context 'classes parameter' do 
+      it 'returns all different classes by default' do
+        pos1 = PosableOne.create :text => 'foo'
+        pos2 = PosableTwo.create :text => 'foo'
       
-      result = Pose.search 'two', PosableOne
+        result = Pose.search 'foo', [PosableOne, PosableTwo]
       
-      result.should == { PosableOne => [] }
-    end
+        result.should have(2).items
+        result[PosableOne].should == [pos1]
+        result[PosableTwo].should == [pos2]
+      end
     
-    it 'returns all different classes by default' do
-      pos1 = PosableOne.create :text => 'foo'
-      pos2 = PosableTwo.create :text => 'foo'
+      it 'allows to provide different classes to return' do
+        pos1 = PosableOne.create :text => 'foo'
+        pos2 = PosableTwo.create :text => 'foo'
       
-      result = Pose.search 'foo', [PosableOne, PosableTwo]
+        result = Pose.search 'foo', [PosableOne, PosableTwo]
       
-      result.should have(2).items
-      result[PosableOne].should == [pos1]
-      result[PosableTwo].should == [pos2]
-    end
+        result.should have(2).items
+        result[PosableOne].should == [pos1]
+        result[PosableTwo].should == [pos2]
+      end
     
-    it 'allows to provide different classes to return' do
-      pos1 = PosableOne.create :text => 'foo'
-      pos2 = PosableTwo.create :text => 'foo'
+      it 'returns only instances of the given classes' do
+        pos1 = PosableOne.create :text => 'one'
+        pos2 = PosableTwo.create :text => 'one'
       
-      result = Pose.search 'foo', [PosableOne, PosableTwo]
+        result = Pose.search 'one', PosableOne
       
-      result.should have(2).items
-      result[PosableOne].should == [pos1]
-      result[PosableTwo].should == [pos2]
+        result.should have(1).items
+        result[PosableOne].should == [pos1]
+      end
     end
     
-    it 'returns only instances of the given classes' do
-      pos1 = PosableOne.create :text => 'one'
-      pos2 = PosableTwo.create :text => 'one'
+    context 'query parameter' do
+
+      it 'returns an empty array if nothing matches' do
+        pos1 = PosableOne.create :text => 'one'
+
+        result = Pose.search 'two', PosableOne
+
+        result.should == { PosableOne => [] }
+      end
+
+      it 'returns only objects that match all given query words' do
+        pos1 = PosableOne.create :text => 'one two'
+        pos2 = PosableOne.create :text => 'one three'
+        pos3 = PosableOne.create :text => 'two three'
       
-      result = Pose.search 'one', PosableOne
+        result = Pose.search 'two one', PosableOne
       
-      result.should have(1).items
-      result[PosableOne].should == [pos1]
-    end
+        result.should have(1).items
+        result[PosableOne].should == [pos1]
+      end
     
-    it 'returns only objects that match all given query words' do
-      pos1 = PosableOne.create :text => 'one two'
-      pos2 = PosableOne.create :text => 'one three'
-      pos3 = PosableOne.create :text => 'two three'
+      it 'returns nothing if searching for a non-existing word' do
+        pos1 = PosableOne.create :text => 'one two'
       
-      result = Pose.search 'two one', PosableOne
+        result = Pose.search 'one zonk', PosableOne
       
-      result.should have(1).items
-      result[PosableOne].should == [pos1]
+        result.should have(1).items
+        result[PosableOne].should == []
+      end
     end
     
-    it 'returns nothing if searching for a non-existing word' do
-      pos1 = PosableOne.create :text => 'one two'
-      
-      result = Pose.search 'one zonk', PosableOne
+    context "'limit' parameter" do
       
-      result.should have(1).items
-      result[PosableOne].should == []
+      it 'works' do
+        Factory :posable_one, :text => 'foo one'
+        Factory :posable_one, :text => 'foo two'
+        Factory :posable_one, :text => 'foo three'
+        Factory :posable_one, :text => 'foo four'
+
+        result = Pose.search 'foo', PosableOne, 2
+        
+        puts result.inspect
+        result[PosableOne].should have(2).items        
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pose
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70112891755440 !ruby/object:Gem::Requirement
+  requirement: &70174822133860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70112891755440
+  version_requirements: *70174822133860
 - !ruby/object:Gem::Dependency
   name: meta_where
-  requirement: &70112891751560 !ruby/object:Gem::Requirement
+  requirement: &70174822133440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112891751560
+  version_requirements: *70174822133440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70112891747180 !ruby/object:Gem::Requirement
+  requirement: &70174822132980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112891747180
+  version_requirements: *70174822132980
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
-  requirement: &70112891743860 !ruby/object:Gem::Requirement
+  requirement: &70174822132560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112891743860
+  version_requirements: *70174822132560
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70112891738440 !ruby/object:Gem::Requirement
+  requirement: &70174822164380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112891738440
+  version_requirements: *70174822164380
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70112891722760 !ruby/object:Gem::Requirement
+  requirement: &70174822163960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112891722760
+  version_requirements: *70174822163960
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70112891711480 !ruby/object:Gem::Requirement
+  requirement: &70174822163540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112891711480
+  version_requirements: *70174822163540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70112891703760 !ruby/object:Gem::Requirement
+  requirement: &70174822163120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112891703760
+  version_requirements: *70174822163120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70112891696280 !ruby/object:Gem::Requirement
+  requirement: &70174822162700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112891696280
+  version_requirements: *70174822162700
 description: Pose ('Polymorphic Search') allows fulltext search for ActiveRecord objects.
 email:
 - kevin.goslar@gmail.com