clortho 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/clortho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clortho}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mark Coates"]
-  s.date = %q{2011-08-02}
+  s.authors = [%q{Mark Coates}]
+  s.date = %q{2011-08-04}
   s.description = %q{Clortho makes keyword and full-text search a breeze for MongoMapper users.}
   s.email = %q{mark.coates@gmail.com}
   s.extra_rdoc_files = [
@@ -31,9 +31,9 @@ Gem::Specification.new do |s|
     "test/test_clortho.rb"
   ]
   s.homepage = %q{http://github.com/oddlyzen/clortho}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Clortho: the Key(word) Master adds search to your MongoMapper classes.}
 
   if s.respond_to? :specification_version then

data/lib/clortho.rb

@@ -8,7 +8,9 @@ module MongoMapper
         class_inheritable_accessor  :searchable_with_options
         write_inheritable_attribute :searchable_with_options, []
         set_callback :create, :before, :inject_default_keywords
+        set_callback :update, :before, :inject_default_keywords
         extend ClassMethods
+        include InstanceMethods
       end
       
       module ExclusionConstants
@@ -16,7 +18,7 @@ module MongoMapper
         VERBS       = %w(have has had do does did be am is are was were having
                          been can could shall should will would may might must being)
         # Article adjectives are normally fluff and offer no additional context or meaning
-        ADJECTIVES  = %w(a an the)
+        ADJECTIVES  = %w(an a the)
       end
       
       module ClassMethods
@@ -47,14 +49,12 @@ module MongoMapper
       end
       
       module InstanceMethods
-        
-        @defaults_set = false
-        
+                
         def inject_default_keywords
           searchable_with_options.each do |field|
             if !self.send(field[0]).nil?
-              keywords = !field[1][:exclude].nil? ? filter_on_exclusions(field, self.send(field[0])) : self.send(field[0])
-              keywords = filter_and_normalize(keywords)
+              text = self.send(field[0]).to_s
+              keywords = filter_and_normalize(!field[1][:exclude].nil? ? filter_on_exclusions(field, filter_and_normalize(text)) : text)
               self.send("#{field[0].to_s}_keywords=".to_sym, keywords) if keywords
               self.send("#{field[0].to_s}_keywords_array=".to_sym, keywords.split.each{ |kw| kw.downcase }) if keywords
             end
@@ -67,13 +67,13 @@ module MongoMapper
             
             options[:exclude].each do |exclusion|
               if exclusion.is_a? String
-                keywords.gsub!(exclusion.to_s, '')
+                keywords.gsub!(/(\b#{exclusion}\b)/, '')
               elsif exclusion.is_a? Symbol
                 klass = self.class
                 ex = exclusion.to_s.upcase.to_sym
                 if Clortho::ExclusionConstants::const_get(ex)
                   Clortho::ExclusionConstants::const_get(ex).each do |e|
-                    keywords.gsub!(e, '')
+                    keywords.gsub!(/(\b#{e}\b)/, '')
                   end
                 end
               end

data/test/test_clortho.rb

@@ -87,6 +87,15 @@ class TestClortho < Test::Unit::TestCase
     assert @colonial.body_keywords !=~ /\-\-/
   end
   
+  should 're-inject keywords on update' do
+    @fridge.about = 'Everyone will Wang Chung tonight.'
+    @colonial.about = 'The ape does bite a Man!'
+    @fridge.save
+    @colonial.save
+    assert @fridge.about_keywords == 'everyone wang chung tonight'
+    assert @colonial.about_keywords == 'ape bite man'
+  end
+  
   def teardown
     Post.destroy_all
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clortho
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-02 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-08-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2168779100 !ruby/object:Gem::Requirement
+  requirement: &2169990840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168779100
+  version_requirements: *2169990840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2168778160 !ruby/object:Gem::Requirement
+  requirement: &2169982740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2168778160
+  version_requirements: *2169982740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2168776700 !ruby/object:Gem::Requirement
+  requirement: &2169980080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2168776700
+  version_requirements: *2169980080
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2168775020 !ruby/object:Gem::Requirement
+  requirement: &2169978800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168775020
+  version_requirements: *2169978800
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &2168773200 !ruby/object:Gem::Requirement
+  requirement: &2169976940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2168773200
+  version_requirements: *2169976940
 - !ruby/object:Gem::Dependency
   name: taggregator
-  requirement: &2168771100 !ruby/object:Gem::Requirement
+  requirement: &2169974840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168771100
+  version_requirements: *2169974840
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2168769420 !ruby/object:Gem::Requirement
+  requirement: &2169969600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168769420
+  version_requirements: *2169969600
 description: Clortho makes keyword and full-text search a breeze for MongoMapper users.
 email: mark.coates@gmail.com
 executables: []
@@ -109,7 +108,6 @@ files:
 - test/helper.rb
 - test/models/post.rb
 - test/test_clortho.rb
-has_rdoc: true
 homepage: http://github.com/oddlyzen/clortho
 licenses:
 - MIT
@@ -125,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3180382170967961300
+      hash: -2521455955088639471
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: ! 'Clortho: the Key(word) Master adds search to your MongoMapper classes.'