mongomapper_ext 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/mongomapper_ext/filter.rb

@@ -10,7 +10,7 @@ module MongoMapperExt
       klass.class_eval do
         extend ClassMethods
 
-        key :_keywords, Array
+        key :_keywords, Set
         ensure_index :_keywords
 
         before_save :_update_keywords
@@ -55,33 +55,123 @@ module MongoMapperExt
         stemmer = Lingua::Stemmer.new(:language => lang)
       end
 
+      stop_words = []
+      if self.respond_to?("#{lang}_stop_words")
+        stop_words = Set.new(self.send("#{lang}_stop_words"))
+      end
+
       self._keywords = []
       self.class.filterable_keys.each do |key|
-        self._keywords += keywords_for_value(read_attribute(key), stemmer)
+        self._keywords += keywords_for_value(read_attribute(key), stemmer, stop_words)
       end
     end
 
     private
-    def keywords_for_value(val, stemmer=nil)
+    def keywords_for_value(val, stemmer=nil, stop_words = [])
       if val.kind_of?(String)
-        val.downcase.split.map do |word|
+        words = []
+        val.downcase.split.each do |word|
+          next if word.length < 3
+          next if word =~ %r{'|"|\/|\\}
+          next if stop_words.include?(word)
+
           stem = word
           if stemmer
             stem = stemmer.stem(word)
           end
 
-          if stem != word
-            [stem, word]
+          if stem && stem != word
+            words += [stem, word]
           else
-            word
+            words << word
           end
-        end.flatten
+        end
+
+        words
       elsif val.kind_of?(Array)
-        val.map { |e| keywords_for_value(e, stemmer) }.flatten
-      else
+        val.map { |e| keywords_for_value(e, stemmer, stop_words) }.flatten
+      elsif val
         [val]
+      else
+        []
       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",
+       "before", "being", "below", "between", "both", "but", "by", "cannot",
+       "can't", "could", "couldn't", "did", "didn't", "do", "does", "doesn't",
+       "doing", "don't", "down", "during", "each", "few", "for", "from",
+       "further", "had", "hadn't", "has", "hasn't", "have", "haven't", "having",
+       "he", "he'd", "he'll", "her", "here", "here's", "hers", "herself", "he's",
+       "him", "himself", "his", "how", "how's", "i", "i'd", "if", "i'll", "i'm",
+       "in", "into", "is", "isn't", "it", "its", "it's", "itself", "i've", "let's",
+       "me", "more", "most", "mustn't", "my", "myself", "no", "nor", "not", "of",
+       "off", "on", "once", "only", "or", "other", "ought", "our", "ours", "ourselves",
+       "out", "over", "own", "same", "shan't", "she", "she'd", "she'll", "she's",
+       "should", "shouldn't", "so", "some", "such", "than", "that", "that's", "the",
+       "their", "theirs", "them", "themselves", "then", "there", "there's", "these",
+       "they", "they'd", "they'll", "they're", "they've", "this", "those", "through",
+       "to", "too", "under", "until", "up", "very", "was", "wasn't", "we", "we'd",
+       "we'll", "were", "we're", "weren't", "we've", "what", "what's", "when",
+       "when's", "where", "where's",  "which", "while", "who", "whom", "who's",
+       "why", "why's", "with", "won't", "would", "wouldn't", "you", "you'd",
+       "you'll", "your", "you're", "yours", "yourself", "yourselves", "you've",
+       "the", "how"]
+    end
+
+    def es_stop_words
+      ["de", "la", "que", "el", "en", "y", "a",
+       "los", "del", "se", "las", "por", "un", "para", "con", "no", "una", "su",
+       "al", "lo", "como", "mas", "pero", "sus", "le", "ya", "o", "este", "sus",
+       "si", "porque", "esta", "entre",
+       "cuando", "muy", "sin", "sobre", "tambien", "me", "hasta", "hay",
+       "donde", "quien", "desde", "todo", "nos", "durante", "todos", "uno", "les",
+       "ni", "contra", "otros", "ese", "eso", "ante", "ellos", "e", "esto",
+       "mi", "antes", "algunos", "que", "unos", "yo", "otro",
+       "otras", "otra", "al", "tanto", "esa", "estos", "mucho", "quienes",
+       "nada", "muchos", "cual", "poco", "ella", "estar", "estas", "algunas",
+       "algo", "nosotros", "mi", "mis", "tus", "ellas", "sus", "una", "uno",
+       "nosotras", "vosostros", "vosostras", "os", "mio", "mia",
+       "mios", "mias", "tuyo", "tuya", "tuyos", "tuyas", "suyo",
+       "suya", "suyos", "suyas", "nuestro", "nuestra", "nuestros", "nuestras",
+       "vuestro", "vuestra", "vuestros", "vuestras", "esos", "esas", "estoy",
+       "estas", "esta", "estamos", "estais", "estan",
+       "este", "estes", "estemos", "esteis", "esten",
+       "estare", "estareis", "estara", "estaremos", "como",
+       "estareis", "estarin", "estaria", "estarias",
+       "estariamos", "estariais", "estarian", "estaba",
+       "estabas", "estabamos", "estabais", "estaban", "estuve",
+       "estuviste", "estuvo", "estuvimos", "estuvisteis", "estuvieron", "estuviera",
+       "estuvieras", "estuvieramos", "estuvierais", "estuvieran", "estuviese",
+       "estuvieses", "estuviesemos", "estuvieseis", "estuviesen", "estando",
+       "estado", "estada", "estados", "estadas", "estad", "he", "has", "ha", "hemos",
+       "habeis", "han", "haya", "hayas", "hayamos", "hayais", "hayan",
+       "habre", "habras", "habra", "habremos", "habreis",
+       "habran", "habria", "habrias", "habriamos",
+       "habriais", "habrian", "habia", "habias",
+       "habiamos", "habiais", "habian", "hube", "hubiste",
+       "hubo", "hubimos", "hubisteis", "hubieron", "hubiera", "hubieras", "hubieramos",
+       "hubierais", "hubieran", "hubiese", "hubieses", "hubiesemos", "hubieseis",
+       "hubiesen", "habiendo", "habido", "habida", "habidos", "habidas", "soy", "eres",
+       "es", "somos", "sois", "son", "sea", "seas", "seamos", "seais",
+       "sean", "sere", "seras", "sera", "seremos", "sereis",
+       "seran", "seria", "serias", "seriamos", "seriais",
+       "serian", "era", "eras", "eramos", "erais", "eran", "fui",
+       "fuiste", "fue", "fuimos", "fuisteis", "fueron", "fuera", "fueras",
+       "fueramos", "fuerais", "fueran", "fuese", "fueses", "fuesemos",
+       "fueseis", "fuesen", "sintiendo", "sentido", "sentida", "sentidos", "sentidas",
+       "siente", "sentid", "tengo", "tienes", "tiene", "tenemos", "teneis",
+       "tienen", "tenga", "tengas", "tengamos", "tengais", "tengan", "tendre",
+       "tendras", "tendra", "tendremos", "tendreis", "tendran",
+       "tendria", "tendrias", "tendriamos", "tendriais",
+       "tendrian", "tenia", "tenias", "teniamos",
+       "teniais", "tenian", "tuve", "tuviste", "tuvo", "tuvimos",
+       "tuvisteis", "tuvieron", "tuviera", "tuvieras", "tuvieramos",
+       "tuvierais", "tuvieran", "tuviese", "tuvieses", "tuviesemos",
+       "tuvieseis", "tuviesen", "teniendo", "tenido", "tenida", "tenidos", "tenidas", "tened"]
+    end
   end
 end
 

data/lib/mongomapper_ext/slugizer.rb

@@ -18,12 +18,14 @@ module MongoMapperExt
     protected
     def generate_slug
       if self.slug.blank?
-        slug = self[self.class.slug_key].gsub(/[^A-Za-z0-9\s\-]/, "")[0,20].strip.gsub(/\s+/, "-").downcase
-        if !self.class.slug_options[:unique]
-          key = UUIDTools::UUID.random_create.hexdigest[0,4] #optimize
-          self.slug = key+"-"+slug
-        else
-          self.slug = slug
+        unless self[self.class.slug_key].blank?
+          slug = self[self.class.slug_key].gsub(/[^A-Za-z0-9\s\-]/, "")[0,20].strip.gsub(/\s+/, "-").downcase
+          if !self.class.slug_options[:unique]
+            key = UUIDTools::UUID.random_create.hexdigest[0,4] #optimize
+            self.slug = key+"-"+slug
+          else
+            self.slug = slug
+          end
         end
       end
     end

data/mongomapper_ext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper_ext}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2010-02-28}
+  s.date = %q{2010-03-04}
   s.description = %q{MongoMapper extensions}
   s.email = %q{krawek@gmail.com}
   s.extra_rdoc_files = [
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dcu/mongomapper_ext}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{MongoMapper extensions}
   s.test_files = [
     "test/test_slugizer.rb",

data/test/test_slugizer.rb

@@ -12,6 +12,11 @@ class TestSlugizer < Test::Unit::TestCase
       @blogpost.slug.should =~ /\w+-blog-post-title/
     end
 
+    should "not generate the slug if the slug key is blank" do
+      @empty_blogpost = BlogPost.new
+      @empty_blogpost.slug.should be_nil
+    end
+
     should "return the slug as param" do
       @blogpost.to_param =~ /\w+-blog-post-title/
     end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mongomapper_ext
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -9,59 +14,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -05:00
+date: 2010-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo_mapper
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 10
         version: 0.6.10
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: uuidtools
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 2
         version: 2.10.2
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-matchy
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :development
+  version_requirements: *id005
 description: MongoMapper extensions
 email: krawek@gmail.com
 executables: []
@@ -121,18 +146,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: MongoMapper extensions