mongomodel 0.4.6 → 0.4.7

data/spec/mongomodel/document/optimistic_locking_spec.rb

@@ -5,11 +5,11 @@ module MongoModel
     describe "optimistic locking" do
       define_class(:TestDocument, Document)
       
-      it "should not lock optimistically by default" do
+      it "does not lock optimistically by default" do
         TestDocument.locking_enabled?.should be_false
       end
       
-      it "should not include a lock version property" do
+      it "does not include a lock version property" do
         TestDocument.properties.should_not include(:_lock_version)
       end
       
@@ -27,28 +27,28 @@ module MongoModel
           @fresh.save!
         end
         
-        it "should be enabled" do
+        it "is enabled" do
           TestDocument.locking_enabled?.should be_true
         end
         
-        it "should define a lock version property" do
+        it "defines a lock version property" do
           TestDocument.properties.should include(:_lock_version)
         end
         
-        it "should save a fresh document" do
+        it "saves a fresh document" do
           @fresh.save.should be_true
         end
         
-        it "should save! a fresh document" do
+        it "saves! a fresh document" do
           @fresh.save!.should be_true
         end
         
-        it "should not save a stale document" do
+        it "does not save a stale document" do
           @stale.save.should be_false
           @stale._lock_version.should == 1
         end
         
-        it "should raise an error when trying to save! a stale document" do
+        it "raises an error when trying to save! a stale document" do
           lambda { @stale.save! }.should raise_error(DocumentNotSaved)
         end
       end

data/spec/mongomodel/document/persistence_spec.rb

@@ -14,11 +14,11 @@ module MongoModel
         it { should be_a_new_record }
 
         describe "#save" do
-          it "should return true" do
+          it "returns true" do
             subject.save.should == true
           end
 
-          it "should persist the document to the collection" do
+          it "persists the document to the collection" do
             subject.save
 
             doc = User.collection.find_one
@@ -30,7 +30,7 @@ module MongoModel
         context "with a custom id" do
           subject { User.new(:id => 'custom-id') }
 
-          it "should save the document using the custom id" do
+          it "saves the document using the custom id" do
             subject.save
             User.collection.find_one['_id'].should == 'custom-id'
           end
@@ -45,17 +45,17 @@ module MongoModel
         it { should_not be_a_new_record }
 
         describe "#save" do
-          it "should return true" do
+          it "returns true" do
             subject.save.should == true
           end
 
-          it "should not create a new document" do
+          it "does not create a new document" do
             lambda {
               subject.save
             }.should_not change(User.collection, :count)
           end
 
-          it "should update the document attributes" do
+          it "updates the document attributes" do
             subject.attributes[:name] = 'Changed'
             subject.save
 
@@ -66,11 +66,11 @@ module MongoModel
       end
       
       describe "#collection_name" do
-        it "should infer the default collection name" do
+        it "infers the default collection name" do
           User.collection_name.should == 'users'
         end
 
-        it "should infer the default collection name for namespaced models" do
+        it "infers the default collection name for namespaced models" do
           module ::Blog
             class Post < MongoModel::Document; end
           end
@@ -78,7 +78,7 @@ module MongoModel
           ::Blog::Post.collection_name.should == 'blog.posts'
         end
 
-        it "should allow a custom collection name" do
+        it "allows a custom collection name" do
           class ::CustomCollectionName < Document
             self.collection_name = 'foobar'
           end
@@ -86,7 +86,7 @@ module MongoModel
           ::CustomCollectionName.collection_name.should == 'foobar'
         end
 
-        it "should inherit a custom collection name" do
+        it "inherits a custom collection name" do
           class ::CustomCollectionName < Document
             self.collection_name = 'foobar'
           end
@@ -97,34 +97,34 @@ module MongoModel
       end
 
       describe "#collection" do
-        it "should be an instrumented collection" do
+        it "is an instrumented collection" do
           User.collection.should be_a(InstrumentedCollection)
         end
 
-        it "should use the correct collection name" do
+        it "uses the correct collection name" do
           User.collection.name.should == 'users'
         end
       end
 
       describe "#database" do
-        it "should return the current database" do
+        it "returns the current database" do
           User.database.should == MongoModel.database
         end
       end
       
       describe "#create" do
         context "attributes hash" do
-          it "should pass attributes to instance" do
+          it "passes attributes to instance" do
             @user = User.create(:name => 'Test', :age => 18)
             @user.name.should == 'Test'
             @user.age.should == 18
           end
 
-          it "should save the instance" do
+          it "saves the instance" do
             User.create.should_not be_a_new_record
           end
 
-          it "should yield the instance to a given block before saving" do
+          it "yields the instance to a given block before saving" do
             block_called = false
 
             User.create do |u|
@@ -143,7 +143,7 @@ module MongoModel
             User.create([{ :name => 'Test', :age => 18 }, { :name => 'Second', :age => 21 }], &block)
           end
 
-          it "should return instances in array with associated attributes" do
+          it "returns instances in array with associated attributes" do
             @users = create_users
             @users[0].name.should == 'Test'
             @users[0].age.should == 18
@@ -151,11 +151,11 @@ module MongoModel
             @users[1].age.should == 21
           end
 
-          it "should save each instance" do
+          it "saves each instance" do
             create_users.each { |user| user.should_not be_a_new_record }
           end
 
-          it "should yield each instance to a given block before saving" do
+          it "yields each instance to a given block before saving" do
             block_called = 0
 
             create_users do |u|
@@ -177,14 +177,14 @@ module MongoModel
           User.create(:id => 'user-3')
         end
 
-        it "should delete by id" do
+        it "deletes by id" do
           User.delete('user-1')
 
           User.exists?('user-1').should be_false
           User.exists?('user-2').should be_true
         end
         
-        it "should delete by multiple ids in array" do
+        it "deletes by multiple ids in array" do
           User.delete(['user-1', 'user-2'])
 
           User.exists?('user-1').should be_false
@@ -199,23 +199,23 @@ module MongoModel
           User.create(:id => 'user-2', :name => 'Another')
         end
 
-        it "should delete the instance from the database" do
+        it "deletes the instance from the database" do
           @user.delete
 
           User.exists?('user-1').should be_false
           User.exists?('user-2').should be_true
         end
 
-        it "should return the instance" do
+        it "returns the instance" do
           @user.delete.should == @user
         end
 
-        it "should freeze the instance" do
+        it "freezes the instance" do
           @user.delete
           @user.should be_frozen
         end
         
-        it "should mark the instance as destroyed" do
+        it "marks the instance as destroyed" do
           @user.delete
           @user.should be_destroyed
         end
@@ -227,23 +227,23 @@ module MongoModel
           User.create(:id => 'user-2', :name => 'Another')
         end
 
-        it "should delete the instance from the database" do
+        it "deletes the instance from the database" do
           @user.destroy
 
           User.exists?('user-1').should be_false
           User.exists?('user-2').should be_true
         end
 
-        it "should return the instance" do
+        it "returns the instance" do
           @user.destroy.should == @user
         end
 
-        it "should freeze the instance" do
+        it "freezes the instance" do
           @user.destroy
           @user.should be_frozen
         end
         
-        it "should mark the instance as destroyed" do
+        it "marks the instance as destroyed" do
           @user.destroy
           @user.should be_destroyed
         end
@@ -256,14 +256,14 @@ module MongoModel
           User.create(:id => 'user-3')
         end
 
-        it "should destroy by id" do
+        it "destroys by id" do
           User.destroy('user-1')
 
           User.exists?('user-1').should be_false
           User.exists?('user-2').should be_true
         end
 
-        it "should destroy by multiple ids in array" do
+        it "destroys by multiple ids in array" do
           User.destroy(['user-1', 'user-2'])
 
           User.exists?('user-1').should be_false
@@ -277,12 +277,12 @@ module MongoModel
         
         before(:each) { user.update_attributes(:name => 'Changed', :age => 20) }
         
-        it "should update the attributes" do
+        it "updates the attributes" do
           user.name.should == 'Changed'
           user.age.should == 20
         end
         
-        it "should save the document" do
+        it "saves the document" do
           user.should_not be_a_new_record
         end
       end
@@ -292,11 +292,11 @@ module MongoModel
         
         before(:each) { user.update_attribute(:name, 'Changed') }
         
-        it "should update the given attribute" do
+        it "updates the given attribute" do
           user.name.should == 'Changed'
         end
         
-        it "should save the document" do
+        it "saves the document" do
           user.should_not be_a_new_record
         end
       end
@@ -313,11 +313,11 @@ module MongoModel
         
         subject { UserComment.create!(:title => "Test", :user => user) }
         
-        it "should return itself" do
+        it "returns itself" do
           subject.reload.should == subject
         end
         
-        it "should reset the attributes" do
+        it "resets the attributes" do
           subject.title = "New Value"
           subject.body = "Blah blah blah"
           subject.reload
@@ -325,7 +325,7 @@ module MongoModel
           subject.body.should == nil
         end
         
-        it "should reset the associations" do
+        it "resets the associations" do
           subject.user.should == user
           subject.user = User.new(:name => "Bill")
           subject.reload

data/spec/mongomodel/document/scopes_spec.rb

@@ -9,7 +9,7 @@ module MongoModel
       
       it { should be_an_instance_of(MongoModel::Scope) }
       
-      it "should set the target class" do
+      it "sets the target class" do
         subject.klass.should == Post
       end
       
@@ -19,7 +19,7 @@ module MongoModel
           default_scope limit(5)
         end
         
-        it "should return the default scope" do
+        it "returns the default scope" do
           scope = Post.scoped
           scope.order_values.should == [:title.asc]
           scope.limit_value.should == 5
@@ -27,7 +27,7 @@ module MongoModel
       end
       
       context "within a with_scope block" do
-        it "should return the current scope" do
+        it "returns the current scope" do
           Post.class_eval do
             with_scope(where(:published => true)) do
               scoped.where_values.should == [{:published => true}]
@@ -37,7 +37,7 @@ module MongoModel
       end
       
       context "within nested with_scope blocks" do
-        it "should return the merged scope" do
+        it "returns the merged scope" do
           Post.class_eval do
             with_scope(where(:published => true)) do
               with_scope(limit(5)) do
@@ -51,7 +51,7 @@ module MongoModel
     end
     
     describe "#scope" do
-      it "should create a method returning the scope" do
+      it "creates a method returning the scope" do
         Post.class_eval do
           scope :published, where(:published => true)
         end
@@ -61,7 +61,7 @@ module MongoModel
         scope.where_values.should == [{:published => true}]
       end
       
-      it "should create parameterized method returning the scope when given a lambda" do
+      it "creates parameterized method returning the scope when given a lambda" do
         Post.class_eval do
           scope :latest, lambda { |num| order(:created_at.desc).limit(num) }
         end
@@ -71,7 +71,7 @@ module MongoModel
         scope.limit_value.should == 4
       end
       
-      it "should allow existing scopes to be built upon" do
+      it "allows existing scopes to be built upon" do
         Post.class_eval do
           scope :recent, order(:created_at.desc).limit(5)
           scope :recently_published, recent.where(:published => true)
@@ -90,7 +90,7 @@ module MongoModel
         scope :recent, order(:created_at.desc).limit(5)
       end
       
-      it "should be chainable" do
+      it "is chainable" do
         scope = Post.published.recent
         scope.where_values.should == [{:published => true}]
         scope.order_values.should == [:created_at.desc]

data/spec/mongomodel/document/validations/uniqueness_spec.rb

@@ -9,22 +9,22 @@ module MongoModel
         end
         
         describe "save" do
-          it "should return false" do
+          it "returns false" do
             subject.save.should be_false
           end
 
-          it "should add errors to the instance" do
+          it "adds errors to the instance" do
             subject.save
             subject.errors[:title].should_not be_nil
           end
         end
 
         describe "save!" do
-          it "should raise a DocumentInvalid exception" do
+          it "raises a DocumentInvalid exception" do
             lambda { subject.save! }.should raise_error(DocumentInvalid)
           end
 
-          it "should add errors to the instance" do
+          it "adds errors to the instance" do
             subject.save! rescue nil
             subject.errors[:title].should_not be_nil
           end
@@ -39,26 +39,26 @@ module MongoModel
         
         subject { Article.new(:title => 'Test') }
         
-        it "should be valid if no document with same title exists" do
+        it "is valid if no document with same title exists" do
           subject.should be_valid
         end
         
-        it "should not be valid if document with same title exists" do
+        it "is not valid if document with same title exists" do
           Article.create!(:title => 'Test')
           subject.should_not be_valid
         end
         
-        it "should be valid if document with different-cased title exists" do
+        it "is valid if document with different-cased title exists" do
           Article.create!(:title => 'TEST')
           subject.should be_valid
         end
         
-        it "should be valid if document already saved and no other document with same title exists" do
+        it "is valid if document already saved and no other document with same title exists" do
           subject.save!
           subject.should be_valid
         end
         
-        it "should generate correct error message" do
+        it "generates correct error message" do
           Article.create!(:title => 'Test')
           subject.valid?
           subject.errors[:title].should include('has already been taken')