jnunemaker-mongomapper 0.1.1 → 0.1.2

data/History

@@ -1,3 +1,8 @@
+0.1.2 7/3/2009
+* 2 minor changes
+  * Straightened out callbacks and added validate, validate_on_create and validate_on_update.
+  * Attributes passed into attributes= now call writer methods if they exist. This is mostly for virtual attributes.
+  
 0.1.1 6/28/2009
 * 1 minor change
   * bumped ruby driver to 0.9 and removed hacks I had in while waiting for it

data/README.rdoc

@@ -2,6 +2,17 @@
 
 Awesome gem for modeling your domain and storing it in mongo.
 
+== Note on Releases
+
+Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code and run 'rake install' to install the gem.
+
+== Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
 == Dependencies
 
 * ActiveSupport (activesupport)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/mongomapper/document.rb

@@ -11,6 +11,11 @@ module MongoMapper
         key :_id, String
         key :created_at, Time
         key :updated_at, Time
+        
+        define_callbacks  :before_create,  :after_create, 
+                          :before_update,  :after_update,
+                          :before_save,    :after_save,
+                          :before_destroy, :after_destroy
       end
     end
     

data/lib/mongomapper/embedded_document.rb

@@ -9,13 +9,6 @@ module MongoMapper
         include Validatable
         include ActiveSupport::Callbacks
         include MongoMapper::Serialization
-        
-        define_callbacks  :before_validation_on_create, :before_validation_on_update,
-                          :before_validation,           :after_validation,
-                          :before_create,               :after_create, 
-                          :before_update,               :after_update,
-                          :before_save,                 :after_save,
-                          :before_destroy,              :after_destroy
       end
     end
     
@@ -131,7 +124,12 @@ module MongoMapper
       
       def attributes=(attrs)
         attrs.each_pair do |key_name, value|
-          write_attribute(key_name, value) if writer?(key_name)
+          if writer?(key_name)
+            write_attribute(key_name, value)
+          else
+            writer_method ="#{key_name}="
+            self.send(writer_method, value) if respond_to?(writer_method)
+          end
         end
       end
     

data/lib/mongomapper/save_with_validation.rb

@@ -4,6 +4,10 @@ module MongoMapper
       base.class_eval do
         alias_method_chain :valid?, :callbacks
         alias_method_chain :save, :validation
+        
+        define_callbacks  :before_validation_on_create,   :before_validation_on_update,
+                          :before_validation,             :after_validation,
+                          :validate, :validate_on_create, :validate_on_update
       end
     end
     
@@ -12,16 +16,34 @@ module MongoMapper
     end
     
     private
-      def save_with_validation
-        new? ? run_callbacks(:before_validation_on_create) : 
-               run_callbacks(:before_validation_on_update)
-      
-        valid? ? save_without_validation : false
+      def save_with_validation        
+        if valid?
+          save_without_validation
+        else
+          false
+        end
       end
     
       def valid_with_callbacks?
         run_callbacks(:before_validation)
-        run_callbacks(:after_validation) if valid_without_callbacks?
+        
+        if new?
+          run_callbacks(:before_validation_on_create)
+        else
+          run_callbacks(:before_validation_on_update)
+        end
+        
+        run_callbacks(:validate)
+        
+        if new?
+          run_callbacks(:validate_on_create)
+        else
+          run_callbacks(:validate_on_update)
+        end
+        
+        is_valid = valid_without_callbacks?
+        run_callbacks(:after_validation) if is_valid
+        is_valid 
       end
   end  
 end

data/mongomapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-06-28}
+  s.date = %q{2009-07-03}
   s.email = %q{nunemaker@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/test/test_callbacks.rb

@@ -15,7 +15,8 @@ class CallbacksTest < Test::Unit::TestCase
           :before_create,     :after_create, 
           :before_update,     :after_update,
           :before_save,       :after_save,
-          :before_destroy,    :after_destroy].each do |callback|
+          :before_destroy,    :after_destroy,
+          :validate, :validate_on_create, :validate_on_update].each do |callback|
           callback_method = "#{callback}_callback"
           send(callback, callback_method)
           define_method(callback_method) do
@@ -36,7 +37,7 @@ class CallbacksTest < Test::Unit::TestCase
     
     should "get the order right for creating documents" do
       doc = @document.create(:name => 'John Nunemaker')
-      doc.history.should == [:before_validation_on_create, :before_validation, :after_validation, :before_save, :before_create, :after_create, :after_save]
+      doc.history.should == [:before_validation, :before_validation_on_create, :validate, :validate_on_create, :after_validation, :before_save, :before_create, :after_create, :after_save]
     end
     
     should "get the order right for updating documents" do
@@ -44,7 +45,7 @@ class CallbacksTest < Test::Unit::TestCase
       doc.clear_history
       doc.name = 'John'
       doc.save
-      doc.history.should == [:before_validation_on_update, :before_validation, :after_validation, :before_save, :before_update, :after_update, :after_save]
+      doc.history.should == [:before_validation, :before_validation_on_update, :validate, :validate_on_update, :after_validation, :before_save, :before_update, :after_update, :after_save]
     end
     
     should "work for before and after validation" do

data/test/test_embedded_document.rb

@@ -56,6 +56,19 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         doc.attributes[:name].should == 'new value'
         doc.attributes[:foobar].should be(nil)
       end
+      
+      should "not ignore keys that have methods defined" do
+        @document.class_eval do
+          attr_writer :password
+          
+          def passwd
+            @password
+          end
+        end
+        
+        doc = @document.new(:name => 'foobar', :password => 'secret')
+        doc.passwd.should == 'secret'
+      end
 
       should "typecast key values" do
         doc = @document.new(:name => 1234, :age => '21')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-28 00:00:00 -07:00
+date: 2009-07-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency