mongoid_search 0.2.0 → 0.2.1

data/.gitignore

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

data/Gemfile

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

data/Gemfile.lock

@@ -1,48 +1,63 @@
+PATH
+  remote: .
+  specs:
+    mongoid_search (0.2.0)
+      bson_ext (~> 1.2)
+      fast-stemmer (~> 1.0.0)
+      mongoid (~> 2.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.5)
-    bson (1.2.4)
+      i18n (~> 0.5.0)
+    activesupport (3.0.6)
+    bson (1.3.0)
+    bson_ext (1.3.0)
     builder (2.1.2)
-    database_cleaner (0.6.4)
+    database_cleaner (0.6.6)
     diff-lcs (1.1.2)
     fast-stemmer (1.0.0)
+    gemcutter (0.6.1)
     git (1.2.5)
     i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
       git (>= 1.2.5)
-      rake
-    mongo (1.2.4)
-      bson (>= 1.2.4)
-    mongoid (2.0.0.rc.7)
+      rubyforge (>= 2.0.0)
+    json_pure (1.5.1)
+    mongo (1.3.0)
+      bson (>= 1.3.0)
+    mongoid (2.0.0)
       activemodel (~> 3.0)
       mongo (~> 1.2)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
     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)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    tzinfo (0.3.24)
+    rspec-mocks (2.5.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    tzinfo (0.3.26)
     will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  database_cleaner
-  fast-stemmer (= 1.0.0)
-  jeweler
-  mongoid (~> 2.0.0.beta.19)
+  bson_ext (~> 1.2)
+  database_cleaner (~> 0.6.4)
+  fast-stemmer (~> 1.0.0)
+  jeweler (~> 1.4.0)
+  mongoid (~> 2.0.0)
+  mongoid_search!
   rake (= 0.8.7)
-  rspec (= 2.3.0)
+  rspec (~> 2.4)

data/README.md

@@ -9,9 +9,9 @@ Installation
 In your Gemfile:
 
     gem 'mongoid_search'
-  
+
 Then:
-  
+
     bundle install
 
 Examples
@@ -25,7 +25,7 @@ Examples
 
       references_many :tags
       refereced_in    :category
-      
+
       search_in :brand, :name, :tags => :name, :category => :name
     end
 
@@ -35,7 +35,7 @@ Examples
 
       referenced_in :product
     end
-    
+
     class Category
       include Mongoid::Document
       field :name
@@ -44,7 +44,7 @@ Examples
     end
 
 Now when you save a product, you get a _keywords field automatically:
-    
+
     p = Product.new :brand => "Apple", :name => "iPhone"
     p.tags << Tag.new(:name => "Amazing")
     p.tags << Tag.new(:name => "Awesome")
@@ -52,45 +52,45 @@ Now when you save a product, you get a _keywords field automatically:
     p.save
     => true
     p._keywords
-    
+
 Now you can run search, which will look in the _keywords field and return all matching results:
 
     Product.search("apple iphone").size
     => 1
-    
+
 Note that the search is case insensitive, and accept partial searching too:
 
     Product.search("ipho").size
     => 1
-    
+
 Options
 -------
 
-match:  
-  _:any_ - match any occurrence  
-  _:all_ - match all ocurrences  
+match:
+  _:any_ - match any occurrence
+  _:all_ - match all ocurrences
   Default is _:any_.
 
     search_in :brand, :name, { :tags => :name }, { :match => :any }
-    
+
     Product.search("apple motorola").size
     => 1
 
     search_in :brand, :name, { :tags => :name }, { :match => :all }
-    
+
     Product.search("apple motorola").size
     => 0
-    
-allow_empty_search:  
-  _true_ - match any occurrence  
-  _false_ - match all ocurrences  
+
+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
 ----
 

data/Rakefile

@@ -1,6 +1,12 @@
 require 'rubygems'
 require 'rake'
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ["-c", "-f progress"]
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -10,19 +16,11 @@ 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"])
-    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
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-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.2.0
+0.2.1

data/lib/mongoid_search.rb

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

data/lib/mongoid_search/mongoid_search.rb

@@ -1,10 +1,10 @@
 module Mongoid::Search
   extend ActiveSupport::Concern
-  
+
   included do
     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)
@@ -18,10 +18,10 @@ module Mongoid::Search
 
       field :_keywords, :type => Array
       index :_keywords
-      
+
       before_save :set_keywords
     end
-    
+
     def search(query, options={})
       if relevant_search
         search_relevant(query, options)
@@ -29,17 +29,17 @@ module Mongoid::Search
         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
@@ -57,27 +57,27 @@ module Mongoid::Search
           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..

data/lib/mongoid_search/util.rb

@@ -1,5 +1,5 @@
 module Util
-      
+
   def self.keywords(text, stem_keywords, ignore_list)
     return [] if text.blank?
     text = text.
@@ -16,4 +16,4 @@ module Util
     text
   end
 
-end
+end

data/mongoid_search.gemspec

@@ -1,54 +1,56 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_search}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mauricio Zaffari"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-04-07}
   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",
-    "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"
+     ".gitignore",
+     "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/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"
+     "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
@@ -56,33 +58,9 @@ 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<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<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<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/models/category.rb

@@ -3,4 +3,4 @@ class Category
   field :name
 
   references_many :products
-end
+end

data/spec/models/subproduct.rb

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

data/spec/models/tag.rb

@@ -3,4 +3,4 @@ class Tag
   field :name
 
   referenced_in :product
-end
+end

data/spec/mongoid_search_spec.rb

@@ -3,7 +3,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Mongoid::Search do
-  
+
   before(:each) do
     Product.stem_keywords = false
     Product.ignore_list   = nil
@@ -13,7 +13,7 @@ describe Mongoid::Search do
                               :category => Category.new(:name => "Mobile"),
                               :subproducts => [Subproduct.new(:brand => "Apple", :name => "Craddle")]
   end
-  
+
   context "utf-8 characters" do
     before(:each) {
       Product.stem_keywords = false
@@ -24,28 +24,28 @@ describe Mongoid::Search do
                                 :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 == ["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
@@ -55,47 +55,47 @@ describe Mongoid::Search do
     @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
     Product.search("Olé").size.should == 1
   end
-       
+
   it "should return results in search even if the case doesn't match" do
     Product.search("oLe").size.should == 1
   end
-      
+
   it "should return results in search with a partial word" do
     Product.search("iph").size.should == 1
   end
-        
+
   it "should return results for any matching word with default search" do
     Product.search("apple motorola").size.should == 1
   end
-          
+
   it "should not return results when all words do not match, if using :match => :all" 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

data/spec/util_spec.rb

@@ -5,35 +5,35 @@ 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  
-  
+  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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mauricio Zaffari
@@ -14,127 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -03:00
+date: 2011-04-07 00:00:00 -03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  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: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
-  type: :runtime
-  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
-  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
-        - 0
-        - 1
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: *id008
+dependencies: []
+
 description: Simple full text search implementation.
 email: mauricio@papodenerd.net
 executables: []
@@ -146,6 +29,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -169,8 +53,8 @@ homepage: http://www.papodenerd.net/mongoid-search-full-text-search-for-your-mon
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement