acts_as_indexed 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,13 +1,16 @@
-===0.8.0
- - Fixed bug where intentianal hyphenation was treated as a negative query. Fixes #31.
+===0.8.1 [21 December 2012]
+ - Fixed bug where record count was not correctly updated on bulk add. [phurni - Pascal Hurni]
+
+===0.8.0 [20 December 2012]
+ - Fixed bug where intentional hyphenation was treated as a negative query. Fixes #31.
  - Fixed bug where will_paginate_search was not being required. Fixes #23.
  - Fixed bug where quoted phrases were matched across field boundaries. [novalis - David Turner]
- - Fixed bug where records with indentical match-rankings were returned in different orders under different ruby implementations.
+ - Fixed bug where records with indentical match-rankings were returned in different orders under different Ruby implementations.
  - Storage is now process and thread-safe. Fixes issue #34. [rsamoilov - Roman Samoilov]
  - Added configuration option to force is-Windows mode for storage. Fixes issues #32, #39.
- - Added multiple Gemfiles for TravisCI. https://travis-ci.org/dougal/acts_as_indexed
+ - Added multiple Gemfiles for Travis CI. https://travis-ci.org/dougal/acts_as_indexed
  - Acts as Indexed can now be tested stand-alone without a generated Rails app.
- - ModelKlass.build_index is now a public method
+ - ModelKlass.build_index is now a public method.
 
 ===0.7.8 [14 March 2011]
  - Fixed bug with file renaming on Windows. Fixes issue #21. [gabynamiman - Gabriel Namiman]

data/README.rdoc

@@ -186,6 +186,7 @@ bugfixes and features wouldn't have happened.
 * Gabriel Namiman
 * Roman Samoilov
 * David Turner
+* Pascal Hurni
 
 
 == Unicode (UTF8) Support

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/acts_as_indexed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts_as_indexed"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Douglas F Shearer"]
-  s.date = "2012-12-20"
+  s.date = "2012-12-21"
   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 = [

data/lib/acts_as_indexed/search_index.rb

@@ -26,15 +26,17 @@ module ActsAsIndexed #:nodoc:
     # Adds multiple records to the index. Accepts an array of +records+.
     def add_records(records)
       atoms = ActiveSupport::OrderedHash.new
+      records_count = 0
 
       records.each do |record|
         next unless @if_proc.call(record)
+        records_count += 1
 
         condensed_record = condense_record(record)
         atoms = add_occurences(condensed_record, record.id, atoms)
       end
 
-      @storage.add(atoms)
+      @storage.add(atoms, records_count)
     end
 
     # Removes +record+ from the index.

data/lib/acts_as_indexed/storage.rb

@@ -15,10 +15,10 @@ module ActsAsIndexed #:nodoc:
     end
 
     # Takes a hash of atoms and adds these to storage.
-    def add(atoms)
+    def add(atoms, count=1)
       operate(:+, atoms)
 
-      update_record_count(1)
+      update_record_count(count)
     end
 
     # Takes a hash of atoms and removes these from storage.

data/test/acts_as_indexed_test.rb

@@ -52,8 +52,8 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
     queries = {
       nil        => [],
       ''         => [],
-      'ship'     => [5,6],
-      'crane'    => [6,5],
+      'ship'     => [6,5],
+      'crane'    => [5,6],
       'foo'      => [6],
       'foo ship' => [6],
       'ship foo' => [6]
@@ -104,17 +104,17 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
 
   def test_start_queries
     queries = {
-      'ship ^crane'  => [5,6],
-      '^crane ship'  => [5,6],
-      '^ship ^crane' => [5,6],
-      '^crane ^ship' => [5,6],
-      '^ship crane'  => [5,6],
-      'crane ^ship'  => [5,6],
-      '^crane'       => [6,5] ,
-      '^cran'        => [6,5],
-      '^cra'         => [6,5],
-      '^cr'          => [6,4,5],
-      '^c'           => [5,2,1,3,6,4],
+      '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],
       '^notthere'    => []
     }
 
@@ -123,18 +123,18 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
 
   def test_start_quoted_queries
     queries = {
-      '^"crane" ship' => [5,6],
-      'ship ^"crane"' => [5,6],
+      '^"crane" ship' => [6,5],
+      'ship ^"crane"' => [6,5],
       '^"crane ship"' => [5],
       '^"crane shi"'  => [5],
       '^"crane sh"'   => [5],
       '^"crane s"'    => [5],
-      '^"crane "'     => [6,5],
-      '^"crane"'      => [6,5],
-      '^"cran"'       => [6,5],
-      '^"cra"'        => [6,5],
-      '^"cr"'         => [6,4,5],
-      '^"c"'          => [5,2,1,3,6,4],
+      '^"crane "'     => [5,6],
+      '^"crane"'      => [5,6],
+      '^"cran"'       => [5,6],
+      '^"cra"'        => [5,6],
+      '^"cr"'         => [4,5,6],
+      '^"c"'          => [1,2,3,4,5,6],
     }
 
     run_queries(queries)
@@ -146,16 +146,16 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
   # The offending assertions are not run in CI as a result.
   def test_find_options
     # limit.
-    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 }
+    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 }
 
     # offset
-    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 }
+    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 }
 
     # limit and offset
-    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 }
+    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 }
 
     # order
     assert_equal [6,5,4,3,2,1], Post.find_with_index('^c', { :order => 'id desc' }).map{ |r| r.id }

data/test/will_paginate_search_test.rb

@@ -11,9 +11,9 @@ class WillPaginateSearchTest < ActiveSupport::TestCase
 
   def test_paginate_search
 
-    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)
+    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)
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_indexed
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-21 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