mongoid 0.6.5 → 0.6.6

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/lib/mongoid/commands.rb

@@ -4,6 +4,7 @@ require "mongoid/commands/delete_all"
 require "mongoid/commands/destroy"
 require "mongoid/commands/destroy_all"
 require "mongoid/commands/save"
+require "mongoid/commands/validate"
 
 module Mongoid #:nodoc:
 
@@ -52,7 +53,7 @@ module Mongoid #:nodoc:
       # Save the +Document+. Delegates to the Save command. If the command
       # returns false then a +ValidationError+ will be raised.
       def save!
-        Save.execute(self) || (raise ValidationsError)
+        Save.execute(self) || (raise ValidationsError.new(self.errors.full_messages))
       end
 
       # Update the attributes of the +Document+. Will call save after the
@@ -83,7 +84,7 @@ module Mongoid #:nodoc:
       # validation.
       def create!(attributes = {})
         document = Create.execute(new(attributes))
-        raise ValidationsError unless document.errors.empty?
+        raise ValidationsError.new(self.errors.full_messages) unless document.errors.empty?
         return document
       end
 

data/lib/mongoid/commands/save.rb

@@ -10,7 +10,7 @@ module Mongoid #:nodoc:
       #
       # Returns: +Document+ if validation passes, +false+ if not.
       def self.execute(doc)
-        return false unless doc.valid?
+        return false unless Validate.execute(doc)
         doc.run_callbacks :before_save
         parent = doc.parent
         parent ? Save.execute(parent) : doc.collection.save(doc.attributes)

data/lib/mongoid/commands/validate.rb

@@ -0,0 +1,20 @@
+module Mongoid #:nodoc:
+  module Commands
+    class Validate
+      # Performs validation of the supplied +Document+, handling all associated
+      # callbacks.
+      #
+      # Options:
+      #
+      # doc: A +Document+ that is going to be persisted.
+      #
+      # Returns: +true+ if validation passes, +false+ if not.
+      def self.execute(doc)
+        doc.run_callbacks(:before_validation)
+        validated = doc.valid?
+        doc.run_callbacks(:after_validation)
+        return validated
+      end
+    end
+  end
+end

data/lib/mongoid/document.rb

@@ -11,10 +11,12 @@ module Mongoid #:nodoc:
       :after_destroy,
       :after_save,
       :after_update,
+      :after_validation,
       :before_create,
       :before_destroy,
       :before_save,
-      :before_update
+      :before_update,
+      :before_validation
 
     class << self
 
@@ -89,6 +91,11 @@ module Mongoid #:nodoc:
         Criteria.translate(*args).execute(self)
       end
 
+      # Find a +Document+ by its id.
+      def find_by_id(id)
+        find(id)
+      end
+
       # Find the first +Document+ given the conditions.
       #
       # Options:
@@ -251,7 +258,7 @@ module Mongoid #:nodoc:
     # Writes all the attributes of this Document, and delegate up to
     # the parent.
     def write_attributes(attrs)
-      @attributes = attrs
+      @attributes = process(fields, attrs)
       notify
     end
 

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.6.5"
+  s.version = "0.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-11-02}
+  s.date = %q{2009-11-09}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/commands/destroy.rb",
      "lib/mongoid/commands/destroy_all.rb",
      "lib/mongoid/commands/save.rb",
+     "lib/mongoid/commands/validate.rb",
      "lib/mongoid/criteria.rb",
      "lib/mongoid/document.rb",
      "lib/mongoid/extensions.rb",
@@ -74,6 +75,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/destroy_all_spec.rb",
      "spec/unit/mongoid/commands/destroy_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
+     "spec/unit/mongoid/commands/validate_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
@@ -116,6 +118,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/destroy_all_spec.rb",
      "spec/unit/mongoid/commands/destroy_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
+     "spec/unit/mongoid/commands/validate_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",

data/spec/integration/mongoid/document_spec.rb

@@ -72,6 +72,18 @@ describe Mongoid::Document do
 
   end
 
+  describe "#find_by_id" do
+
+    before do
+      @person = Person.create
+    end
+
+    it "returns the document with the matching id" do
+      Person.find_by_id(@person.id).should == @person
+    end
+
+  end
+
   describe "#group" do
 
     before do

data/spec/unit/mongoid/commands/validate_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
+
+describe Mongoid::Commands::Validate do
+
+  describe "#execute" do
+
+    before do
+      @document = stub(:run_callbacks)
+    end
+
+    it "validates the document" do
+      @document.expects(:valid?).returns(true)
+      Mongoid::Commands::Validate.execute(@document).should be_true
+    end
+
+    it "runs the before and after validate callbacks" do
+      @document.expects(:valid?).returns(true)
+      @document.expects(:run_callbacks).with(:before_validation)
+      @document.expects(:run_callbacks).with(:after_validation)
+      Mongoid::Commands::Validate.execute(@document)
+    end
+
+  end
+
+end

data/spec/unit/mongoid/document_spec.rb

@@ -234,6 +234,19 @@ describe Mongoid::Document do
 
   end
 
+  describe "#find_by_id" do
+
+    before do
+      @criteria = stub_everything
+    end
+
+    it "delegates to find with an id parameter" do
+      Mongoid::Criteria.expects(:translate).with("1").returns(@criteria)
+      Person.find_by_id("1")
+    end
+
+  end
+
   describe "#first" do
 
     before do
@@ -561,6 +574,20 @@ describe Mongoid::Document do
 
   describe "#write_attributes" do
 
+    context "typecasting" do
+
+      before do
+        @person = Person.new
+        @attributes = { :age => "50" }
+      end
+
+      it "properly casts values" do
+        @person.write_attributes(@attributes)
+        @person.age.should == 50
+      end
+
+    end
+
     context "on a child document" do
 
       context "when child is part of a has one" do

data/spec/unit/mongoid/extensions/date/conversions_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_he
 describe Mongoid::Extensions::Date::Conversions do
 
   before do
-    @time = Date.today.to_time.utc
+    @time = Date.today.to_time
   end
 
   describe "#set" do
@@ -11,7 +11,7 @@ describe Mongoid::Extensions::Date::Conversions do
     context "when string provided" do
 
       it "returns a time from the string" do
-        Date.set(@time.to_s).should == @time
+        Date.set(@time.utc.to_s).should == @time
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -05:00
+date: 2009-11-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,7 @@ files:
 - lib/mongoid/commands/destroy.rb
 - lib/mongoid/commands/destroy_all.rb
 - lib/mongoid/commands/save.rb
+- lib/mongoid/commands/validate.rb
 - lib/mongoid/criteria.rb
 - lib/mongoid/document.rb
 - lib/mongoid/extensions.rb
@@ -130,6 +131,7 @@ files:
 - spec/unit/mongoid/commands/destroy_all_spec.rb
 - spec/unit/mongoid/commands/destroy_spec.rb
 - spec/unit/mongoid/commands/save_spec.rb
+- spec/unit/mongoid/commands/validate_spec.rb
 - spec/unit/mongoid/commands_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
@@ -194,6 +196,7 @@ test_files:
 - spec/unit/mongoid/commands/destroy_all_spec.rb
 - spec/unit/mongoid/commands/destroy_spec.rb
 - spec/unit/mongoid/commands/save_spec.rb
+- spec/unit/mongoid/commands/validate_spec.rb
 - spec/unit/mongoid/commands_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb