mongoid_search 0.2.7 → 0.2.8

data/lib/mongoid_search/mongoid_search.rb

@@ -26,7 +26,8 @@ module Mongoid::Search
       self.search_fields      = (self.search_fields || []).concat args
 
       field :_keywords, :type => Array
-      index :_keywords, :background => true
+      
+      Gem.loaded_specs["mongoid"].version.to_s.include?("3.0") ? (index({_keywords: 1}, {background: true})) : (index :_keywords, :background => true)
 
       before_save :set_keywords
     end
@@ -97,11 +98,8 @@ module Mongoid::Search
     end
   end
 
-  module InstanceMethods #:nodoc:
-    # Indexes the document keywords
-    def index_keywords!
-      update_attribute(:_keywords, set_keywords)
-    end
+  def index_keywords!
+    update_attribute(:_keywords, set_keywords)
   end
 
   private

data/lib/mongoid_search/util.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Util
 
   def self.keywords(klass, field, stem_keywords, ignore_list)
@@ -12,6 +13,12 @@ module Util
             else
               attribute.map(&method).map { |t| Util.normalize_keywords t, stem_keywords, ignore_list }
             end
+          elsif attribute.is_a?(Hash)
+            if method.is_a?(Array)
+              method.map {|m| Util.normalize_keywords attribute[m.to_sym], stem_keywords, ignore_list }
+            else
+              Util.normalize_keywords(attribute[method.to_sym], stem_keywords, ignore_list)
+            end
           else
             Util.normalize_keywords(attribute.send(method), stem_keywords, ignore_list)
           end
@@ -25,14 +32,17 @@ module Util
   end
 
   def self.normalize_keywords(text, stem_keywords, ignore_list)
+    ligatures = {"œ"=>"oe", "æ"=>"ae"}
+
     return [] if text.blank?
     text = text.to_s.
       mb_chars.
       normalize(:kd).
+      downcase.
       to_s.
       gsub(/[._:;'"`,?|+={}()!@#%^&*<>~\$\-\\\/\[\]]/, ' '). # strip punctuation
       gsub(/[^[:alnum:]\s]/,'').   # strip accents
-      downcase.
+      gsub(/[#{ligatures.keys.join("")}]/) {|c| ligatures[c]}.
       split(' ').
       reject { |word| word.size < 2 }
     text = text.reject { |word| ignore_list.include?(word) } unless ignore_list.blank?

data/spec/models/product.rb

@@ -4,10 +4,12 @@ class Product
   field :brand
   field :name
   field :attrs, :type => Array
+  field :info, :type => Hash
 
   references_many :tags
   referenced_in   :category
   embeds_many     :subproducts
 
-  search_in :brand, :name, :outlet, :attrs, :tags => :name, :category => :name, :subproducts => [:brand, :name]
+  search_in :brand, :name, :outlet, :attrs, :tags => :name, :category => :name,
+            :subproducts => [:brand, :name], :info => [ :summary, :description ]
 end

data/spec/mongoid_search_spec.rb

@@ -11,7 +11,30 @@ describe Mongoid::Search do
                               :name => "iPhone",
                               :tags => ["Amazing", "Awesome", "Olé"].map { |tag| Tag.new(:name => tag) },
                               :category => Category.new(:name => "Mobile"),
-                              :subproducts => [Subproduct.new(:brand => "Apple", :name => "Craddle")]
+                              :subproducts => [Subproduct.new(:brand => "Apple", :name => "Craddle")],
+                              :info => { :summary => "Info-summary",
+                                         :description => "Info-description"}
+  end
+
+  describe "Serialized hash fields" do
+    context "when the hash is populated" do
+      it "should return the product" do
+        Product.search("Info-summary").first.should eq @product
+        Product.search("Info-description").first.should eq @product
+      end
+    end
+
+    context "when the hash is empty" do
+      before(:each) do
+        @product.info = nil
+        @product.save
+      end
+
+      it "should not return the product" do
+        Product.search("Info-description").size.should eq 0
+        Product.search("Info-summary").size.should eq 0
+      end
+    end
   end
 
   context "utf-8 characters" do
@@ -26,7 +49,11 @@ describe Mongoid::Search do
     }
 
     it "should leave utf8 characters" do
-      @product._keywords.should == ["amazing", "awesome", "ole", "Процессор", "Эльбрус", "процессоры"]
+      @product._keywords.should == ["amazing", "awesome", "ole", "процессор", "процессоры", "эльбрус"]
+    end
+
+    it "should return results in search when case doesn't match" do
+      Product.search("ЭЛЬБРУС").size.should == 1
     end
   end
 
@@ -36,7 +63,7 @@ describe Mongoid::Search do
         lambda { Product.create! }.should_not raise_error
       end
     end
-    
+
     subject { Product.create :brand => "Apple", :name => "iPhone" }
 
     its(:_keywords) { should == ["apple", "iphone"] }
@@ -59,16 +86,26 @@ describe Mongoid::Search do
     Variant.search(:name => 'Apple', :color => :white).should eq [variant]
   end
 
+  it "should expand the ligature to ease searching" do
+    # ref: http://en.wikipedia.org/wiki/Typographic_ligature, only for french right now. Rules for other languages are not know
+    variant1 = Variant.create :tags => ["œuvre"].map {|tag| Tag.new(:name => tag)}
+    variant2 = Variant.create :tags => ["æquo"].map {|tag| Tag.new(:name => tag)}
+
+    Variant.search("œuvre").should eq [variant1]
+    Variant.search("oeuvre").should eq [variant1]
+    Variant.search("æquo").should eq [variant2]
+    Variant.search("aequo").should eq [variant2]
+  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", "awesom", "craddl", "iphon", "mobil", "ol"]
+    @product._keywords.sort.should == ["amaz", "appl", "awesom", "craddl", "iphon", "mobil", "ol", "info", "descript", "summari"].sort
   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", "craddle", "iphone", "mobile", "ole"]
+    @product._keywords.sort.should == ["apple", "craddle", "iphone", "mobile", "ole", "info", "description", "summary"].sort
   end
 
    it "should incorporate numbers as keywords" do
@@ -153,5 +190,5 @@ describe Mongoid::Search do
     Product.index_keywords!.should_not include(false)
   end
 
-  
+
 end

data/spec/util_spec.rb

@@ -22,6 +22,10 @@ describe Util do
     Util.normalize_keywords("CaFé", false, "").should == ["cafe"]
   end
 
+  it "should downcase utf-8 chars of the text passed" do
+    Util.normalize_keywords("Кафе", false, "").should == ["кафе"]
+  end
+
   it "should split whitespaces, hifens, dots, underlines, etc.." do
     Util.normalize_keywords("CaFé-express.com delicious;come visit, and 'win' an \"iPad\"", false, "").should == ["cafe", "express", "com", "delicious", "come", "visit", "and", "win", "an", "ipad"]
   end

metadata

@@ -1,114 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongoid_search
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 7
-  version: 0.2.7
+version: !ruby/object:Gem::Version
+  version: 0.2.8
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Mauricio Zaffari
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-10 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongoid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
+  requirement: &70364721915420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+  version_requirements: *70364721915420
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &70364721930900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fast-stemmer
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70364721930900
+- !ruby/object:Gem::Dependency
+  name: fast-stemmer
+  requirement: &70364721929380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70364721929380
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &70364721927540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.6.4
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70364721927540
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70364721926220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70364721926220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70364721925360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70364721925360
 description: Simple full text search implementation.
-email: 
+email:
 - mauricio@papodenerd.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/mongoid_search/log.rb
 - lib/mongoid_search/mongoid_search.rb
 - lib/mongoid_search/railtie.rb
@@ -118,39 +93,40 @@ files:
 - README.md
 - Rakefile
 - VERSION
-has_rdoc: true
+- spec/config/ignorelist.yml
+- spec/models/category.rb
+- spec/models/product.rb
+- spec/models/subproduct.rb
+- spec/models/tag.rb
+- spec/models/variant.rb
+- spec/mongoid_search_spec.rb
+- spec/spec_helper.rb
+- spec/util_spec.rb
 homepage: http://www.papodenerd.net/mongoid-search-full-text-search-for-your-mongoid-models/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Search implementation for Mongoid ORM
-test_files: 
+test_files:
 - spec/config/ignorelist.yml
 - spec/models/category.rb
 - spec/models/product.rb