mongoid_fulltext 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/mongoid_fulltext.rb

@@ -24,7 +24,7 @@ module Mongoid::FullTextSearch
 
       config = { 
         :alphabet => 'abcdefghijklmnopqrstuvwxyz0123456789 ',
-        :word_separators => "- \n\t",
+        :word_separators => "-_ \n\t",
         :ngram_width => 3,
         :max_ngrams_to_search => 6,
         :apply_prefix_scoring_to_all_words => true,
@@ -189,8 +189,8 @@ module Mongoid::FullTextSearch
         str = UnicodeUtils.nfkd(CGI.unescape(str)).gsub(/[^\x00-\x7F]/,'')
       end
 
-      # Remove any characters that aren't in the alphabet
-      filtered_str = str.mb_chars.to_s.downcase.split('').find_all{ |ch| config[:alphabet][ch] }.join('')
+      # Remove any characters that aren't in the alphabet and aren't word separators
+      filtered_str = str.mb_chars.to_s.downcase.split('').find_all{ |ch| config[:alphabet][ch] or config[:word_separators][ch] }.join('')
       
       # Figure out how many ngrams to extract from the string. If we can't afford to extract all ngrams,
       # step over the string in evenly spaced strides to extract ngrams. For example, to extract 3 3-letter

data/mongoid_fulltext.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_fulltext}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Windsor"]

data/spec/mongoid/fulltext_spec.rb

@@ -410,6 +410,18 @@ module Mongoid
       end
     end
 
+    context "with various word separators" do
+      let!(:hard_edged_painting)   { BasicArtwork.create(:title => "Hard-edged painting") }
+      let!(:edgy_painting)         { BasicArtwork.create(:title => "Edgy painting") }
+      let!(:hard_to_find_ledge)    { BasicArtwork.create(:title => "Hard to find ledge") }
+
+      it "should treat dashes as word separators, giving a score boost to each dash-separated word" do
+        BasicArtwork.fulltext_search('hard-edged').first.should == hard_edged_painting
+        BasicArtwork.fulltext_search('hard edge').first.should == hard_edged_painting
+        BasicArtwork.fulltext_search('hard edged').first.should == hard_edged_painting
+      end
+    end
+
     context "returning scores" do
       # Since we return scores, let's make some weak guarantees about what they actually mean
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_fulltext
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode_utils
-  requirement: &74785740 !ruby/object:Gem::Requirement
+  requirement: &79305610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *74785740
+  version_requirements: *79305610
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &74785500 !ruby/object:Gem::Requirement
+  requirement: &79305370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *74785500
+  version_requirements: *79305370
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &74785260 !ruby/object:Gem::Requirement
+  requirement: &79305130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *74785260
+  version_requirements: *79305130
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74785020 !ruby/object:Gem::Requirement
+  requirement: &79304890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *74785020
+  version_requirements: *79304890
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &74784780 !ruby/object:Gem::Requirement
+  requirement: &79304650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,7 +66,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *74784780
+  version_requirements: *79304650
 description: Full-text search for the Mongoid ORM, using n-grams extracted from text
 email: aaron.windsor@gmail.com
 executables: []
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -329929775
+      hash: 465387827
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: