mongoid_fulltext 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/mongoid_fulltext.rb

@@ -46,29 +46,40 @@ module Mongoid::FullTextSearch
       db = collection.db
       coll = db.collection(index_name)
 
+      # The order of filters matters when the same index is used from two or more collections.
       filter_indexes = (config[:filters] || []).map do |key,value|
         ["filter_values.#{key}", Mongo::ASCENDING]
-      end
+      end.sort_by { |filter_index| filter_index[0] }
+      
       index_definition = [['ngram', Mongo::ASCENDING], ['score', Mongo::DESCENDING]].concat(filter_indexes)
 
       # Since the definition of the index could have changed, we'll clean up by
-      # removing any indexes that aren't on the exact 
+      # removing any indexes that aren't on the exact.
       correct_keys = index_definition.map{ |field_def| field_def[0] }
       all_filter_keys = filter_indexes.map{ |field_def| field_def[0] }
       coll.index_information.each do |name, definition|
         keys = definition['key'].keys
         next if !keys.member?('ngram')
         all_filter_keys |= keys.find_all{ |key| key.starts_with?('filter_values.') }
-        coll.drop_index(name) if keys & correct_keys != correct_keys
+        if keys & correct_keys != correct_keys
+          fulltext_log "Droping #{name} [#{keys & correct_keys} <=> #{correct_keys}]"
+          coll.drop_index(name)
+        end
       end
 
       if all_filter_keys.length > filter_indexes.length
-        filter_indexes = all_filter_keys.map { |key| [key, Mongo::ASCENDING] }
+        filter_indexes = all_filter_keys.map { |key| [key, Mongo::ASCENDING] }.sort_by { |filter_index| filter_index[0] }
         index_definition = [['ngram', Mongo::ASCENDING], ['score', Mongo::DESCENDING]].concat(filter_indexes)        
       end
 
-      coll.ensure_index(index_definition, name: 'fts_index')
-      coll.ensure_index([['document_id', Mongo::ASCENDING]]) # to make removes fast
+      fulltext_log "Ensuring fts_index on #{coll.name}: #{index_definition}"
+      coll.ensure_index(index_definition, { :name => 'fts_index', :background => true })
+      fulltext_log "Ensuring document_id index on #{coll.name}"
+      coll.ensure_index([['document_id', Mongo::ASCENDING]], { :background => true }) # to make removes fast
+    end
+    
+    def fulltext_log(message)
+      Mongoid.logger.info("[mongoid_fulltext] #{message}") if Mongoid.logger
     end
 
     def fulltext_search(query_string, options={})

data/mongoid_fulltext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_fulltext}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Windsor"]
-  s.date = %q{2011-07-19}
+  s.date = %q{2011-07-27}
   s.description = %q{Full-text search for the Mongoid ORM, using n-grams extracted from text}
   s.email = %q{aaron.windsor@gmail.com}
   s.extra_rdoc_files = [

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'database_cleaner'
 Mongoid.configure do |config|
   name = "mongoid_fulltext_test"
   config.master = Mongo::Connection.new.db(name)
+  config.logger = Logger.new('/dev/null')
 end
 
 require File.expand_path("../../lib/mongoid_fulltext", __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_fulltext
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-19 00:00:00.000000000 -04:00
+date: 2011-07-27 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70446910 !ruby/object:Gem::Requirement
+  requirement: &75050220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70446910
+  version_requirements: *75050220
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70444760 !ruby/object:Gem::Requirement
+  requirement: &75049790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70444760
+  version_requirements: *75049790
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70397170 !ruby/object:Gem::Requirement
+  requirement: &75049460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70397170
+  version_requirements: *75049460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70386800 !ruby/object:Gem::Requirement
+  requirement: &75049090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70386800
+  version_requirements: *75049090
 description: Full-text search for the Mongoid ORM, using n-grams extracted from text
 email: aaron.windsor@gmail.com
 executables: []
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 858859311
+      hash: 871827713
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: