mongoid 0.9.4 → 0.9.5

data/Rakefile

@@ -2,7 +2,6 @@ require "rubygems"
 require "rake"
 require "rake/rdoctask"
 require "spec/rake/spectask"
-require "metric_fu"
 
 begin
   require "jeweler"
@@ -16,8 +15,8 @@ begin
     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.17.1")
-    gem.add_dependency("mongo_ext", "0.17.1")
+    gem.add_dependency("mongo", "0.18.1")
+    gem.add_dependency("mongo_ext", "0.18.1")
 
     gem.add_development_dependency("rspec", "1.2.9")
     gem.add_development_dependency("mocha", "0.9.8")
@@ -53,4 +52,3 @@ Rake::RDocTask.new do |rdoc|
 end
 
 task :default => ["spec"]
-task :metrics => ["rcov", "metrics:all"]

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/mongoid.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Copyright (c) 2009 Durran Jordan
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -21,8 +22,8 @@
 require "rubygems"
 
 gem "activesupport", "2.3.4"
-gem "mongo", "0.17.1"
-gem "mongo_ext", "0.17.1"
+gem "mongo", "0.18.1"
+gem "mongo_ext", "0.18.1"
 gem "durran-validatable", "1.8.3"
 gem "leshill-will_paginate", "2.3.11"
 

data/lib/mongoid/associations.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "mongoid/associations/decorator"
 require "mongoid/associations/accessor"
 require "mongoid/associations/belongs_to"

data/lib/mongoid/associations/accessor.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class Accessor #:nodoc:

data/lib/mongoid/associations/belongs_to.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class BelongsTo #:nodoc:

data/lib/mongoid/associations/decorator.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     module Decorator #:nodoc:

data/lib/mongoid/associations/has_many.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class HasMany < DelegateClass(Array) #:nodoc:

data/lib/mongoid/associations/has_one.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class HasOne #:nodoc:

data/lib/mongoid/associations/options.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class Options #:nodoc:

data/lib/mongoid/associations/relates_to_many.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class RelatesToMany < DelegateClass(Array) #:nodoc:

data/lib/mongoid/associations/relates_to_one.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class RelatesToOne #:nodoc:

data/lib/mongoid/attributes.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Attributes #:nodoc:
     # Process the provided attributes casting them to their proper values if a

data/lib/mongoid/commands.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "mongoid/commands/create"
 require "mongoid/commands/delete"
 require "mongoid/commands/delete_all"

data/lib/mongoid/commands/create.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Commands
     class Create

data/lib/mongoid/commands/delete.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Commands
     class Delete

data/lib/mongoid/commands/delete_all.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Commands
     class DeleteAll

data/lib/mongoid/commands/destroy.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Commands
     class Destroy

data/lib/mongoid/commands/destroy_all.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Commands
     class DestroyAll

data/lib/mongoid/commands/save.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Commands
     class Save

data/lib/mongoid/commands/validate.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Commands
     class Validate

data/lib/mongoid/criteria.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   # The +Criteria+ class is the core object needed in Mongoid to retrieve
   # objects from the database. It is a DSL that essentially sets up the
@@ -73,6 +74,25 @@ module Mongoid #:nodoc:
       selections.each { |key, value| @selector[key] = { "$all" => value } }; self
     end
 
+    # Adds a criterion to the +Criteria+ that specifies values that must
+    # be matched in order to return results. This is similar to a SQL "WHERE"
+    # clause. This is the actual selector that will be provided to MongoDB,
+    # similar to the Javascript object that is used when performing a find()
+    # in the MongoDB console.
+    #
+    # Options:
+    #
+    # selectior: A +Hash+ that must match the attributes of the +Document+.
+    #
+    # Example:
+    #
+    # <tt>criteria.and(:field1 => "value1", :field2 => 15)</tt>
+    #
+    # Returns: <tt>self</tt>
+    def and(selector = nil)
+      where(selector)
+    end
+
     # Get the count of matching documents in the database for the +Criteria+.
     #
     # Example:
@@ -447,8 +467,14 @@ module Mongoid #:nodoc:
     # <tt>criteria.where(:field1 => "value1", :field2 => 15)</tt>
     #
     # Returns: <tt>self</tt>
-    def where(selector = {})
-      @selector = selector; self
+    def where(selector = nil)
+      case selector
+      when String
+        @selector.update("$where" => selector)
+      else
+        @selector.update(selector || {})
+      end
+      self
     end
 
     protected

data/lib/mongoid/document.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   class Document
     include ActiveSupport::Callbacks
@@ -57,10 +58,9 @@ module Mongoid #:nodoc:
       def field(name, options = {})
         @fields ||= {}.with_indifferent_access
         @defaults ||= {}.with_indifferent_access
-        @fields[name.to_s] = Field.new(name.to_s, options)
-        @defaults[name.to_s] = options[:default] if options[:default]
-        define_method(name) { read_attribute(name) }
-        define_method("#{name}=") { |value| write_attribute(name, value) }
+        @fields[name] = Field.new(name.to_s, options)
+        @defaults[name] = options[:default] if options[:default]
+        define_field_methods(name, options)
       end
 
       # Returns all the fields for the Document as a +Hash+ with names as keys.
@@ -80,9 +80,9 @@ module Mongoid #:nodoc:
       end
 
       # Instantiate a new object, only when loaded from the database.
-      def instantiate(attrs = {})
+      def instantiate(attrs = {}, allocating = false)
         attributes = attrs.with_indifferent_access
-        if attributes[:_id]
+        if attributes[:_id] || allocating
           document = allocate
           document.instance_variable_set(:@attributes, attributes)
           return document
@@ -106,6 +106,13 @@ module Mongoid #:nodoc:
         @primary_key
       end
 
+      protected
+      def define_field_methods(name, options)
+        define_method(name) { read_attribute(name) }
+        define_method("#{name}=") { |value| write_attribute(name, value) }
+        define_method("#{name}?") { read_attribute(name) == true } if options[:type] == Boolean
+      end
+
     end
 
     # Performs equality checking on the attributes. For now we chack against
@@ -139,7 +146,7 @@ module Mongoid #:nodoc:
     # Clone the current +Document+. This will return all attributes with the
     # exception of the document's id and versions.
     def clone
-      self.class.new(@attributes.except(:_id).except(:versions).dup)
+      self.class.instantiate(@attributes.except(:_id).except(:versions).dup, true)
     end
 
     # Get the Mongo::Collection associated with this Document.

data/lib/mongoid/dynamic_finder.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   class DynamicFinder
     # Regex for standard dynamic finder methods.

data/lib/mongoid/extensions.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+require "mongoid/extensions/array/accessors"
 require "mongoid/extensions/array/assimilation"
 require "mongoid/extensions/array/conversions"
 require "mongoid/extensions/array/parentization"
@@ -16,6 +18,7 @@ require "mongoid/extensions/symbol/inflections"
 require "mongoid/extensions/time/conversions"
 
 class Array #:nodoc:
+  include Mongoid::Extensions::Array::Accessors
   include Mongoid::Extensions::Array::Assimilation
   include Mongoid::Extensions::Array::Conversions
   include Mongoid::Extensions::Array::Parentization

data/lib/mongoid/extensions/array/accessors.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Array #:nodoc:
+      module Accessors #:nodoc:
+        # If the attributes already exists in the array then they will be
+        # updated, otherwise they will be appended.
+        def update(attributes)
+          delete_if { |e| attributes[:_id] && (e[:_id] == attributes[:_id]) }
+          self.<< attributes
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/array/assimilation.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Array #:nodoc:

data/lib/mongoid/extensions/array/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Array #:nodoc:

data/lib/mongoid/extensions/array/parentization.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Array #:nodoc:

data/lib/mongoid/extensions/boolean/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Boolean #:nodoc:

data/lib/mongoid/extensions/date/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Date #:nodoc:

data/lib/mongoid/extensions/datetime/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module DateTime #:nodoc:

data/lib/mongoid/extensions/float/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Float #:nodoc:

data/lib/mongoid/extensions/hash/accessors.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Hash #:nodoc:
@@ -8,7 +9,7 @@ module Mongoid #:nodoc:
             self[key] = self[key].merge(attrs) if self[key]
           else
             if elements = self[key]
-              elements.delete_if { |e| (e[:_id] == attrs[:_id]) } << attrs
+              elements.update(attrs)
             else
               self[key] = [attrs]
             end

data/lib/mongoid/extensions/hash/assimilation.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Hash #:nodoc:

data/lib/mongoid/extensions/hash/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Hash #:nodoc:

data/lib/mongoid/extensions/integer/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Integer #:nodoc:

data/lib/mongoid/extensions/object/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Object #:nodoc:

data/lib/mongoid/extensions/string/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module String #:nodoc:

data/lib/mongoid/extensions/string/inflections.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module String #:nodoc:

data/lib/mongoid/extensions/symbol/inflections.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Symbol #:nodoc:

data/lib/mongoid/extensions/time/conversions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Time #:nodoc:

data/lib/mongoid/field.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   class Field
 

data/lib/mongoid/finders.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Finders #:nodoc:
     # Find +Documents+ given the conditions.

data/lib/mongoid/timestamps.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid
   module Timestamps
 
@@ -5,8 +6,8 @@ module Mongoid
       base.class_eval do
         include InstanceMethods
         field :created_at, :type => Time
-        field :modified_at, :type => Time
-        before_save :update_created_at, :update_modified_at
+        field :updated_at, :type => Time
+        before_save :set_created_at, :set_updated_at
       end
     end
 
@@ -14,14 +15,14 @@ module Mongoid
 
       # Update the created_at field on the Document to the current time. This is
       # only called on create.
-      def update_created_at
+      def set_created_at
         self.created_at = Time.now.utc if !created_at
       end
 
-      # Update the last_modified field on the Document to the current time.
+      # Update the updated_at field on the Document to the current time.
       # This is only called on create and on save.
-      def update_modified_at
-        self.modified_at = Time.now.utc
+      def set_updated_at
+        self.updated_at = Time.now.utc
       end
     end
 

data/lib/mongoid/versioning.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   # Include this module to get automatic versioning of root level documents.
   # This will add a version field to the +Document+ and a has_many association

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-01}
+  s.date = %q{2009-12-08}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/document.rb",
      "lib/mongoid/dynamic_finder.rb",
      "lib/mongoid/extensions.rb",
+     "lib/mongoid/extensions/array/accessors.rb",
      "lib/mongoid/extensions/array/assimilation.rb",
      "lib/mongoid/extensions/array/conversions.rb",
      "lib/mongoid/extensions/array/parentization.rb",
@@ -91,6 +92,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/dynamic_finder_spec.rb",
+     "spec/unit/mongoid/extensions/array/accessors_spec.rb",
      "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
@@ -141,6 +143,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/dynamic_finder_spec.rb",
+     "spec/unit/mongoid/extensions/array/accessors_spec.rb",
      "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
@@ -171,16 +174,16 @@ Gem::Specification.new do |s|
       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.17.1"])
-      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.17.1"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18.1"])
+      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.18.1"])
       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.17.1"])
-      s.add_dependency(%q<mongo_ext>, ["= 0.17.1"])
+      s.add_dependency(%q<mongo>, ["= 0.18.1"])
+      s.add_dependency(%q<mongo_ext>, ["= 0.18.1"])
       s.add_dependency(%q<rspec>, ["= 1.2.9"])
       s.add_dependency(%q<mocha>, ["= 0.9.8"])
     end
@@ -188,8 +191,8 @@ Gem::Specification.new do |s|
     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.17.1"])
-    s.add_dependency(%q<mongo_ext>, ["= 0.17.1"])
+    s.add_dependency(%q<mongo>, ["= 0.18.1"])
+    s.add_dependency(%q<mongo_ext>, ["= 0.18.1"])
     s.add_dependency(%q<rspec>, ["= 1.2.9"])
     s.add_dependency(%q<mocha>, ["= 0.9.8"])
   end

data/spec/integration/mongoid/document_spec.rb

@@ -376,6 +376,10 @@ describe Mongoid::Document do
       @comment.save
     end
 
+    after do
+      Comment.collection.drop
+    end
+
     context "first save" do
 
       it "creates a new version" do
@@ -392,7 +396,6 @@ describe Mongoid::Document do
 
       before do
         5.times do |n|
-          @comment.text = "#{n}"
           @comment.save
         end
       end
@@ -407,4 +410,36 @@ describe Mongoid::Document do
 
   end
 
+  context "executing criteria with date comparisons" do
+
+    context "handling specific dates" do
+
+      before do
+        @person = Person.create(:dob => Date.new(2000, 10, 31))
+      end
+
+      it "handles comparisons with todays date"do
+        people = Person.select.where("this.dob < new Date()")
+        people.first.should == @person
+      end
+
+      it "handles conparisons with a date range" do
+        people = Person.select.where("new Date(1976, 10, 31) < this.dob && this.dob < new Date()")
+        people.first.should == @person
+      end
+
+      it "handles false comparisons in a date range" do
+        people = Person.select.where("new Date(2005, 10, 31) < this.dob && this.dob < new Date()")
+        people.should be_empty
+      end
+
+      it "handles comparisons with date objects"do
+        people = Person.select.where(:dob => { "$lt" => Date.today.midnight })
+        people.first.should == @person
+      end
+
+    end
+
+  end
+
 end

data/spec/spec.opts

@@ -1,5 +1,3 @@
 --colour
--fs
---loadby
-mtime
---reverse
+--format nested
+--drb

data/spec/spec_helper.rb

@@ -36,6 +36,11 @@ class Person < Mongoid::Document
   has_one :name
   has_one :pet, :class_name => "Animal"
 
+  index :title
+  index :dob
+  index :addresses
+  index :name
+
   relates_to_one :game
   relates_to_many :posts
 
@@ -124,6 +129,7 @@ end
 class Comment < Mongoid::Document
   include Mongoid::Versioning
   field :text
+  key :text
 end
 
 class Decorated

data/spec/unit/mongoid/criteria_spec.rb

@@ -54,6 +54,32 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#and" do
+
+    context "when provided a hash" do
+
+      it "adds the clause to the selector" do
+        @criteria.and(:title => "Title", :text => "Text")
+        @criteria.selector.should == { :title => "Title", :text => "Text" }
+      end
+
+    end
+
+    context "when provided a string" do
+
+      it "adds the $where clause to the selector" do
+        @criteria.and("this.date < new Date()")
+        @criteria.selector.should == { "$where" => "this.date < new Date()" }
+      end
+
+    end
+
+    it "returns self" do
+      @criteria.and.should == @criteria
+    end
+
+  end
+
   describe "#collect" do
 
     context "filtering" do
@@ -821,9 +847,22 @@ describe Mongoid::Criteria do
 
   describe "#where" do
 
-    it "adds the clause to the selector" do
-      @criteria.where(:title => "Title", :text => "Text")
-      @criteria.selector.should == { :title => "Title", :text => "Text" }
+    context "when provided a hash" do
+
+      it "adds the clause to the selector" do
+        @criteria.where(:title => "Title", :text => "Text")
+        @criteria.selector.should == { :title => "Title", :text => "Text" }
+      end
+
+    end
+
+    context "when provided a string" do
+
+      it "adds the $where clause to the selector" do
+        @criteria.where("this.date < new Date()")
+        @criteria.selector.should == { "$where" => "this.date < new Date()" }
+      end
+
     end
 
     it "returns self" do

data/spec/unit/mongoid/document_spec.rb

@@ -207,6 +207,18 @@ describe Mongoid::Document do
 
     end
 
+    context "when type is a boolean" do
+
+      before do
+        @person = Person.new(:terms => true)
+      end
+
+      it "adds an accessor method with a question mark" do
+        @person.terms?.should be_true
+      end
+
+    end
+
   end
 
   describe ".human_name" do
@@ -253,30 +265,13 @@ describe Mongoid::Document do
 
   describe ".instantiate" do
 
-    context "when document is new" do
-
-      before do
-        @attributes = { :_id => "1", :title => "Sir", :age => 30 }
-        @person = Person.new(@attributes)
-      end
-
-      it "sets the attributes directly" do
-        Person.instantiate(@attributes).should == @person
-      end
-
+    before do
+      @attributes = { :_id => "1", :title => "Sir", :age => 30 }
+      @person = Person.new(@attributes)
     end
 
-    context "when document is not new" do
-
-      before do
-        @attributes = { :title => "Sir", :age => 30 }
-        @person = Person.new(@attributes)
-      end
-
-      it "instantiates normally" do
-        Person.instantiate(@attributes).id.should_not be_nil
-      end
-
+    it "sets the attributes directly" do
+      Person.instantiate(@attributes).should == @person
     end
 
   end

data/spec/unit/mongoid/extensions/array/accessors_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe Mongoid::Extensions::Array::Accessors do
+
+  describe "#update" do
+
+    context "when the attributes exist" do
+
+      before do
+        @array = [{ :_id => 1, :name => "James T. Kirk" }]
+      end
+
+      it "overwrites with the new attributes" do
+        @array.update({ :_id => 1, :name => "Spock" })
+        @array.first[:name].should == "Spock"
+      end
+
+    end
+
+    context "when the attributes do not exist" do
+
+      before do
+        @array = [{ :_id => 1, :name => "James T. Kirk" }]
+      end
+
+      it "appends the new attributes" do
+        @array.update({ :_id => 2, :name => "Scotty" })
+        @array.size.should == 2
+        @array.last[:name].should == "Scotty"
+      end
+
+    end
+
+    context "when the new attribtues have no id" do
+
+      before do
+        @array = [{ :_id => 1, :name => "James T. Kirk" }]
+      end
+
+      it "appends the new attributes" do
+        @array.update({:name => "Scotty" })
+        @array.size.should == 2
+        @array.last[:name].should == "Scotty"
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/timestamps_spec.rb

@@ -8,16 +8,16 @@ describe Mongoid::Timestamps do
       @person = Person.new
     end
 
-    it "adds created_at and modified_at to the document" do
+    it "adds created_at and updated_at to the document" do
       fields = Person.instance_variable_get(:@fields)
       fields[:created_at].should_not be_nil
-      fields[:modified_at].should_not be_nil
+      fields[:updated_at].should_not be_nil
     end
 
     it "forces the timestamps to UTC" do
       @person.run_callbacks(:before_save)
       @person.created_at.should be_close(Time.now.utc, 10.seconds)
-      @person.modified_at.should be_close(Time.now.utc, 10.seconds)
+      @person.updated_at.should be_close(Time.now.utc, 10.seconds)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 -05:00
+date: 2009-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.17.1
+        version: 0.18.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongo_ext
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.17.1
+        version: 0.18.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -120,6 +120,7 @@ files:
 - lib/mongoid/document.rb
 - lib/mongoid/dynamic_finder.rb
 - lib/mongoid/extensions.rb
+- lib/mongoid/extensions/array/accessors.rb
 - lib/mongoid/extensions/array/assimilation.rb
 - lib/mongoid/extensions/array/conversions.rb
 - lib/mongoid/extensions/array/parentization.rb
@@ -167,6 +168,7 @@ files:
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/dynamic_finder_spec.rb
+- spec/unit/mongoid/extensions/array/accessors_spec.rb
 - spec/unit/mongoid/extensions/array/assimilation_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/array/parentization_spec.rb
@@ -239,6 +241,7 @@ test_files:
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/dynamic_finder_spec.rb
+- spec/unit/mongoid/extensions/array/accessors_spec.rb
 - spec/unit/mongoid/extensions/array/assimilation_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/array/parentization_spec.rb