mongoid-haystack 1.2.0 → 1.2.1

data/HISTORY

@@ -0,0 +1,8 @@
+1.2.1:
+  - stems split on underscore: "cats_dogs" #=> "cat", "dog"
+
+1.2.0:
+  - faster indexing using bulk operators
+  - pagination support
+  - more tests
+  - more docs

data/lib/mongoid-haystack.rb

@@ -2,7 +2,7 @@
 #
   module Mongoid
     module Haystack
-      const_set :Version, '1.2.0'
+      const_set :Version, '1.2.1'
 
       class << Haystack
         def version

data/lib/mongoid-haystack/util.rb

@@ -60,8 +60,12 @@ module Mongoid
       end
 
       def words_for(*args)
-        string = args.flatten.compact.join(' ').scan(/\w+/).join(' ')
+        string = args.join(' ')
+        string.gsub!(/_+/, '-')
+        string.gsub!(/[^\w]/, ' ')
+
         words = []
+
         UnicodeUtils.each_word(string) do |word|
           word = UnicodeUtils.nfkd(word.strip)
           word.gsub!(/\A(?:[^\w]|_|\s)+/, '')  # leading punctuation/spaces
@@ -69,6 +73,7 @@ module Mongoid
           next if word.empty?
           words.push(word)
         end
+
         words
       end
 

data/mongoid-haystack.gemspec

@@ -3,13 +3,14 @@
 
 Gem::Specification::new do |spec|
   spec.name = "mongoid-haystack"
-  spec.version = "1.2.0"
+  spec.version = "1.2.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "mongoid-haystack"
   spec.description = "a mongoid 3 zero-config, zero-integration, POLS pure mongo fulltext solution"
 
   spec.files =
-["README.md",
+["HISTORY",
+ "README.md",
  "Rakefile",
  "lib",
  "lib/app",

data/test/mongoid-haystack_test.rb

@@ -339,6 +339,30 @@ Testing Mongoid::Haystack do
      assert{ models.is_a?(Array) }
   end
 
+##
+#
+  test '.words_for' do
+    {
+      ' cats and dogs ' => %w( cats and dogs ),
+      ' cats-and-dogs ' => %w( cats and dogs ),
+      ' cats_and_dogs ' => %w( cats and dogs ),
+      ' cats!and?dogs ' => %w( cats and dogs ),
+    }.each do |src, dst|
+      assert{ Mongoid::Haystack::words_for(src) == dst }
+    end
+  end
+
+  test '.stems_for' do
+    {
+      ' cats and dogs ' => %w( cat dog ),
+      ' cats!and?dogs ' => %w( cat dog ),
+      ' fishing and hunting ' => %w( fish hunt ),
+      ' fishing-and-hunting ' => %w( fish hunt ),
+    }.each do |src, dst|
+      assert{ Mongoid::Haystack::stems_for(src) == dst }
+    end
+  end
+
 protected
 
   def new_klass(&block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-haystack
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -129,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- HISTORY
 - README.md
 - Rakefile
 - lib/app/models/mongoid/haystack/index.rb