mongoid_search 0.1.2 → 0.2.0

data/Gemfile

@@ -2,5 +2,7 @@ source 'http://rubygems.org'
 
 gem "jeweler"
 gem "database_cleaner"
-gem "mongoid", "2.0.0.beta.18"
-gem "rspec", "2.0.0.beta.22"
+gem "mongoid", "~> 2.0.0.beta.19"
+gem "rake", "0.8.7"
+gem "rspec", "2.3.0"
+gem "fast-stemmer", "1.0.0"

data/Gemfile.lock

@@ -1,44 +1,39 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.0)
-    bson (1.0.4)
+      i18n (~> 0.4)
+    activesupport (3.0.5)
+    bson (1.2.4)
     builder (2.1.2)
-    database_cleaner (0.5.2)
+    database_cleaner (0.6.4)
     diff-lcs (1.1.2)
-    gemcutter (0.6.1)
+    fast-stemmer (1.0.0)
     git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    i18n (0.5.0)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    mongo (1.0.7)
-      bson (>= 1.0.4)
-    mongoid (2.0.0.beta.18)
-      activemodel (~> 3.0.0)
-      bson (= 1.0.4)
-      mongo (= 1.0.7)
+      rake
+    mongo (1.2.4)
+      bson (>= 1.2.4)
+    mongoid (2.0.0.rc.7)
+      activemodel (~> 3.0)
+      mongo (~> 1.2)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    tzinfo (0.3.23)
+    rake (0.8.7)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    tzinfo (0.3.24)
     will_paginate (3.0.pre2)
 
 PLATFORMS
@@ -46,6 +41,8 @@ PLATFORMS
 
 DEPENDENCIES
   database_cleaner
+  fast-stemmer (= 1.0.0)
   jeweler
-  mongoid (= 2.0.0.beta.18)
-  rspec (= 2.0.0.beta.22)
+  mongoid (~> 2.0.0.beta.19)
+  rake (= 0.8.7)
+  rspec (= 2.3.0)

data/README.md

@@ -24,8 +24,9 @@ Examples
       field :name
 
       references_many :tags
+      refereced_in    :category
       
-      search_in :brand, :name, :tags => :name
+      search_in :brand, :name, :tags => :name, :category => :name
     end
 
     class Tag
@@ -34,6 +35,13 @@ Examples
 
       referenced_in :product
     end
+    
+    class Category
+      include Mongoid::Document
+      field :name
+
+      references_many :products
+    end
 
 Now when you save a product, you get a _keywords field automatically:
     
@@ -58,10 +66,10 @@ Note that the search is case insensitive, and accept partial searching too:
 Options
 -------
 
-:match:
-  :any - match any occurrence
-  :all - match all ocurrences 
-  Default is :any.
+match:  
+  _:any_ - match any occurrence  
+  _:all_ - match all ocurrences  
+  Default is _:any_.
 
     search_in :brand, :name, { :tags => :name }, { :match => :any }
     
@@ -72,3 +80,21 @@ Options
     
     Product.search("apple motorola").size
     => 0
+    
+allow_empty_search:  
+  _true_ - match any occurrence  
+  _false_ - match all ocurrences  
+  Default is _false_.
+
+    search_in :brand, :name, { :tags => :name }, { :allow_empty_search => true }
+    
+    Product.search("").size
+    => 1
+    
+TODO
+----
+
+* Strip html with sanitize (https://github.com/rgrove/sanitize)
+* Test relevant search
+* Move all configurations to a configuration file. Maybe /config/mongoid_search.yml.
+

data/Rakefile

@@ -10,8 +10,8 @@ begin
     gem.email = "mauricio@papodenerd.net"
     gem.homepage = "http://www.papodenerd.net/mongoid-search-full-text-search-for-your-mongoid-models/"
     gem.authors = ["Mauricio Zaffari"]
-    gem.add_dependency("mongoid", ["~> 2.0.0.beta"])
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_dependency("mongoid", ["~> 2.0.0"])
+    gem.add_development_dependency "rspec", ">= 2.0.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -19,10 +19,10 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ["-c", "-f progress"]
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/mongoid_search.rb

@@ -1,2 +1,2 @@
-require 'mongoid_search/keywords_extractor'
+require 'mongoid_search/util'
 require 'mongoid_search/mongoid_search'

data/lib/mongoid_search/mongoid_search.rb

@@ -2,15 +2,19 @@ module Mongoid::Search
   extend ActiveSupport::Concern
   
   included do
-    cattr_accessor :search_fields, :match
+    cattr_accessor :search_fields, :match, :allow_empty_search, :relevant_search, :stem_keywords, :ignore_list
   end
   
   module ClassMethods #:nodoc:
     # Set a field or a number of fields as sources for search
     def search_in(*args)
-      options = args.last.is_a?(Hash) && (args.last.keys.first == :match) ? args.pop : {}
-      self.match = [:any, :all].include?(options[:match]) ? options[:match] : :any
-      self.search_fields = args
+      options = args.last.is_a?(Hash) && [:match, :allow_empty_search, :relevant_search, :stem_keywords, :ignore_list].include?(args.last.keys.first) ? args.pop : {}
+      self.match              = [:any, :all].include?(options[:match]) ? options[:match] : :any
+      self.allow_empty_search = [true, false].include?(options[:allow_empty_search]) ? options[:allow_empty_search] : false
+      self.relevant_search    = [true, false].include?(options[:relevant_search]) ? options[:allow_empty_search] : false
+      self.stem_keywords      = [true, false].include?(options[:stem_keywords]) ? options[:allow_empty_search] : false
+      self.ignore_list        = YAML.load(File.open(options[:ignore_list]))["ignorelist"] if options[:ignore_list].present?
+      self.search_fields      = args
 
       field :_keywords, :type => Array
       index :_keywords
@@ -18,20 +22,85 @@ module Mongoid::Search
       before_save :set_keywords
     end
     
-    def search(query)
-      self.send("#{self.match.to_s}_in", :_keywords => KeywordsExtractor.extract(query).map { |q| /#{q}/ })
+    def search(query, options={})
+      if relevant_search
+        search_relevant(query, options)
+      else
+        search_without_relevance(query, options)
+      end
+    end
+    
+    def search_without_relevance(query, options={})
+      return self.all if query.blank? && allow_empty_search
+      self.send("#{(options[:match]||self.match).to_s}_in", :_keywords => Util.keywords(query, stem_keywords, ignore_list).map { |q| /#{q}/ })
+    end
+    
+    def search_relevant(query, options={})
+      return self.all if query.blank? && allow_empty_search
+      
+      keywords = Util.keywords(query, stem_keywords, ignore_list)
+      
+      map = <<-EOS
+        function() {
+          var entries = 0
+          for(i in keywords)
+            for(j in this._keywords) {
+              if(this._keywords[j] == keywords[i])
+                entries++
+            }
+          if(entries > 0)
+            emit(this._id, entries)
+        }
+      EOS
+      reduce = <<-EOS
+        function(key, values) {
+          return(values[0])
+        }
+      EOS
+  
+      #raise [self.class, self.inspect].inspect
+      
+      kw_conditions = keywords.map do |kw|
+        {:_keywords => kw}
+      end
+      
+      criteria = self.any_of(*kw_conditions)
+      
+      query = criteria.selector
+
+      options.delete(:limit)
+      options.delete(:skip)
+      options.merge! :scope => {:keywords => keywords}, :query => query
+               
+      res = collection.map_reduce(map, reduce, options)
+
+      res.find.sort(['value', -1]) # Cursor
     end
   end
   
   private
-  
+
+  # TODO: This need some refatoring..
   def set_keywords
     self._keywords = self.search_fields.map do |field|
       if field.is_a?(Hash)
-        field.keys.map { |key| self.send(key).map(&field[key]).map { |t| KeywordsExtractor.extract t } }
+        field.keys.map do |key|
+          attribute = self.send(key)
+          method = field[key]
+          if attribute.is_a?(Array)
+            if method.is_a?(Array)
+              method.map {|m| attribute.map { |a| Util.keywords a.send(m), stem_keywords, ignore_list } }
+            else
+              attribute.map(&method).map { |t| Util.keywords t, stem_keywords, ignore_list }
+            end
+          else
+            Util.keywords(attribute.send(method), stem_keywords, ignore_list)
+          end
+        end
       else
-        KeywordsExtractor.extract(self.send(field))
+        text = self[field]
+        Util.keywords(text, stem_keywords, ignore_list) unless text.nil?
       end
-    end.flatten.compact.uniq
+    end.flatten.compact.sort
   end
-end
+end

data/lib/mongoid_search/util.rb

@@ -0,0 +1,19 @@
+module Util
+      
+  def self.keywords(text, stem_keywords, ignore_list)
+    return [] if text.blank?
+    text = text.
+      mb_chars.
+      normalize(:kd).
+      to_s.
+      gsub(/[._:;'"`,?|+={}()!@#%^&*<>~\$\-\\\/\[\]]/, ' '). # strip punctuation
+      gsub(/[^[:alpha:]\s]/,'').  # strip accents
+      downcase.
+      split(' ').
+      reject { |word| word.size < 2 }
+    text = text.reject { |word| ignore_list.include?(word) } unless ignore_list.blank?
+    text = text.map(&:stem) if stem_keywords
+    text
+  end
+
+end

data/mongoid_search.gemspec

@@ -1,52 +1,54 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_search}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mauricio Zaffari"]
-  s.date = %q{2010-09-17}
+  s.date = %q{2011-03-28}
   s.description = %q{Simple full text search implementation.}
   s.email = %q{mauricio@papodenerd.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/mongoid_search.rb",
-     "lib/mongoid_search/keywords_extractor.rb",
-     "lib/mongoid_search/mongoid_search.rb",
-     "mongoid_search.gemspec",
-     "spec/keywords_extractor_spec.rb",
-     "spec/models/product.rb",
-     "spec/models/tag.rb",
-     "spec/mongoid_search_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/mongoid_search.rb",
+    "lib/mongoid_search/mongoid_search.rb",
+    "lib/mongoid_search/util.rb",
+    "mongoid_search.gemspec",
+    "spec/config/ignorelist.yml",
+    "spec/models/category.rb",
+    "spec/models/product.rb",
+    "spec/models/subproduct.rb",
+    "spec/models/tag.rb",
+    "spec/mongoid_search_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/util_spec.rb"
   ]
   s.homepage = %q{http://www.papodenerd.net/mongoid-search-full-text-search-for-your-mongoid-models/}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Search implementation for Mongoid ORM}
   s.test_files = [
-    "spec/keywords_extractor_spec.rb",
-     "spec/models/product.rb",
-     "spec/models/tag.rb",
-     "spec/mongoid_search_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/models/category.rb",
+    "spec/models/product.rb",
+    "spec/models/subproduct.rb",
+    "spec/models/tag.rb",
+    "spec/mongoid_search_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/util_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -54,15 +56,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.beta"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.beta.19"])
+      s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.3.0"])
+      s.add_runtime_dependency(%q<fast-stemmer>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
     else
-      s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.19"])
+      s.add_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_dependency(%q<rspec>, ["= 2.3.0"])
+      s.add_dependency(%q<fast-stemmer>, ["= 1.0.0"])
+      s.add_dependency(%q<mongoid>, ["~> 2.0.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.1"])
     end
   else
-    s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<database_cleaner>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.19"])
+    s.add_dependency(%q<rake>, ["= 0.8.7"])
+    s.add_dependency(%q<rspec>, ["= 2.3.0"])
+    s.add_dependency(%q<fast-stemmer>, ["= 1.0.0"])
+    s.add_dependency(%q<mongoid>, ["~> 2.0.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.1"])
   end
 end
 

data/spec/config/ignorelist.yml

@@ -0,0 +1,2 @@
+ignorelist:
+  amazing, awesome

data/spec/models/category.rb

@@ -0,0 +1,6 @@
+class Category
+  include Mongoid::Document
+  field :name
+
+  references_many :products
+end

data/spec/models/product.rb

@@ -5,6 +5,8 @@ class Product
   field :name
 
   references_many :tags
+  referenced_in   :category
+  embeds_many     :subproducts
 
-  search_in :brand, :name, :tags => :name
+  search_in :brand, :name, :outlet, :tags => :name, :category => :name, :subproducts => [:brand, :name]
 end

data/spec/models/subproduct.rb

@@ -0,0 +1,8 @@
+class Subproduct
+  include Mongoid::Document
+  
+  field :brand
+  field :name
+  
+  embedded_in :product, :inverse_of => :subproducts
+end

data/spec/mongoid_search_spec.rb

@@ -5,16 +5,56 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Mongoid::Search do
   
   before(:each) do
-    @product = Product.create :brand => "Apple", :name => "iPhone", :tags => ["Amazing", "Awesome", "Olé"].map { |tag| Tag.new(:name => tag) }
+    Product.stem_keywords = false
+    Product.ignore_list   = nil
+    @product = Product.create :brand => "Apple",
+                              :name => "iPhone",
+                              :tags => ["Amazing", "Awesome", "Olé"].map { |tag| Tag.new(:name => tag) },
+                              :category => Category.new(:name => "Mobile"),
+                              :subproducts => [Subproduct.new(:brand => "Apple", :name => "Craddle")]
+  end
+  
+  context "utf-8 characters" do
+    before(:each) {
+      Product.stem_keywords = false
+      Product.ignore_list   = nil
+      @product = Product.create :brand => "Эльбрус",
+                                :name => "Процессор",
+                                :tags => ["Amazing", "Awesome", "Olé"].map { |tag| Tag.new(:name => tag) },
+                                :category => Category.new(:name => "процессоры"),
+                                :subproducts => []
+    }
+    
+    it "should leave utf8 characters" do
+      @product._keywords.should == ["amazing", "awesome", "ole", "Процессор", "Эльбрус", "процессоры"]
+    end
   end
   
   it "should set the _keywords field" do
-    @product._keywords.should == ["apple", "iphone", "amazing", "awesome", "ole"]
+    @product._keywords.should == ["amazing", "apple", "apple", "awesome", "craddle", "iphone", "mobile", "ole"]
+  end
+  
+  it "should set the _keywords field with stemmed words if stem is enabled" do
+    Product.stem_keywords = true
+    @product.save!
+    @product._keywords.should == ["amaz", "appl", "appl", "awesom", "craddl", "iphon", "mobil", "ol"]
+  end
+  
+  it "should ignore keywords in an ignore list" do
+    Product.ignore_list = YAML.load(File.open(File.dirname(__FILE__) + '/config/ignorelist.yml'))["ignorelist"]
+    @product.save!
+    @product._keywords.should == ["apple", "apple", "craddle", "iphone", "mobile", "ole"]
   end
     
   it "should return results in search" do
     Product.search("apple").size.should == 1
   end
+
+  it "should return results in search for dynamic attribute" do
+    @product[:outlet] = "online shop"
+    @product.save!
+    Product.search("online").size.should == 1
+  end
       
   it "should return results in search even searching a accented word" do
     Product.search("Ole").size.should == 1
@@ -37,4 +77,26 @@ describe Mongoid::Search do
     Product.match = :all
     Product.search("apple motorola").size.should == 0
   end
+    
+  it "should return results for any matching word, using :match => :all, passing :match => :any to .search" do
+    Product.match = :all
+    Product.search("apple motorola", :match => :any).size.should == 1
+  end
+  
+  it "should not return results when all words do not match, passing :match => :all to .search" do
+    Product.search("apple motorola", :match => :all).size.should == 0
+  end
+  
+  it "should return no results when a blank search is made" do
+    Product.search("").size.should == 0
+  end
+    
+  it "should return results when a blank search is made when :allow_empty_search is true" do
+    Product.allow_empty_search = true
+    Product.search("").size.should == 1
+  end
+      
+  it "should search for embedded documents" do
+    Product.search("craddle").size.should == 1
+  end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongoid'
 require 'database_cleaner'
+require 'fast_stemmer'
+require 'yaml'
 require 'mongoid_search'
 
 Mongoid.configure do |config|
@@ -11,9 +13,9 @@ end
 
 Dir["#{File.dirname(__FILE__)}/models/*.rb"].each { |file| require file }
 
-DatabaseCleaner.orm = "mongoid"
+DatabaseCleaner.orm = :mongoid
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:all) do
     DatabaseCleaner.strategy = :truncation
   end

data/spec/util_spec.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Util do
+  it "should return an empty array if no text is passed" do
+    Util.keywords("", false, "").should == []
+  end
+    
+  it "should return an array of keywords" do
+    Util.keywords("keyword", false, "").class.should == Array
+  end  
+  
+  it "should return an array of strings" do
+    Util.keywords("keyword", false, "").first.class.should == String
+  end
+  
+  it "should remove accents from the text passed" do
+    Util.keywords("café", false, "").should == ["cafe"]
+  end
+    
+  it "should downcase the text passed" do
+    Util.keywords("CaFé", false, "").should == ["cafe"]
+  end
+    
+  it "should split whitespaces, hifens, dots, underlines, etc.." do
+    Util.keywords("CaFé-express.com delicious;come visit, and 'win' an \"iPad\"", false, "").should == ["cafe", "express", "com", "delicious", "come", "visit", "and", "win", "an", "ipad"]
+  end
+  
+  it "should stem keywords" do
+    Util.keywords("A runner running and eating", true, "").should == ["runner", "run", "and", "eat"]
+  end
+  
+  it "should ignore keywords from ignore list" do
+    Util.keywords("An amazing awesome runner running and eating", true, YAML.load(File.open(File.dirname(__FILE__) + '/config/ignorelist.yml'))["ignorelist"]).should == ["an", "runner", "run", "and", "eat"]
+  end
+  
+  it "should ignore keywords with less than two words" do
+    Util.keywords("A runner running", false, "").should_not include "a"
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mauricio Zaffari
@@ -14,13 +14,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 -03:00
+date: 2011-03-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongoid
-  prerelease: false
+  name: jeweler
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,24 +55,86 @@ dependencies:
         - 0
         - 0
         - beta
-        version: 2.0.0.beta
+        - 19
+        version: 2.0.0.beta.19
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: fast-stemmer
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 1
+        version: 2.0.1
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id008
 description: Simple full text search implementation.
 email: mauricio@papodenerd.net
 executables: []
@@ -59,7 +146,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
-- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -67,22 +153,24 @@ files:
 - Rakefile
 - VERSION
 - lib/mongoid_search.rb
-- lib/mongoid_search/keywords_extractor.rb
 - lib/mongoid_search/mongoid_search.rb
+- lib/mongoid_search/util.rb
 - mongoid_search.gemspec
-- spec/keywords_extractor_spec.rb
+- spec/config/ignorelist.yml
+- spec/models/category.rb
 - spec/models/product.rb
+- spec/models/subproduct.rb
 - spec/models/tag.rb
 - spec/mongoid_search_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
+- spec/util_spec.rb
 has_rdoc: true
 homepage: http://www.papodenerd.net/mongoid-search-full-text-search-for-your-mongoid-models/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -109,8 +197,10 @@ signing_key:
 specification_version: 3
 summary: Search implementation for Mongoid ORM
 test_files: 
-- spec/keywords_extractor_spec.rb
+- spec/models/category.rb
 - spec/models/product.rb
+- spec/models/subproduct.rb
 - spec/models/tag.rb
 - spec/mongoid_search_spec.rb
 - spec/spec_helper.rb
+- spec/util_spec.rb

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-.bundle

data/lib/mongoid_search/keywords_extractor.rb

@@ -1,6 +0,0 @@
-class KeywordsExtractor
-  def self.extract(text)
-    return if text.blank?
-    text.mb_chars.normalize(:kd).to_s.gsub(/[^\x00-\x7F]/,'').downcase.split(/[\s\.\-_]+/)
-  end
-end

data/spec/keywords_extractor_spec.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe KeywordsExtractor do
-  it "should return if no text is passed" do
-    KeywordsExtractor.extract("").should == nil
-  end
-    
-  it "should return an array of keywords" do
-    KeywordsExtractor.extract("keyword").class.should == Array
-  end  
-  
-  it "should return an array of strings" do
-    KeywordsExtractor.extract("keyword").first.class.should == String
-  end
-  
-  it "should remove accents from the text passed" do
-    KeywordsExtractor.extract("café").should == ["cafe"]
-  end
-    
-  it "should downcase the text passed" do
-    KeywordsExtractor.extract("CaFé").should == ["cafe"]
-  end
-    
-  it "should split whitespaces, hifens, dots and underlines" do
-    KeywordsExtractor.extract("CaFé-express.com delicious").should == ["cafe", "express", "com", "delicious"]
-  end
-end

data/spec/spec.opts

@@ -1 +0,0 @@
---color