redis-textsearch 0.1.2 → 0.1.3

data/README.rdoc

@@ -17,13 +17,11 @@ that just returns a string, or an MD5 of a filename, or something else unique.
 
 == Installation
 
-    gem install gemcutter
-    gem tumble
     gem install redis-textsearch
 
 == Initialization
     
-If on Rails, config/initializers/redis.rb is a good place for this:
+If you're using Rails, config/initializers/redis.rb is a good place for this:
 
     require 'redis'
     require 'redis/text_search'
@@ -89,5 +87,5 @@ hash must be in brackets:
 
 == Author
 
-Copyright (c) 2009 {Nate Wiger}[http://nate.wiger.org].  All Rights Reserved.
+Copyright (c) 2009-2010 {Nate Wiger}[http://nate.wiger.org].  All Rights Reserved.
 Released under the {Artistic License}[http://www.opensource.org/licenses/artistic-license-2.0.php].

data/lib/redis/text_search/collection.rb

@@ -118,6 +118,19 @@ module Redis::TextSearch
       @total_entries = number.to_i
       @total_pages   = (@total_entries / per_page.to_f).ceil
     end
+    
+    # returns the current start ordinal of the paginated collection
+    def row_start  
+      @total_entries > 0 ? offset + 1 : 0
+    end
+ 
+    # returns the current end ordinal of the paginated collection
+    def row_end
+      end_ordinal = offset + per_page
+      # bounds check row_end
+      end_ordinal = @total_entries if end_ordinal > @total_entries
+      end_ordinal
+    end
 
     # This is a magic wrapper for the original Array#replace method. It serves
     # for populating the paginated collection after initialization.

data/lib/redis/text_search.rb

@@ -7,6 +7,7 @@ class Redis
   module TextSearch
     class NoFinderMethod < StandardError; end
     class BadTextIndex < StandardError; end
+    class BadConditions < StandardError; end
 
     DEFAULT_EXCLUDE_LIST = %w(a an and as at but by for in into of on onto to the)
 
@@ -26,7 +27,7 @@ class Redis
         klass.instance_variable_set('@text_index_exclude_list', DEFAULT_EXCLUDE_LIST)
         klass.send :include, InstanceMethods
         klass.extend ClassMethods
-        klass.guess_text_search_find
+        klass.extend WpHelpers unless respond_to?(:wp_count)
         class << klass
           define_method(:per_page) { 30 } unless respond_to?(:per_page)
         end
@@ -61,31 +62,40 @@ class Redis
       # This is called when the class is imported, and uses reflection to guess
       # how to retrieve records.  You can override it by explicitly defining a
       # +text_search_find+ class method that takes an array of IDs as an argument.
-      def guess_text_search_find
-        if defined?(ActiveRecord::Base) and ancestors.include?(ActiveRecord::Base)
-          instance_eval <<-EndMethod
-            def text_search_find(ids, options)
-              all(options.merge(:conditions => {:#{primary_key} => ids}))
-            end
-          EndMethod
-        elsif defined?(MongoRecord::Base) and ancestors.include?(MongoRecord::Base)
-          instance_eval <<-EndMethod
-            def text_search_find(ids, options)
-              all(options.merge(:conditions => {:#{primary_key} => ids}))
-            end
-          EndMethod
+      def text_search_find(ids, options)
+        if defined?(ActiveModel)
+          # guess that we're on Rails 3
+          raise "text_search_find not implemented for Rails 3 (yet) - patches welcome"
+        elsif defined?(ActiveRecord::Base) and ancestors.include?(ActiveRecord::Base)
+          merge_text_search_conditions!(ids, options)
+          all(options)
         elsif defined?(Sequel::Model) and ancestors.include?(Sequel::Model)
-          instance_eval <<-EndMethod
-            def text_search_find(ids, options)
-              all(options.merge(:conditions => {:#{primary_key} => ids}))
-            end
-          EndMethod
+          self[primary_key.to_sym => ids].filter(options)
         elsif defined?(DataMapper::Resource) and included_modules.include?(DataMapper::Resource)          
-          instance_eval <<-EndMethod
-            def text_search_find(ids, options)
-              get(ids, options)
-            end
-          EndMethod
+          get(options.merge(primary_key.to_sym => ids))
+        end
+      end
+
+      def merge_text_search_conditions!(ids, options)
+        pk = "#{table_name}.#{primary_key}"
+        case options[:conditions]
+        when Array
+          if options[:conditions][1].is_a?(Hash)
+            options[:conditions][0] = "(#{options[:conditions][0]}) AND #{pk} IN (:text_search_ids)"
+            options[:conditions][1][:text_search_ids] = ids
+          else
+            options[:conditions][0] = "(#{options[:conditions][0]}) AND #{pk} IN (?)"
+            options[:conditions] << ids
+          end
+        when Hash
+          if options[:conditions].has_key?(primary_key.to_sym)
+            raise BadConditions, "Cannot specify primary key (#{pk}) in :conditions to #{self.name}.text_search"
+          end
+          options[:conditions][primary_key.to_sym] = ids
+        when String
+          options[:conditions] = ["(#{options[:conditions]}) AND #{pk} IN (?)", ids]
+        else
+          options.merge!(:conditions => {primary_key => ids})
         end
       end
 
@@ -93,7 +103,7 @@ class Redis
       # update_text_indexes after record save or at the appropriate point.
       def text_index(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        options[:minlength] ||= 1
+        options[:minlength] ||= 2
         options[:split] ||= /\s+/
         raise ArgumentError, "Must specify fields to index to #{self.name}.text_index" unless args.length > 0
         args.each do |name|
@@ -141,21 +151,29 @@ class Redis
           end
         end
 
+        # Assemble our options for our finder conditions (destructive for speed)
+        recalculate_count = options.has_key?(:conditions)
+
         # Calculate pagination if applicable. Presence of :page indicates we want pagination.
         # Adapted from will_paginate/finder.rb
         if options.has_key?(:page)
           page = options.delete(:page) || 1
           per_page = options.delete(:per_page) || self.per_page
-          total = ids.length
 
-          Redis::TextSearch::Collection.create(page, per_page, total) do |pager|
+          Redis::TextSearch::Collection.create(page, per_page, nil) do |pager|
             # Convert page/per_page to limit/offset
             options.merge!(:offset => pager.offset, :limit => pager.per_page)
-            pager.replace(send(finder, ids, options){ |*a| yield(*a) if block_given? })
+            if ids.empty?
+              pager.replace([])
+              pager.total_entries = 0
+            else
+              pager.replace(send(finder, ids, options){ |*a| yield(*a) if block_given? })
+              pager.total_entries = recalculate_count ? wp_count(options, [], finder.to_s) : ids.length  # hacked into will_paginate for compat
+            end
           end
         else
           # Execute finder directly
-          send(finder, ids, options)
+          ids.empty? ? [] : send(finder, ids, options)
         end
       end
 
@@ -221,7 +239,7 @@ class Redis
         fields = self.class.text_indexes.keys if fields.empty?
         fields.each do |field|
           options = self.class.text_indexes[field]
-          value = self.send(field)
+          value = self.send(field).to_s
           return false if value.length < options[:minlength]  # too short to index
           indexes = []
 
@@ -238,13 +256,24 @@ class Redis
               indexes << "#{options[:key]}:#{str}"
             else
               len = options[:minlength]
-              while len < val.length
-                str = val[0..len].gsub(/\s+/, '.')  # can't have " " in Redis cmd string
+              while len <= val.length
+                str = val[0,len].gsub(/\s+/, '.')  # can't have " " in Redis cmd string
                 indexes << "#{options[:key]}:#{str}"
                 len += 1
               end
             end
           end
+          
+          # Also left-anchor the cropped string if "full" is specified
+          if options[:full]
+            val = values.join('.')
+            len = options[:minlength]
+            while len <= val.length
+              str = val[0,len].gsub(/\s+/, '.')  # can't have " " in Redis cmd string
+              indexes << "#{options[:key]}:#{str}"
+              len += 1
+            end
+          end
 
           # Determine what, if anything, needs to be done.  If the indexes are unchanged,
           # don't make any trips to Redis.  Saves tons of useless network calls.
@@ -288,7 +317,67 @@ class Redis
           end
         end
       end
-      
-    end
+
+    end # InstanceMethods
+    
+    module WpHelpers
+      # Does the not-so-trivial job of finding out the total number of entries
+      # in the database. It relies on the ActiveRecord +count+ method.
+      def wp_count(options, args, finder)
+        excludees = [:count, :order, :limit, :offset, :readonly]
+        if defined?(ActiveRecord::Calculations)
+          excludees << :from unless ActiveRecord::Calculations::CALCULATIONS_OPTIONS.include?(:from)
+        end
+
+        # we may be in a model or an association proxy
+        klass = (@owner and @reflection) ? @reflection.klass : self
+
+        # Use :select from scope if it isn't already present.
+        options[:select] = scope(:find, :select) unless options[:select]
+
+        if options[:select] and options[:select] =~ /^\s*DISTINCT\b/i
+          # Remove quoting and check for table_name.*-like statement.
+          if options[:select].gsub('`', '') =~ /\w+\.\*/
+            options[:select] = "DISTINCT #{klass.table_name}.#{klass.primary_key}"
+          end
+        else
+          excludees << :select # only exclude the select param if it doesn't begin with DISTINCT
+        end
+
+        # count expects (almost) the same options as find
+        count_options = options.except *excludees
+
+        # merge the hash found in :count
+        # this allows you to specify :select, :order, or anything else just for the count query
+        count_options.update options[:count] if options[:count]
+
+        # forget about includes if they are irrelevant (Rails 2.1)
+        # if count_options[:include] and
+        #     klass.private_methods.include_method?(:references_eager_loaded_tables?) and
+        #     !klass.send(:references_eager_loaded_tables?, count_options)
+        #   count_options.delete :include
+        # end
+
+        # we may have to scope ...
+        counter = Proc.new { count(count_options) }
+
+        count = if finder.index('find_') == 0 and klass.respond_to?(scoper = finder.sub('find', 'with'))
+                  # scope_out adds a 'with_finder' method which acts like with_scope, if it's present
+                  # then execute the count with the scoping provided by the with_finder
+                  send(scoper, &counter)
+                elsif finder =~ /^find_(all_by|by)_([_a-zA-Z]\w*)$/
+                  # extract conditions from calls like "paginate_by_foo_and_bar"
+                  attribute_names = $2.split('_and_')
+                  conditions = construct_attributes_from_arguments(attribute_names, args)
+                  with_scope(:find => { :conditions => conditions }, &counter)
+                else
+                  counter.call
+                end
+
+        count.respond_to?(:length) ? count.length : count
+      end
+
+    end  # WpHelpers
+    
   end
 end

data/spec/{redis_text_search_sqlite_spec.rb → redis_text_search_activerecord_spec.rb}

@@ -1,8 +1,13 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+DBFILE = File.dirname(__FILE__) + '/test.db'
+
+require 'logger'
 require 'active_record'
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'test.db')
+require 'fileutils'
+
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => DBFILE)
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 
 def check_result_ids(results, ids, sort=true)
@@ -20,9 +25,14 @@ end
 class Post < ActiveRecord::Base
   include Redis::TextSearch
   include Marshal
+  
+  BLOG = 101
+  INFO = 102
+  CAL  = 103
 
   text_index :title
   text_index :tags, :exact => true
+  text_index :type_id, :exact => true
 end
 
 class CreatePosts < ActiveRecord::Migration
@@ -30,6 +40,7 @@ class CreatePosts < ActiveRecord::Migration
     create_table :posts do |t|
       t.string :title
       t.string :tags
+      t.integer :type_id
       t.timestamps
     end
   end
@@ -52,20 +63,25 @@ TAGS = [
   ['gaming','technical']
 ]
 
+TYPES = [
+  Post::BLOG,
+  Post::BLOG,
+  Post::INFO
+]
 
 describe Redis::TextSearch do
   before :all do
     CreatePosts.up
     
-    @post  = Post.new(:title => TITLES[0], :tags => TAGS[0] * ' ')
+    @post  = Post.new(:title => TITLES[0], :tags => TAGS[0] * ' ', :type_id => TYPES[0])
     # @post.id = 1
     @post.save!
     # sleep 1 # sqlite timestamps
-    @post2 = Post.new(:title => TITLES[1], :tags => TAGS[1] * ' ')
+    @post2 = Post.new(:title => TITLES[1], :tags => TAGS[1] * ' ', :type_id => TYPES[1])
     # @post2.id = 2
     @post2.save!
     # sleep 1 # sqlite timestamps
-    @post3 = Post.new(:title => TITLES[2], :tags => TAGS[2] * ' ')
+    @post3 = Post.new(:title => TITLES[2], :tags => TAGS[2] * ' ', :type_id => TYPES[2])
     # @post3.id = 3
     @post3.save!
     # sleep 1 # sqlite timestamps
@@ -77,6 +93,7 @@ describe Redis::TextSearch do
 
   after :all do 
     CreatePosts.down
+    FileUtils.rm_f DBFILE
   end
 
   it "should define text indexes in the class" do
@@ -153,6 +170,7 @@ describe Redis::TextSearch do
       res.first.tags
     rescue => error
     end
+    error.should_not be_nil
     error.should be_kind_of ActiveRecord::MissingAttributeError
     
     error = nil
@@ -160,6 +178,7 @@ describe Redis::TextSearch do
       res.first.updated_at
     rescue => error
     end
+    error.should_not be_nil
     error.should be_kind_of ActiveRecord::MissingAttributeError
 
     error = nil
@@ -167,7 +186,25 @@ describe Redis::TextSearch do
       res.first.created_at
     rescue => error
     end
+    error.should_not be_nil
     error.should be_kind_of ActiveRecord::MissingAttributeError
+
+    # Merging conditions for SQL
+    check_result_ids Post.text_search('some', :conditions => 'id < 2'), [1]
+    check_result_ids Post.text_search('some', :conditions => ['id < ?', 2]), [1]
+    check_result_ids Post.text_search('some', :conditions => ['id = ?', 1]), [1]
+    check_result_ids Post.text_search('some', :conditions => ['id = ? and title = ?', 1, TITLES[0]]), [1]
+    check_result_ids Post.text_search('some', :conditions => ['title = :title and id = :id', {:id => 1, :title => TITLES[0]}]), [1]
+    check_result_ids Post.text_search('some', :conditions => {:title => TITLES[0]}), [1]
+    check_result_ids Post.text_search('some', :conditions => {:title => TITLES[0], :tags => TAGS[0] * ' '}), [1]
+
+    error = nil
+    begin
+      check_result_ids Post.text_search('some', :conditions => {:id => 1}), [1]
+    rescue => error
+    end
+    error.should_not be_nil
+    error.should be_kind_of Redis::TextSearch::BadConditions
   end
 
   it "should handle pagination" do
@@ -191,6 +228,21 @@ describe Redis::TextSearch do
     res.total_pages.should == 1
     res.per_page.should == 5
     res.current_page.should == 2
+    
+    res = Post.text_search('some', :page => 1, :per_page => 1, :conditions => ['id > ?', 2], :order => 'id')
+    check_result_ids res, [3]
+    res.total_entries.should == 1
+    res.total_pages.should == 1
+    res.per_page.should == 1
+    res.current_page.should == 1
+
+    res = Post.text_search('some', :page => 1, :per_page => 1, :order => 'id',
+                           :conditions => ['title = :title', {:title => TITLES[0]}])
+    check_result_ids res, [1]
+    res.total_entries.should == 1
+    res.total_pages.should == 1
+    res.per_page.should == 1
+    res.current_page.should == 1
   end
 
   it "should support a hash to the text_search method" do

data/spec/redis_text_search_core_spec.rb

@@ -6,6 +6,10 @@ class Post
 
   text_index :title
   text_index :tags, :exact => true
+  text_index :description, :full => true
+
+  def self.table_name;  'post'; end
+  def self.primary_key; 'id'; end
 
   def self.text_search_find(ids, options)
     options.empty? ? ids : [ids, options]
@@ -21,7 +25,7 @@ class Post
   end
   def id; @id; end
   def method_missing(name, *args)
-    @attrib[name] || super
+    @attrib.has_key?(name) ? @attrib[name] : super
   end
 end
 
@@ -35,15 +39,15 @@ TITLES = [
 TAGS = [
   ['personal', 'nontechnical'],
   ['mysql', 'technical'],
-  ['gaming','technical']
+  ['gaming','technical'],
+  ['character', 'halloween']
 ]
 
-
 describe Redis::TextSearch do
   before :all do
-    @post  = Post.new(:title => TITLES[0], :tags => TAGS[0] * ' ', :id => 1)
-    @post2 = Post.new(:title => TITLES[1], :tags => TAGS[1], :id => 2)
-    @post3 = Post.new(:title => TITLES[2], :tags => TAGS[2] * ' ', :id => 3)
+    @post  = Post.new(:title => TITLES[0], :tags => TAGS[0] * ' ', :id => 1, :description => nil)
+    @post2 = Post.new(:title => TITLES[1], :tags => TAGS[1], :id => 2, :description => nil)
+    @post3 = Post.new(:title => TITLES[2], :tags => TAGS[2] * ' ', :id => 3, :description => nil)
 
     @post.delete_text_indexes
     @post2.delete_text_indexes
@@ -59,6 +63,7 @@ describe Redis::TextSearch do
     @post.update_text_indexes
     @post2.update_text_indexes
 
+    Post.redis.set_members('post:text_index:title:s').should == []
     Post.redis.set_members('post:text_index:title:so').should == ['1']
     Post.redis.set_members('post:text_index:title:som').should == ['1']
     Post.redis.set_members('post:text_index:title:some').should == ['1']
@@ -66,6 +71,7 @@ describe Redis::TextSearch do
     Post.redis.set_members('post:text_index:title:pla').sort.should == ['1','2']
     Post.redis.set_members('post:text_index:title:plai').sort.should == ['1','2']
     Post.redis.set_members('post:text_index:title:plain').sort.should == ['1','2']
+    Post.redis.set_members('post:text_index:title:t').should == []
     Post.redis.set_members('post:text_index:title:te').sort.should == ['1','2']
     Post.redis.set_members('post:text_index:title:tex').sort.should == ['1','2']
     Post.redis.set_members('post:text_index:title:text').sort.should == ['1','2']
@@ -75,6 +81,7 @@ describe Redis::TextSearch do
     Post.redis.set_members('post:text_index:title:textstri').should == ['2']
     Post.redis.set_members('post:text_index:title:textstrin').should == ['2']
     Post.redis.set_members('post:text_index:title:textstring').should == ['2']
+    Post.redis.set_members('post:text_index:tags:p').should == []
     Post.redis.set_members('post:text_index:tags:pe').should == []
     Post.redis.set_members('post:text_index:tags:per').should == []
     Post.redis.set_members('post:text_index:tags:pers').should == []
@@ -82,6 +89,7 @@ describe Redis::TextSearch do
     Post.redis.set_members('post:text_index:tags:person').should == []
     Post.redis.set_members('post:text_index:tags:persona').should == []
     Post.redis.set_members('post:text_index:tags:personal').should == ['1']
+    Post.redis.set_members('post:text_index:tags:n').should == []
     Post.redis.set_members('post:text_index:tags:no').should == []
     Post.redis.set_members('post:text_index:tags:non').should == []
     Post.redis.set_members('post:text_index:tags:nont').should == []
@@ -130,6 +138,39 @@ describe Redis::TextSearch do
     Post.text_search(:tags => ['technical','MYsql'], :title => 'some').should == []
     Post.text_search(:tags => 'technical', :title => 'comments').sort.should == ['2','3']
   end
+  
+  it "should support full-phrase and sub-phrase simultaneously" do
+    @post4 = Post.new(:title => 'Dude', :description => 'Red flame dude', :tags => TAGS[3], :id => 4)
+    @post4.delete_text_indexes
+    @post4.update_text_indexes
+    Post.text_search(:description => 'Red flame dude').should == ['4']
+    Post.text_search(:description => 'Red flame dude', :tags => 'character').should == ['4']
+    Post.text_search(:description => 'Red').should == ['4']
+    Post.text_search(:description => 'Red', :tags => 'character').should == ['4']
+    Post.text_search(:description => 'Red', :tags => 'luigi').should == []
+    Post.text_search(:description => 'Red flame').should == ['4']
+    Post.text_search(:description => 'Red flame', :tags => 'halloween').should == ['4']
+    Post.text_search(:description => 'Red flame', :tags => 'hallowee').should == []
+    Post.text_search(:description => 'red FLame').should == ['4']
+    Post.text_search(:description => 'Red fla').should == ['4']
+    Post.text_search(:description => 'flame').should == ['4']
+    Post.text_search(:description => 'flame dude').should == []  # NOT SUPPORTED (must left-anchor)
+
+    Post.redis.set_members('post:text_index:description:red.flame.dude').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.flame.dud').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.flame.du').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.flame.d').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.flame.').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.flame').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.flam').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.fla').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.fl').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.f').should == ['4']
+    Post.redis.set_members('post:text_index:description:red.').should == ['4']
+    Post.redis.set_members('post:text_index:description:red').should == ['4']
+    Post.redis.set_members('post:text_index:description:re').should == ['4']
+    Post.redis.set_members('post:text_index:description:r').should == []
+  end
 
   # MUST BE LAST!!!!!!
   it "should delete text indexes" do
@@ -139,5 +180,6 @@ describe Redis::TextSearch do
     @post.text_indexes.should == []
     @post2.text_indexes.should == []
     @post3.text_indexes.should == []
+    Post.delete_text_indexes(4)
   end
 end

data/spec/redis_text_search_sequel_spec.rb

@@ -0,0 +1,266 @@
+
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+DBFILE = File.dirname(__FILE__) + '/test.db'
+
+require 'logger'
+require 'sequel'
+require 'fileutils'
+
+Sequel.extension :migration
+DB = Sequel.connect(:adapter => 'sqlite', :database => DBFILE, :loggers => [Logger.new(STDOUT)])
+
+def check_result_ids(results, ids, sort=true)
+  results.length.should == ids.length
+  if results.length > 0
+    results.first.should be_kind_of(Sequel::Model)
+  end
+  if sort
+    results.collect{|m| m.id}.sort.should == ids.sort
+  else
+    results.collect{|m| m.id}.should == ids
+  end
+end
+  
+class Post < Sequel::Model
+  include Redis::TextSearch
+  include Marshal
+  
+  BLOG = 101
+  INFO = 102
+  CAL  = 103
+
+  text_index :title
+  text_index :tags, :exact => true
+  text_index :type_id, :exact => true
+end
+
+class CreatePosts < Sequel::Migration
+  def up
+    create_table :posts do
+      primary_key :id
+      String :title
+      String :tags
+      Integer :type_id
+    end
+  end
+
+  def down
+    drop_table :posts
+  end
+end
+
+TITLES = [
+  'Some plain text',
+  'More plain textstring comments',
+  'Come get somebody personal comments',
+  '*Welcome to Nate\'s new BLOG!!',
+]
+
+TAGS = [
+  ['personal', 'nontechnical'],
+  ['mysql', 'technical'],
+  ['gaming','technical']
+]
+
+TYPES = [
+  Post::BLOG,
+  Post::BLOG,
+  Post::INFO
+]
+
+describe Redis::TextSearch do
+  before :all do
+    CreatePosts.apply(DB, :up)
+    
+    @post  = Post.new(:title => TITLES[0], :tags => TAGS[0] * ' ', :type_id => TYPES[0])
+    # @post.id = 1
+    @post.save!
+    # sleep 1 # sqlite timestamps
+    @post2 = Post.new(:title => TITLES[1], :tags => TAGS[1] * ' ', :type_id => TYPES[1])
+    # @post2.id = 2
+    @post2.save!
+    # sleep 1 # sqlite timestamps
+    @post3 = Post.new(:title => TITLES[2], :tags => TAGS[2] * ' ', :type_id => TYPES[2])
+    # @post3.id = 3
+    @post3.save!
+    # sleep 1 # sqlite timestamps
+
+    @post.delete_text_indexes
+    @post2.delete_text_indexes
+    Post.delete_text_indexes(3)
+  end
+
+  after :all do
+    CreatePosts.apply(DB, :down)
+    FileUtils.rm_f DBFILE
+  end
+
+  it "should define text indexes in the class" do
+    Post.text_indexes[:title][:key].should   == 'post:text_index:title'
+    Post.text_indexes[:tags][:key].should == 'post:text_index:tags'
+  end
+
+  it "should update text indexes correctly" do
+    @post.update_text_indexes
+    @post2.update_text_indexes
+
+    Post.redis.set_members('post:text_index:title:so').should == ['1']
+    Post.redis.set_members('post:text_index:title:som').should == ['1']
+    Post.redis.set_members('post:text_index:title:some').should == ['1']
+    Post.redis.set_members('post:text_index:title:pl').sort.should == ['1','2']
+    Post.redis.set_members('post:text_index:title:pla').sort.should == ['1','2']
+    Post.redis.set_members('post:text_index:title:plai').sort.should == ['1','2']
+    Post.redis.set_members('post:text_index:title:plain').sort.should == ['1','2']
+    Post.redis.set_members('post:text_index:title:te').sort.should == ['1','2']
+    Post.redis.set_members('post:text_index:title:tex').sort.should == ['1','2']
+    Post.redis.set_members('post:text_index:title:text').sort.should == ['1','2']
+    Post.redis.set_members('post:text_index:title:texts').should == ['2']
+    Post.redis.set_members('post:text_index:title:textst').should == ['2']
+    Post.redis.set_members('post:text_index:title:textstr').should == ['2']
+    Post.redis.set_members('post:text_index:title:textstri').should == ['2']
+    Post.redis.set_members('post:text_index:title:textstrin').should == ['2']
+    Post.redis.set_members('post:text_index:title:textstring').should == ['2']
+    Post.redis.set_members('post:text_index:tags:pe').should == []
+    Post.redis.set_members('post:text_index:tags:per').should == []
+    Post.redis.set_members('post:text_index:tags:pers').should == []
+    Post.redis.set_members('post:text_index:tags:perso').should == []
+    Post.redis.set_members('post:text_index:tags:person').should == []
+    Post.redis.set_members('post:text_index:tags:persona').should == []
+    Post.redis.set_members('post:text_index:tags:personal').should == ['1']
+    Post.redis.set_members('post:text_index:tags:no').should == []
+    Post.redis.set_members('post:text_index:tags:non').should == []
+    Post.redis.set_members('post:text_index:tags:nont').should == []
+    Post.redis.set_members('post:text_index:tags:nonte').should == []
+    Post.redis.set_members('post:text_index:tags:nontec').should == []
+    Post.redis.set_members('post:text_index:tags:nontech').should == []
+    Post.redis.set_members('post:text_index:tags:nontechn').should == []
+    Post.redis.set_members('post:text_index:tags:nontechni').should == []
+    Post.redis.set_members('post:text_index:tags:nontechnic').should == []
+    Post.redis.set_members('post:text_index:tags:nontechnica').should == []
+    Post.redis.set_members('post:text_index:tags:nontechnical').should == ['1']
+  end
+
+  it "should search text indexes and return records" do
+    check_result_ids Post.text_search('some'), [1]
+    @post3.update_text_indexes
+    check_result_ids Post.text_search('some'), [1,3]
+
+    check_result_ids Post.text_search('plain'), [1,2]
+    check_result_ids Post.text_search('plain','text'), [1,2]
+    check_result_ids Post.text_search('plain','textstr'), [2]
+    check_result_ids Post.text_search('some','TExt'), [1]
+    check_result_ids Post.text_search('techNIcal'), [2,3]
+    check_result_ids Post.text_search('nontechnical'), [1]
+    check_result_ids Post.text_search('personal'), [1,3]
+    check_result_ids Post.text_search('personAL', :fields => :tags), [1]
+    check_result_ids Post.text_search('PERsonal', :fields => [:tags]), [1]
+    check_result_ids Post.text_search('nontechnical', :fields => [:title]), []
+  end
+
+  it "should pass options thru to find" do
+    check_result_ids Post.text_search('some', :order => 'id desc'), [3,1], false
+    res = Post.text_search('some', :select => 'id,title', :order => 'tags desc')
+    check_result_ids res, [1,3]
+    res.first.title.should == TITLES[0]
+    res.last.title.should == TITLES[2]
+
+    error = nil
+    begin
+      res.first.tags
+    rescue => error
+    end
+    error.should_not be_nil
+    error.should be_kind_of ActiveRecord::MissingAttributeError
+    
+    error = nil
+    begin
+      res.first.updated_at
+    rescue => error
+    end
+    error.should_not be_nil
+    error.should be_kind_of ActiveRecord::MissingAttributeError
+
+    error = nil
+    begin
+      res.first.created_at
+    rescue => error
+    end
+    error.should_not be_nil
+    error.should be_kind_of ActiveRecord::MissingAttributeError
+
+    # Merging conditions for SQL
+    check_result_ids Post.text_search('some', :conditions => 'id < 2'), [1]
+    check_result_ids Post.text_search('some', :conditions => ['id < ?', 2]), [1]
+    check_result_ids Post.text_search('some', :conditions => ['id = ?', 1]), [1]
+    check_result_ids Post.text_search('some', :conditions => ['id = ? and title = ?', 1, TITLES[0]]), [1]
+    check_result_ids Post.text_search('some', :conditions => ['title = :title and id = :id', {:id => 1, :title => TITLES[0]}]), [1]
+    check_result_ids Post.text_search('some', :conditions => {:title => TITLES[0]}), [1]
+    check_result_ids Post.text_search('some', :conditions => {:title => TITLES[0], :tags => TAGS[0] * ' '}), [1]
+
+    error = nil
+    begin
+      check_result_ids Post.text_search('some', :conditions => {:id => 1}), [1]
+    rescue => error
+    end
+    error.should_not be_nil
+    error.should be_kind_of Redis::TextSearch::BadConditions
+  end
+
+  it "should handle pagination" do
+    res = Post.text_search('some', :page => 1, :per_page => 1, :order => 'id desc')
+    check_result_ids res, [3]
+    res.total_entries.should == 2
+    res.total_pages.should == 2
+    res.per_page.should == 1
+    res.current_page.should == 1
+
+    res = Post.text_search('some', :page => 2, :per_page => 1, :order => 'id desc')
+    check_result_ids res, [1]
+    res.total_entries.should == 2
+    res.total_pages.should == 2
+    res.per_page.should == 1
+    res.current_page.should == 2
+
+    res = Post.text_search('some', :page => 2, :per_page => 5)
+    check_result_ids res, []
+    res.total_entries.should == 2
+    res.total_pages.should == 1
+    res.per_page.should == 5
+    res.current_page.should == 2
+    
+    res = Post.text_search('some', :page => 1, :per_page => 1, :conditions => ['id > ?', 2], :order => 'id')
+    check_result_ids res, [3]
+    res.total_entries.should == 1
+    res.total_pages.should == 1
+    res.per_page.should == 1
+    res.current_page.should == 1
+
+    res = Post.text_search('some', :page => 1, :per_page => 1, :order => 'id',
+                           :conditions => ['title = :title', {:title => TITLES[0]}])
+    check_result_ids res, [1]
+    res.total_entries.should == 1
+    res.total_pages.should == 1
+    res.per_page.should == 1
+    res.current_page.should == 1
+  end
+
+  it "should support a hash to the text_search method" do
+    check_result_ids Post.text_search(:tags => 'technical'), [2,3]
+    check_result_ids Post.text_search(:tags => 'nontechnical'), [1]
+    check_result_ids Post.text_search(:tags => 'technical', :title => 'plain'), [2]
+    check_result_ids Post.text_search(:tags => ['technical','MYsql'], :title => 'Mo'), [2]
+    check_result_ids Post.text_search(:tags => ['technical','MYsql'], :title => 'some'), []
+    check_result_ids Post.text_search(:tags => 'technical', :title => 'comments'), [2,3]
+  end
+
+  # MUST BE LAST!!!!!!
+  it "should delete text indexes" do
+    @post.delete_text_indexes
+    @post2.delete_text_indexes
+    Post.delete_text_indexes(3)
+    @post.text_indexes.should == []
+    @post2.text_indexes.should == []
+    @post3.text_indexes.should == []
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redis-textsearch
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nate Wiger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -08:00
+date: 2010-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,8 +33,9 @@ extra_rdoc_files:
 files: 
 - lib/redis/text_search/collection.rb
 - lib/redis/text_search.rb
+- spec/redis_text_search_activerecord_spec.rb
 - spec/redis_text_search_core_spec.rb
-- spec/redis_text_search_sqlite_spec.rb
+- spec/redis_text_search_sequel_spec.rb
 - spec/spec_helper.rb
 - README.rdoc
 has_rdoc: true