mongoid 0.9.10 → 0.9.11

data/README.textile

@@ -11,6 +11,7 @@
 <a href="http://www.pivotaltracker.com/projects/27482">Mongoid on Pivotal Tracker</a>
 <a href="http://groups.google.com/group/mongoid">Mongoid Google Group</a>
 <a href="http://mongoid.org:4444/">Mongoid on CI Joe</a>
+<a href="http://mongoid.org">Mongoid Website and Documentation</a>
 
 <h3>Compatibility</h3>
 
@@ -26,173 +27,9 @@
   release notes and documentation with each release.
 </p>
 
-<h2>Mongoid in Action</h2>
+<h2>Documentation</h2>
 
-Initialize Mongoid:
-
-<pre>
-  connection = Mongo::Connection.new
-  Mongoid.database = connection.db("my_db_name")
-</pre>
-
-Example of a simple domain model:
-
-<pre>
-  class Person < Mongoid::Document
-    include Mongoid::Versioning
-
-    field :title
-    field :age, :type => Integer, :default => 0
-
-    has_one :name
-    has_many :addresses
-
-    has_one_related :game
-    has_many_related :posts
-  end
-
-  class Address < Mongoid::Document
-    field :street
-    field :city
-    field :state
-    field :post_code
-    belongs_to :person, :inverse_of => :addresses
-  end
-
-  class Name < Mongoid::Document
-    include Mongoid::Timestamps
-    field :first_name
-    field :last_name
-    belongs_to :person, :inverse_of => :name
-  end
-
-  class Post < Mongoid::Document
-    include Mongoid::Timestamps
-    field :title
-    field :text
-    field :tags, :type => Array
-    belongs_to_related :person
-  end
-
-  class Game < ActiveRecord::Base
-    belongs_to_related :person
-  end
-</pre>
-
-Mongoid supports all the basic ActiveRecord creation and persistence methods.
-
-Creation:
-
-<pre>
-  Person.create(:title => "Esquire")
-  Person.create!(:title => "Sir", :name => { :first_name => "Elton", :last_name => "John" })
-</pre>
-
-Save:
-
-<pre>
-  person.save
-  person.save!
-</pre>
-
-Updating:
-
-<pre>
-  person.update_attributes(:title => "Sir")
-  person.update_attributes!(:name => { :first_name => "Emmanuel", :last_name => "Zorg" })
-</pre>
-
-Deleting:
-
-<pre>
-  person.destroy
-  Person.destroy_all(:title => "Sir")
-  person.delete
-  Person.delete_all(:title => "Sir")
-</pre>
-
-Count:
-
-<pre>
-  Person.count
-</pre>
-
-Retrieval of Documents from the database can be done in the traditional ActiveRecord
-manner or done using the Mongoid criteria DSL.
-
-Old School:
-
-<pre>
-  Person.find(:all, :conditions => { :title => "Esquire" })
-  Person.find(:first, :conditions => { :title => "Esquire" })
-  Person.first(:conditions => { :title => "Sir" })
-  Person.all(:conditions => { :title => "Sir" })
-</pre>
-
-New School:
-
-<pre>
-  Person.select(:first_name, :last_name).where(:title => "Sir").skip(10).limit(10).paginate
-  Person.select(:title).aggregate
-  Person.select(:first_name).order_by([[:first_name, :asc]])
-  Criteria.translate(:conditions => { :title => "Sir" })
-</pre>
-
-Chaining Scopes:
-
-Class methods that return criteria, either through the Criteria API or the traditional Finder API, can
-be chained, similar to DataMapper.
-
-<pre>
-  class Person < Mongoid::Document
-    field :title
-    field :age, :type => Integer
-
-    class << self
-      def knighted
-        criteria.where(:title => "Sir")
-      end
-      def old
-        criteria.where(:age => { "$gt" > 70 })
-      end
-    end
-  end
-
-  Person.old.knighted
-  Person.old.paginate
-</pre>
-
-Paginate Document search results:
-
-<pre>
-  Person.paginate(:conditions => {:title => "Esquire"}, :page => 1, :per_page => 20)
-</pre>
-
-Versioning:
-
-Versioning can be added by including Mongoid::Versioning in your document. This will give
-a version field, and will update the version number with each save. Additionally each
-version of the document will be stored in a versions array, embedded within the document.
-
-<pre>
-  class Person < Mongoid::Document
-    include Mongoid::Versioning
-    field :title
-  end
-
-  @person = Person.new
-  @person.save # Version 1
-  @person.title = "Madam"
-  @person.save # Version 2
-  @person.versions.size = 1
-</pre>
-
-Validations:
-
-Mongoid supports all validations provided by Jay Fields' <tt>Validatable</tt> gem.
-For more information please see the <tt>Validatable</tt> documentation.
-
-<a href="http://validatable.rubyforge.org/">Validatable on RubyForge</a>
+<p>Please see the new Mongoid website for up-to-date documentation: <a href="http://mongoid.org">mongoid.org</a></p>
 
 <h2>License</h2>
 

data/Rakefile

@@ -12,11 +12,11 @@ begin
     gem.homepage = "http://github.com/durran/mongoid"
     gem.authors = ["Durran Jordan"]
 
-    gem.add_dependency("durran-validatable", ">= 1.8.3")
-    gem.add_dependency("leshill-will_paginate", ">= 2.3.11")
     gem.add_dependency("activesupport", ">= 2.3.4")
     gem.add_dependency("mongo", ">= 0.18.1")
     gem.add_dependency("mongo_ext", ">= 0.18.1")
+    gem.add_dependency("durran-validatable", ">= 1.8.3")
+    gem.add_dependency("leshill-will_paginate", ">= 2.3.11")
 
     gem.add_development_dependency("rspec", ">= 1.2.9")
     gem.add_development_dependency("mocha", ">= 0.9.8")

data/VERSION

@@ -1 +1 @@
-0.9.10
+0.9.11

data/lib/mongoid.rb

@@ -21,11 +21,11 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 require "rubygems"
 
-gem "activesupport", "2.3.4"
-gem "mongo", "0.18.1"
-gem "mongo_ext", "0.18.1"
-gem "durran-validatable", "1.8.3"
-gem "leshill-will_paginate", "2.3.11"
+gem "activesupport", ">= 2.3.4"
+gem "mongo", ">= 0.18.1"
+gem "mongo_ext", ">= 0.18.1"
+gem "durran-validatable", ">= 1.8.3"
+gem "leshill-will_paginate", ">= 2.3.11"
 
 require "delegate"
 require "observer"

data/lib/mongoid/attributes.rb

@@ -86,6 +86,18 @@ module Mongoid #:nodoc:
         process(attrs)
         notify
       end
+
+      protected
+      # Used when supplying a :reject_if block as an option to
+      # accepts_nested_attributes_for
+      def reject(attributes, options)
+        rejector = options[:reject_if]
+        if rejector
+          attributes.delete_if do |key, value|
+            rejector.call(value)
+          end
+        end
+      end
     end
 
     module ClassMethods
@@ -101,8 +113,11 @@ module Mongoid #:nodoc:
       #     accepts_nested_attributes_for :name, :addresses
       #   end
       def accepts_nested_attributes_for(*args)
-        args.flatten.each do |name|
+        associations = args.flatten
+        options = associations.last.is_a?(Hash) ? associations.pop : {}
+        associations.each do |name|
           define_method("#{name}_attributes=") do |attrs|
+            reject(attrs, options)
             association = send(name)
             update(association, true)
             association.nested_build(attrs)

data/lib/mongoid/commands.rb

@@ -5,7 +5,6 @@ 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:
 

data/lib/mongoid/commands/save.rb

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

data/lib/mongoid/document.rb

@@ -49,8 +49,8 @@ module Mongoid #:nodoc:
       #
       # <tt>field :score, :default => 0</tt>
       def field(name, options = {})
-        define(name, options)
-        default(name, options)
+        set_field(name, options)
+        set_default(name, options)
       end
 
       # Returns all the fields for the Document as a +Hash+ with names as keys.
@@ -99,17 +99,22 @@ module Mongoid #:nodoc:
       protected
 
       # Define a field attribute for the +Document+.
-      def define(name, options = {})
+      def set_field(name, options = {})
         meth = options.delete(:as) || name
         @fields ||= {}.with_indifferent_access
         @fields[name] = Field.new(name.to_s, options)
+        create_accessors(name, meth, options)
+      end
+
+      # Create the field accessors.
+      def create_accessors(name, meth, options = {})
         define_method(meth) { read_attribute(name) }
         define_method("#{meth}=") { |value| write_attribute(name, value) }
         define_method("#{meth}?") { read_attribute(name) == true } if options[:type] == Boolean
       end
 
       # Set up a default value for a field.
-      def default(name, options = {})
+      def set_default(name, options = {})
         value = options[:default]
         @defaults ||= {}.with_indifferent_access
         @defaults[name] = value if value
@@ -269,6 +274,15 @@ module Mongoid #:nodoc:
       notify
     end
 
+    # Needs to run the appropriate callbacks the delegate up to the validatable
+    # gem.
+    def valid?
+      run_callbacks(:before_validation)
+      result = super
+      run_callbacks(:after_validation)
+      result
+    end
+
     protected
     def generate_key
       if primary_key

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.9.10"
+  s.version = "0.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-19}
+  s.date = %q{2009-12-20}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -39,7 +39,6 @@ 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/dynamic_finder.rb",
@@ -89,7 +88,6 @@ 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",
@@ -143,7 +141,6 @@ 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",
@@ -178,28 +175,28 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<durran-validatable>, [">= 1.8.3"])
-      s.add_runtime_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.18.1"])
       s.add_runtime_dependency(%q<mongo_ext>, [">= 0.18.1"])
+      s.add_runtime_dependency(%q<durran-validatable>, [">= 1.8.3"])
+      s.add_runtime_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
     else
-      s.add_dependency(%q<durran-validatable>, [">= 1.8.3"])
-      s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_dependency(%q<mongo>, [">= 0.18.1"])
       s.add_dependency(%q<mongo_ext>, [">= 0.18.1"])
+      s.add_dependency(%q<durran-validatable>, [">= 1.8.3"])
+      s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
     end
   else
-    s.add_dependency(%q<durran-validatable>, [">= 1.8.3"])
-    s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     s.add_dependency(%q<mongo>, [">= 0.18.1"])
     s.add_dependency(%q<mongo_ext>, [">= 0.18.1"])
+    s.add_dependency(%q<durran-validatable>, [">= 1.8.3"])
+    s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
   end

data/spec/spec_helper.rb

@@ -37,7 +37,8 @@ class Person < Mongoid::Document
   has_one :name
   has_one :pet, :class_name => "Animal"
 
-  accepts_nested_attributes_for :addresses, :name
+  accepts_nested_attributes_for :addresses, :reject_if => lambda { |attrs| attrs["street"].blank? }
+  accepts_nested_attributes_for :name
 
   index :title
   index :dob
@@ -131,12 +132,15 @@ end
 
 class Comment < Mongoid::Document
   include Mongoid::Versioning
+  include Mongoid::Timestamps
   field :text
   key :text
+  validates_presence_of :text
 end
 
 class Post < Mongoid::Document
   include Mongoid::Versioning
+  include Mongoid::Timestamps
   field :title
   belongs_to_related :person
 end

data/spec/unit/mongoid/attributes_spec.rb

@@ -16,6 +16,21 @@ describe Mongoid::Attributes do
 
       context "on a has many association" do
 
+        context "when a reject block supplied" do
+
+          before do
+            @attributes = {
+              "0" => { "city" => "San Francisco" }
+            }
+            @person.addresses_attributes = @attributes
+          end
+
+          it "removes the attributes that match" do
+            @person.addresses.should be_empty
+          end
+
+        end
+
         context "when association is empty" do
 
           before do

data/spec/unit/mongoid/commands_spec.rb

@@ -177,4 +177,23 @@ describe Mongoid::Commands do
 
   end
 
+  describe "#valid?" do
+
+    before do
+      @comment = Comment.new
+    end
+
+    it "validates the document" do
+      @comment.valid?.should be_false
+    end
+
+    it "runs the validation callbacks" do
+      @comment.expects(:run_callbacks).with(:validate)
+      @comment.expects(:run_callbacks).with(:before_validation)
+      @comment.expects(:run_callbacks).with(:after_validation)
+      @comment.valid?
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,58 +9,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 -05:00
+date: 2009-12-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: durran-validatable
+  name: activesupport
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: leshill-will_paginate
+  name: mongo
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.11
+        version: 0.18.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: mongo_ext
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.4
+        version: 0.18.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mongo
+  name: durran-validatable
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.1
+        version: 1.8.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mongo_ext
+  name: leshill-will_paginate
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.1
+        version: 2.3.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -115,7 +115,6 @@ 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/dynamic_finder.rb
@@ -165,7 +164,6 @@ 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
@@ -241,7 +239,6 @@ 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

data/lib/mongoid/commands/validate.rb

@@ -1,21 +0,0 @@
-# encoding: utf-8
-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/spec/unit/mongoid/commands/validate_spec.rb

@@ -1,25 +0,0 @@
-require "spec_helper"
-
-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