mongomatic 0.5.1 → 0.5.2

data/lib/mongomatic/base.rb

@@ -63,9 +63,19 @@ module Mongomatic
       end
 
       def drop
-        self.send(:before_drop) if self.respond_to?(:before_drop)
+        do_callback(:before_drop)
         collection.drop
-        self.send(:after_drop) if self.respond_to?(:after_drop)
+        do_callback(:after_drop)
+      end
+      
+      private
+      
+      def do_callback(meth)
+        begin
+          send(meth)
+        rescue NoMethodError => e
+          false
+        end
       end
     end
 
@@ -90,9 +100,9 @@ module Mongomatic
     
     def valid?
       self.errors = Mongomatic::Errors.new
-      self.send(:before_validate) if self.respond_to?(:before_validate)
+      do_callback(:before_validate)
       validate
-      self.send(:after_validate) if self.respond_to?(:after_validate)
+      do_callback(:after_validate)
       self.errors.empty?
     end
     
@@ -148,14 +158,14 @@ module Mongomatic
     # require an additional call to the db.
     def insert(opts={})
       return false unless new? && valid?
-      self.send(:before_insert) if self.respond_to?(:before_insert)
-      self.send(:before_insert_or_update) if self.respond_to?(:before_insert_or_update)
+      do_callback(:before_insert)
+      do_callback(:before_insert_or_update)
       if ret = self.class.collection.insert(@doc,opts)
         @doc["_id"] = @doc.delete(:_id) if @doc[:_id]
         self.is_new = false
       end
-      self.send(:after_insert) if self.respond_to?(:after_insert)
-      self.send(:after_insert_or_update) if self.respond_to?(:after_insert_or_update)
+      do_callback(:after_insert)
+      do_callback(:after_insert_or_update)
       ret
     end
     
@@ -171,11 +181,11 @@ module Mongomatic
     # error raised. Note that this will require an additional call to the db.
     def update(opts={},update_doc=@doc)
       return false if new? || removed? || !valid?
-      self.send(:before_update) if self.respond_to?(:before_update)
-      self.send(:before_insert_or_update) if self.respond_to?(:before_insert_or_update)
+      do_callback(:before_update)
+      do_callback(:before_insert_or_update)
       ret = self.class.collection.update({"_id" => @doc["_id"]}, update_doc, opts)
-      self.send(:after_update) if self.respond_to?(:after_update)
-      self.send(:after_insert_or_update) if self.respond_to?(:after_insert_or_update)
+      do_callback(:after_update)
+      do_callback(:after_insert_or_update)
       ret
     end
     
@@ -188,11 +198,11 @@ module Mongomatic
     # if you want an exception raised.
     def remove(opts={})
       return false if new?
-      self.send(:before_remove) if self.respond_to?(:before_remove)
+      do_callback(:before_remove)
       if ret = self.class.collection.remove({"_id" => @doc["_id"]})
         self.removed = true; freeze; ret
       end
-      self.send(:after_remove) if self.respond_to?(:after_remove)
+      do_callback(:after_remove)
       ret
     end
     
@@ -209,6 +219,14 @@ module Mongomatic
     
     protected
     
+    def do_callback(meth)
+      begin
+        send(meth)
+      rescue NoMethodError => e
+        false
+      end
+    end
+    
     def doc
       @doc
     end

data/test/helper.rb

@@ -34,6 +34,8 @@ class Person < Mongomatic::Base
     self.errors << ["Name", "can't be empty"] if self["name"].blank?
   end
   
+  private
+  
   def before_validate
     self.callback_tests ||= []
     self.callback_tests << :before_validate

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Ben Myles
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -07:00
+date: 2010-09-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency