pose 1.2.2 → 1.2.3

data/README.md

@@ -4,9 +4,10 @@ Pose  ("Polymorphic Search") allows fulltext search for ActiveRecord objects.
 
 * Searches over several ActiveRecord classes at once.
 * The searchable fulltext content per document can be freely customized.
-* Uses the Rails database, no sparate search engines are necessary.
-* The algorithm is designed to work with any data store that allows for range queries: SQL and NoSQL.
-* The search runs very fast, doing simple queries over fully indexed columns.
+* Uses the main Rails database, no sparate search engines are necessary.
+* Does not require to add attributes to the searchable classes or their database tables.
+* The algorithm is designed to work with any data store that allows for range queries, which covers pretty much every SQL or NoSQL database.
+* The search is very fast, doing only simple queries over fully indexed columns.
 * The search index provides data for autocomplete search fields.
 
 
@@ -120,6 +121,7 @@ result = Pose.search 'foo',
                      MyClass,
                      limit: 3,            # Limit the result count to 3.
                      result_type: :ids    # Don't load the resulting objects, return just their ids.
+                     where: [ public: true, ['user_id <> ?', @user.id] ]    # Additional where clauses for when the result entries are loaded from the database.
 ```
 
 

data/lib/pose/static_api.rb

@@ -51,19 +51,18 @@ module Pose
           else
             # Here we have results.
 
-            # Limit.
-            ids = ids.slice(0, options[:limit]) if options[:limit]
-
             if options[:result_type] == :ids
               # Ids requested for result.
 
               if options[:where].blank?
                 # No scope.
-                result[result_class] = ids
+                result[result_class] = options[:limit] ? ids.slice(0, options[:limit]) : ids
               else
                 # We have a scope.
                 options[:where].each do |scope|
-                  query = result_class.select('id').where('id IN (?)', ids).where(scope).to_sql
+                  query = result_class.select('id').where('id IN (?)', ids).where(scope)
+                  query = query.limit(options[:limit]) unless options[:limit].blank?
+                  query = query.to_sql
                   result[result_class] = result_class.connection.select_values(query).map(&:to_i)
                 end
               end
@@ -72,6 +71,7 @@ module Pose
               # Classes requested for result.
 
               result[result_class] = result_class.where(id: ids)
+              result[result_class] = result[result_class].limit(options[:limit]) unless options[:limit].blank?
               unless options[:where].blank?
                 options[:where].each do |scope|
                   result[result_class] = result[result_class].where('id IN (?)', ids).where(scope)

data/lib/pose/version.rb

@@ -1,3 +1,3 @@
 module Pose
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/pose_api_spec.rb

@@ -162,14 +162,38 @@ describe Pose do
 
     describe "'limit' parameter" do
 
-      it 'works' do
-        FactoryGirl.create :posable_one, text: 'foo one'
-        FactoryGirl.create :posable_one, text: 'foo two'
-        FactoryGirl.create :posable_one, text: 'foo three'
+      before :each do
+        @pos1 = FactoryGirl.create :posable_one, text: 'foo', private: true
+        @pos2 = FactoryGirl.create :posable_one, text: 'foo', private: true
+        @pos3 = FactoryGirl.create :posable_one, text: 'foo', private: false
+      end
 
-        result = Pose.search 'foo', PosableOne, limit: 2
+      context 'with ids and no scope' do
+        it 'limits the result set to the given number' do
+          result = Pose.search 'foo', PosableOne, result_type: :ids, limit: 1
+          result[PosableOne].should have(1).item
+        end
+      end
 
-        result[PosableOne].should have(2).items
+      context 'with ids and scope' do
+        it 'limits the result set to the given number' do
+          result = Pose.search 'foo', PosableOne, result_type: :ids, limit: 1, where: [private: false]
+          result[PosableOne].should have(1).item
+        end
+      end
+
+      context 'with classes and no scope' do
+        it 'limits the result set to the given number' do
+          result = Pose.search 'foo', PosableOne, limit: 1
+          result[PosableOne].should have(1).item
+        end
+      end
+
+      context 'with classes and scope' do
+        it 'limits the result set to the given number' do
+          result = Pose.search 'foo', PosableOne, limit: 1, where: [private: false]
+          result[PosableOne].should have(1).item
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pose
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails