mongomodel 0.5.5 → 0.5.6

data/spec/mongomodel/concerns/observing_spec.rb

@@ -7,7 +7,7 @@ module MongoModel
         define_class(:TestDocument, described_class)
         define_class(:TestObserver, Observer) do
           observe :test_document
-        
+
           attr_accessor :callback
 
           def after_save(model)
@@ -20,11 +20,11 @@ module MongoModel
         it "has an #instance method to access the observer singleton" do
           TestObserver.instance.should eq(TestObserver.instance)
         end
-      
+
         it "invokes the TestObserver singleton's after_save method after saving" do
           callback = double
           callback.should_receive(:call).with(subject)
-        
+
           TestObserver.instance.callback = callback
           subject.save
         end

data/spec/mongomodel/concerns/pretty_inspect_spec.rb

@@ -8,22 +8,22 @@ module MongoModel
           described_class.inspect.should == described_class.name
         end
       end
-      
+
       context "on subclasses" do
         context "without properties" do
           define_class(:TestDocument, described_class)
-      
+
           it "returns class name" do
             TestDocument.inspect.should == 'TestDocument()'
           end
         end
-      
+
         context "with properties" do
           define_class(:TestDocument, described_class) do
             property :name, String
             property :age, Integer
           end
-        
+
           it "returns class name and property definitions" do
             TestDocument.inspect.should == 'TestDocument(name: String, age: Integer)'
           end
@@ -31,7 +31,7 @@ module MongoModel
       end
     end
   end
-  
+
   specs_for(Document) do
     describe "#inspect" do
       context "on subclass instances" do
@@ -39,16 +39,16 @@ module MongoModel
           property :name, String
           property :age, Integer
         end
-      
+
         subject { TestDocument.new(:id => 'abc-123', :name => 'Doc name', :age => 54) }
-  
+
         it "returns class name and property values" do
           subject.inspect.should == '#<TestDocument id: abc-123, name: "Doc name", age: 54>'
         end
       end
     end
   end
-  
+
   specs_for(EmbeddedDocument) do
     describe "#inspect" do
       context "on subclass instances" do
@@ -56,9 +56,9 @@ module MongoModel
           property :name, String
           property :age, Integer
         end
-      
+
         subject { TestDocument.new(:name => 'Doc name', :age => 54) }
-  
+
         it "returns class name and property values" do
           subject.inspect.should == '#<TestDocument name: "Doc name", age: 54>'
         end

data/spec/mongomodel/concerns/properties_spec.rb

@@ -6,18 +6,18 @@ module MongoModel
       property :name, String
       property :age, Integer, :default => 21
     end
-    
+
     define_class(:SkilledPerson, :Person) do
       property :skill, String
     end
-    
+
     it "has a populated hash of properties" do
       Person.properties.should include({
         :name => Properties::Property.new(:name, String),
         :age => Properties::Property.new(:age, Integer, :default => 21)
       })
     end
-    
+
     it "extends properties in subclasses" do
       SkilledPerson.properties.should include({
         :name => Properties::Property.new(:name, String),
@@ -25,41 +25,41 @@ module MongoModel
         :skill => Properties::Property.new(:skill, String)
       })
     end
-    
+
     it "has a set of internal property names" do
       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 "loads 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 "loads correctly when property is nil" do
         factory = Factory.find(without_manager.id)
         factory.manager.should be_nil
       end
     end
-    
+
     describe "when using a property type that defines #mongomodel_accessors" do
       define_class(:ParentClass, described_class) do
         property :custom, CustomClassWithAccessors
       end
-      
+
       subject { ParentClass.new }
-      
+
       it "includes methods from the module" do
         subject.should respond_to(:custom_accessor)
         subject.custom_accessor.should == "Custom accessor method"

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

@@ -8,30 +8,30 @@ module MongoModel
       property :paid, Boolean
       property :prefs, Hash
       property :internal, String, :internal => true
-      
+
       def hello
         "Hi friend!"
       end
     end
-    
+
     let(:instance) do
       TestModel.new(:id => "abc-123", :name => 'Hello World', :age => 25, :paid => true, :prefs => { :foo => 'bar' }, :internal => 'hideme')
     end
-    
+
     it "includes root in the JSON response when include_root_in_json = true" do
       TestModel.include_root_in_json = true
-      
+
       json = instance.to_json
       json.should match(/^\{"test_model":\{/)
     end
-    
+
     it "does not include root in the JSON response when include_root_in_json = false" do
       TestModel.include_root_in_json = false
-      
+
       json = instance.to_json
       json.should_not match(/^\{"test_model":\{/)
     end
-    
+
     it "encodes all public attributes" do
       json = instance.to_json
       json.should match(/"name":"Hello World"/)
@@ -39,19 +39,19 @@ module MongoModel
       json.should match(/"paid":true/)
       json.should match(/"prefs":\{"foo":"bar"\}/)
     end
-    
+
     if described_class == Document
       it "encodes the id" do
         json = instance.to_json
         json.should match(/"id":"abc-123"/)
       end
     end
-    
+
     it "does not encode internal attributes" do
       json = instance.to_json
       json.should_not match(/"internal":"hideme"/)
     end
-    
+
     it "allows attribute filtering with only" do
       json = instance.to_json(:only => [:name, :age])
       json.should match(/"name":"Hello World"/)
@@ -59,7 +59,7 @@ module MongoModel
       json.should_not match(/"paid":true/)
       json.should_not match(/"prefs":\{"foo":"bar"\}/)
     end
-    
+
     it "allows attribute filtering with except" do
       json = instance.to_json(:except => [:name, :age])
       json.should_not match(/"name":"Hello World"/)
@@ -67,13 +67,13 @@ module MongoModel
       json.should match(/"paid":true/)
       json.should match(/"prefs":\{"foo":"bar"\}/)
     end
-    
+
     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"/)
     end
-    
+
     it "encodes keys in the serializable_hash as strings" do
       hash = instance.serializable_hash(:methods => :hello)
       hash.should have_key("name")

data/spec/mongomodel/concerns/timestamps_spec.rb

@@ -7,163 +7,163 @@ module MongoModel
       define_class(:TestDocument, described_class) do
         timestamps!
       end
-      
+
       it "defines a Time property updated_at" do
         TestDocument.properties.should include(:updated_at)
         TestDocument.properties[:updated_at].type.should == Time
       end
-      
+
       it "defines a Time property created_at" do
         TestDocument.properties.should include(:created_at)
         TestDocument.properties[:created_at].type.should == Time
       end
     end
-    
+
     context "with updated_at property" do
       define_class(:TestDocument, described_class) do
         property :updated_at, Time
       end
-      
+
       if specing?(EmbeddedDocument)
         define_class(:ParentDocument, Document) do
           property :child, TestDocument
         end
-        
+
         let(:parent) { ParentDocument.new(:child => subject) }
         let(:doc) { parent }
       else
         let(:doc) { subject }
       end
-      
+
       subject { TestDocument.new }
-      
+
       before(:each) do
         @now = Types::Time.new.cast(Time.now)
         Time.stub(:now).and_return(@now)
       end
-      
+
       it "sets the updated_at property to the current time when saved" do
         doc.save
         subject.updated_at.should == @now
       end
     end
-    
+
     context "with updated_on property" do
       define_class(:TestDocument, described_class) do
         property :updated_on, Date
       end
-      
+
       if specing?(EmbeddedDocument)
         define_class(:ParentDocument, Document) do
           property :child, TestDocument
         end
-        
+
         let(:parent) { ParentDocument.new(:child => subject) }
         let(:doc) { parent }
       else
         let(:doc) { subject }
       end
-      
+
       subject { TestDocument.new }
-      
+
       it "sets the updated_on property to the current date when saved" do
         doc.save
         subject.updated_on.should == Date.today
       end
     end
-    
+
     context "with created_at property" do
       define_class(:TestDocument, described_class) do
         property :created_at, Time
       end
-      
+
       if specing?(EmbeddedDocument)
         define_class(:ParentDocument, Document) do
           property :child, TestDocument
         end
-        
+
         let(:parent) { ParentDocument.new(:child => subject) }
         let(:doc) { parent }
       else
         let(:doc) { subject }
       end
-      
+
       subject { TestDocument.new }
-      
+
       before(:each) do
         @now = Types::Time.new.cast(Time.now)
         Time.stub(:now).and_return(@now)
       end
-      
+
       it "sets the created_at property to the current time when created" do
         doc.save
         subject.created_at.should == @now
       end
-      
+
       it "does not change the created_at property when updated" do
         @next = 1.day.from_now
-        
+
         Time.stub(:now).and_return(@now)
-        
+
         doc.save
-        
+
         Time.stub(:now).and_return(@next)
-        
+
         doc.save
         subject.created_at.should == @now
       end
-      
+
       it "preserves created_at attribute when set explicitly" do
         @a_year_ago = 1.year.ago
-        
+
         subject.created_at = @a_year_ago
         doc.save
-        
+
         subject.created_at.should == @a_year_ago
       end
     end
-    
+
     context "with created_on property" do
       define_class(:TestDocument, described_class) do
         property :created_on, Date
       end
-      
+
       if specing?(EmbeddedDocument)
         define_class(:ParentDocument, Document) do
           property :child, TestDocument
         end
-        
+
         let(:parent) { ParentDocument.new(:child => subject) }
         let(:doc) { parent }
       else
         let(:doc) { subject }
       end
-      
+
       subject { TestDocument.new }
-      
+
       it "sets the created_on property to the current date when created" do
         doc.save
         subject.created_on.should == Date.today
       end
-      
+
       it "does not change the created_on property when updated" do
         doc.save
-        
+
         @today = Date.today
         @tomorrow = 1.day.from_now
-        
+
         Time.stub(:now).and_return(@tomorrow)
-        
+
         doc.save
         subject.created_on.should == @today
       end
-      
+
       it "preserves created_on attribute when set explicitly" do
         @a_year_ago = 1.year.ago.to_date
-        
+
         subject.created_on = @a_year_ago
         doc.save
-        
+
         subject.created_on.should == @a_year_ago
       end
     end

data/spec/mongomodel/concerns/validations_spec.rb

@@ -6,111 +6,114 @@ module MongoModel
       define_class(:TestDocument, described_class) do
         property :title, String
         validates_presence_of :title
-        
+
         extend ValidationHelpers
       end
-      
+
       if specing?(EmbeddedDocument)
         define_class(:ParentDocument, Document) do
           property :child, TestDocument
         end
-        
+
         let(:child) { TestDocument.new }
         let(:parent) { ParentDocument.new(:child => child) }
         let(:doc) { parent }
-        
+
         subject { parent.child }
       else
         let(:doc) { TestDocument.new }
-        
+
         subject { doc }
       end
-      
+
       it "has an errors collection" do
         subject.errors.should be_an_instance_of(ActiveModel::Errors)
       end
-      
+
       context "when validations are not met" do
         before(:each) { subject.valid? }
-        
+
         it { should_not be_valid }
-        it { should have(1).error }
+
+        it "should have 1 error" do
+          subject.errors.size.should == 1
+        end
       end
-      
+
       describe "validation on create" do
         before(:each) do
           TestDocument.clear_validations!
           TestDocument.validates_presence_of :title, :on => :create
         end
-        
+
         context "new document" do
           it { should_not be_valid }
         end
-        
+
         context "existing document" do
           before(:each) do
             subject.title = 'Valid title'
             doc.save!
             subject.title = nil
           end
-          
+
           it { should be_valid }
         end
       end
-      
+
       describe "validation on update" do
         before(:each) do
           TestDocument.clear_validations!
           TestDocument.validates_presence_of :title, :on => :update
         end
-        
+
         context "new document" do
           it { should be_valid }
         end
-      
+
         context "existing document" do
           before(:each) do
             subject.title = 'Valid title'
             doc.save!
             subject.title = nil
           end
-        
+
           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 "is not valid in custom context" do
-          subject.valid?(:custom).should be_false
+          subject.valid?(:custom).should be false
         end
       end
     end
-    
+
     describe "validation shortcuts" do
       define_class(:TestDocument, described_class)
       define_class(:SubDocument, EmbeddedDocument)
-      
+
       describe ":required => true" 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 "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)
@@ -119,52 +122,52 @@ module MongoModel
       end
     end
   end
-  
+
   specs_for(EmbeddedDocument) do
     describe "validations" do
       define_class(:ChildDocument, EmbeddedDocument) do
         property :title, String
         validates_presence_of :title
-      
+
         extend ValidationHelpers
       end
-    
+
       define_class(:ParentDocument, Document) do
         property :child, ChildDocument
       end
-      
+
       let(:child) { ChildDocument.new }
       let(:parent) { ParentDocument.new(:child => child) }
-    
+
       subject { parent.child }
-    
+
       context "child document is invalid" do
         before(:each) { parent.valid? }
-        
+
         specify "parent should be invalid" do
           parent.should_not be_valid
         end
-        
+
         specify "parent should have error on child" do
-          parent.should have(1).error
+          parent.errors.size.should == 1
           parent.errors[:child].should_not be_nil
         end
-        
+
         specify "child should be invalid" do
           child.should_not be_valid
         end
-        
+
         specify "child should have error" do
           child.errors[:title].should_not be_nil
         end
       end
-      
+
       context "parent has no child" do
         before(:each) do
           parent.child = nil
           parent.valid?
         end
-        
+
         specify "parent should be valid" do
           parent.should be_valid
         end