mongomodel 0.2.2 → 0.2.3

data/Gemfile

@@ -1,11 +1,11 @@
-source "http://gemcutter.org"
+source "http://rubygems.org"
 git "git://github.com/rails/rails.git"
 
-gem "activemodel"
-gem "activesupport"
+gem "activemodel", ">= 3.0.0.beta3"
+gem "activesupport", ">= 3.0.0.beta3"
 
-gem "mongo"
-gem "bson"
-gem "bson_ext"
+gem "mongo", '>= 0.20.1'
+gem "bson", '>= 0.20.1'
+gem "bson_ext", '>= 0.20.1'
 
 gem "rspec"

data/Rakefile

@@ -1,18 +1,28 @@
-require 'spec/rake/spectask'
 require 'rake/rdoctask'
 
 task :default => :spec
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs << 'lib'
-  t.spec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
-end
-
-namespace :spec do
-  desc "Run specs in nested documenting format"
-  Spec::Rake::SpecTask.new(:doc) do |t|
+begin
+  require 'spec/rake/spectask'
+  desc 'Run the specs'
+  Spec::Rake::SpecTask.new(:spec) do |t|
     t.libs << 'lib'
-    t.spec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/specdoc.opts"]
+    t.spec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
+  end
+  
+  namespace :spec do
+    desc "Run specs in nested documenting format"
+    Spec::Rake::SpecTask.new(:doc) do |t|
+      t.libs << 'lib'
+      t.spec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/specdoc.opts"]
+    end
+  end
+rescue LoadError
+  task :spec do
+    STDERR.puts "You must have rspec to run the tests"
+  end
+  namespace :spec do
+    task :doc => :spec
   end
 end
 
@@ -40,9 +50,10 @@ begin
     gem.add_dependency('activemodel', '>= 3.0.0.beta3')
     gem.add_dependency('mongo', '>= 0.20.1')
     gem.add_dependency('bson', '>= 0.20.1')
+    gem.add_development_dependency('rspec', '>= 1.3.0')
   end
   
   Jeweler::GemcutterTasks.new  
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
+  STDERR.puts "Jeweler not available. Install it with: gem install jeweler"
 end

data/lib/mongomodel.rb

@@ -26,6 +26,7 @@ module MongoModel
   autoload :PrettyInspect,    'mongomodel/concerns/pretty_inspect'
   autoload :RecordStatus,     'mongomodel/concerns/record_status'
   autoload :AbstractClass,    'mongomodel/concerns/abstract_class'
+  autoload :DocumentParent,   'mongomodel/concerns/document_parent'
   autoload :ActiveModelCompatibility, 'mongomodel/concerns/activemodel'
   
   autoload :Reference,        'mongomodel/support/reference'

data/lib/mongomodel/attributes/mongo.rb

@@ -21,7 +21,8 @@ module MongoModel
           property = properties_as[k.to_s]
           
           if property
-            self[property.name] = property.from_mongo(v)
+            child = self[property.name] = property.from_mongo(v)
+            child.parent_document = instance if child.respond_to?(:parent_document=)
           else
             self[k.to_sym] = v
           end

data/lib/mongomodel/attributes/typecasting.rb

@@ -3,7 +3,10 @@ module MongoModel
     module Typecasting
       def []=(key, value)
         values_before_typecast[key] = value
-        super(key, typecast(key, value))
+        
+        result = super(key, typecast(key, value))
+        result.parent_document = instance if result.respond_to?(:parent_document=)
+        result
       end
       
       # Check if key has a value that typecasts to true.

data/lib/mongomodel/concerns/attribute_methods/dirty.rb

@@ -16,7 +16,7 @@ module MongoModel
       
       # Wrap write_attribute to remember original attribute value.
       def write_attribute(attr, value)
-        attr = attr.to_sym
+        attr = attr.to_s
           
         # The attribute already has an unsaved change.
         if changed_attributes.include?(attr)

data/lib/mongomodel/concerns/attributes.rb

@@ -56,9 +56,11 @@ module MongoModel
     
     module ClassMethods
       def from_mongo(hash)
-        doc = class_for_type(hash['_type']).new
-        doc.attributes.from_mongo!(hash)
-        doc
+        if hash
+          doc = class_for_type(hash['_type']).new
+          doc.attributes.from_mongo!(hash)
+          doc
+        end
       end
     
     private

data/lib/mongomodel/concerns/callbacks.rb

@@ -286,8 +286,8 @@ module MongoModel
   
   private
     def nest_embedded_callbacks(kind, *args, &block)
-      embedded_documents.inject(block) do |block, doc|
-        Proc.new { doc.run_callbacks(kind, *args, &block) }
+      embedded_documents.inject(block) do |callback, doc|
+        Proc.new { doc.run_callbacks(kind, *args, &callback) }
       end
     end
   end

data/lib/mongomodel/concerns/document_parent.rb

@@ -0,0 +1,13 @@
+module MongoModel
+  module DocumentParent
+    extend ActiveSupport::Concern
+    
+    def parent_document
+      @_parent_document.is_a?(Proc) ? @_parent_document.call(self) : @_parent_document
+    end
+    
+    def parent_document=(doc)
+      @_parent_document = doc
+    end
+  end
+end

data/lib/mongomodel/document/persistence.rb

@@ -10,10 +10,27 @@ module MongoModel
         class_inheritable_writer :collection_name
       end
       
+      # Reload the document from the database. If the document
+      # hasn't been saved, this method will raise an error.
+      def reload
+        reloaded = self.class.unscoped.find(id)
+        
+        attributes.clear
+        attributes.from_mongo!(reloaded.attributes.to_mongo)
+        
+        associations.values.each do |association|
+          association.proxy.reset
+        end
+        
+        self
+      end
+
+      # Save the document to the database. Returns +true+ on success.
       def save
         create_or_update
       end
 
+      # Save the document to the database. Raises a DocumentNotSaved exception if it fails.
       def save!
         create_or_update || raise(DocumentNotSaved)
       end
@@ -23,7 +40,8 @@ module MongoModel
         set_destroyed(true)
         freeze
       end
-      
+
+      # Remove the document from the database.
       def destroy
         delete
       end
@@ -50,6 +68,8 @@ module MongoModel
         self.class.database
       end
       
+      # Generate a new BSON::ObjectID for the record.
+      # Override in subclasses for custom ID generation.
       def generate_id
         ::BSON::ObjectID.new.to_s
       end
@@ -67,7 +87,7 @@ module MongoModel
 
         def from_mongo(document)
           instance = super
-          instance.send(:instantiate, document)
+          instance.send(:instantiate, document) if instance
           instance
         end
         
@@ -109,7 +129,7 @@ module MongoModel
       def update
         save_to_collection
       end
-
+      
       def save_to_collection
         collection.save(to_mongo, :safe => self.class.save_safely?)
         set_new_record(false)

data/lib/mongomodel/document/scopes.rb

@@ -12,7 +12,7 @@ module MongoModel
       
       module ClassMethods
         delegate :find, :first, :last, :all, :exists?, :count, :to => :scoped
-        delegate :delete, :delete_all, :destroy, :destroy_all, :to => :scoped
+        delegate :update, :update_all, :delete, :delete_all, :destroy, :destroy_all, :to => :scoped
         delegate :select, :order, :where, :limit, :offset, :from, :to => :scoped
         
         def unscoped

data/lib/mongomodel/embedded_document.rb

@@ -28,9 +28,11 @@ module MongoModel
     include Timestamps
     include PrettyInspect
     include AbstractClass
+    include DocumentParent
     
     # Allow Collection class to be used in property definitions
     Collection = MongoModel::Collection
+    extend Collection::PropertyDefaults
     
     undef_method :type if method_defined?(:type)
     property :type, String, :as => '_type', :default => lambda { |doc| doc.class.name }, :protected => true

data/lib/mongomodel/support/collection.rb

@@ -1,20 +1,40 @@
 module MongoModel
   class Collection < Array
+    module PropertyDefaults
+      def property(name, *args, &block) #:nodoc:
+        property = super(name, *args, &block)
+        
+        if property.type <= Collection
+          property.options[:default] ||= property.type.new
+        end
+        
+        property
+      end
+    end
+    
     ARRAY_CONVERTER = Types.converter_for(Array)
     
     class_inheritable_accessor :type
     self.type = Object
     
+    include DocumentParent
+    
     def initialize(array=[])
-      super(array.map { |i| convert(i) })
+      super(array.map { |i| convert_for_add(i) })
     end
     
     def []=(index, value)
-      super(index, convert(value))
+      super(index, convert_for_add(value))
     end
     
     def <<(value)
-      super(convert(value))
+      super(convert_for_add(value))
+    end
+    
+    def build (value)
+      value = convert(value)
+      self << value
+      value
     end
     
     def +(other)
@@ -22,7 +42,7 @@ module MongoModel
     end
     
     def concat(values)
-      super(values.map { |v| convert(v) })
+      super(values.map { |v| convert_for_add(v) })
     end
     
     def delete(value)
@@ -38,11 +58,11 @@ module MongoModel
     end
     
     def insert(index, value)
-      super(index, convert(value))
+      super(index, convert_for_add(value))
     end
     
     def push(*values)
-      super(*values.map { |v| convert(v) })
+      super(*values.map { |v| convert_for_add(v) })
     end
     
     def rindex(value)
@@ -50,7 +70,7 @@ module MongoModel
     end
     
     def unshift(*values)
-      super(*values.map { |v| convert(v) })
+      super(*values.map { |v| convert_for_add(v) })
     end
     
     def to_mongo
@@ -69,7 +89,31 @@ module MongoModel
           "Collection[#{type}]"
         end
       end
-    
+      
+      # Create a new MongoModel::Collection class with the type set to the specified class.
+      # This allows you declare arrays of embedded documents like:
+      #
+      #   class Thing < MongoModel::EmbeddedDocument
+      #     property :name, String
+      #   end
+      #   
+      #   class MyModel < MongoModel::Document
+      #     property :things, Collection[Thing]
+      #   end
+      #
+      # If you don't declare a default on a property that has a Collection type, the
+      # default will be automatically set to an empty Collection.
+      #
+      # This method is aliased as #of, so you can use the alternative syntax:
+      #    property :things, Collection.of(Thing)
+      #
+      # Examples:
+      #
+      #   model = MyModel.new
+      #   model.things # => []
+      #   model.things << {:name => "Thing One"}
+      #   model.things # => [#<Thing name: "Thing One">]
+      #   model.things = [{:name => "Thing Two"}] # => [#<Thing name: "Thing Two">]
       def [](type)
         @collection_class_cache ||= {}
         @collection_class_cache[type] ||= begin
@@ -79,6 +123,8 @@ module MongoModel
         end
       end
       
+      alias of []
+      
       def from_mongo(array)
         new(array.map { |i| instantiate(i) })
       end
@@ -102,6 +148,12 @@ module MongoModel
       converter.cast(value)
     end
     
+    def convert_for_add(value)
+      result = convert(value)
+      result.parent_document = lambda { parent_document } if result.respond_to?(:parent_document=)
+      result
+    end
+    
     def converter
       self.class.converter
     end

data/lib/mongomodel/support/scope.rb

@@ -83,6 +83,17 @@ module MongoModel
       reset
     end
     
+    def update_all(updates)
+      selector = MongoOptions.new(klass, :conditions => finder_conditions).selector
+      collection.update(selector, { "$set" => updates }, { :multi => true })
+      reset
+    end
+    
+    def update(ids, updates)
+      where(ids_to_conditions(ids)).update_all(updates)
+      reset
+    end
+    
     def loaded?
       @loaded
     end
@@ -174,7 +185,7 @@ module MongoModel
     end
     
     def ids_to_conditions(ids)
-      ids.flatten!
+      ids = Array.wrap(ids).flatten
       
       if ids.size == 1
         { :id => ids.first.to_s }

data/lib/mongomodel/support/types/time.rb

@@ -5,7 +5,11 @@ module MongoModel
   module Types
     class Time < Object
       def cast(value)
-        value.to_time.utc rescue nil
+        time = value.to_time.utc
+        # BSON only stores time accurate to the millisecond
+        ::Time.at((time.to_f * 1000).floor / 1000.0)
+      rescue
+        nil
       end
     end
   end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/mongomodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomodel}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Pohlenz"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-04-30}
   s.default_executable = %q{console}
   s.description = %q{MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.}
   s.email = %q{sam@sampohlenz.com}
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
      "lib/mongomodel/concerns/attribute_methods/write.rb",
      "lib/mongomodel/concerns/attributes.rb",
      "lib/mongomodel/concerns/callbacks.rb",
+     "lib/mongomodel/concerns/document_parent.rb",
      "lib/mongomodel/concerns/logging.rb",
      "lib/mongomodel/concerns/pretty_inspect.rb",
      "lib/mongomodel/concerns/properties.rb",
@@ -145,8 +146,7 @@ Gem::Specification.new do |s|
      "spec/support/matchers/find_with.rb",
      "spec/support/matchers/respond_to_boolean.rb",
      "spec/support/matchers/run_callbacks.rb",
-     "spec/support/models.rb",
-     "spec/support/time.rb"
+     "spec/support/models.rb"
   ]
   s.homepage = %q{http://github.com/spohlenz/mongomodel}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -202,8 +202,7 @@ Gem::Specification.new do |s|
      "spec/support/matchers/find_with.rb",
      "spec/support/matchers/respond_to_boolean.rb",
      "spec/support/matchers/run_callbacks.rb",
-     "spec/support/models.rb",
-     "spec/support/time.rb"
+     "spec/support/models.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -215,17 +214,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.20.1"])
       s.add_runtime_dependency(%q<bson>, [">= 0.20.1"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.0.0.beta3"])
       s.add_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
       s.add_dependency(%q<mongo>, [">= 0.20.1"])
       s.add_dependency(%q<bson>, [">= 0.20.1"])
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 3.0.0.beta3"])
     s.add_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
     s.add_dependency(%q<mongo>, [">= 0.20.1"])
     s.add_dependency(%q<bson>, [">= 0.20.1"])
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end
 end
 

data/spec/mongomodel/attributes/store_spec.rb

@@ -96,10 +96,10 @@ module MongoModel
           },
         :time =>
           {
-            Time.local(2008, 5, 14, 1, 2, 3, 4) => Time.local(2008, 5, 14, 1, 2, 3, 4),
-            Date.civil(2009, 11, 15)            => Time.local(2009, 11, 15, 0, 0, 0, 0),
-            "Sat Jan 01 20:15:01 UTC 2000"      => Time.utc(2000, 1, 1, 20, 15, 1, 0),
-            "2009/3/4"                          => Time.utc(2009, 3, 4, 0, 0, 0, 0)
+            Time.local(2008, 5, 14, 1, 2, 3, 4) => Time.local(2008, 5, 14, 1, 2, 3, 4, 0),
+            Date.civil(2009, 11, 15)            => Time.local(2009, 11, 15, 0, 0, 0, 0, 0),
+            "Sat Jan 01 20:15:01 UTC 2000"      => Time.utc(2000, 1, 1, 20, 15, 1, 0, 0),
+            "2009/3/4"                          => Time.utc(2009, 3, 4, 0, 0, 0, 0, 0)
           }
       }
     
@@ -216,7 +216,7 @@ module MongoModel
         subject[:hash] = { :foo => 'bar', :custom => CustomClass.new('custom in hash') }
         subject[:array] = [ 123, 'abc', 45.67, true, :bar, CustomClass.new('custom in array') ]
         subject[:date] = Date.civil(2009, 11, 15)
-        subject[:time] = Time.local(2008, 5, 14, 1, 2, 3, 4)
+        subject[:time] = Time.local(2008, 5, 14, 1, 2, 3, 4, 0.5)
         subject[:custom] = CustomClass.new('custom')
         subject[:as] = "As property"
         subject[:non_property] = "Hello World"
@@ -231,7 +231,7 @@ module MongoModel
           'hash' => { :foo => 'bar', :custom => { :name => 'custom in hash' } },
           'array' => [ 123, 'abc', 45.67, true, :bar, { :name => 'custom in array' } ],
           'date' => "2009/11/15",
-          'time' => Time.local(2008, 5, 14, 1, 2, 3, 4),
+          'time' => Time.local(2008, 5, 14, 1, 2, 3, 4, 0),
           'custom' => { :name => 'custom' },
           '_custom_as' => "As property",
           'non_property' => "Hello World",
@@ -249,7 +249,7 @@ module MongoModel
           'hash' => { :foo => 'bar' },
           'array' => [ 123, 'abc', 45.67, true, :bar ],
           'date' => Time.utc(2009, 11, 15),
-          'time' => Time.local(2008, 5, 14, 1, 2, 3, 4),
+          'time' => Time.local(2008, 5, 14, 1, 2, 3, 4, 0.5),
           'custom' => { :name => 'custom' },
           '_custom_as' => "As property",
           'custom_non_property' => { :name => 'custom non property' }
@@ -263,7 +263,7 @@ module MongoModel
         subject[:hash].should == { :foo => 'bar' }.with_indifferent_access
         subject[:array].should == [ 123, 'abc', 45.67, true, :bar ]
         subject[:date].should == Date.civil(2009, 11, 15)
-        subject[:time].should == Time.local(2008, 5, 14, 1, 2, 3, 4)
+        subject[:time].should == Time.local(2008, 5, 14, 1, 2, 3, 4, 0)
         subject[:custom].should == CustomClass.new('custom')
         subject[:as].should == "As property"
         subject[:custom_non_property].should == { :name => 'custom non property' }

data/spec/mongomodel/concerns/attribute_methods/dirty_spec.rb

@@ -31,15 +31,15 @@ module MongoModel
       end
       
       it "should add the old attribute name to the changed attributes" do
-        subject.changed.should include(:foo)
+        subject.changed.should include("foo")
       end
       
       it "should not add other attributes to the changed attributes" do
-        subject.changed.should_not include(:bar)
+        subject.changed.should_not include("bar")
       end
       
       it "should add the changed attribute value to the changes hash" do
-        subject.changes[:foo].should == ['original foo', 'new foo']
+        subject.changes["foo"].should == ['original foo', 'new foo']
       end
       
       context "when called twice" do
@@ -48,7 +48,7 @@ module MongoModel
         end
         
         it "should keep the original value as the old value in the changes hash" do
-          subject.changes[:foo].should == ['original foo', 'new foo #2']
+          subject.changes["foo"].should == ['original foo', 'new foo #2']
         end
       end
     end
@@ -60,6 +60,24 @@ module MongoModel
         end
       
         it { should be_changed }
+        
+        it "should have a changed attribute" do
+          subject.foo_changed?.should == true
+        end
+        
+        it "should tell what the attribute was" do
+          subject.foo_was.should == "original foo"
+        end
+        
+        it "should have an attribute change" do
+          subject.foo_change.should == ["original foo", "foo changed"]
+        end
+        
+        it "should be able to reset an attribute" do
+          subject.reset_foo!
+          subject.foo.should == "original foo"
+          subject.changed?.should == false
+        end
       end
       
       context "attribute set to the original value" do
@@ -68,11 +86,47 @@ module MongoModel
         end
         
         it { should_not be_changed }
+        
+        it "should not have a changed attribute" do
+          subject.foo_changed?.should == false
+        end
+        
+        it "should tell what the attribute was" do
+          subject.foo_was.should == "original foo"
+        end
+        
+        it "should not have an attribute change" do
+          subject.foo_change.should == nil
+        end
+        
+        it "should be able to reset an attribute" do
+          subject.reset_foo!
+          subject.foo.should == "original foo"
+          subject.changed?.should == false
+        end
       end
     end
     
     context "without changed attributes" do
       it { should_not be_changed }
+        
+      it "should not have a changed attribute" do
+        subject.foo_changed?.should == false
+      end
+      
+      it "should tell what the attribute was" do
+        subject.foo_was.should == "original foo"
+      end
+      
+      it "should not have an attribute change" do
+        subject.foo_change.should == nil
+      end
+      
+      it "should be able to reset an attribute" do
+        subject.reset_foo!
+        subject.foo.should == "original foo"
+        subject.changed?.should == false
+      end
     end
     
     context "#original_attributes" do
@@ -82,7 +136,7 @@ module MongoModel
         end
         
         it "should return the attributes before changes" do
-          subject.original_attributes[:foo].should == 'original foo'
+          subject.original_attributes['foo'].should == 'original foo'
         end
       end
       

data/spec/mongomodel/concerns/attributes_spec.rb

@@ -11,7 +11,7 @@ module MongoModel
     Array => [ 1, 2, 3, "hello", :world, [99, 100] ],
     Hash => { :rabbit => 'hat', 'hello' => 12345 }.with_indifferent_access,
     Date => Date.today,
-    Time => Time.now,
+    Time => Types::Time.new.cast(Time.now),
     CustomClass => CustomClass.new('hello')
   }
   

data/spec/mongomodel/concerns/callbacks_spec.rb

@@ -2,6 +2,27 @@ require 'spec_helper'
 
 module MongoModel
   specs_for(EmbeddedDocument) do
+    describe "callbacks on many embedded documents" do
+      define_class(:ChildThingDocument, EmbeddedDocument) do
+        include MongoModel::CallbackHelpers
+        property :name, String
+      end
+      
+      define_class(:ParentDocument, Document) do
+        property :things, Collection[ChildThingDocument]
+      end
+            
+      it "should call callbacks on all embedded documents when adding a new one" do
+        parent = ParentDocument.create!
+        parent.things = Collection[ChildThingDocument].new
+        parent.things << ChildThingDocument.new(:name => "Thing One")
+        parent.save!
+        parent = ParentDocument.find(parent.id)
+        parent.things << ChildThingDocument.new(:name => "Thing Two")
+        parent.save!
+      end
+    end
+    
     describe "callbacks" do
       define_class(:ChildDocument, EmbeddedDocument) do
         include MongoModel::CallbackHelpers

data/spec/mongomodel/concerns/properties_spec.rb

@@ -30,5 +30,27 @@ module MongoModel
       Person.internal_properties.should include(Person.properties[:type])
       Person.internal_properties.should include(Person.properties[:id]) if described_class == Document
     end
+    
+    describe "when used as a property inside a document" do
+      define_class(:Factory, Document) do
+        property :manager, Person
+      end
+      
+      let(:person) { SkilledPerson.new(:name => "Joe", :age => 44, :skill => "Management") }
+      let(:with_manager) { Factory.create!(:manager => person) }
+      let(:without_manager) { Factory.create! }
+      
+      it "should load correctly when property is set" do
+        factory = Factory.find(with_manager.id)
+        factory.manager.should be_an_instance_of(SkilledPerson)
+        factory.manager.name.should == "Joe"
+        factory.manager.skill.should == "Management"
+      end
+      
+      it "should load correctly when property is nil" do
+        factory = Factory.find(without_manager.id)
+        factory.manager.should be_nil
+      end
+    end
   end
 end

data/spec/mongomodel/concerns/timestamps_spec.rb

@@ -38,7 +38,7 @@ module MongoModel
       subject { TestDocument.new }
       
       before(:each) do
-        @now = Time.now.utc
+        @now = Types::Time.new.cast(Time.now)
         Time.stub!(:now).and_return(@now)
       end
       
@@ -91,7 +91,7 @@ module MongoModel
       subject { TestDocument.new }
       
       before(:each) do
-        @now = Time.now.utc
+        @now = Types::Time.new.cast(Time.now)
         Time.stub!(:now).and_return(@now)
       end
       

data/spec/mongomodel/document/persistence_spec.rb

@@ -300,6 +300,38 @@ module MongoModel
           user.should_not be_a_new_record
         end
       end
+      
+      describe "#reload" do
+        define_class(:UserComment, Document) do
+          property :title, String
+          property :body, String
+          
+          belongs_to :user
+        end
+        
+        let(:user) { User.create!(:name => "Bob") }
+        
+        subject { UserComment.create!(:title => "Test", :user => user) }
+        
+        it "should return itself" do
+          subject.reload.should == subject
+        end
+        
+        it "should reset the attributes" do
+          subject.title = "New Value"
+          subject.body = "Blah blah blah"
+          subject.reload
+          subject.title.should == "Test"
+          subject.body.should == nil
+        end
+        
+        it "should reset the associations" do
+          subject.user.should == user
+          subject.user = User.new(:name => "Bill")
+          subject.reload
+          subject.user.should == user
+        end
+      end
     end
   end
 end

data/spec/mongomodel/embedded_document_spec.rb

@@ -41,19 +41,20 @@ module MongoModel
   end
   
   specs_for(EmbeddedDocument) do
+    define_class(:Event, EmbeddedDocument)
+    define_class(:SpecialEvent, :Event)
+    
+    define_class(:Parent, Document) do
+      property :event, Event
+      property :events, Collection[Event], :default => []
+    end
+    
+    let(:event) { Event.new }
+    let(:special) { SpecialEvent.new }
+    let(:parent) { Parent.new(:event => special) }
+    let(:reloaded) { parent.save!; Parent.find(parent.id) }
+    
     describe "single collection inheritance" do
-      define_class(:Event, EmbeddedDocument)
-      define_class(:SpecialEvent, :Event)
-      
-      define_class(:Parent, Document) do
-        property :event, Event
-      end
-      
-      let(:event) { Event.new }
-      let(:special) { SpecialEvent.new }
-      let(:parent) { Parent.new(:event => special) }
-      let(:reloaded) { parent.save!; Parent.find(parent.id) }
-      
       it "should not typecast to parent type when assigning to property" do
         parent.event.should be_an_instance_of(SpecialEvent)
       end
@@ -62,5 +63,33 @@ module MongoModel
         reloaded.event.should be_an_instance_of(SpecialEvent)
       end
     end
+    
+    describe "parent document" do
+      context "on an embedded document" do
+        it "should set the parent document on the embedded document" do
+          parent.event.parent_document.should == parent
+        end
+      
+        it "should set the parent document on the embedded document when loaded from database" do
+          reloaded.event.parent_document.should == reloaded
+        end
+      end
+      
+      context "on a collection" do
+        it "should set the parent document on the collection" do
+          parent.events.parent_document.should == parent
+        end
+      
+        it "should set the parent document on each item added to a collection" do
+          parent.events << special
+          parent.events.first.parent_document.should == parent
+        end
+      
+        it "should set the parent document on each item in a collection when loaded from database" do
+          parent.events << special
+          reloaded.events.first.parent_document.should == parent
+        end
+      end
+    end
   end
 end

data/spec/mongomodel/support/collection_spec.rb

@@ -234,8 +234,14 @@ module MongoModel
       let(:embedded2) { Embedded.new(:number => 2) }
       let(:embedded3) { Embedded.new(:number => 3) }
       
+      let(:empty) { TestDocument.new }
       subject { TestDocument.new(:embedded => embedded1, :embedded_collection => [embedded2, embedded3]) }
       
+      it "should default to an empty collection" do
+        empty.embedded_collection.should be_an_instance_of(Collection[Embedded])
+        empty.embedded_collection.should be_empty
+      end
+      
       it "should include the embedded properties in the embedded documents list" do
         subject.embedded_documents.should include(embedded1)
       end

data/spec/mongomodel/support/scope_spec.rb

@@ -611,6 +611,55 @@ module MongoModel
           end
         end
       end
+      
+      describe "#update_all" do
+        it "should update all matching documents" do
+          model.should_update(finder_conditions, { :name => "New name" })
+          subject.update_all(:name => "New name")
+        end
+        
+        subject_loaded do
+          it "should reset the scope" do
+            subject.update_all(:name => "New name")
+            subject.should_not be_loaded
+          end
+        end
+      end
+      
+      describe "#update" do
+        context "by single id" do
+          let(:post) { posts.first }
+          
+          it "should update the document with the given id" do
+            model.should_update(finder_conditions.merge(:id => post.id), { :name => "New name" })
+            subject.update(post.id, :name => "New name")
+          end
+          
+          subject_loaded do
+            it "should reset the scope" do
+              subject.update(post.id, {})
+              subject.should_not be_loaded
+            end
+          end
+        end
+        
+        context "by multiple ids" do
+          let(:post1) { posts.first }
+          let(:post2) { posts.last }
+          
+          it "should update the documents with the given ids" do
+            model.should_update(finder_conditions.merge(:id.in => [post1.id, post2.id]), { :name => "New name" })
+            subject.update([post1.id, post2.id], :name => "New name")
+          end
+          
+          subject_loaded do
+            it "should reset the scope" do
+              subject.update([post1.id, post2.id], {})
+              subject.should_not be_loaded
+            end
+          end
+        end
+      end
     end
     
     

data/spec/spec.opts

@@ -3,4 +3,5 @@
 progress
 --loadby
 mtime
---reverse
+--reverse
+--backtrace

data/spec/support/helpers/document_finder_stubs.rb

@@ -41,4 +41,10 @@ module DocumentFinderStubs
     collection.should_receive(:remove).once.with(selector)
     yield if block_given?
   end
+  
+  def should_update(conditions={}, updates={})
+    selector, options = MongoModel::MongoOptions.new(self, :conditions => conditions).to_a
+    collection.should_receive(:update).once.with(selector, { "$set" => updates }, { :multi => true })
+    yield if block_given?
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 +09:30
+date: 2010-04-30 00:00:00 +09:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,20 @@ dependencies:
         version: 0.20.1
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id005
 description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.
 email: sam@sampohlenz.com
 executables: 
@@ -113,6 +127,7 @@ files:
 - lib/mongomodel/concerns/attribute_methods/write.rb
 - lib/mongomodel/concerns/attributes.rb
 - lib/mongomodel/concerns/callbacks.rb
+- lib/mongomodel/concerns/document_parent.rb
 - lib/mongomodel/concerns/logging.rb
 - lib/mongomodel/concerns/pretty_inspect.rb
 - lib/mongomodel/concerns/properties.rb
@@ -212,7 +227,6 @@ files:
 - spec/support/matchers/respond_to_boolean.rb
 - spec/support/matchers/run_callbacks.rb
 - spec/support/models.rb
-- spec/support/time.rb
 has_rdoc: true
 homepage: http://github.com/spohlenz/mongomodel
 licenses: []
@@ -293,4 +307,3 @@ test_files:
 - spec/support/matchers/respond_to_boolean.rb
 - spec/support/matchers/run_callbacks.rb
 - spec/support/models.rb
-- spec/support/time.rb

data/spec/support/time.rb

@@ -1,6 +0,0 @@
-# For the purposes of tests, we ignore fractions of a second when comparing Time objects
-class Time
-  def ==(other)
-    super(other) || utc.to_s == other.utc.to_s if other
-  end
-end