mongoid 1.2.6 → 1.2.7

data/spec/unit/mongoid/document_spec.rb

@@ -554,6 +554,10 @@ 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

data/spec/unit/mongoid/enslavement_spec.rb

@@ -0,0 +1,63 @@
+require "spec_helper"
+
+describe Mongoid::Enslavement do
+
+  before do
+    @klass = Class.new do
+      include Mongoid::Enslavement
+    end
+  end
+
+  describe ".enslave" do
+
+    before do
+      @klass.enslave
+    end
+
+    it "sets the enslaved boolean on the class" do
+      @klass.enslaved.should be_true
+    end
+
+  end
+
+  describe ".enslaved" do
+
+    it "defaults to false" do
+      @klass.enslaved.should be_false
+    end
+  end
+
+  describe ".enslaved?" do
+
+    context "when the class is enslaved" do
+
+      before do
+        @klass.enslave
+      end
+
+      it "returns true" do
+        @klass.should be_enslaved
+      end
+    end
+
+    context "when the class is not enslaved" do
+
+      it "returns false" do
+        @klass.should_not be_enslaved
+      end
+    end
+
+  end
+
+  describe "#enslaved?" do
+
+    before do
+      @klass.enslave
+      @doc = @klass.new
+    end
+
+    it "returns the class enslaved? value" do
+      @doc.should be_enslaved
+    end
+  end
+end

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 }),
-          HashWithIndifferentAccess.new({ :_id => 2, :title => "Madam", :age => 100, :_type => "Person", "blood_alcohol_content" => 0.0 }) ]
+        [ 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 }) ]
     end
 
   end

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

@@ -6,7 +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 }
+        { "_id" => 1, "title" => "Sir", "age" => 100, "_type" => "Person", "blood_alcohol_content" => 0.0, "pets" => false}
     end
 
   end
@@ -28,7 +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 }
+        @attributes = { "_id" => "test", "title" => "Sir", "age" => 100, "_type" => "Person", "blood_alcohol_content" => 0.0, "pets" => false }
         @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 => { :_type => { "$in" => [ "Doctor", "Person" ] }, :title => "Sir" } }
+          { :where => { :title => "Sir" } }
       end
 
     end

data/spec/unit/mongoid/fields_spec.rb

@@ -57,6 +57,12 @@ 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
@@ -73,6 +79,10 @@ 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

@@ -360,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 == { :_type => { "$in" => ["Doctor", "Person"] }, :title => "Sir" }
+      criteria.selector.should == { :title => "Sir" }
     end
 
   end

data/spec/unit/mongoid/identity_spec.rb

@@ -40,9 +40,29 @@ describe Mongoid::Identity do
           Mongo::ObjectID.expects(:new).returns(@object_id)
         end
 
-        it "sets the id to a mongo object id" do
-          Mongoid::Identity.create(@person)
-          @person.id.should == "1"
+        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
+
         end
 
       end

data/spec/unit/mongoid/named_scope_spec.rb

@@ -17,6 +17,7 @@ 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
@@ -73,10 +74,22 @@ describe Mongoid::NamedScope do
 
     context "when a block is supplied" do
 
-      it "adds the block as an extension" do
-        Player.active.extension.should == "extension"
+      it "adds a class method for the scope" do
+        Player.should respond_to(:deaths_over)
       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", :_type => { "$in" => [ "Doctor", "Person" ] } }
+        { :title => "Sir" }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -05:00
+date: 2010-02-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,6 +119,7 @@ files:
 - lib/mongoid/config.rb
 - lib/mongoid/contexts.rb
 - lib/mongoid/contexts/enumerable.rb
+- lib/mongoid/contexts/ids.rb
 - lib/mongoid/contexts/mongo.rb
 - lib/mongoid/contexts/paging.rb
 - lib/mongoid/criteria.rb
@@ -128,6 +129,7 @@ files:
 - lib/mongoid/criterion/optional.rb
 - lib/mongoid/cursor.rb
 - lib/mongoid/document.rb
+- lib/mongoid/enslavement.rb
 - lib/mongoid/errors.rb
 - lib/mongoid/extensions.rb
 - lib/mongoid/extensions/array/accessors.rb
@@ -233,6 +235,7 @@ files:
 - spec/unit/mongoid/config_spec.rb
 - spec/unit/mongoid/contexts/enumerable_spec.rb
 - spec/unit/mongoid/contexts/mongo_spec.rb
+- spec/unit/mongoid/contexts_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/criterion/complex_spec.rb
 - spec/unit/mongoid/criterion/exclusion_spec.rb
@@ -240,6 +243,7 @@ files:
 - spec/unit/mongoid/criterion/optional_spec.rb
 - spec/unit/mongoid/cursor_spec.rb
 - spec/unit/mongoid/document_spec.rb
+- spec/unit/mongoid/enslavement_spec.rb
 - spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb
 - spec/unit/mongoid/extensions/array/assimilation_spec.rb
@@ -370,6 +374,7 @@ test_files:
 - spec/unit/mongoid/config_spec.rb
 - spec/unit/mongoid/contexts/enumerable_spec.rb
 - spec/unit/mongoid/contexts/mongo_spec.rb
+- spec/unit/mongoid/contexts_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/criterion/complex_spec.rb
 - spec/unit/mongoid/criterion/exclusion_spec.rb
@@ -377,6 +382,7 @@ test_files:
 - spec/unit/mongoid/criterion/optional_spec.rb
 - spec/unit/mongoid/cursor_spec.rb
 - spec/unit/mongoid/document_spec.rb
+- spec/unit/mongoid/enslavement_spec.rb
 - spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb
 - spec/unit/mongoid/extensions/array/assimilation_spec.rb