mongomodel 0.4.6 → 0.4.7

data/spec/mongomodel/concerns/serialization/json_serialization_spec.rb

@@ -18,7 +18,7 @@ module MongoModel
       TestModel.new(:name => 'Hello World', :age => 25, :paid => true, :prefs => { :foo => 'bar' }, :internal => 'hideme')
     end
     
-    it "should include root in json" do
+    it "includes root in json" do
       begin
         TestModel.include_root_in_json = true
         
@@ -29,7 +29,7 @@ module MongoModel
       end
     end
     
-    it "should encode all public attributes" do
+    it "encodes all public attributes" do
       json = instance.to_json
       json.should match(/"name":"Hello World"/)
       json.should match(/"age":25/)
@@ -37,12 +37,12 @@ module MongoModel
       json.should match(/"prefs":\{"foo":"bar"\}/)
     end
     
-    it "should not encode internal attributes" do
+    it "does not encode internal attributes" do
       json = instance.to_json
       json.should_not match(/"internal":"hideme"/)
     end
     
-    it "should allow attribute filtering with only" do
+    it "allows attribute filtering with only" do
       json = instance.to_json(:only => [:name, :age])
       json.should match(/"name":"Hello World"/)
       json.should match(/"age":25/)
@@ -50,7 +50,7 @@ module MongoModel
       json.should_not match(/"prefs":\{"foo":"bar"\}/)
     end
     
-    it "should allow attribute filtering with except" do
+    it "allows attribute filtering with except" do
       json = instance.to_json(:except => [:name, :age])
       json.should_not match(/"name":"Hello World"/)
       json.should_not match(/"age":25/)
@@ -58,7 +58,7 @@ module MongoModel
       json.should match(/"prefs":\{"foo":"bar"\}/)
     end
     
-    it "should allow methods to be included" do
+    it "allows methods to be included" do
       json = instance.to_json(:methods => [:hello, :type])
       json.should match(/"hello":"Hi friend!"/)
       json.should match(/"type":"TestModel"/)

data/spec/mongomodel/concerns/timestamps_spec.rb

@@ -8,12 +8,12 @@ module MongoModel
         timestamps!
       end
       
-      it "should define a Time property updated_at" do
+      it "defines a Time property updated_at" do
         TestDocument.properties.should include(:updated_at)
         TestDocument.properties[:updated_at].type.should == Time
       end
       
-      it "should define a Time property created_at" do
+      it "defines a Time property created_at" do
         TestDocument.properties.should include(:created_at)
         TestDocument.properties[:created_at].type.should == Time
       end
@@ -42,7 +42,7 @@ module MongoModel
         Time.stub!(:now).and_return(@now)
       end
       
-      it "should set the updated_at property to the current time when saved" do
+      it "sets the updated_at property to the current time when saved" do
         doc.save
         subject.updated_at.should == @now
       end
@@ -66,7 +66,7 @@ module MongoModel
       
       subject { TestDocument.new }
       
-      it "should set the updated_on property to the current date when saved" do
+      it "sets the updated_on property to the current date when saved" do
         doc.save
         subject.updated_on.should == Date.today
       end
@@ -95,12 +95,12 @@ module MongoModel
         Time.stub!(:now).and_return(@now)
       end
       
-      it "should set the created_at property to the current time when created" do
+      it "sets the created_at property to the current time when created" do
         doc.save
         subject.created_at.should == @now
       end
       
-      it "should not change the created_at property when updated" do
+      it "does not change the created_at property when updated" do
         @next = 1.day.from_now
         
         Time.stub!(:now).and_return(@now)
@@ -113,7 +113,7 @@ module MongoModel
         subject.created_at.should == @now
       end
       
-      it "should preserve created_at attribute when set explicitly" do
+      it "preserves created_at attribute when set explicitly" do
         @a_year_ago = 1.year.ago
         
         subject.created_at = @a_year_ago
@@ -141,12 +141,12 @@ module MongoModel
       
       subject { TestDocument.new }
       
-      it "should set the created_on property to the current date when created" do
+      it "sets the created_on property to the current date when created" do
         doc.save
         subject.created_on.should == Date.today
       end
       
-      it "should not change the created_on property when updated" do
+      it "does not change the created_on property when updated" do
         doc.save
         
         @today = Date.today
@@ -158,7 +158,7 @@ module MongoModel
         subject.created_on.should == @today
       end
       
-      it "should preserve created_on attribute when set explicitly" do
+      it "preserves created_on attribute when set explicitly" do
         @a_year_ago = 1.year.ago.to_date
         
         subject.created_on = @a_year_ago

data/spec/mongomodel/concerns/translation_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module MongoModel
   specs_for(Document, EmbeddedDocument) do
-    it "should use correct i18n scope" do
+    it "uses correct i18n scope" do
       described_class.i18n_scope.should == :mongomodel
     end
   end

data/spec/mongomodel/concerns/validations_spec.rb

@@ -26,7 +26,7 @@ module MongoModel
         subject { doc }
       end
       
-      it "should have an errors collection" do
+      it "has an errors collection" do
         subject.errors.should be_an_instance_of(ActiveModel::Errors)
       end
       
@@ -87,7 +87,7 @@ module MongoModel
         
         it { should be_valid }
         
-        it "should not be valid in custom context" do
+        it "is not valid in custom context" do
           subject.valid?(:custom).should be_false
         end
       end
@@ -95,20 +95,28 @@ module MongoModel
     
     describe "validation shortcuts" do
       define_class(:TestDocument, described_class)
+      define_class(:SubDocument, EmbeddedDocument)
       
       describe ":required => true" do
-        it "should add a validates_presence_of validation" do
+        it "adds a validates_presence_of validation" do
           TestDocument.should_receive(:validates_presence_of).with(:title)
           TestDocument.property :title, String, :required => true
         end
       end
       
       describe ":format => /regex/" do
-        it "should add a validates_format_of validation" do
+        it "adds a validates_format_of validation" do
           TestDocument.should_receive(:validates_format_of).with(:email, /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i)
           TestDocument.property :email, String, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
         end
       end
+      
+      describe ":validate => false" do
+        it "skips validations on embedded/associated models" do
+          TestDocument.should_not_receive(:validates_associated).with(:sub_object)
+          TestDocument.property :sub_object, SubDocument, :validate => false
+        end
+      end
     end
   end
   

data/spec/mongomodel/document/callbacks_spec.rb

@@ -9,46 +9,46 @@ module MongoModel
       
       let(:doc) { CallbackTestDocument.create! }
       
-      it "should run each type of callback when initializing" do
+      it "runs each type of callback when initializing" do
         instance = CallbackTestDocument.new
         instance.should run_callbacks(:after_initialize)
       end
   
-      it "should run each type of callback on find" do
+      it "runs each type of callback on find" do
         instance = CallbackTestDocument.find(doc.id)
         instance.should run_callbacks(:after_initialize, :after_find)
       end
   
-      it "should run each type of callback when validating a new document" do
+      it "runs each type of callback when validating a new document" do
         instance = CallbackTestDocument.new
         instance.valid?
         instance.should run_callbacks(:after_initialize, :before_validation, :after_validation)
       end
   
-      it "should run each type of callback when validating an existing document" do
+      it "runs each type of callback when validating an existing document" do
         instance = CallbackTestDocument.find(doc.id)
         instance.valid?
         instance.should run_callbacks(:after_initialize, :after_find, :before_validation, :after_validation)
       end
   
-      it "should run each type of callback when creating a document" do
+      it "runs each type of callback when creating a document" do
         instance = CallbackTestDocument.create!
         instance.should run_callbacks(:after_initialize, :before_validation, :after_validation, :before_save, :before_create, :after_create, :after_save)
       end
   
-      it "should run each type of callback when saving an existing document" do
+      it "runs each type of callback when saving an existing document" do
         instance = CallbackTestDocument.find(doc.id)
         instance.save
         instance.should run_callbacks(:after_initialize, :after_find, :before_validation, :after_validation, :before_save, :before_update, :after_update, :after_save)
       end
   
-      it "should run each type of callback when destroying a document" do
+      it "runs each type of callback when destroying a document" do
         instance = CallbackTestDocument.find(doc.id)
         instance.destroy
         instance.should run_callbacks(:after_initialize, :after_find, :before_destroy, :after_destroy)
       end
   
-      it "should not run destroy callbacks when deleting a document" do
+      it "does not run destroy callbacks when deleting a document" do
         instance = CallbackTestDocument.find(doc.id)
         instance.delete
         instance.should run_callbacks(:after_initialize, :after_find)
@@ -64,13 +64,13 @@ module MongoModel
         subject { CallbackTestDocument.new }
       
         describe "#save" do
-          it "should return false" do
+          it "returns false" do
             subject.save.should be_false
           end
         end
       
         describe "#save!" do
-          it "should raise a MongoModel::DocumentNotSaved exception" do
+          it "raises a MongoModel::DocumentNotSaved exception" do
             lambda { subject.save! }.should raise_error(MongoModel::DocumentNotSaved)
           end
         end

data/spec/mongomodel/document/collection_modifiers_spec.rb

@@ -13,7 +13,7 @@ module MongoModel
       subject { Post }
       
       def self.should_update_collection(expression, &block)
-        it "should update the collection" do
+        it "updates the collection" do
           collection.should_receive(:update).with(selector, expression, :multi => true)
           instance_eval(&block)
         end

data/spec/mongomodel/document/dynamic_finders_spec.rb

@@ -19,21 +19,21 @@ module MongoModel
       end
       
       def self.should_find(*args, &block)
-        it "should return correct results when called with #{args.inspect}" do
+        it "returns correct results when called with #{args.inspect}" do
           expected = instance_eval(&block)
           subject.send(valid_finder, *args).should == expected
         end
       end
       
       def self.should_raise(*args, &block)
-        it "should raise DocumentNotFound exception if results not found" do
+        it "raises DocumentNotFound exception if results not found" do
           message = instance_eval(&block)
           lambda { subject.send(valid_finder, *args) }.should raise_error(DocumentNotFound, message)
         end
       end
       
       def self.should_initialize(*args, &block)
-        it "should initialize new instance" do
+        it "initializes new instance" do
           result = subject.send(valid_finder, *args)
           result.should be_a_new_record
           result.should be_an_instance_of(Person)
@@ -42,7 +42,7 @@ module MongoModel
       end
       
       def self.should_create(*args, &block)
-        it "should create new instance" do
+        it "creates new instance" do
           result = subject.send(valid_finder, *args)
           result.should_not be_a_new_record
           result.should be_an_instance_of(Person)
@@ -54,7 +54,7 @@ module MongoModel
         it { should respond_to(valid_finder) }
         it { should_not respond_to(invalid_finder) }
         
-        it "should raise NoMethodError calling an invalid finder" do
+        it "raises NoMethodError calling an invalid finder" do
           lambda { subject.send(invalid_finder, "Foo") }.should raise_error(NoMethodError)
         end
       end

data/spec/mongomodel/document/finders_spec.rb

@@ -20,24 +20,24 @@ module MongoModel
         context "document exists" do
           subject { User.find('2') }
           
-          it "should return a User" do
+          it "returns a User" do
             subject.should be_a(User)
           end
           
-          it "should load the document attributes" do
+          it "loads the document attributes" do
             subject.id.should == '2'
             subject.name.should == 'Alistair'
           end
           
           it { should_not be_a_new_record }
           
-          it "should stringify ids" do
+          it "stringifies ids" do
             User.find(2).id.should == '2'
           end
         end
         
         context "document does not exist" do
-          it "should raise a DocumentNotFound exception" do
+          it "raises a DocumentNotFound exception" do
             lambda {
               User.find('4')
             }.should raise_error(MongoModel::DocumentNotFound)
@@ -45,7 +45,7 @@ module MongoModel
         end
         
         context "no id specified" do
-          it "should raise an ArgumentError" do
+          it "raises an ArgumentError" do
             lambda { 
               User.find
             }.should raise_error(ArgumentError)
@@ -57,17 +57,17 @@ module MongoModel
         context "all documents exist" do
           subject { User.find('1', '2') }
           
-          it "should return an array of Users" do
+          it "returns an array of Users" do
             subject[0].should be_a(User)
             subject[1].should be_a(User)
           end
           
-          it "should load document attributes" do
+          it "loads document attributes" do
             subject[0].name.should == 'Fred'
             subject[1].name.should == 'Alistair'
           end
           
-          it "should load documents in correct order" do
+          it "loads documents in correct order" do
             result = User.find('2', '1')
             result[0].id.should == '2'
             result[1].id.should == '1'
@@ -75,7 +75,7 @@ module MongoModel
         end
         
         context "some documents missing" do
-          it "should raise a DocumentNotFound exception" do
+          it "raises a DocumentNotFound exception" do
             lambda {
               User.find('1', '2', '4')
             }.should raise_error(MongoModel::DocumentNotFound)

data/spec/mongomodel/document/indexes_spec.rb

@@ -13,23 +13,23 @@ module MongoModel
         Class.new(klass)
       end
     
-      it "should have an indexes collection" do
+      it "has an indexes collection" do
         Article.indexes.should be_an_instance_of(Array)
       end
     
-      it "should inherit indexes from parent classes" do
+      it "inherits indexes from parent classes" do
         index = mock('index')
         Article.indexes << index
         subclass(Article).indexes.should include(index)
       end
     
       describe "#index" do
-        it "should add an index to the indexes collection" do
+        it "adds an index to the indexes collection" do
           Article.index :title, :unique => true
           Article.indexes.last.should == Index.new(:title, :unique => true)
         end
       
-        it "should mark indexes as uninitialized" do
+        it "marks indexes as uninitialized" do
           Article.ensure_indexes!
         
           Article.indexes_initialized?.should be_true
@@ -45,7 +45,7 @@ module MongoModel
           Article.index :position => :geo2d, :min => -100, :max => 100
         end
       
-        it "should create indexes on the collection" do
+        it "creates indexes on the collection" do
           Article.collection.should_receive(:create_index).with(:_type)
           Article.collection.should_receive(:create_index).with(:title, :unique => true)
           Article.collection.should_receive(:create_index).with([[:age, Mongo::DESCENDING]])
@@ -53,7 +53,7 @@ module MongoModel
           Article.ensure_indexes!
         end
       
-        it "should mark indexes as initialized" do
+        it "marks indexes as initialized" do
           Article.indexes_initialized?.should be_false
           Article.ensure_indexes!
           Article.indexes_initialized?.should be_true
@@ -61,12 +61,12 @@ module MongoModel
       end
     
       describe "#_find" do
-        it "should run ensure_indexes!" do
+        it "runs ensure_indexes!" do
           Article.should_receive(:ensure_indexes!)
           Article.first
         end
       
-        it "should rerun ensure_indexes! if indexes are initialized" do
+        it "reruns ensure_indexes! if indexes are initialized" do
           Article.ensure_indexes!
           Article.should_not_receive(:ensure_indexes!)
           Article.first
@@ -78,7 +78,7 @@ module MongoModel
       define_class(:TestDocument, Document)
       
       describe ":index => true" do
-        it "should add an index on the property" do
+        it "adds an index on the property" do
           TestDocument.should_receive(:index).with(:title)
           TestDocument.property :title, String, :index => true
         end
@@ -87,44 +87,44 @@ module MongoModel
   end
   
   describe Index do
-    it "should convert index with single key to arguments for Mongo::Collection#create_index" do
+    it "converts index with single key to arguments for Mongo::Collection#create_index" do
       Index.new(:title).to_args.should == [:title]
     end
     
-    it "should convert nested index with single key to arguments for Mongo::Collection#create_index" do
+    it "converts nested index with single key to arguments for Mongo::Collection#create_index" do
       Index.new('page.title').to_args.should == [:'page.title']
     end
     
-    it "should convert index with unique option to arguments for Mongo::Collection#create_index" do
+    it "converts index with unique option to arguments for Mongo::Collection#create_index" do
       Index.new(:title, :unique => true).to_args.should == [:title, { :unique => true }]
     end
     
-    it "should convert index with descending key to arguments for Mongo::Collection#create_index" do
+    it "converts index with descending key to arguments for Mongo::Collection#create_index" do
       Index.new(:title => :descending).to_args.should == [[[:title, Mongo::DESCENDING]]]
     end
     
-    it "should convert index with multiple keys to arguments for Mongo::Collection#create_index" do
+    it "converts index with multiple keys to arguments for Mongo::Collection#create_index" do
       Index.new(:title, :age).to_args.should == [[[:age, Mongo::ASCENDING], [:title, Mongo::ASCENDING]]]
     end
     
-    it "should convert index with multiple keys (ascending and descending) to arguments for Mongo::Collection#create_index" do
+    it "converts index with multiple keys (ascending and descending) to arguments for Mongo::Collection#create_index" do
       Index.new(:title => :ascending, :age => :descending).to_args.should == [[[:age, Mongo::DESCENDING], [:title, Mongo::ASCENDING]]]
     end
     
-    it "should convert geospatial index with no options" do
+    it "converts geospatial index with no options" do
       Index.new(:position => :geo2d).to_args.should == [[[:position, Mongo::GEO2D]]]
     end
     
-    it "should convert geospatial index with min/max options" do
+    it "converts geospatial index with min/max options" do
       Index.new(:position => :geo2d, :min => -50, :max => 50).to_args.should == [[[:position, Mongo::GEO2D]], { :min => -50, :max => 50 }]
     end
     
-    it "should be equal to an equivalent index" do
+    it "is equal to an equivalent index" do
       Index.new(:title).should == Index.new(:title)
       Index.new(:title, :age).should == Index.new(:title => :ascending, :age => :ascending)
     end
     
-    it "should not be equal to an non-equivalent index" do
+    it "is not equal to an non-equivalent index" do
       Index.new(:title).should_not == Index.new(:age)
       Index.new(:title, :age).should_not == Index.new(:title => :ascending, :age => :descending)
     end