mongomapper_ext 0.3.0 → 0.4.0

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/dcu/mongomapper_ext"
     gem.authors = ["David A. Cuadrado"]
 
-    gem.add_dependency('mongo_mapper', '~> 0.7')
+    gem.add_dependency('mongo_mapper', '~> 0.8')
     gem.add_dependency('uuidtools', '>= 2.0.0')
 
     gem.add_development_dependency("shoulda", ">= 2.10.2")

data/TODO

@@ -0,0 +1,2 @@
+- arreglar si el stemmer no soporta el lenguaje
+

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/mongomapper_ext.rb

@@ -14,6 +14,8 @@ rescue LoadError
   $stderr.puts "disabling `magic` support. use 'gem install magic' to enable it"
 end
 
+require 'mongomapper_ext/paginator'
+
 # types
 require 'mongomapper_ext/types/open_struct'
 require 'mongomapper_ext/types/timestamp'

data/lib/mongomapper_ext/file.rb

@@ -24,7 +24,7 @@ module MongoMapperExt
         io = StringIO.new(io)
       end
 
-      if defined?(Magic)
+      if defined?(Magic) && Magic.respond_to?(:guess_string_mime_type)
         data = io.read(256) # be nice with memory usage
         self.content_type = options[:content_type] = Magic.guess_string_mime_type(data.to_s)
         self.extension ||= options[:content_type].to_s.split("/").last.split("-").last

data/lib/mongomapper_ext/filter.rb

@@ -38,7 +38,7 @@ module MongoMapperExt
 
         stemmed = []
         if defined?(Lingua)
-          stemmer = Lingua::Stemmer.new(:language => language)
+          stemmer = MongoMapperExt::Filter.build_stemmer(language)
           original_words.each do |word|
             stemmed_word = stemmer.stem(word)
             stemmed << stemmed_word unless original_words.include?(stemmed_word)
@@ -54,11 +54,11 @@ module MongoMapperExt
         page = opts.delete(:page) || 1
         select = opts.delete(:select) || self.keys.keys
 
-        criteria, options = to_query(opts)
+        query = Plucky::Query.new(self.collection, opts)
 
-        results = self.database.eval("function(collection, q, config) { return filter(collection, q, config); }", self.collection_name, criteria.merge({"_keywords" => {:$in => regex}}), {:words => original_words.to_a, :stemmed => stemmed.to_a, :limit => limit, :min_score => min_score, :select => select })
+        results = self.database.eval("function(collection, q, config) { return filter(collection, q, config); }", self.collection_name, query.criteria.source.merge({"_keywords" => {:$in => regex}}), {:words => original_words.to_a, :stemmed => stemmed.to_a, :limit => limit, :min_score => min_score, :select => select })
 
-        pagination = MongoMapper::Plugins::Pagination::Proxy.new(results["total_entries"], page, limit)
+        pagination = Paginator.new(results["total_entries"], page, limit)
 
         pagination.subject = results['results'].map do |result|
           item = self.new(result['doc'])
@@ -82,7 +82,7 @@ module MongoMapperExt
 
       stemmer = nil
       if defined?(Lingua)
-        stemmer = Lingua::Stemmer.new(:language => lang)
+        stemmer = MongoMapperExt::Filter.build_stemmer(lang)
       end
 
       stop_words = []
@@ -142,6 +142,14 @@ module MongoMapperExt
       end
     end
 
+    def self.build_stemmer(language)
+      begin
+        return Lingua::Stemmer.new(:language => language)
+      rescue Lingua::StemmerError
+        return nil
+      end
+    end
+
     def en_stop_words
       ["a", "about", "above", "after", "again", "against", "all", "am", "an",
        "and", "any", "are", "aren't", "as", "at", "be", "because", "been",

data/lib/mongomapper_ext/paginator.rb

@@ -0,0 +1,69 @@
+# encoding: UTF-8
+module MongoMapperExt
+  class Paginator
+    instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|respond_to\?|proxy_|^object_id$)/ }
+
+    attr_accessor :subject
+    attr_reader :total_entries, :per_page, :current_page
+    alias limit per_page
+
+    def initialize(total_entries, current_page, per_page=nil)
+      @total_entries    = total_entries.to_i
+      self.per_page     = per_page
+      self.current_page = current_page
+    end
+
+    def total_pages
+      (total_entries / per_page.to_f).ceil
+    end
+
+    def out_of_bounds?
+      current_page > total_pages
+    end
+
+    def previous_page
+      current_page > 1 ? (current_page - 1) : nil
+    end
+
+    def next_page
+      current_page < total_pages ? (current_page + 1) : nil
+    end
+
+    def skip
+      (current_page - 1) * per_page
+    end
+    alias offset skip # for will paginate support
+
+    def send(method, *args, &block)
+      if respond_to?(method)
+        super
+      else
+        subject.send(method, *args, &block)
+      end
+    end
+
+    def ===(other)
+      other === subject
+    end
+
+    def method_missing(name, *args, &block)
+      @subject.send(name, *args, &block)
+    end
+
+    def respond_to?(name, *args, &block)
+      super || @subject.respond_to?(name, *args, &block)
+    end
+
+    private
+      def per_page=(value)
+        value = 25 if value.blank?
+        @per_page = value.to_i
+      end
+
+      def current_page=(value)
+        value = value.to_i
+        value = 1 if value < 1
+        @current_page = value
+      end
+  end
+end

data/mongomapper_ext.gemspec

@@ -5,16 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper_ext}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2010-05-08}
+  s.date = %q{2010-06-20}
   s.description = %q{MongoMapper extensions}
   s.email = %q{krawek@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.rdoc",
+     "TODO"
   ]
   s.files = [
     ".document",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/mongomapper_ext/js/filter.js",
      "lib/mongomapper_ext/js/find_tags.js",
      "lib/mongomapper_ext/js/tag_cloud.js",
+     "lib/mongomapper_ext/paginator.rb",
      "lib/mongomapper_ext/slugizer.rb",
      "lib/mongomapper_ext/storage.rb",
      "lib/mongomapper_ext/tags.rb",
@@ -90,20 +92,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo_mapper>, ["~> 0.7"])
+      s.add_runtime_dependency(%q<mongo_mapper>, ["~> 0.8"])
       s.add_runtime_dependency(%q<uuidtools>, [">= 2.0.0"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.4"])
     else
-      s.add_dependency(%q<mongo_mapper>, ["~> 0.7"])
+      s.add_dependency(%q<mongo_mapper>, ["~> 0.8"])
       s.add_dependency(%q<uuidtools>, [">= 2.0.0"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<mocha>, [">= 0.9.4"])
     end
   else
-    s.add_dependency(%q<mongo_mapper>, ["~> 0.7"])
+    s.add_dependency(%q<mongo_mapper>, ["~> 0.8"])
     s.add_dependency(%q<uuidtools>, [">= 2.0.0"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-08 00:00:00 -05:00
+date: 2010-06-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,8 +26,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        version: "0.7"
+        - 8
+        version: "0.8"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+- TODO
 files: 
 - .document
 - .gitignore
@@ -117,6 +118,7 @@ files:
 - lib/mongomapper_ext/js/filter.js
 - lib/mongomapper_ext/js/find_tags.js
 - lib/mongomapper_ext/js/tag_cloud.js
+- lib/mongomapper_ext/paginator.rb
 - lib/mongomapper_ext/slugizer.rb
 - lib/mongomapper_ext/storage.rb
 - lib/mongomapper_ext/tags.rb
@@ -136,6 +138,7 @@ files:
 - test/types/test_open_struct.rb
 - test/types/test_set.rb
 - test/types/test_timestamp.rb
+- TODO
 has_rdoc: true
 homepage: http://github.com/dcu/mongomapper_ext
 licenses: []