mongoid-pre 2.0.0.beta1 → 2.0.0.pre

data/spec/unit/mongoid/document_spec.rb

@@ -67,73 +67,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#eql?" do
-
-    context "when other object is a Document" do
-
-      context "when attributes are equal" do
-
-        before do
-          @document = Person.new(:_id => 1, :title => "Sir")
-          @other = Person.new(:_id => 1, :title => "Sir")
-        end
-
-        it "returns true" do
-          @document.eql?(@other).should be_true
-        end
-
-      end
-
-      context "when attributes are not equal" do
-
-        before do
-          @document = Person.new(:title => "Sir")
-          @other = Person.new(:title => "Madam")
-        end
-
-        it "returns false" do
-          @document.eql?(@other).should_not be_true
-        end
-
-      end
-
-    end
-
-    context "when other object is not a Document" do
-
-      it "returns false" do
-        Person.new.eql?("Test").should be_false
-      end
-
-    end
-
-    context "when comapring parent to its subclass" do
-
-      it "returns false" do
-        Canvas.new.eql?(Firefox.new).should_not be_true
-      end
-
-    end
-
-  end
-
-  describe "#hash" do
-
-    before do
-      @document = Person.new(:_id => 1, :title => "Sir")
-      @other = Person.new(:_id => 2, :title => "Sir")
-    end
-
-    it "deligates to id" do
-      @document.hash.should == @document.id.hash
-    end
-
-    it "has unique hash per id" do
-      @document.hash.should_not == @other.hash
-    end
-
-  end
-
   describe "#alias_method_chain" do
 
     context "on a field setter" do
@@ -471,6 +404,34 @@ describe Mongoid::Document do
 
   end
 
+  describe "#new_record?" do
+
+    context "when the object has been saved" do
+
+      before do
+        @person = Person.new(:_id => "1")
+      end
+
+      it "returns false" do
+        @person.new_record?.should be_false
+      end
+
+    end
+
+    context "when the object has not been saved" do
+
+      before do
+        @person = Person.new
+      end
+
+      it "returns true" do
+        @person.new_record?.should be_true
+      end
+
+    end
+
+  end
+
   describe "#_parent" do
 
     before do
@@ -526,10 +487,6 @@ describe Mongoid::Document do
       @person.attributes.should == @attributes
     end
 
-    it 'should return a person object' do
-      @person.reload.should be_kind_of(Person)
-    end
-
   end
 
   describe "#remove" do
@@ -561,7 +518,9 @@ describe Mongoid::Document do
         @person.remove(@name)
         @person.name.should be_nil
       end
+
     end
+
   end
 
   describe "#_root" do
@@ -579,6 +538,7 @@ describe Mongoid::Document do
       it "returns self" do
         @person._root.should == @person
       end
+
     end
 
     context "when document is embedded one level" do
@@ -586,6 +546,7 @@ describe Mongoid::Document do
       it "returns the parent" do
         @phone_number._root.should == @person
       end
+
     end
 
     context "when document is embedded multiple levels" do
@@ -593,7 +554,9 @@ describe Mongoid::Document do
       it "returns the top level parent" do
         @country_code._root.should == @person
       end
+
     end
+
   end
 
   describe ".store_in" do

data/spec/unit/mongoid/extensions/array/conversions_spec.rb

@@ -10,8 +10,8 @@ describe Mongoid::Extensions::Array::Conversions do
         Person.new(:_id => 2, :title => "Madam")
       ]
       array.mongoidize.should ==
-        [ HashWithIndifferentAccess.new({ :_id => 1, :title => "Sir", :age => 100, :_type => "Person", "blood_alcohol_content" => 0.0, :pets => false }),
-          HashWithIndifferentAccess.new({ :_id => 2, :title => "Madam", :age => 100, :_type => "Person", "blood_alcohol_content" => 0.0, :pets => false }) ]
+        [ HashWithIndifferentAccess.new({ :_id => 1, :title => "Sir", :age => 100, :_type => "Person", "blood_alcohol_content" => 0.0 }),
+          HashWithIndifferentAccess.new({ :_id => 2, :title => "Madam", :age => 100, :_type => "Person", "blood_alcohol_content" => 0.0 }) ]
     end
 
   end

data/spec/unit/mongoid/extensions/datetime/conversions_spec.rb

@@ -62,6 +62,9 @@ describe Mongoid::Extensions::DateTime::Conversions do
       it "returns nil" do
         DateTime.get(nil).should be_nil
       end
+
     end
+
   end
+
 end

data/spec/unit/mongoid/extensions/object/conversions_spec.rb

@@ -6,14 +6,7 @@ describe Mongoid::Extensions::Object::Conversions do
 
     it "returns its attributes" do
       Person.new(:_id => 1, :title => "Sir").mongoidize.should ==
-        {
-          "_id" => 1,
-          "title" => "Sir",
-          "age" => 100,
-          "_type" => "Person",
-          "blood_alcohol_content" => 0.0,
-          "pets" => false
-        }
+        { "_id" => 1, "title" => "Sir", "age" => 100, "_type" => "Person", "blood_alcohol_content" => 0.0 }
     end
 
   end
@@ -35,14 +28,7 @@ describe Mongoid::Extensions::Object::Conversions do
     context "when object has attributes" do
 
       before do
-        @attributes = {
-          "_id" => "test",
-          "title" => "Sir",
-          "age" => 100,
-          "_type" => "Person",
-          "blood_alcohol_content" => 0.0,
-          "pets" => false
-        }
+        @attributes = { "_id" => "test", "title" => "Sir", "age" => 100, "_type" => "Person", "blood_alcohol_content" => 0.0 }
         @person = Person.new(@attributes)
       end
 

data/spec/unit/mongoid/extensions/proc/scoping_spec.rb

@@ -24,7 +24,7 @@ describe Mongoid::Extensions::Proc::Scoping do
 
       it "returns the criteria scoped" do
         @proc.scoped("Sir").should ==
-          { :where => { :title => "Sir" } }
+          { :where => { :_type => { "$in" => [ "Doctor", "Person" ] }, :title => "Sir" } }
       end
 
     end

data/spec/unit/mongoid/field_spec.rb

@@ -2,42 +2,6 @@ require "spec_helper"
 
 describe Mongoid::Field do
 
-  describe "#accessible?" do
-
-    context "when value is not set" do
-
-      before do
-        @field = Mongoid::Field.new(:name)
-      end
-
-      it "defaults to true" do
-        @field.accessible?.should be_true
-      end
-    end
-
-    context "when set to true" do
-
-      before do
-        @field = Mongoid::Field.new(:name, :accessible => true)
-      end
-
-      it "returns true" do
-        @field.accessible?.should be_true
-      end
-    end
-
-    context "when set to false" do
-
-      before do
-        @field = Mongoid::Field.new(:name, :accessible => false)
-      end
-
-      it "returns false" do
-        @field.accessible?.should be_false
-      end
-    end
-  end
-
   describe "#default" do
 
     before do
@@ -48,32 +12,6 @@ describe Mongoid::Field do
       @field.default.should == 0
     end
 
-    context "when the field is an array" do
-
-      before do
-        @field = Mongoid::Field.new(:vals, :type => Array, :default => [ "first" ])
-      end
-
-      it "dups the array" do
-        array = @field.default
-        array << "second"
-        @field.default.should == [ "first" ]
-      end
-    end
-
-    context "when the field is a hash" do
-
-      before do
-        @field = Mongoid::Field.new(:vals, :type => Hash, :default => { :key => "value" })
-      end
-
-      it "dups the hash" do
-        hash = @field.default
-        hash[:key_two] = "value2"
-        @field.default.should == { :key => "value" }
-      end
-    end
-
   end
 
   describe "#name" do

data/spec/unit/mongoid/fields_spec.rb

@@ -12,29 +12,6 @@ describe Mongoid::Fields do
 
   describe "#defaults" do
 
-    context "with defaults specified as a non-primitive" do
-
-      before do
-        Person.field(:hash_testing, :type => Hash, :default => {})
-        Person.field(:array_testing, :type => Array, :default => [])
-        @first_person = Person.new
-        @second_person = Person.new
-      end
-
-      after do
-        Person.fields.delete("hash_testing")
-        Person.fields.delete("array_testing")
-      end
-
-      it "should not return the same object when calling defaults with a default hash" do
-        @first_person.hash_testing.object_id.should_not == @second_person.hash_testing.object_id
-      end
-
-      it "should not return the same object when calling defaults with a default array" do
-        @first_person.array_testing.object_id.should_not == @second_person.array_testing.object_id
-      end
-    end
-
     context "on parent classes" do
 
       before do
@@ -80,12 +57,6 @@ describe Mongoid::Fields do
         @person.testing.should == "Testy"
       end
 
-      it "adds an reader method with a question mark" do
-        @person = Person.new(:testing => "Test")
-        @person.testing?.should be_true
-        Person.new.testing?.should be_false
-      end
-
     end
 
     context "when type is an object" do
@@ -102,10 +73,6 @@ describe Mongoid::Fields do
           { "name" => "Jack and Coke" }
       end
 
-      it "adds an reader method with a question mark" do
-        @person.mixed_drink?.should be_true
-      end
-
     end
 
     context "when type is a boolean" do

data/spec/unit/mongoid/finders_spec.rb

@@ -40,24 +40,6 @@ describe Mongoid::Finders do
 
   end
 
-  describe ".all_in" do
-
-    it "returns a new criteria with select conditions added" do
-      criteria = Person.all_in(:aliases => [ "Bond", "007" ])
-      criteria.selector.should == { :aliases => { "$all" => [ "Bond", "007" ] } }
-    end
-
-  end
-
-  describe ".any_in" do
-
-    it "returns a new criteria with select conditions added" do
-      criteria = Person.any_in(:aliases => [ "Bond", "007" ])
-      criteria.selector.should == { :aliases => { "$in" => [ "Bond", "007" ] } }
-    end
-
-  end
-
   describe ".count" do
 
     before do
@@ -83,15 +65,6 @@ describe Mongoid::Finders do
 
   end
 
-  describe ".excludes" do
-
-    it "returns a new criteria with select conditions added" do
-      criteria = Person.excludes(:title => "Sir")
-      criteria.selector.should == { :title => { "$ne" => "Sir" } }
-    end
-
-  end
-
   describe ".find" do
 
     before do
@@ -323,15 +296,6 @@ describe Mongoid::Finders do
 
   end
 
-  describe ".not_in" do
-
-    it "returns a new criteria with select conditions added" do
-      criteria = Person.not_in(:aliases => [ "Bond", "007" ])
-      criteria.selector.should == { :aliases => { "$nin" => [ "Bond", "007" ] } }
-    end
-
-  end
-
   describe ".paginate" do
 
     before do
@@ -396,7 +360,7 @@ describe Mongoid::Finders do
 
     it "returns a new criteria with select conditions added" do
       criteria = Person.where(:title => "Sir")
-      criteria.selector.should == { :title => "Sir" }
+      criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :title => "Sir" }
     end
 
   end

data/spec/unit/mongoid/identity_spec.rb

@@ -6,30 +6,9 @@ describe Mongoid::Identity do
 
     let(:name) { Name.new }
 
-    context "when persisting types" do
-
-      it "sets the document _type to the class name" do
-        Mongoid::Identity.create(name)
-        name._type.should == "Name"
-      end
-
-    end
-
-    context "when not persisting types" do
-
-      before do
-        Mongoid.persist_types = false
-        @name = Name.new
-      end
-
-      after do
-        Mongoid.persist_types = true
-      end
-
-      it "does not set the type" do
-        @name._type.should be_nil
-      end
-
+    it "sets the document _type to the class name" do
+      Mongoid::Identity.create(name)
+      name._type.should == "Name"
     end
 
     it "returns the document" do
@@ -61,29 +40,9 @@ describe Mongoid::Identity do
           Mongo::ObjectID.expects(:new).returns(@object_id)
         end
 
-        context "when using object ids" do
-
-          before do
-            Mongoid.use_object_ids = true
-          end
-
-          after do
-            Mongoid.use_object_ids = false
-          end
-
-          it "sets the id to a mongo object id" do
-            Mongoid::Identity.create(@person)
-            @person.id.should == @object_id
-          end
-        end
-
-        context "when not using object ids" do
-
-          it "sets the id to a mongo object id string" do
-            Mongoid::Identity.create(@person)
-            @person.id.should == "1"
-          end
-
+        it "sets the id to a mongo object id" do
+          Mongoid::Identity.create(@person)
+          @person.id.should == "1"
         end
 
       end

data/spec/unit/mongoid/named_scope_spec.rb

@@ -17,7 +17,6 @@ describe Mongoid::NamedScope do
     named_scope :inactive, :where => { :active => false }
     named_scope :frags_over, lambda { |count| { :where => { :frags.gt => count } } }
     named_scope :deaths_under, lambda { |count| criteria.where(:deaths.lt => count) }
-    scope :deaths_over, lambda { |count| criteria.where(:deaths.gt => count) }
 
     class << self
       def alive
@@ -74,22 +73,10 @@ describe Mongoid::NamedScope do
 
     context "when a block is supplied" do
 
-      it "adds a class method for the scope" do
-        Player.should respond_to(:deaths_over)
+      it "adds the block as an extension" do
+        Player.active.extension.should == "extension"
       end
 
-      it "adds the scope to the scopes" do
-        Player.scopes.should include(:deaths_over)
-      end
-
-    end
-
-  end
-
-  describe ".scope" do
-
-    it "aliases to named_scope" do
-      Player.should respond_to(:deaths_over)
     end
 
   end

data/spec/unit/mongoid/scope_spec.rb

@@ -232,7 +232,7 @@ describe Mongoid::Scope do
 
     it "returns the conditions criteria" do
       @scope.target.selector.should ==
-        { :title => "Sir" }
+        { :title => "Sir", :_type => { "$in" => [ "Doctor", "Person" ] } }
     end
 
   end

data/spec/unit/mongoid/validations/uniqueness_spec.rb

@@ -14,7 +14,7 @@ describe Mongoid::Validations::UniquenessValidator do
 
       before do
         @criteria = stub(:empty? => false)
-        Person.expects(:where).with(all_of(has_entry(:title, "Sir"), has_value(@document._id))).returns(@criteria)
+        Person.expects(:where).with(:title => "Sir").returns(@criteria)
         validator.validate_each(@document, :title, "Sir")
       end
 
@@ -28,11 +28,11 @@ describe Mongoid::Validations::UniquenessValidator do
 
     end
 
-    context "when no other document exists with the attribute value" do
+    context "when no document exists with the attribute" do
 
       before do
         @criteria = stub(:empty? => true)
-        Person.expects(:where).with(all_of(has_entry(:title, "Sir"), has_value(@document._id))).returns(@criteria)
+        Person.expects(:where).with(:title => "Sir").returns(@criteria)
         validator.validate_each(@document, :title, "Sir")
       end
 

data/spec/unit/mongoid_spec.rb

@@ -9,6 +9,7 @@ describe Mongoid do
       it "returns the config singleton" do
         Mongoid.configure.should == Mongoid::Config.instance
       end
+
     end
 
     context "when a block is supplied" do
@@ -28,19 +29,9 @@ describe Mongoid do
       it "sets the values on the config instance" do
         Mongoid.allow_dynamic_fields.should be_false
       end
-    end
-  end
 
-  describe ".deprecate" do
-
-    before do
-      @deprecation = mock
-      Mongoid::Deprecation.expects(:instance).returns(@deprecation)
     end
 
-    it "calls alert on the deprecation singleton" do
-      @deprecation.expects(:alert).with("testing")
-      Mongoid.deprecate("testing")
-    end
   end
+
 end