noodall-core 0.3.6 → 0.3.7

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/noodall/search.rb

@@ -24,6 +24,10 @@ module Noodall
       def language(lang = 'en')
         @language ||= lang
       end
+      
+      def stemmer
+        @stemmer ||= Lingua::Stemmer.new(:language => language)
+      end
 
       def search(query, options = {})
         if options[:per_page] || options[:per_page]
@@ -39,7 +43,11 @@ module Noodall
         # Extract words from the query and clean up
         words = query.downcase.split(/\W/) - STOPWORDS
         words.reject!{|w| w.length < 3}
-        criteria.merge!( :_keywords => { :$all => words } )
+        
+        # add stemmed words to the array of words
+        words = stem(words) | words
+
+        criteria.merge!( :_keywords => { :$in => words } )
 
         # The Search result
         search_result = collection.map_reduce(search_map(words), search_reduce, {:query => criteria, :finalize => search_finalize})
@@ -63,6 +71,10 @@ module Noodall
           docs.map! { |hash| load(hash['value']) }
         end
       end
+      
+      def stem(words)
+        words.map { |word| stemmer.stem(word) }
+      end
 
       def search_map(words)
         #convert words into Regex OR
@@ -90,22 +102,20 @@ module Noodall
     module InstanceMethods
       protected
       def _update_keywords
-        s = Lingua::Stemmer.new(:language => self.class.language)
-
         self._keywords = []
 
         self.class.searchable_keys.each do |search_key|
-          self._keywords += keywords_for_value(s, send(search_key)).compact
+          self._keywords += keywords_for_value(send(search_key)).compact
         end
       end
 
       private
-      def keywords_for_value(stemmer, val)
+      def keywords_for_value(val)
         if val.kind_of?(String)
           words = val.downcase.split(/\W/) - STOPWORDS
           words.reject!{|w| w.length < 3}
           words.map do |word|
-            stem = stemmer.stem(word)
+            stem = self.class.stemmer.stem(word)
             if stem != word
               [stem, word]
             else

data/noodall-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{noodall-core}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-12-13}
+  s.date = %q{2010-12-17}
   s.description = %q{Core data objects for Noodall}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [

data/spec/node_spec.rb

@@ -329,6 +329,38 @@ describe Noodall::Node do
 
     results.should have(0).things
   end
+  
+  describe "creating keywords" do
+    
+    it "should create keywords" do
+      page = Factory(:page, :title => "I like to teach")
+      page._keywords.should include("teach")
+      
+      page = Factory(:page, :title => "I am going to be teaching")
+      page._keywords.should include("teach")
+      
+      page = Factory(:page, :title => "The way he teaches is terrible")
+      page._keywords.should include("teach")
+    end
+    
+  end
+  
+  describe "stemmed searching" do
+    
+    before(:each) do
+      Factory(:page, :title => "I like to teach")
+      Factory(:page, :title => "I like teaching")
+      Factory(:page, :title => "The way he teaches is terrible")
+      Factory(:page, :title => "I like the moon")
+      Factory(:page, :title => "I like cheese")
+    end
+    
+    it "should return stemmed matches" do
+      results = Page.search("teaching")
+      results.should have(3).things
+    end
+    
+  end
 
   it "should return related" do
     Factory(:page, :title => "My Page 1", :tag_list => 'one,two,three')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-core
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +00:00
+date: 2010-12-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency