mongomodel 0.4.1 → 0.4.2

data/Appraisals

@@ -1,8 +1,3 @@
-appraise "rails-3.0" do
-  gem "activesupport", "3.0.10"
-  gem "activemodel", "3.0.10"
-end
-
 appraise "rails-3.1" do
   gem "activesupport", "3.1.0"
   gem "activemodel", "3.1.0"

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})    { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb') { "spec" }
+end

data/gemfiles/rails-3.1.gemfile.lock

@@ -1,9 +1,9 @@
 PATH
-  remote: /Users/sam/Scratch/mongomodel
+  remote: /Users/sam/Development/MongoDB/mongomodel
   specs:
-    mongomodel (0.4.0)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
+    mongomodel (0.4.1)
+      activemodel (~> 3.1)
+      activesupport (~> 3.1)
       mongo (~> 1.4)
       will_paginate (~> 2.3.15)
 
@@ -25,6 +25,10 @@ GEM
     bson_ext (1.4.0)
     builder (3.0.0)
     diff-lcs (1.1.3)
+    guard (0.8.6)
+      thor (~> 0.14.6)
+    guard-rspec (0.5.0)
+      guard (>= 0.8.4)
     i18n (0.6.0)
     mongo (1.4.0)
       bson (= 1.4.0)
@@ -38,6 +42,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    thor (0.14.6)
     tzinfo (0.3.29)
     will_paginate (2.3.16)
 
@@ -50,6 +55,7 @@ DEPENDENCIES
   appraisal (~> 0.3.6)
   bson_ext (~> 1.4)
   bundler (>= 1.0.0)
+  guard-rspec (~> 0.5.0)
   mongomodel!
   rspec (~> 2.6.0)
   tzinfo

data/gemfiles/rails-edge.gemfile.lock

@@ -12,11 +12,11 @@ GIT
       multi_json (~> 1.0)
 
 PATH
-  remote: /Users/sam/Scratch/mongomodel
+  remote: /Users/sam/Development/MongoDB/mongomodel
   specs:
-    mongomodel (0.4.0)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
+    mongomodel (0.4.1)
+      activemodel (~> 3.1)
+      activesupport (~> 3.1)
       mongo (~> 1.4)
       will_paginate (~> 2.3.15)
 
@@ -31,6 +31,10 @@ GEM
     bson_ext (1.4.0)
     builder (3.0.0)
     diff-lcs (1.1.2)
+    guard (0.8.6)
+      thor (~> 0.14.6)
+    guard-rspec (0.5.0)
+      guard (>= 0.8.4)
     i18n (0.6.0)
     mongo (1.4.0)
       bson (= 1.4.0)
@@ -44,6 +48,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    thor (0.14.6)
     tzinfo (0.3.29)
     will_paginate (2.3.16)
 
@@ -56,6 +61,7 @@ DEPENDENCIES
   appraisal (~> 0.3.6)
   bson_ext (~> 1.4)
   bundler (>= 1.0.0)
+  guard-rspec (~> 0.5.0)
   mongomodel!
   rspec (~> 2.6.0)
   tzinfo

data/lib/mongomodel.rb

@@ -51,6 +51,7 @@ module MongoModel
     autoload :BeforeTypeCast, 'mongomodel/concerns/attribute_methods/before_type_cast'
     autoload :Protected,      'mongomodel/concerns/attribute_methods/protected'
     autoload :Dirty,          'mongomodel/concerns/attribute_methods/dirty'
+    autoload :Nested,         'mongomodel/concerns/attribute_methods/nested'
     autoload :MultiParameterAssignment, 'mongomodel/concerns/attribute_methods/multi_parameter_assignment'
   end
   

data/lib/mongomodel/concerns/associations/base/definition.rb

@@ -38,6 +38,10 @@ module MongoModel
           options[:polymorphic]
         end
         
+        def collection?
+          true
+        end
+        
         def scope
           klass.scoped.apply_finder_options(scope_options)
         end

data/lib/mongomodel/concerns/associations/belongs_to.rb

@@ -9,6 +9,10 @@ module MongoModel
         @type_key ||= :"#{name}_type"
       end
       
+      def collection?
+        false
+      end
+      
       properties do |association|
         property association.foreign_key, MongoModel::Reference, :internal => true
         property association.type_key, String, :internal => true if association.polymorphic?

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

@@ -0,0 +1,103 @@
+module MongoModel
+  module AttributeMethods
+    module Nested
+      extend ActiveSupport::Concern
+      
+      included do
+        class_attribute :nested_attributes_options, :instance_writer => false
+        self.nested_attributes_options = {}
+      end
+      
+      module ClassMethods
+        def accepts_nested_attributes_for(*attr_names)
+          options = attr_names.extract_options!
+          
+          attr_names.each do |attr_name|
+            type = property_type(attr_name)
+            
+            nested_attributes_options = self.nested_attributes_options.dup
+            nested_attributes_options[attr_name.to_sym] = options
+            self.nested_attributes_options = nested_attributes_options
+            
+            class_eval <<-EORUBY, __FILE__, __LINE__ + 1
+              if method_defined?(:#{attr_name}_attributes=)
+                remove_method(:#{attr_name}_attributes=)
+              end
+              
+              def #{attr_name}_attributes=(attributes)
+                assign_nested_attributes_for_#{type}(:#{attr_name}, attributes)
+              end
+            EORUBY
+          end
+        end
+      
+      private
+        def property_type(attr_name)
+          if property = properties[attr_name]
+            property.type <= Array ? :collection : :property
+          elsif association = associations[attr_name]
+            association.collection? ? :association_collection : :association
+          end
+        end
+      end
+    
+    private
+      def assign_nested_attributes_for_property(property, attributes)
+        if obj = send(property)
+          obj.attributes = attributes
+        else
+          send("#{property}=", attributes)
+        end
+      end
+      
+      def assign_nested_attributes_for_collection(property, attributes_collection)
+        attributes_collection = convert_to_array(attributes_collection)
+        options = self.nested_attributes_options[property]
+        
+        if options[:limit] && attributes_collection.size > options[:limit]
+          raise TooManyDocuments, "Maximum #{options[:limit]} documents are allowed. Got #{attributes_collection.size} documents instead."
+        end
+        
+        collection = send(property)
+        attributes_collection.each_with_index do |attributes, index|
+          if collection[index]
+            collection[index].attributes = attributes
+          else
+            collection[index] = attributes
+          end
+        end
+      end
+      
+      def assign_nested_attributes_for_association(association, attributes)
+        if obj = send(association)
+          obj.attributes = attributes
+        else
+          send("build_#{association}", attributes)
+        end
+      end
+      
+      def assign_nested_attributes_for_association_collection(association, attributes_collection)
+        attributes_collection = convert_to_array(attributes_collection)
+        options = self.nested_attributes_options[association]
+        
+        if options[:limit] && attributes_collection.size > options[:limit]
+          raise TooManyDocuments, "Maximum #{options[:limit]} documents are allowed. Got #{attributes_collection.size} documents instead."
+        end
+        
+        association = send(association)
+        attributes_collection.each do |attributes|
+          association.build(attributes)
+        end
+      end
+      
+      def convert_to_array(params)
+        case params
+        when Hash
+          params.sort.map(&:last)
+        else
+          Array(params)
+        end
+      end
+    end
+  end
+end

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

@@ -16,8 +16,12 @@ module MongoModel
         end
       end
       
-      def attributes=(attrs)#:nodoc:
-        super(sanitize_for_mass_assignment(attrs))
+      def assign_attributes(attrs, options={})
+        if options[:without_protection]
+          super
+        else
+          super(sanitize_for_mass_assignment(attrs, options[:as] || :default))
+        end
       end
     end
   end

data/lib/mongomodel/concerns/attributes.rb

@@ -13,7 +13,9 @@ module MongoModel
       @attributes ||= Attributes::Store.new(self)
     end
     
-    def attributes=(attrs)
+    def assign_attributes(attrs, options={})
+      return unless attrs
+      
       attrs.each do |attr, value|
         if respond_to?("#{attr}=")
           send("#{attr}=", value)
@@ -23,6 +25,10 @@ module MongoModel
       end
     end
     
+    def attributes=(attrs)
+      assign_attributes(attrs)
+    end
+    
     def freeze
       attributes.freeze; self
     end

data/lib/mongomodel/concerns/validations.rb

@@ -17,12 +17,8 @@ module MongoModel
     end
     
     def valid?(context=nil)
-      errors.clear
-      
-      self.validation_context = new_record? ? :create : :update
-      run_callbacks(:validate)
-      
-      errors.empty?
+      context ||= new_record? ? :create : :update
+      super
     end
   end
 end

data/lib/mongomodel/concerns/validations/associated.rb

@@ -1,5 +1,12 @@
 module MongoModel
   module Validations
+    class AssociatedValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if Array(value).map { |r| r.nil? || r.valid?(record.validation_context) }.all?
+        record.errors.add(attribute, :invalid, options.merge(:value => value))
+      end
+    end
+    
     module ClassMethods
       # Validates whether the associated object or objects are all valid themselves. Works with any kind of association.
       #
@@ -33,13 +40,7 @@ module MongoModel
       #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).  The
       #   method, proc or string should return or evaluate to a true or false value.
       def validates_associated(*attr_names)
-        configuration = attr_names.extract_options!
-
-        validates_each(attr_names, configuration) do |record, attr_name, value|
-          unless (value.is_a?(Array) ? value : [value]).collect { |r| r.nil? || r.valid? }.all?
-            record.errors.add(attr_name, :invalid, :default => configuration[:message], :value => value)
-          end
-        end
+        validates_with AssociatedValidator, _merge_attributes(attr_names)
       end
     end
   end

data/lib/mongomodel/document/persistence.rb

@@ -24,12 +24,12 @@ module MongoModel
       end
 
       # Save the document to the database. Returns +true+ on success.
-      def save
+      def save(*)
         create_or_update
       end
 
       # Save the document to the database. Raises a DocumentNotSaved exception if it fails.
-      def save!
+      def save!(*)
         create_or_update || raise(DocumentNotSaved)
       end
       
@@ -46,16 +46,28 @@ module MongoModel
       
       # Updates all the attributes from the passed-in Hash and saves the document.
       # If the object is invalid, the saving will fail and false will be returned.
-      def update_attributes(attributes)
-        self.attributes = attributes
+      #
+      # When updating model attributes, mass-assignment security protection is respected.
+      # If no +:as+ option is supplied then the +:default+ role will be used.
+      # If you want to bypass the protection given by +attr_protected+ and
+      # +attr_accessible+ then you can do so using the +:without_protection+ option.
+      def update_attributes(attributes, options={})
+        self.assign_attributes(attributes, options)
         save
       end
       
+      # Updates its receiver just like +update_attributes+ but calls <tt>save!</tt> instead
+      # of +save+, so an exception is raised if the docuemnt is invalid.
+      def update_attributes!(attributes, options={})
+        self.assign_attributes(attributes, options)
+        save!
+      end
+      
       # Updates a single attribute and saves the document without going through the normal validation procedure.
       # This is especially useful for boolean flags on existing documents.
       def update_attribute(name, value)
         send("#{name}=", value)
-        save(false)
+        save(:validate => false)
       end
       
       def collection

data/lib/mongomodel/document/validations.rb

@@ -2,12 +2,7 @@ module MongoModel
   module DocumentExtensions
     module Validations
       extend ActiveSupport::Concern
-      
-      included do
-        alias_method_chain :save, :validation
-        alias_method_chain :save!, :validation
-      end
-    
+
       module ClassMethods
         def property(name, *args, &block) #:nodoc:
           property = super
@@ -30,12 +25,12 @@ module MongoModel
         end
       end
     
-      # The validation process on save can be skipped by passing false. The regular Document#save method is
+      # The validation process on save can be skipped by passing <tt>:validate => false</tt>. The regular Document#save method is
       # replaced with this when the validations module is mixed in, which it is by default.
-      def save_with_validation(perform_validation = true)
-        if perform_validation && valid? || !perform_validation
+      def save(options={})
+        if perform_validation(options)
           begin
-            save_without_validation
+            super
           rescue DocumentNotSaved
             valid?
             false
@@ -47,17 +42,23 @@ module MongoModel
     
       # Attempts to save the document just like Document#save but will raise a DocumentInvalid exception
       # instead of returning false if the document is not valid.
-      def save_with_validation!
-        if valid?
+      def save!(options={})
+        if perform_validation(options)
           begin
-            save_without_validation!
+            super
           rescue DocumentNotSaved => e
-            raise valid? ? e : DocumentInvalid.new(self)
+            valid? ? raise : raise(DocumentInvalid.new(self))
           end
         else
           raise DocumentInvalid.new(self)
         end
       end
+    
+    protected
+      def perform_validation(options={})
+        perform_validation = options != false && options[:validate] != false
+        perform_validation ? valid?(options[:context]) : true
+      end
     end
   end
 end

data/lib/mongomodel/embedded_document.rb

@@ -20,6 +20,7 @@ module MongoModel
     include AttributeMethods::BeforeTypeCast
     include AttributeMethods::Protected
     include AttributeMethods::Dirty
+    include AttributeMethods::Nested
     include AttributeMethods::MultiParameterAssignment
     
     include Logging

data/lib/mongomodel/support/collection.rb

@@ -119,7 +119,7 @@ module MongoModel
       def [](type)
         @collection_class_cache ||= {}
         @collection_class_cache[type] ||= begin
-          collection = Class.new(Collection)
+          collection = Class.new(self)
           collection.type = type
           collection
         end
@@ -127,8 +127,25 @@ module MongoModel
       
       alias of []
       
-      def from_mongo(array)
-        new(array.map { |i| instantiate(i) })
+      def cast(value)
+        case value
+        when Array
+          new(value)
+        when Hash
+          value.stringify_keys!
+          value['_collection'] ? cast(value['items']) : new([value])
+        else
+          new(Array(value))
+        end
+      end
+      
+      def from_mongo(value)
+        case value
+        when Array
+          new(value.map { |i| instantiate(i) })
+        else
+          from_mongo([value])
+        end
       end
     
       def converter

data/lib/mongomodel/support/configuration.rb

@@ -8,23 +8,23 @@ module MongoModel
     end
     
     def host
-      @options['host']
+      options['host']
     end
     
     def port
-      @options['port']
+      options['port']
     end
     
     def database
-      @options['database']
+      options['database']
     end
     
     def username
-      @options['username']
+      options['username']
     end
     
     def password
-      @options['password']
+      options['password']
     end
     
     def establish_connection
@@ -35,12 +35,16 @@ module MongoModel
     end
     
     def use_database(database)
-      @options['database'] = database
+      options['database'] = database
       establish_connection
     end
     
     def connection_options
-      @options.except('host', 'port', 'database', 'username', 'password').symbolize_keys
+      options.except('host', 'port', 'database', 'username', 'password').symbolize_keys
+    end
+    
+    def options
+      @options ||= {}
     end
     
     def set_options!(options)

data/lib/mongomodel/support/exceptions.rb

@@ -22,4 +22,6 @@ module MongoModel
   end
   
   class AssociationTypeMismatch < StandardError; end
+  
+  class TooManyDocuments < StandardError; end
 end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/mongomodel.gemspec

@@ -14,13 +14,14 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "mongomodel"
   
-  s.add_dependency "activesupport", "~> 3.0"
-  s.add_dependency "activemodel",   "~> 3.0"
+  s.add_dependency "activesupport", "~> 3.1"
+  s.add_dependency "activemodel",   "~> 3.1"
   s.add_dependency "mongo",         "~> 1.4"
   s.add_dependency "will_paginate", "~> 2.3.15"
 
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rspec",   "~> 2.6.0"
+  s.add_development_dependency "bundler",     ">= 1.0.0"
+  s.add_development_dependency "rspec",       "~> 2.6.0"
+  s.add_development_dependency "guard-rspec", "~> 0.5.0"
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'

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

@@ -0,0 +1,180 @@
+require 'spec_helper'
+
+module MongoModel
+  specs_for(Document, EmbeddedDocument) do
+    def self.define_user(type)
+      define_class(:User, type) do
+        property :name, String
+        property :age, Integer
+      end
+    end
+    
+    describe ".accepts_nested_attributes_for" do
+      describe "single embedded property" do
+        define_user(EmbeddedDocument)
+        define_class(:Account, described_class) do
+          property :owner, User
+          accepts_nested_attributes_for :owner
+        end
+        
+        subject { Account.new }
+        
+        it "creates new model when property is blank" do
+          subject.owner_attributes = { :name => "John Smith", :age => 35 }
+          subject.owner.name.should == "John Smith"
+          subject.owner.age.should == 35
+        end
+        
+        it "sets existing model attributes when property exists" do
+          subject.owner = User.new(:name => "Jane Doe")
+          subject.owner_attributes = { :age => 22 }
+          subject.owner.name.should == "Jane Doe"
+          subject.owner.age.should == 22
+        end
+      end
+      
+      describe "embedded collection" do
+        define_user(EmbeddedDocument)
+        define_class(:Account, described_class) do
+          property :owners, Collection[User]
+          accepts_nested_attributes_for :owners
+        end
+        
+        subject { Account.new }
+        
+        it "accepts an array of hashes" do
+          subject.owners_attributes = [
+            { :name => "Fred", :age => 35 },
+            { :name => "Mary", :age => 22 }
+          ]
+          
+          subject.owners[0].name.should == "Fred"
+          subject.owners[0].age.should == 35
+          subject.owners[1].name.should == "Mary"
+          subject.owners[1].age.should == 22
+        end
+        
+        it "accepts a hash keyed by indexes" do
+          subject.owners_attributes = {
+            "1" => { :name => "Joe", :age => 15 },
+            "0" => { :name => "Peter", :age => 44 }
+          }
+          
+          subject.owners[0].name.should == "Peter"
+          subject.owners[0].age.should == 44
+          subject.owners[1].name.should == "Joe"
+          subject.owners[1].age.should == 15
+        end
+        
+        it "modifies existing collection" do
+          subject.owners << User.new(:name => "John")
+          subject.owners_attributes = [
+            { :age => 18 },
+            { :name => "Max", :age => 10 }
+          ]
+          
+          subject.owners[0].name.should == "John"
+          subject.owners[0].age.should == 18
+          subject.owners[1].name.should == "Max"
+          subject.owners[1].age.should == 10
+        end
+      end
+      
+      describe "embedded collection with limit" do
+        define_user(EmbeddedDocument)
+        define_class(:Account, described_class) do
+          property :owners, Collection[User]
+          accepts_nested_attributes_for :owners, :limit => 2
+        end
+        
+        subject { Account.new }
+        
+        it "raises a TooManyDocuments error if number of documents exceeds limit" do
+          lambda {
+            subject.owners_attributes = [{}, {}, {}]
+          }.should raise_error(MongoModel::TooManyDocuments, "Maximum 2 documents are allowed. Got 3 documents instead.")
+        end
+      end
+      
+      describe "belongs_to association" do
+        define_user(Document)
+        define_class(:Account, described_class) do
+          belongs_to :owner, :class => User
+          accepts_nested_attributes_for :owner
+        end
+
+        subject { Account.new }
+
+        it "creates new model when property is blank" do
+          subject.owner_attributes = { :name => "John Smith", :age => 35 }
+          subject.owner.name.should == "John Smith"
+          subject.owner.age.should == 35
+        end
+
+        it "sets existing model attributes when property exists" do
+          subject.owner = User.new(:name => "Jane Doe")
+          subject.owner_attributes = { :age => 22 }
+          subject.owner.name.should == "Jane Doe"
+          subject.owner.age.should == 22
+        end
+      end
+    end
+  end
+  
+  specs_for(Document) do
+    define_class(:User, Document) do
+      property :name, String
+      property :age, Integer
+    end
+    
+    describe ".accepts_nested_attributes_for" do
+      describe "has_many association" do
+        define_class(:Account, described_class) do
+          has_many :owners, :class => User
+          accepts_nested_attributes_for :owners
+        end
+        
+        subject { Account.new }
+        
+        it "accepts an array of hashes" do
+          subject.owners_attributes = [
+            { :name => "Fred", :age => 35 },
+            { :name => "Mary", :age => 22 }
+          ]
+          
+          subject.owners[0].name.should == "Fred"
+          subject.owners[0].age.should == 35
+          subject.owners[1].name.should == "Mary"
+          subject.owners[1].age.should == 22
+        end
+        
+        it "accepts a hash keyed by indexes" do
+          subject.owners_attributes = {
+            "1" => { :name => "Joe", :age => 15 },
+            "0" => { :name => "Peter", :age => 44 }
+          }
+          
+          subject.owners[0].name.should == "Peter"
+          subject.owners[0].age.should == 44
+          subject.owners[1].name.should == "Joe"
+          subject.owners[1].age.should == 15
+        end
+      end
+      
+      describe "has_many association with limit" do
+        define_class(:Account, described_class) do
+          has_many :owners, :class => User
+          accepts_nested_attributes_for :owners, :limit => 2
+        end
+        
+        subject { Account.new }
+        
+        it "raises a TooManyDocuments error if number of documents exceeds limit" do
+          lambda {
+            subject.owners_attributes = [{}, {}, {}]
+          }.should raise_error(MongoModel::TooManyDocuments, "Maximum 2 documents are allowed. Got 3 documents instead.")
+        end
+      end
+    end
+  end
+end

data/spec/mongomodel/concerns/validations_spec.rb

@@ -1,19 +1,13 @@
 require 'spec_helper'
 
 module MongoModel
-  module ValidationHelpers
-    def clear_validations! 
-      reset_callbacks(:validate)
-    end
-  end
-  
   specs_for(Document, EmbeddedDocument) do
     describe "validations" do
       define_class(:TestDocument, described_class) do
         property :title, String
         validates_presence_of :title
         
-        extend MongoModel::ValidationHelpers
+        extend ValidationHelpers
       end
       
       if specing?(EmbeddedDocument)
@@ -84,6 +78,19 @@ module MongoModel
           it { should_not be_valid }
         end
       end
+      
+      describe "validation on custom context" do
+        before(:each) do
+          TestDocument.clear_validations!
+          TestDocument.validates_presence_of :title, :on => :custom
+        end
+        
+        it { should be_valid }
+        
+        it "should not be valid in custom context" do
+          subject.valid?(:custom).should be_false
+        end
+      end
     end
     
     describe "validation shortcuts" do
@@ -111,7 +118,7 @@ module MongoModel
         property :title, String
         validates_presence_of :title
       
-        extend MongoModel::ValidationHelpers
+        extend ValidationHelpers
       end
     
       define_class(:ParentDocument, Document) do

data/spec/mongomodel/document/validations_spec.rb

@@ -6,6 +6,8 @@ module MongoModel
       define_class(:TestDocument, Document) do
         property :title, String
         validates_presence_of :title
+        
+        extend ValidationHelpers
       end
 
       context "when validations are not met" do
@@ -27,19 +29,50 @@ module MongoModel
           end
         end
     
-        describe "#save(false)" do
+        shared_examples_for "saving without validation" do
           it "should not validate the document" do
             subject.should_not_receive(:valid?)
-            subject.save(false)
+            save
           end
 
           it "should save the document" do
-            subject.should_receive(:save_without_validation).and_return(true)
-            subject.save(false)
+            subject.should_receive(:create_or_update).and_return(true)
+            save
           end
 
           it "should return true" do
-            subject.save(false).should be_true
+            save.should be_true
+          end
+        end
+    
+        describe "#save(false) [deprecated save without validations]" do
+          def save
+            subject.save(false)
+          end
+          
+          it_should_behave_like "saving without validation"
+        end
+        
+        describe "#save(:validate => false)" do
+          def save
+             subject.save(:validate => false)
+           end
+          
+          it_should_behave_like "saving without validation"
+        end
+        
+        describe "#save(:context => :custom)" do
+          before(:each) do
+            TestDocument.clear_validations!
+            TestDocument.validates_presence_of :title, :on => :custom
+          end
+          
+          it "should save in default context" do
+            subject.save.should be_true
+          end
+          
+          it "should not save in custom context" do
+            subject.save(:context => :custom).should be_false
           end
         end
       end

data/spec/mongomodel/support/collection_spec.rb

@@ -194,6 +194,12 @@ module MongoModel
         collection.should be_a(subject)
         collection.should == [CustomClass.new("abc"), CustomClass.new("123")]
       end
+      
+      it "should load from mongo representation of single item" do
+        collection = subject.from_mongo({ :name => "abc" })
+        collection.should be_a(subject)
+        collection.should == [CustomClass.new("abc")]
+      end
     end
   end
   
@@ -249,6 +255,21 @@ module MongoModel
       it "should include the elements in the collection in the embedded documents list" do
         subject.embedded_documents.should include(embedded2, embedded3)
       end
+      
+      it "should cast items to embedded document class when assigning array of hashes" do
+        subject.embedded_collection = [ { :number => 5 }, { :number => 99 } ]
+        subject.embedded_collection.should == [ Embedded.new(:number => 5), Embedded.new(:number => 99) ]
+      end
+      
+      it "should cast items to embedded document class when assigning collection hash" do
+        subject.embedded_collection = { :_collection => true, :items => [ { :number => 49 }, { :number => 64 } ] }
+        subject.embedded_collection.should == [ Embedded.new(:number => 49), Embedded.new(:number => 64) ]
+      end
+      
+      it "should cast item to embedded document class when assigning attributes hash" do
+        subject.embedded_collection = { :number => 8 }
+        subject.embedded_collection.should == [ Embedded.new(:number => 8) ]
+      end
     end
   end
 end

data/spec/support/helpers/validations.rb

@@ -0,0 +1,5 @@
+module ValidationHelpers
+  def clear_validations! 
+    reset_callbacks(:validate)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongomodel
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-26 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156338320 !ruby/object:Gem::Requirement
+  requirement: &70171471424760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156338320
+  version_requirements: *70171471424760
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2156336540 !ruby/object:Gem::Requirement
+  requirement: &70171471423920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156336540
+  version_requirements: *70171471423920
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2156334360 !ruby/object:Gem::Requirement
+  requirement: &70171471423300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2156334360
+  version_requirements: *70171471423300
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &2156331960 !ruby/object:Gem::Requirement
+  requirement: &70171471422520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.15
   type: :runtime
   prerelease: false
-  version_requirements: *2156331960
+  version_requirements: *70171471422520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156329880 !ruby/object:Gem::Requirement
+  requirement: &70171471421740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156329880
+  version_requirements: *70171471421740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156294220 !ruby/object:Gem::Requirement
+  requirement: &70171471420620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,18 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156294220
+  version_requirements: *70171471420620
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70171471419380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: *70171471419380
 description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and
   DataMapper.
 email:
@@ -88,13 +99,11 @@ files:
 - .gitignore
 - Appraisals
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
-- autotest/discover.rb
 - bin/console
-- gemfiles/rails-3.0.gemfile
-- gemfiles/rails-3.0.gemfile.lock
 - gemfiles/rails-3.1-edge.gemfile
 - gemfiles/rails-3.1-edge.gemfile.lock
 - gemfiles/rails-3.1-latest.gemfile
@@ -120,6 +129,7 @@ files:
 - lib/mongomodel/concerns/attribute_methods/before_type_cast.rb
 - lib/mongomodel/concerns/attribute_methods/dirty.rb
 - lib/mongomodel/concerns/attribute_methods/multi_parameter_assignment.rb
+- lib/mongomodel/concerns/attribute_methods/nested.rb
 - lib/mongomodel/concerns/attribute_methods/protected.rb
 - lib/mongomodel/concerns/attribute_methods/query.rb
 - lib/mongomodel/concerns/attribute_methods/read.rb
@@ -200,6 +210,7 @@ files:
 - spec/mongomodel/concerns/attribute_methods/before_type_cast_spec.rb
 - spec/mongomodel/concerns/attribute_methods/dirty_spec.rb
 - spec/mongomodel/concerns/attribute_methods/multi_parameter_assignment_spec.rb
+- spec/mongomodel/concerns/attribute_methods/nested_spec.rb
 - spec/mongomodel/concerns/attribute_methods/protected_spec.rb
 - spec/mongomodel/concerns/attribute_methods/query_spec.rb
 - spec/mongomodel/concerns/attribute_methods/read_spec.rb
@@ -240,6 +251,7 @@ files:
 - spec/support/helpers/define_class.rb
 - spec/support/helpers/document_finder_stubs.rb
 - spec/support/helpers/specs_for.rb
+- spec/support/helpers/validations.rb
 - spec/support/matchers/be_a_subclass_of.rb
 - spec/support/matchers/be_truthy.rb
 - spec/support/matchers/find_with.rb
@@ -260,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1437842966940713292
+      hash: 3076200504632961352
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -269,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongomodel
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec" }

data/gemfiles/rails-3.0.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "appraisal", "~> 0.3.6"
-gem "bson_ext", "~> 1.4"
-gem "tzinfo"
-gem "activesupport", "3.0.10"
-gem "activemodel", "3.0.10"
-
-gemspec :path=>"../"

data/gemfiles/rails-3.0.gemfile.lock

@@ -1,75 +0,0 @@
-PATH
-  remote: /Users/sam/Scratch/mongomodel
-  specs:
-    mongomodel (0.4.0)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      mongo (~> 1.4)
-      will_paginate (~> 2.3.15)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.10)
-    appraisal (0.3.6)
-      aruba (~> 0.4.2)
-      bundler
-      rake
-    aruba (0.4.3)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.7)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.1)
-      rack (~> 1.0)
-    bson (1.4.0)
-    bson_ext (1.4.0)
-    builder (2.1.2)
-    childprocess (0.1.9)
-      ffi (~> 1.0.6)
-    cucumber (1.0.0)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    ffi (1.0.9)
-    gherkin (2.4.1)
-      json (>= 1.4.6)
-    i18n (0.5.0)
-    json (1.5.3)
-    mongo (1.4.0)
-      bson (= 1.4.0)
-    rack (1.3.0)
-    rake (0.9.2)
-    rdiscount (1.6.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    term-ansicolor (1.0.5)
-    tzinfo (0.3.29)
-    will_paginate (2.3.16)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel (= 3.0.10)
-  activesupport (= 3.0.10)
-  appraisal (~> 0.3.6)
-  bson_ext (~> 1.4)
-  bundler (>= 1.0.0)
-  mongomodel!
-  rspec (~> 2.6.0)
-  tzinfo