mongomatic 0.0.7 → 0.0.8

data/lib/mongomatic/base.rb

@@ -89,21 +89,34 @@ module Mongomatic
 
     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)
       if ret = self.class.collection.insert(@doc,opts)
         @doc["_id"] = @doc.delete(:_id); ret
       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)
+      ret
     end
     
     def update(opts={},update_doc=@doc)
       return false if new? || removed? || !valid?
-      self.class.collection.update({"_id" => @doc["_id"]}, update_doc, opts)
+      self.send(:before_update) if self.respond_to?(:before_update)
+      self.send(:before_insert_or_update) if self.respond_to?(: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)
+      ret
     end
     
     def remove(opts={})
       return false if new?
+      self.send(:before_remove) if self.respond_to?(: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)
+      ret
     end
     
     def to_hash

data/lib/mongomatic/validatable/validatable_instance_methods.rb

@@ -9,7 +9,10 @@ module Mongomatic
     #
     # Returns true if no errors were added otherwise false. Only executes validations that have no :groups option specified
     def valid?
-      valid_for_group?(nil)
+      self.send(:before_validate) if self.respond_to?(:before_validate)
+      r = valid_for_group?(nil)
+      self.send(:after_validate) if self.respond_to?(:after_validate)
+      r
     end
   
     # call-seq: errors

data/test/helper.rb

@@ -11,6 +11,58 @@ Mongomatic.settings = { :connection => ["localhost", 27017, {}], :db => "mongoma
 
 class Person < Mongomatic::Base
   validates_presence_of :name
+  attr_accessor :callback_tests
+  
+  def before_validate
+    self.callback_tests ||= []
+    self.callback_tests << :before_validate
+  end
+  
+  def after_validate
+    self.callback_tests ||= []
+    self.callback_tests << :after_validate
+  end
+  
+  def before_insert
+    self.callback_tests ||= []
+    self.callback_tests << :before_insert
+  end
+  
+  def before_insert_or_update
+    self.callback_tests ||= []
+    self.callback_tests << :before_insert_or_update
+  end
+  
+  def after_insert_or_update
+    self.callback_tests ||= []
+    self.callback_tests << :after_insert_or_update
+  end
+  
+  def after_insert
+    self.callback_tests ||= []
+    self.callback_tests << :after_insert
+  end
+
+  def before_update
+    self.callback_tests ||= []
+    self.callback_tests << :before_update
+  end
+  
+  def after_update
+    self.callback_tests ||= []
+    self.callback_tests << :after_update
+  end
+  
+  def before_remove
+    self.callback_tests ||= []
+    self.callback_tests << :before_remove
+  end
+  
+  def after_remove
+    self.callback_tests ||= []
+    self.callback_tests << :after_remove
+  end
+  
 end
 
 class Test::Unit::TestCase

data/test/test_mongomatic.rb

@@ -1,6 +1,17 @@
 require 'helper'
 
 class TestMongomatic < Test::Unit::TestCase
+  should "work with enumerable methods" do
+    Person.collection.remove
+    p1 = Person.new(:name => "Ben1", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
+    p2 = Person.new(:name => "Ben2", :birth_year => 1986, :created_at => Time.now.utc, :admin => true)
+    assert p1.insert.is_a?(BSON::ObjectID)
+    assert p2.insert.is_a?(BSON::ObjectID)
+    assert_equal 2, Person.collection.count
+    assert_equal 2, Person.find.inject(0) { |sum, p| assert p.is_a?(Person); sum += 1 }
+    assert_equal p2, Person.find.max { |p1,p2| p1["birth_year"] <=> p2["birth_year"] }
+  end
+  
   should "be able to insert, update, remove documents" do
     Person.collection.remove
     
@@ -98,4 +109,21 @@ class TestMongomatic < Test::Unit::TestCase
     p = Person.find({"_id" => p["_id"]}).next
     assert_equal 1986, p["birth_year"]
   end
+  
+  should "have callbacks" do    
+    p = Person.new(:name => "Ben1", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
+    p.callback_tests = []
+    assert p.callback_tests.empty?
+    assert p.valid?
+    assert_equal [:before_validate, :after_validate], p.callback_tests
+    p.callback_tests = []
+    assert p.insert.is_a?(BSON::ObjectID)
+    assert_equal [:before_validate, :after_validate,  :before_insert, :before_insert_or_update, :after_insert, :after_insert_or_update], p.callback_tests
+    p.callback_tests = []
+    p.update
+    assert_equal [:before_validate, :after_validate, :before_update, :before_insert_or_update, :after_update, :after_insert_or_update], p.callback_tests
+    p.callback_tests = []
+    p.remove
+    assert_equal [:before_remove, :after_remove], p.callback_tests
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Ben Myles
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -07:00
+date: 2010-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: bson
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -49,6 +51,7 @@ dependencies:
   name: bson_ext
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -63,6 +66,7 @@ dependencies:
   name: mongo
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -77,6 +81,7 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -125,6 +130,8 @@ files:
 - lib/mongomatic/validatable/validations/validation_base.rb
 - LICENSE
 - README.rdoc
+- test/helper.rb
+- test/test_mongomatic.rb
 has_rdoc: true
 homepage: http://github.com/benmyles/mongomatic
 licenses: []
@@ -135,6 +142,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -142,6 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -151,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mongomatic is a simple Ruby object mapper for Mongo