mm-search 0.0.2 → 0.0.3

data/README.rdoc

@@ -1,6 +1,6 @@
 = mm-search
 
-* http://github.com/#{github_username}/#{project_name}
+* http://github.com/dcu/mm-files
 
 == DESCRIPTION:
 
@@ -45,4 +45,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -14,7 +14,7 @@ $hoe = Hoe.spec 'mm-search' do
   self.developer 'David Cuadrado', 'krawek@gmail.com'
 #  self.post_install_message = 'PostInstall.txt'
   self.rubyforge_name       = "mm-plugins"
-  self.extra_deps         = [['mongomapper','>= 0.3.1']]
+  self.extra_deps         = [['mongo_mapper','>= 0.5.0']]
 
 end
 

data/lib/mm-search.rb

@@ -2,9 +2,9 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module MmSearch
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
 
 
-require 'mongomapper'
+require 'mongo_mapper'
 require 'mm-search/search'

data/lib/mm-search/search.rb

@@ -29,13 +29,24 @@ module MongoMapper
         q = query.downcase.split.map do |k|
           Regexp.escape(k)
         end.join("|")
-        self.find(:all, opts.deep_merge(:conditions => {:_keywords => /^(#{q}).*/ }))
+        if opts[:per_page]
+          self.paginate(opts.deep_merge(:conditions => {:_keywords => /^(#{q}).*/ }))
+        else
+          self.find(:all, opts.deep_merge(:conditions => {:_keywords => /^(#{q}).*/ }))
+        end
       end
     end
 
     protected
     def _update_keywords
-      s = Lingua::Stemmer.new(:language => self.class.language)
+      lang = self.class.language
+      if lang.kind_of?(Symbol)
+        lang = send(lang)
+      elsif lang.kind_of?(Proc)
+        lang = lang.call(self)
+      end
+
+      s = Lingua::Stemmer.new(:language => lang)
 
       self._keywords = []
       self.class.searchable_keys.each do |key|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mm-search
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Cuadrado
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-18 00:00:00 -05:00
+date: 2009-10-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongomapper
+  name: mongo_mapper
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
 description: FIX (describe your package)
 email: 
@@ -54,7 +54,7 @@ files:
 - test/test_helper.rb
 - test/test_mm-search.rb
 has_rdoc: true
-homepage: http://github.com/#{github_username}/#{project_name}
+homepage: http://github.com/dcu/mm-files
 licenses: []
 
 post_install_message: