mongoid 1.2.6 → 1.2.7

data/lib/mongoid/document.rb

@@ -229,6 +229,7 @@ module Mongoid #:nodoc:
       # Reloads the +Document+ attributes from the database.
       def reload
         @attributes = collection.find_one(:_id => id)
+        self
       end
 
       # Remove a child document from this parent +Document+. Will reset the

data/lib/mongoid/enslavement.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Enslavement #:nodoc:
+    def self.included(base)
+      base.class_eval do
+        extend ClassMethods
+        class_inheritable_accessor :enslaved
+        self.enslaved = false
+
+        delegate :enslaved?, :to => "self.class"
+      end
+    end
+
+    module ClassMethods #:nodoc
+      # Set whether or not this documents read operations should delegate to
+      # the slave database by default.
+      #
+      # Example:
+      #
+      #   class Person
+      #     include Mongoid::Document
+      #     enslave
+      #   end
+      def enslave
+        self.enslaved = true
+      end
+
+      # Determines if the class is enslaved or not.
+      #
+      # Returns:
+      #
+      # True if enslaved, false if not.
+      def enslaved?
+        self.enslaved == true
+      end
+    end
+  end
+end

data/lib/mongoid/fields.rb

@@ -46,13 +46,16 @@ module Mongoid #:nodoc
       def create_accessors(name, meth, options = {})
         define_method(meth) { read_attribute(name) }
         define_method("#{meth}=") { |value| write_attribute(name, value) }
-        define_method("#{meth}?") { read_attribute(name) == true } if options[:type] == Boolean
+        define_method("#{meth}?") do
+          attr = read_attribute(name)
+          (options[:type] == Boolean) ? attr == true : attr.present?
+        end
       end
 
       # Set up a default value for a field.
       def set_default(name, options = {})
         value = options[:default]
-        defaults[name] = value if value
+        defaults[name] = value unless value.nil?
       end
     end
   end

data/lib/mongoid/identity.rb

@@ -13,10 +13,16 @@ module Mongoid #:nodoc:
       end
 
       protected
+      # Return the proper id for the document.
+      def generate_id
+        id = Mongo::ObjectID.new
+        Mongoid.use_object_ids ? id : id.to_s
+      end
+
       # Set the id for the document.
       def identify(doc)
         doc.id = compose(doc).join(" ").identify if doc.primary_key
-        doc.id = Mongo::ObjectID.new.to_s unless doc.id
+        doc.id = generate_id unless doc.id
       end
 
       # Set the _type field on the document.

data/lib/mongoid/named_scope.rb

@@ -28,6 +28,8 @@ module Mongoid #:nodoc:
       EOT
     end
 
+    alias :scope :named_scope
+
     # Return the scopes or default to an empty +Hash+.
     def scopes
       read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.6"
+  s.version = "1.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-02-18}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
      "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",
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
      "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",
@@ -167,6 +169,7 @@ Gem::Specification.new do |s|
      "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",
@@ -174,6 +177,7 @@ Gem::Specification.new do |s|
      "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",
@@ -282,6 +286,7 @@ Gem::Specification.new do |s|
      "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",
@@ -289,6 +294,7 @@ Gem::Specification.new do |s|
      "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",

data/spec/integration/mongoid/commands_spec.rb

@@ -200,7 +200,7 @@ describe Mongoid::Commands do
   describe ".delete_all" do
 
     it "returns true" do
-      Person.delete_all.should be_true
+      Person.delete_all.should == true
     end
 
   end
@@ -208,7 +208,7 @@ describe Mongoid::Commands do
   describe ".destroy_all" do
 
     it "returns true" do
-      Person.destroy_all.should be_true
+      Person.destroy_all.should == true
     end
 
   end

data/spec/integration/mongoid/contexts/enumerable_spec.rb

@@ -17,4 +17,17 @@ describe Mongoid::Contexts::Enumerable do
       addresses.size.should == 5
     end
   end
+
+  describe "limit and skip" do
+
+    it "limits" do
+      @person.addresses.criteria.limit(5).size.should == 5
+    end
+
+    it "skips" do
+      @person.addresses.criteria.skip(5).limit(10).
+        map(&:number).should == [5, 6, 7, 8, 9]
+    end
+
+  end
 end

data/spec/integration/mongoid/criteria_spec.rb

@@ -215,9 +215,9 @@ describe Mongoid::Criteria do
 
     it "iterates over the cursor only once" do
       criteria = Person.where(:title => "Sir").cache
-      criteria.collect.size.should == 10
+      criteria.collect.to_a.size.should == 10
       # Do it again!
-      criteria.collect.size.should == 10
+      criteria.collect.to_a.size.should == 10
     end
   end
 

data/spec/integration/mongoid/document_spec.rb

@@ -285,7 +285,7 @@ describe Mongoid::Document do
     end
 
     it "returns a pretty string of class name and attributes" do
-      attrs = Person.fields.map { |name, field| "#{name}: #{@person.attributes[name] || 'nil'}" } * ", "
+      attrs = Person.fields.map { |name, field| "#{name}: #{@person.attributes[name].nil? ? 'nil' : @person.attributes[name]}" } * ", "
       @person.inspect.should == "#<Person _id: #{@person.id}, #{attrs}>"
     end
 
@@ -325,6 +325,10 @@ describe Mongoid::Document do
       @person.age.should == 35
     end
 
+    it "reload should return self" do
+      @person.reload.should == @from_db
+    end
+
   end
 
   describe "#save" do

data/spec/integration/mongoid/finders_spec.rb

@@ -4,59 +4,116 @@ describe Mongoid::Finders do
 
   describe "#find" do
 
-    before do
-      @documents = []
-      @document = Person.create(:title => "Mrs.", :ssn => "another")
-      3.times do |n|
-        @documents << Person.create(:title => "Mr.", :ssn => "#{n}22")
+    context "using string ids" do
+
+      before do
+        @documents = []
+        @document = Person.create(:title => "Mrs.", :ssn => "another")
+        3.times do |n|
+          @documents << Person.create(:title => "Mr.", :ssn => "#{n}22")
+        end
       end
-    end
 
-    after do
-      Person.delete_all
-    end
+      after do
+        Person.delete_all
+      end
 
-    context "with an id as an argument" do
+      context "with an id as an argument" do
 
-      context "when the document is found" do
+        context "when the document is found" do
+
+          it "returns the document" do
+            Person.find(@document.id).should == @document
+          end
 
-        it "returns the document" do
-          Person.find(@document.id).should == @document
         end
 
-      end
+        context "when the document is not found" do
 
-      context "when the document is not found" do
+          it "raises an error" do
+            lambda { Person.find("5") }.should raise_error
+          end
 
-        it "raises an error" do
-          lambda { Person.find("5") }.should raise_error
         end
 
       end
 
-    end
+      context "with an array of ids as args" do
 
-    context "with an array of ids as args" do
+        context "when the documents are found" do
 
-      context "when the documents are found" do
+          it "returns an array of the documents" do
+            @people = Person.find(@documents.map(&:id))
+            @people.should == @documents
+          end
 
-        it "returns an array of the documents" do
-          @people = Person.find(@documents.map(&:id))
-          @people.should == @documents
         end
 
+        context "when no documents found" do
+
+          it "raises an error" do
+            lambda { Person.find(["11", "21", "31"]) }.should raise_error
+          end
+
+        end
       end
+    end
 
-      context "when no documents found" do
+    context "using object ids" do
 
-        it "raises an error" do
-          lambda { Person.find(["11", "21", "31"]) }.should raise_error
+      before do
+        Mongoid.use_object_ids = true
+        @documents = []
+        @document = Person.create(:title => "Mrs.", :ssn => "another")
+        3.times do |n|
+          @documents << Person.create(:title => "Mr.", :ssn => "#{n}22")
         end
+      end
 
+      after do
+        Mongoid.use_object_ids = false
+        Person.delete_all
       end
 
-    end
+      context "with an id as an argument" do
 
-  end
+        context "when the document is found" do
+
+          it "returns the document" do
+            Person.find(@document.id).should == @document
+          end
+
+        end
 
+        context "when the document is not found" do
+
+          it "raises an error" do
+            lambda { Person.find("5") }.should raise_error
+          end
+
+        end
+
+      end
+
+      context "with an array of ids as args" do
+
+        context "when the documents are found" do
+
+          it "returns an array of the documents" do
+            @people = Person.find(@documents.map(&:id))
+            @people.should == @documents
+          end
+
+        end
+
+        context "when no documents found" do
+
+          it "raises an error" do
+            lambda { Person.find(["11", "21", "31"]) }.should raise_error
+          end
+
+        end
+      end
+    end
+  end
 end

data/spec/models/person.rb

@@ -4,6 +4,7 @@ class Person
 
   field :title
   field :terms, :type => Boolean
+  field :pets, :type => Boolean, :default => false
   field :age, :type => Integer, :default => 100
   field :dob, :type => Date
   field :mixed_drink, :type => MixedDrink

data/spec/unit/mongoid/associations_spec.rb

@@ -199,6 +199,18 @@ describe Mongoid::Associations do
 
     end
 
+    context "when attributes are nil" do
+
+      before do
+        @writer = @canvas.build_writer(nil)
+      end
+
+      it "defaults them to empty" do
+        @writer.should be_a_kind_of(Writer)
+      end
+
+    end
+
   end
 
   describe "#create_*" do

data/spec/unit/mongoid/attributes_spec.rb

@@ -331,6 +331,7 @@ describe Mongoid::Attributes do
 
       it "returns the default value" do
         @person.age.should == 100
+        @person.pets.should == false
       end
 
     end
@@ -391,83 +392,91 @@ describe Mongoid::Attributes do
 
   end
 
-  describe "#write_attributes" do
-
-    context "typecasting" do
-
-      before do
-        @person = Person.new
-        @attributes = { :age => "50" }
-      end
-
-      it "properly casts values" do
-        @person.write_attributes(@attributes)
-        @person.age.should == 50
-      end
-
-      it "allows passing of nil" do
-        @person.write_attributes(nil)
-        @person.age.should == 100
-      end
+  describe "#attributes=" do
+    it 'should be a alias of write_attributes' do
 
     end
+  end
 
-    context "on a parent document" do
+  [:attributes=, :write_attributes].each do |method|
+    describe "##{method}" do
 
-      context "when the parent has a has many through a has one" do
+      context "typecasting" do
 
         before do
-          @owner = PetOwner.new(:title => "Mr")
-          @pet = Pet.new(:name => "Fido")
-          @owner.pet = @pet
-          @vet_visit = VetVisit.new(:date => Date.today)
-          @pet.vet_visits = [@vet_visit]
+          @person = Person.new
+          @attributes = { :age => "50" }
+        end
+
+        it "properly casts values" do
+          @person.send(method, @attributes)
+          @person.age.should == 50
         end
 
-        it "does not overwrite child attributes if not in the hash" do
-          @owner.write_attributes({ :pet => { :name => "Bingo" } })
-          @owner.pet.name.should == "Bingo"
-          @owner.pet.vet_visits.size.should == 1
+        it "allows passing of nil" do
+          @person.send(method, nil)
+          @person.age.should == 100
         end
 
       end
 
-    end
+      context "on a parent document" do
 
-    context "on a child document" do
+        context "when the parent has a has many through a has one" do
 
-      context "when child is part of a has one" do
+          before do
+            @owner = PetOwner.new(:title => "Mr")
+            @pet = Pet.new(:name => "Fido")
+            @owner.pet = @pet
+            @vet_visit = VetVisit.new(:date => Date.today)
+            @pet.vet_visits = [@vet_visit]
+          end
 
-        before do
-          @person = Person.new(:title => "Sir", :age => 30)
-          @name = Name.new(:first_name => "Test", :last_name => "User")
-          @person.name = @name
-        end
+          it "does not overwrite child attributes if not in the hash" do
+            @owner.send(method, { :pet => { :name => "Bingo" } })
+            @owner.pet.name.should == "Bingo"
+            @owner.pet.vet_visits.size.should == 1
+          end
 
-        it "sets the child attributes on the parent" do
-          @name.write_attributes(:first_name => "Test2", :last_name => "User2")
-          @person.attributes[:name].should ==
-            { "_id" => "test-user", "first_name" => "Test2", "last_name" => "User2", "_type" => "Name" }
         end
 
       end
 
-      context "when child is part of a has many" do
+      context "on a child document" do
+
+        context "when child is part of a has one" do
+
+          before do
+            @person = Person.new(:title => "Sir", :age => 30)
+            @name = Name.new(:first_name => "Test", :last_name => "User")
+            @person.name = @name
+          end
+
+          it "sets the child attributes on the parent" do
+            @name.send(method, :first_name => "Test2", :last_name => "User2")
+            @person.attributes[:name].should ==
+              { "_id" => "test-user", "first_name" => "Test2", "last_name" => "User2", "_type" => "Name" }
+          end
 
-        before do
-          @person = Person.new(:title => "Sir")
-          @address = Address.new(:street => "Test")
-          @person.addresses << @address
         end
 
-        it "updates the child attributes on the parent" do
-          @address.write_attributes("street" => "Test2")
-          @person.attributes[:addresses].should ==
-            [ { "_id" => "test", "street" => "Test2", "_type" => "Address" } ]
+        context "when child is part of a has many" do
+
+          before do
+            @person = Person.new(:title => "Sir")
+            @address = Address.new(:street => "Test")
+            @person.addresses << @address
+          end
+
+          it "updates the child attributes on the parent" do
+            @address.send(method, "street" => "Test2")
+            @person.attributes[:addresses].should ==
+              [ { "_id" => "test", "street" => "Test2", "_type" => "Address" } ]
+          end
+
         end
 
       end
-
     end
 
   end