mongoid-searchable 0.1.0 → 0.1.1

data/README.md

@@ -2,6 +2,8 @@
 
 Mongoid Searchable provides simple field search for your Mongoid models using the full-text search technique described in the [MongoDB documentation](http://www.mongodb.org/display/DOCS/Full+Text+Search+in+Mongo).
 
+[![travis](https://secure.travis-ci.org/jcoene/mongoid-searchable.png)](http://travis-ci.org/jcoene/mongoid-searchable)
+
 ## Getting Started
 
 First, add mongoid-searchable to your Gemfile:
@@ -94,4 +96,4 @@ If you find the project useful but it doesn't meet all of your needs, feel free
 
 ## License
 
-MIT license, go wild.
+MIT license, go wild.

data/lib/mongoid/searchable/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Searchable
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/mongoid/searchable.rb

@@ -26,7 +26,7 @@ module Mongoid
       end
 
       def search(query, options={})
-        keywords = query.to_s.split(' ').map { |s| s.downcase.gsub(/[^a-z0-9]/, '') }.select { |s| s.length >= 2 }.uniq
+        keywords = clean_keywords(query)
         options[:match] ||= :all
         options[:exact] ||= false
 
@@ -44,22 +44,18 @@ module Mongoid
           elsif options[:match].to_sym == :any
             any_in(keywords_field.to_sym => match)
           else
-            where()
+            raise "Please specify either :all or :any to match."
           end
         else
           where()
         end
       end
 
-    end
-
-    module InstanceMethods
-
       def clean_keywords(value)
         words = []
 
         if value.is_a?(String) or value.is_a?(Numeric)
-          words << value.to_s.split(' ').map { |s| s.downcase.gsub(/[^a-z0-9]/, '') }.select { |s| s.length >= 2 }
+          words << value.to_s.downcase.gsub(/<\/?[^>]*>/, '').split(' ').map { |s| s.gsub(/[._:;'"`,?|+={}()!@#%^&*<>~\$\-\\\/\[\]]/, '') }.select { |s| s.length >= 2 }
         elsif value.is_a?(Array) && value.any?
           value.each do |v|
             words << clean_keywords(v)
@@ -73,10 +69,14 @@ module Mongoid
         words.flatten.uniq
       end
 
+    end
+
+    module InstanceMethods
+
       def build_keywords
         keywords = []
         self.class.searchable_fields.each do |f|
-          keywords << clean_keywords(send("#{f}"))
+          keywords << self.class.clean_keywords(send("#{f}"))
         end
         write_attribute(self.class.keywords_field, keywords.flatten.uniq)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-searchable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70209780623120 !ruby/object:Gem::Requirement
+  requirement: &70175576163600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70209780623120
+  version_requirements: *70175576163600
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70209780602240 !ruby/object:Gem::Requirement
+  requirement: &70175576162920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70209780602240
+  version_requirements: *70175576162920
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70209780588960 !ruby/object:Gem::Requirement
+  requirement: &70175576162320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209780588960
+  version_requirements: *70175576162320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70209780575180 !ruby/object:Gem::Requirement
+  requirement: &70175576161360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70209780575180
+  version_requirements: *70175576161360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209780540880 !ruby/object:Gem::Requirement
+  requirement: &70175576160100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70209780540880
+  version_requirements: *70175576160100
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70209780534900 !ruby/object:Gem::Requirement
+  requirement: &70175576159400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *70209780534900
+  version_requirements: *70175576159400
 description: Mongoid Searchable allows you to easily perform full-text search your
   Mongoid models.
 email: