acts_as_indexed 0.8.1 → 0.8.2

data/CHANGELOG

@@ -1,3 +1,12 @@
+===0.8.2 [27 January 2013]
+ - Full review and update of test examples.
+ - Fixed bug where all records matching resulted in an ID rather than scored order. [phurni - Pascal Hurni]
+ - Fixed bug where records were returned in order of lowest-score first. [phurni - Pascal Hurni]
+ - Fixed bug where 1.8.7 would fail CI tests. [parndt - Philip Arndt]
+ - 70x performance improvement for non-changed record updates.
+ - Added a benchmark suite.
+ - Updated README install instructions. [gudata - Ivaylo Bardarov]
+
 ===0.8.1 [21 December 2012]
  - Fixed bug where record count was not correctly updated on bulk add. [phurni - Pascal Hurni]
 

data/Gemfile

@@ -1,9 +1,9 @@
 source "http://rubygems.org"
 
 group :test do
-  gem "mocha"
+  gem "rake"
+  gem "mocha", "~> 0.9.11"
   gem "sqlite3", "~> 1.3.5"
-  gem "rcov"
-  gem "activerecord"
+  gem "activerecord", "~> 3.2.9"
   gem "will_paginate", "~> 3.0.3"
 end

data/Gemfile.lock

@@ -1,35 +1,33 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
     i18n (0.6.1)
-    mocha (0.9.11)
-      rake
-    multi_json (1.3.7)
-    rake (0.8.7)
-    rcov (0.9.9)
+    mocha (0.9.12)
+    multi_json (1.5.0)
+    rake (10.0.3)
     sqlite3 (1.3.6)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
     will_paginate (3.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
-  mocha
-  rcov
+  activerecord (~> 3.2.9)
+  mocha (~> 0.9.11)
+  rake
   sqlite3 (~> 1.3.5)
   will_paginate (~> 3.0.3)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 - 2012 Douglas Shearer
+Copyright (c) 2007 - 2013 Douglas Shearer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -18,9 +18,9 @@ app with no dependencies and minimal setup.
 
 === Installation
 
-==== Add to your gemfile
+==== Add to your Gemfile
 
-  gem install acts_as_indexed
+  gem 'acts_as_indexed'
 
 Run <tt>bundle install</tt>. Done.
 

data/Rakefile

@@ -1,27 +1,39 @@
 require 'rake'
 require 'rake/testtask'
 
-desc 'Default: run unit tests.'
+desc 'Default: run all tests.'
 task :default => :test
 
-desc 'Test the acts_as_indexed plugin.'
+desc 'Run all tests.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
+  t.test_files = FileList['test/integration/*_test.rb', 'test/unit/*_test.rb']
   t.verbose = true
 end
 
-namespace :rcov do
-  desc "Generate a coverage report in coverage/"
-  task :gen do
-    sh "rcov --output coverage test/*_test.rb"
-  end
+desc 'Run unit tests.'
+Rake::TestTask.new('test:unit') do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.pattern = 'test/unit/*_test.rb'
+  t.verbose = true
+end
 
-  desc "Remove generated coverage files."
-  task :clobber do
-    sh "rm -rdf coverage"
-  end
+desc 'Run integration tests.'
+Rake::TestTask.new('test:integration') do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.pattern = 'test/integration/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Run performance tests.'
+Rake::TestTask.new('test:performance') do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.pattern = 'test/performance/*_test.rb'
+  t.verbose = true
 end
 
 begin

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/acts_as_indexed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts_as_indexed"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Douglas F Shearer"]
-  s.date = "2012-12-21"
+  s.date = "2013-01-27"
   s.description = "Acts As Indexed is a plugin which provides a pain-free way to add fulltext search to your Ruby on Rails app"
   s.email = "dougal.s@gmail.com"
   s.extra_rdoc_files = [
@@ -42,19 +42,24 @@ Gem::Specification.new do |s|
     "lib/acts_as_indexed/tokenizer.rb",
     "lib/will_paginate_search.rb",
     "rails/init.rb",
-    "test/abstract_unit.rb",
-    "test/acts_as_indexed_test.rb",
-    "test/configuration_test.rb",
-    "test/database.yml",
+    "test/config/database.yml",
+    "test/db/schema.rb",
     "test/fixtures/post.rb",
     "test/fixtures/posts.yml",
-    "test/pre_tokenizer_test.rb",
-    "test/schema.rb",
-    "test/search_atom_test.rb",
-    "test/search_index_test.rb",
-    "test/token_normalizer_test.rb",
-    "test/tokenizer_test.rb",
-    "test/will_paginate_search_test.rb"
+    "test/integration/acts_as_indexed_test.rb",
+    "test/integration/will_paginate_search_test.rb",
+    "test/integration_test_helper.rb",
+    "test/performance/query_performance_test.rb",
+    "test/performance/record_addition_performance_test.rb",
+    "test/performance/record_removal_performance_test.rb",
+    "test/performance/record_update_performance_test.rb",
+    "test/unit/configuration_test.rb",
+    "test/unit/pre_tokenizer_test.rb",
+    "test/unit/search_atom_test.rb",
+    "test/unit/search_index_test.rb",
+    "test/unit/token_normalizer_test.rb",
+    "test/unit/tokenizer_test.rb",
+    "test/unit_test_helper.rb"
   ]
   s.homepage = "http://github.com/dougal/acts_as_indexed"
   s.require_paths = ["lib"]

data/gemfiles/rails2_3.gemfile

@@ -1,8 +1,9 @@
 source "http://rubygems.org"
 
-gem "rake"
-gem "mocha", "~> 0.9.11"
-gem "sqlite3", "~> 1.3.5"
-gem "activerecord", "~> 2.3.14"
-gem "will_paginate", "~> 3.0.3"
-
+group :test do
+  gem "rake"
+  gem "mocha", "~> 0.9.11"
+  gem "sqlite3", "~> 1.3.5"
+  gem "activerecord", "~> 2.3.14"
+  gem "will_paginate", "~> 3.0.3"
+end

data/gemfiles/rails3_0.gemfile

@@ -1,7 +1,9 @@
 source "http://rubygems.org"
 
-gem "rake"
-gem "mocha", "~> 0.9.11"
-gem "sqlite3", "~> 1.3.5"
-gem "activerecord", "~> 3.0.17"
-gem "will_paginate", "~> 3.0.3"
+group :test do
+  gem "rake"
+  gem "mocha", "~> 0.9.11"
+  gem "sqlite3", "~> 1.3.5"
+  gem "activerecord", "~> 3.0.17"
+  gem "will_paginate", "~> 3.0.3"
+end

data/gemfiles/rails3_1.gemfile

@@ -1,7 +1,9 @@
 source "http://rubygems.org"
 
-gem "rake"
-gem "mocha", "~> 0.9.11"
-gem "sqlite3", "~> 1.3.5"
-gem "activerecord", "~> 3.1.8"
-gem "will_paginate", "~> 3.0.3"
+group :test do
+  gem "rake"
+  gem "mocha", "~> 0.9.11"
+  gem "sqlite3", "~> 1.3.5"
+  gem "activerecord", "~> 3.1.8"
+  gem "will_paginate", "~> 3.0.3"
+end

data/gemfiles/rails3_2.gemfile

@@ -1,7 +1,9 @@
 source "http://rubygems.org"
 
-gem "rake"
-gem "mocha", "~> 0.9.11"
-gem "sqlite3", "~> 1.3.5"
-gem "activerecord", "~> 3.2.9"
-gem "will_paginate", "~> 3.0.3"
+group :test do
+  gem "rake"
+  gem "mocha", "~> 0.9.11"
+  gem "sqlite3", "~> 1.3.5"
+  gem "activerecord", "~> 3.2.9"
+  gem "will_paginate", "~> 3.0.3"
+end

data/lib/acts_as_indexed/class_methods.rb

@@ -182,7 +182,7 @@ module ActsAsIndexed
         if a_score == b_score
           a_id <=> b_id
         else
-          a_score <=> b_score
+          b_score <=> a_score # We want the records with better relevance first.
         end
 
       }

data/lib/acts_as_indexed/search_atom.rb

@@ -87,6 +87,12 @@ module ActsAsIndexed #:nodoc:
     # atom.
     def weightings(records_size)
       out = ActiveSupport::OrderedHash.new
+
+      ## phurni 2012-09-21 when records_size is exactly the @records.size (all records are matches), the Math.log would
+      ## return 0 which means the frequency (pos.size) will have no effect. Cheat to make it like the matching
+      ## record is one less, so that we still can weight on frequency.
+      matching_records_size = (records_size == @records.size ? @records.size - 1 : @records.size)
+
       @records.each do |r_id, pos|
 
         # Fixes a bug when the records_size is zero. i.e. The only record
@@ -99,8 +105,9 @@ module ActsAsIndexed #:nodoc:
         # weighting = frequency * log (records.size / records_with_atom)
         ## parndt 2010/05/03 changed to records_size.to_f to avoid -Infinity Errno::ERANGE exceptions
         ## which would happen for example Math.log(1 / 20) == -Infinity but Math.log(1.0 / 20) == -2.99573227355399
-        out[r_id] = pos.size * Math.log(records_size.to_f / @records.size)
+        out[r_id] = pos.size * Math.log(records_size.to_f / matching_records_size)
       end
+
       out
     end
 

data/lib/acts_as_indexed/search_index.rb

@@ -15,7 +15,7 @@ module ActsAsIndexed #:nodoc:
 
     # Adds +record+ to the index.
     def add_record(record)
-      return unless @if_proc.call(record)
+      return unless allow_indexing?(record)
 
       condensed_record = condense_record(record)
       atoms = add_occurences(condensed_record, record.id)
@@ -29,7 +29,7 @@ module ActsAsIndexed #:nodoc:
       records_count = 0
 
       records.each do |record|
-        next unless @if_proc.call(record)
+        next unless allow_indexing?(record)
         records_count += 1
 
         condensed_record = condense_record(record)
@@ -48,8 +48,15 @@ module ActsAsIndexed #:nodoc:
     end
 
     def update_record(record_new, record_old)
-      remove_record(record_old)
-      add_record(record_new)
+      if !record_unchanged?(record_new, record_old)
+        remove_record(record_old)
+        add_record(record_new)
+
+      # Always try to remove the record if it is non-indexable, in case proc
+      # makes use of any methods or attributes exteral of the record.
+      elsif !allow_indexing?(record_new)
+        remove_record(record_old)
+      end
     end
 
     # Returns an array of IDs for records matching +query+.
@@ -90,6 +97,20 @@ module ActsAsIndexed #:nodoc:
 
     private
 
+    # The record is unchanged for our purposes if all the fields are the same
+    # and the if_proc returns the same result for both.
+    def record_unchanged?(record_new, record_old)
+      # NOTE: Using the dirty state would be great here, but it doesn't keep track of
+      # in-place changes.
+
+      allow_indexing?(record_old) == allow_indexing?(record_new) &&
+        !@fields.map { |field| record_old.send(field) == record_new.send(field) }.include?(false)
+    end
+
+    def allow_indexing?(record)
+      @if_proc.call(record)
+    end
+
     def merge_query_results(results1, results2)
       # Return the other if one is empty.
       return results1 if results2.empty?

data/lib/acts_as_indexed/storage.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module ActsAsIndexed #:nodoc:
   class Storage
 

data/test/{acts_as_indexed_test.rb → integration/acts_as_indexed_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require 'integration_test_helper.rb'
 
 class ActsAsIndexedTest < ActiveSupport::TestCase
   fixtures :posts
@@ -52,8 +52,8 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
     queries = {
       nil        => [],
       ''         => [],
-      'ship'     => [6,5],
-      'crane'    => [5,6],
+      'ship'     => [5, 6], # 5 has 3/4 occurences, 6 has 1/4.
+      'crane'    => [6, 5], # 6 has 2/3 occurences, 5 has 1/3.
       'foo'      => [6],
       'foo ship' => [6],
       'ship foo' => [6]
@@ -93,28 +93,19 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
     run_queries(queries)
   end
 
-  def test_scoped_negative_quoted_queries
-    queries = {
-      'crane -"crane ship"' => [6],
-      '-"crane big"'        => []
-    }
-
-    run_queries(queries)
-  end
-
   def test_start_queries
     queries = {
-      'ship ^crane'  => [6,5],
-      '^crane ship'  => [6,5],
-      '^ship ^crane' => [6,5],
-      '^crane ^ship' => [6,5],
-      '^ship crane'  => [6,5],
-      'crane ^ship'  => [6,5],
-      '^crane'       => [5,6] ,
-      '^cran'        => [5,6],
-      '^cra'         => [5,6],
-      '^cr'          => [4,5,6],
-      '^c'           => [1,2,3,4,5,6],
+      'ship ^crane'  => [5, 6], # 5 has 3/4 + 2/3 = 17/12, 6 has 1/4 + 1/3 = 7/12
+      '^crane ship'  => [5, 6], # 5 has 3/4 + 2/3 = 17/12, 6 has 1/4 + 1/3 = 7/12
+      '^ship ^crane' => [5, 6], # 5 has 3/4 + 2/3 = 17/12, 6 has 1/4 + 1/3 = 7/12
+      '^crane ^ship' => [5, 6], # 5 has 3/4 + 2/3 = 17/12, 6 has 1/4 + 1/3 = 7/12
+      '^ship crane'  => [5, 6], # 5 has 3/4 + 2/3 = 17/12, 6 has 1/4 + 1/3 = 7/12
+      'crane ^ship'  => [5, 6], # 5 has 3/4 + 2/3 = 17/12, 6 has 1/4 + 1/3 = 7/12
+      '^crane'       => [6, 5], # 6 has 2/3 occurences, 5 has 1/3.
+      '^cran'        => [6, 5], # 6 has 2/3 occurences, 5 has 1/3.
+      '^cra'         => [6, 5], # 6 has 2/3 occurences, 5 has 1/3.
+      '^cr'          => [6, 4, 5], # 6 has 2/4, 4 has 1/4, 5 has 1/4.
+      '^c'           => [5, 2, 1, 3, 6, 4], # 5 has 9/25, 2 has 8/25, 1 has 1/25, 3 has 2/25, 6 has 2/25, 5 has 1/25.
       '^notthere'    => []
     }
 
@@ -123,18 +114,18 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
 
   def test_start_quoted_queries
     queries = {
-      '^"crane" ship' => [6,5],
-      'ship ^"crane"' => [6,5],
+      '^"crane" ship' => [5, 6], # 5 has 3/4 + 2/3 = 17/12, 6 has 1/4 + 1/3 = 7/12
+      'ship ^"crane"' => [5, 6], # 5 has 3/4 + 2/3 = 17/12, 6 has 1/4 + 1/3 = 7/12
       '^"crane ship"' => [5],
       '^"crane shi"'  => [5],
       '^"crane sh"'   => [5],
       '^"crane s"'    => [5],
-      '^"crane "'     => [5,6],
-      '^"crane"'      => [5,6],
-      '^"cran"'       => [5,6],
-      '^"cra"'        => [5,6],
-      '^"cr"'         => [4,5,6],
-      '^"c"'          => [1,2,3,4,5,6],
+      '^"crane "'     => [6, 5], # 6 has 2/3 occurences, 5 has 1/3.
+      '^"crane"'      => [6, 5], # 6 has 2/3 occurences, 5 has 1/3.
+      '^"cran"'       => [6, 5], # 6 has 2/3 occurences, 5 has 1/3.
+      '^"cra"'        => [6, 5], # 6 has 2/3 occurences, 5 has 1/3.
+      '^"cr"'         => [6, 4, 5], # 6 has 2/4, 4 has 1/4, 5 has 1/4.
+      '^"c"'          => [5, 2, 1, 3, 6, 4] # 5 has 9/25, 2 has 8/25, 1 has 1/25, 3 has 2/25, 6 has 2/25, 5 has 1/25.
     }
 
     run_queries(queries)
@@ -146,16 +137,16 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
   # The offending assertions are not run in CI as a result.
   def test_find_options
     # limit.
-    assert_equal [4], Post.find_with_index('^cr', { :limit => 1 }, :ids_only => true)
-    assert_equal [4], Post.find_with_index('^cr', { :limit => 1 }).map{ |r| r.id }
+    assert_equal [6], Post.find_with_index('^cr', { :limit => 1 }, :ids_only => true)
+    assert_equal [6], Post.find_with_index('^cr', { :limit => 1 }).map{ |r| r.id }
 
     # offset
-    assert_equal [5,6], Post.find_with_index('^cr', { :offset => 1 }, :ids_only => true)
-    assert_equal [5,6], Post.find_with_index('^cr', { :offset => 1 }).map{ |r| r.id }
+    assert_equal [4, 5], Post.find_with_index('^cr', { :offset => 1 }, :ids_only => true)
+    assert_equal [4, 5], Post.find_with_index('^cr', { :offset => 1 }).map{ |r| r.id }
 
     # limit and offset
-    assert_equal [5], Post.find_with_index('^cr', { :limit => 1, :offset => 1 }, :ids_only => true)
-    assert_equal [5], Post.find_with_index('^cr', { :limit => 1, :offset => 1 }).map{ |r| r.id }
+    assert_equal [4], Post.find_with_index('^cr', { :limit => 1, :offset => 1 }, :ids_only => true)
+    assert_equal [4], Post.find_with_index('^cr', { :limit => 1, :offset => 1 }).map{ |r| r.id }
 
     # order
     assert_equal [6,5,4,3,2,1], Post.find_with_index('^c', { :order => 'id desc' }).map{ |r| r.id }
@@ -190,7 +181,7 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
     assert_equal(expected_message, error.message)
   end
 
-  # When a atom already in a record is duplicated, it removes
+  # When a atom already in a record is duplicated, it should not remove
   # all records with that same atom from the index.
   def test_update_record_bug
     p = Post.find(6)
@@ -251,15 +242,28 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
     assert_equal 2, Post.find_with_index('crane',{},{ :no_query_cache => true, :ids_only => true}).size
   end
 
-  # If an index doesn't exist, and an if proc is supplied, and the proc is false, then nothing happens
+  # If a record is not in the index, and is updated, it should still not be in the index.
   def test_update_if_not_in
     Post.acts_as_indexed :fields => [:title, :body], :if => Proc.new { |post| post.visible }
     destroy_index
 
-    assert_equal 1, Post.find_with_index('crane', {}, { :no_query_cache => true, :ids_only => true}).size
-    p = Post.find(5)
-    assert p.update_attributes(:visible => false)
-    assert_equal 1, Post.find_with_index('crane',{},{ :no_query_cache => true, :ids_only => true}).size
+    assert_equal [6], Post.find_with_index('crane', {}, { :no_query_cache => true, :ids_only => true})
+
+    posts(:wikipedia_article_5).update_attributes(:title => 'A new title')
+    assert_equal [6], Post.find_with_index('crane',{},{ :no_query_cache => true, :ids_only => true})
+  end
+
+  def test_update_if_with_external_proc
+    external_truth = true
+    Post.acts_as_indexed :fields => [:title, :body], :if => Proc.new { |post| external_truth }
+    destroy_index
+
+    assert_equal [6], Post.find_with_index('foo', {}, { :no_query_cache => true, :ids_only => true})
+
+    # When the proc returns false, on update, the post should be removed from the index.
+    external_truth = false
+    posts(:article_similar_to_5).save
+    assert_equal [], Post.find_with_index('foo', {}, { :no_query_cache => true, :ids_only => true})
   end
 
   def test_case_insensitive

data/test/{will_paginate_search_test.rb → integration/will_paginate_search_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require 'integration_test_helper.rb'
 
 class WillPaginateSearchTest < ActiveSupport::TestCase
   fixtures :posts
@@ -11,9 +11,9 @@ class WillPaginateSearchTest < ActiveSupport::TestCase
 
   def test_paginate_search
 
-    assert_equal [1,2,3,4,5,6], paginate_search(1, 10)
-    assert_equal [1,2,3], paginate_search(1, 3)
-    assert_equal [4,5,6], paginate_search(2, 3)
+    assert_equal [5, 2, 1, 3, 6, 4], paginate_search(1, 10)
+    assert_equal [5, 2, 1], paginate_search(1, 3)
+    assert_equal [3, 6, 4], paginate_search(2, 3)
   end
 
   private

data/test/{abstract_unit.rb → integration_test_helper.rb}

@@ -7,6 +7,8 @@ require 'active_record'
 require 'active_record/fixtures'
 require 'mocha'
 
+puts "ActiveRecord version is #{ActiveRecord::VERSION::STRING}"
+
 # Mock out the required environment variables.
 # Do this before requiring AAI.
 class Rails
@@ -26,11 +28,11 @@ test_path = Pathname.new(File.expand_path('../', __FILE__))
 require test_path.parent.join('lib', 'acts_as_indexed').to_s
 
 ActiveRecord::Base.logger = Logger.new(test_path.join('test.log').to_s)
-ActiveRecord::Base.configurations = YAML::load(IO.read(test_path.join('database.yml').to_s))
+ActiveRecord::Base.configurations = YAML::load(IO.read(test_path.join('config', 'database.yml').to_s))
 ActiveRecord::Base.establish_connection(ENV['DB'] || 'sqlite3')
 
 # Load Schema
-load(test_path.join('schema.rb').to_s)
+load(test_path.join('db', 'schema.rb').to_s)
 
 # Load model.
 $LOAD_PATH.unshift(test_path.join('fixtures').to_s)

data/test/performance/query_performance_test.rb

@@ -0,0 +1,47 @@
+require 'integration_test_helper.rb'
+require 'benchmark'
+
+class RecordUpdatePerformanceTest < ActiveSupport::TestCase
+  fixtures :posts
+
+  QUERIES = [
+    ['crane', 10_000],
+    ['foo', 10_000],
+    ['-foo', 10_000],
+    ['-foo crane', 10_000],
+    ['foo "crane ship', 10_000],
+    ['crane -"crane ship"', 10_000],
+    ['^cran', 10_000],
+    ['ship ^cran', 10_000],
+    ['^"crane" ship', 10_000],
+    ['^"crane"', 10_000]
+  ]
+
+  def teardown
+    # need to do this to work with the :if Proc tests.
+    Post.acts_as_indexed :fields => [:title, :body]
+    destroy_index
+  end
+
+  def test_queries_without_cache
+    QUERIES.each do |query|
+      run_query(*query, true)
+    end
+  end
+
+  def test_queries_with_cache
+    QUERIES.each do |query|
+      run_query(query[0], query[1], false)
+    end
+  end
+
+  def run_query(query, iterations, no_query_cache)
+    puts "Benchmarking query #{query} with#{ 'out' if no_query_cache } cache (x #{iterations})"
+    puts Benchmark.measure {
+      iterations.times do
+        Post.find_with_index(query, {}, :ids_only => true, :no_query_cache => no_query_cache)
+      end
+    }
+  end
+
+end

data/test/performance/record_addition_performance_test.rb

@@ -0,0 +1,23 @@
+require 'integration_test_helper.rb'
+require 'benchmark'
+
+class RecordAdditionPerformanceTest < ActiveSupport::TestCase
+  fixtures :posts
+
+  def teardown
+    # need to do this to work with the :if Proc tests.
+    Post.acts_as_indexed :fields => [:title, :body]
+    destroy_index
+  end
+
+  def test_addition
+    iterations = 200
+    puts "Record addition (x #{ iterations })"
+
+    puts Benchmark.measure {
+      iterations.times do
+        posts(:wikipedia_article_1).dup.save
+      end
+    }
+  end
+end

data/test/performance/record_removal_performance_test.rb

@@ -0,0 +1,23 @@
+require 'integration_test_helper.rb'
+require 'benchmark'
+
+class RecordRemovalPerformanceTest < ActiveSupport::TestCase
+  fixtures :posts
+
+  def teardown
+    # need to do this to work with the :if Proc tests.
+    Post.acts_as_indexed :fields => [:title, :body]
+    destroy_index
+  end
+
+  def test_removal
+    iterations = 200
+    puts "Record removal (x #{ iterations })"
+
+    (iterations - Post.count).times do
+      posts(:wikipedia_article_1).dup.save
+    end
+
+    puts Benchmark.measure { Post.destroy_all }
+  end
+end

data/test/performance/record_update_performance_test.rb

@@ -0,0 +1,42 @@
+require 'integration_test_helper.rb'
+require 'benchmark'
+
+class RecordUpdatePerformanceTest < ActiveSupport::TestCase
+  fixtures :posts
+
+  def teardown
+    # need to do this to work with the :if Proc tests.
+    Post.acts_as_indexed :fields => [:title, :body]
+    destroy_index
+  end
+
+  def test_unchanged
+    iterations = 10_000
+    puts "Unchanged record update (x #{ iterations })"
+
+    puts Benchmark.measure { iterations.times { posts(:wikipedia_article_1).save } }
+  end
+
+  def test_changed
+    iterations = 200
+    puts "Changed record update (x #{ iterations })"
+
+    original_title = posts(:wikipedia_article_1).title
+
+    puts Benchmark.measure {
+      iterations.times do |index|
+        posts(:wikipedia_article_1).update_attribute(:title, "#{original_title} #{ index }")
+      end
+    }
+  end
+
+  def test_unchanged_with_false_if_proc
+    iterations = 200
+    puts "Unchanged record update with false if_proc (x #{ iterations })"
+
+    Post.acts_as_indexed :fields => [:title, :body], :if => Proc.new { |post| post.visible }
+
+
+    puts Benchmark.measure { iterations.times { posts(:wikipedia_article_5).save } }
+  end
+end

data/test/{configuration_test.rb → unit/configuration_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require 'unit_test_helper.rb'
 include ActsAsIndexed
 
 class ConfigurationTest < ActiveSupport::TestCase

data/test/{pre_tokenizer_test.rb → unit/pre_tokenizer_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require 'unit_test_helper.rb'
 include ActsAsIndexed
 
 class PreTokenizerTest < ActiveSupport::TestCase

data/test/{search_atom_test.rb → unit/search_atom_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require 'unit_test_helper.rb'
 include ActsAsIndexed
 
 class SearchAtomTest < ActiveSupport::TestCase  

data/test/{search_index_test.rb → unit/search_index_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require 'unit_test_helper.rb'
 include ActsAsIndexed
 
 class SearchIndexTest < ActiveSupport::TestCase

data/test/{token_normalizer_test.rb → unit/token_normalizer_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require 'unit_test_helper.rb'
 include ActsAsIndexed
 
 class TokenNormalizerTest < ActiveSupport::TestCase

data/test/{tokenizer_test.rb → unit/tokenizer_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require 'unit_test_helper.rb'
 include ActsAsIndexed
 
 class TokenizerTest < ActiveSupport::TestCase

data/test/unit_test_helper.rb

@@ -0,0 +1,20 @@
+require 'test/unit'
+require 'fileutils'
+require 'rubygems'
+
+require 'bundler/setup'
+require 'mocha'
+
+# Mock out the required environment variables.
+# Do this before requiring AAI.
+class Rails
+  def self.root
+    Pathname.new(Dir.pwd)
+  end
+  def self.env
+    'test'
+  end
+end
+
+test_path = Pathname.new(File.expand_path('../', __FILE__))
+require test_path.parent.join('lib', 'acts_as_indexed').to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_indexed
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies: []
 description: Acts As Indexed is a plugin which provides a pain-free way to add fulltext
   search to your Ruby on Rails app
@@ -45,19 +45,24 @@ files:
 - lib/acts_as_indexed/tokenizer.rb
 - lib/will_paginate_search.rb
 - rails/init.rb
-- test/abstract_unit.rb
-- test/acts_as_indexed_test.rb
-- test/configuration_test.rb
-- test/database.yml
+- test/config/database.yml
+- test/db/schema.rb
 - test/fixtures/post.rb
 - test/fixtures/posts.yml
-- test/pre_tokenizer_test.rb
-- test/schema.rb
-- test/search_atom_test.rb
-- test/search_index_test.rb
-- test/token_normalizer_test.rb
-- test/tokenizer_test.rb
-- test/will_paginate_search_test.rb
+- test/integration/acts_as_indexed_test.rb
+- test/integration/will_paginate_search_test.rb
+- test/integration_test_helper.rb
+- test/performance/query_performance_test.rb
+- test/performance/record_addition_performance_test.rb
+- test/performance/record_removal_performance_test.rb
+- test/performance/record_update_performance_test.rb
+- test/unit/configuration_test.rb
+- test/unit/pre_tokenizer_test.rb
+- test/unit/search_atom_test.rb
+- test/unit/search_index_test.rb
+- test/unit/token_normalizer_test.rb
+- test/unit/tokenizer_test.rb
+- test/unit_test_helper.rb
 homepage: http://github.com/dougal/acts_as_indexed
 licenses: []
 post_install_message: