mongoid 4.0.0.alpha2 → 4.0.0.beta1

data/spec/mongoid/relations/bindings/embedded/in_spec.rb

@@ -88,11 +88,11 @@ describe Mongoid::Relations::Bindings::Embedded::In do
         context "when the base has metadata" do
 
           before do
-            address.metadata = person_metadata
+            address.__metadata = person_metadata
           end
 
           it "does not overwrite the existing metadata" do
-            expect(address).to receive(:metadata=).never
+            expect(address).to receive(:__metadata=).never
             binding.bind_one
           end
         end

data/spec/mongoid/relations/builders/referenced/many_spec.rb

@@ -127,7 +127,7 @@ describe Mongoid::Relations::Builders::Referenced::Many do
           it "returns an empty array" do
             Person.new do |p|
               expect(p.posts).to be_empty
-              expect(p.posts.metadata).to_not be_nil
+              expect(p.posts.__metadata).to_not be_nil
             end
           end
         end

data/spec/mongoid/relations/eager/has_and_belongs_to_many_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Relations::Eager::HasAndBelongsToMany do
 
-  describe ".grouped_docs" do
+  describe ".keys_from_docs" do
 
     let(:docs) do
       Person.all.to_a
@@ -26,40 +26,8 @@ describe Mongoid::Relations::Eager::HasAndBelongsToMany do
       end
     end
 
-    it "aggregates by the parent primary key" do
-      expect(eager.grouped_docs.keys).to eq([person.id])
-    end
-  end
-
-  describe ".set_on_parent" do
-
-    let(:docs) do
-      Person.all.to_a
-    end
-
-    let!(:person) do
-      Person.create!(houses: [house])
-    end
-
-    let!(:house) do
-      House.create!
-    end
-
-    let(:metadata) do
-      Person.reflect_on_association(:houses)
-    end
-
-    let(:eager) do
-      described_class.new([metadata], docs).tap do |b|
-        b.shift_metadata
-      end
-    end
-
-    it "sets the relation into the parent" do
-      docs.each do |doc|
-        expect(doc).to receive(:__build__).once.with(:houses, :foo, metadata)
-      end
-      eager.set_on_parent(person.id, :foo)
+    it "aggregates by the foreign key" do
+      expect(eager.keys_from_docs).to eq([house.id])
     end
   end
 
@@ -76,14 +44,20 @@ describe Mongoid::Relations::Eager::HasAndBelongsToMany do
     context "when including the has_and_belongs_to_many relation" do
 
       it "queries twice" do
-
         expect_query(2) do
-
           Person.all.includes(:houses).each do |person|
             expect(person.houses).to_not be_nil
+
+            expect(person.houses.length).to be(3)
           end
         end
       end
+
+      it "has all items" do
+        Person.all.includes(:houses).each do |person|
+          expect(person.ivar(:houses).length).to be(3)
+        end
+      end
     end
 
     context "when the relation is not polymorphic" do

data/spec/mongoid/relations/eager/has_one_spec.rb

@@ -114,7 +114,7 @@ describe Mongoid::Relations::Eager::HasOne do
       end
 
       let!(:eager) do
-        Person.all.includes(:game).first
+        Person.where(_id: person.id).includes(:game).first
       end
 
       it "puts the documents in the parent document" do

data/spec/mongoid/relations/embedded/in_spec.rb

@@ -446,7 +446,7 @@ describe Mongoid::Relations::Embedded::In do
 
     it "returns the valid options" do
       expect(described_class.valid_options).to eq(
-        [ :autobuild, :cyclic, :polymorphic ]
+        [ :autobuild, :cyclic, :polymorphic, :touch ]
       )
     end
   end

data/spec/mongoid/relations/embedded/many_spec.rb

@@ -41,7 +41,7 @@ describe Mongoid::Relations::Embedded::Many do
         end
 
         it "sets the metadata on the child" do
-          expect(address.metadata).to_not be_nil
+          expect(address.__metadata).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -181,7 +181,7 @@ describe Mongoid::Relations::Embedded::Many do
           end
 
           it "sets the metadata on the child" do
-            expect(child_role.metadata).to_not be_nil
+            expect(child_role.__metadata).to_not be_nil
           end
 
           it "sets the index on the child" do
@@ -283,7 +283,7 @@ describe Mongoid::Relations::Embedded::Many do
       end
 
       it "sets the metadata on the child" do
-        expect(address.metadata).to_not be_nil
+        expect(address.__metadata).to_not be_nil
       end
 
       it "sets the index on the child" do
@@ -634,7 +634,7 @@ describe Mongoid::Relations::Embedded::Many do
         end
 
         it "sets the metadata on the child" do
-          expect(child_role.metadata).to_not be_nil
+          expect(child_role.__metadata).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -981,7 +981,7 @@ describe Mongoid::Relations::Embedded::Many do
         end
 
         it "sets the metadata on the child" do
-          expect(address.metadata).to_not be_nil
+          expect(address.__metadata).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -1024,7 +1024,7 @@ describe Mongoid::Relations::Embedded::Many do
         end
 
         it "sets the metadata on the child" do
-          expect(child_role.metadata).to_not be_nil
+          expect(child_role.__metadata).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -1213,7 +1213,7 @@ describe Mongoid::Relations::Embedded::Many do
       end
 
       it "sets the metadata on the child" do
-        expect(address.metadata).to_not be_nil
+        expect(address.__metadata).to_not be_nil
       end
 
       it "sets the index on the child" do
@@ -1320,7 +1320,7 @@ describe Mongoid::Relations::Embedded::Many do
         end
 
         it "sets the metadata on the child" do
-          expect(child_role.metadata).to_not be_nil
+          expect(child_role.__metadata).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -1427,7 +1427,7 @@ describe Mongoid::Relations::Embedded::Many do
       end
 
       it "sets the metadata on the child" do
-        expect(address.metadata).to_not be_nil
+        expect(address.__metadata).to_not be_nil
       end
 
       it "sets the index on the child" do
@@ -1526,7 +1526,7 @@ describe Mongoid::Relations::Embedded::Many do
       end
 
       it "sets the metadata on the child" do
-        expect(address.metadata).to_not be_nil
+        expect(address.__metadata).to_not be_nil
       end
 
       it "sets the index on the child" do

data/spec/mongoid/relations/embedded/one_spec.rb

@@ -174,11 +174,11 @@ describe Mongoid::Relations::Embedded::One do
             end
 
             let(:pet_one) do
-              Pet.new
+              Pet.new(name: 'kika')
             end
 
             let(:pet_two) do
-              Pet.new
+              Pet.new(name: 'tiksy')
             end
 
             before do
@@ -189,6 +189,14 @@ describe Mongoid::Relations::Embedded::One do
             it "runs the destroy callbacks on the old document" do
               expect(pet_one.destroy_flag).to be true
             end
+
+            it "keeps the name of the destroyed" do
+              expect(pet_one.name).to eq("kika")
+            end
+
+            it "saves the new name" do
+              expect(pet_owner.pet.name).to eq("tiksy")
+            end
           end
         end
 

data/spec/mongoid/relations/referenced/in_spec.rb

@@ -79,7 +79,7 @@ describe Mongoid::Relations::Referenced::In do
       end
 
       it "does not erase the metadata" do
-        expect(address.metadata).to_not be_nil
+        expect(address.__metadata).to_not be_nil
       end
 
       it "allows saving of the embedded document" do

data/spec/mongoid/relations/referenced/many_spec.rb

@@ -1577,6 +1577,33 @@ describe Mongoid::Relations::Referenced::Many do
           expect(person.posts.count).to eq(1)
         end
       end
+
+      context "when passing a new object" do
+
+        let!(:odd) do
+          Odd.create(name: 'one')
+        end
+
+        let!(:even) do
+          odd.evens.create(name: 'two', odds: [Odd.new(name: 'three')])
+        end
+
+        it "only push one even to the list" do
+          expect(odd.evens.count).to eq(1)
+        end
+
+        it "saves the reference back" do
+          expect(odd.evens.first.odds.count).to eq(1)
+        end
+
+        it "only saves one even" do
+          expect(Even.count).to eq(1)
+        end
+
+        it "saves the first odd and the second" do
+          expect(Odd.count).to eq(2)
+        end
+      end
     end
 
     context "when the relation is polymorphic" do
@@ -2361,8 +2388,16 @@ describe Mongoid::Relations::Referenced::Many do
             movie.ratings.find([ rating_one.id, rating_two.id ])
           end
 
-          it "returns the matching documents" do
-            expect(ratings).to eq([ rating_one, rating_two ])
+          it "returns the first matching document" do
+            expect(ratings).to include(rating_one)
+          end
+
+          it "returns the second matching document" do
+            expect(ratings).to include(rating_two)
+          end
+
+          it "returns the correct number of documents" do
+            expect(ratings.size).to eq(2)
           end
         end
 

data/spec/mongoid/relations/touchable_spec.rb

@@ -207,6 +207,26 @@ describe Mongoid::Relations::Touchable do
 
     context "when relations have touch options" do
 
+      context "when the relation is a parent of an embedded doc" do
+
+        let(:page) do
+          WikiPage.create(title: "test")
+        end
+
+        let!(:edit) do
+          page.edits.create
+        end
+
+        before do
+          page.unset(:updated_at)
+          edit.touch
+        end
+
+        it "touches the parent document" do
+          expect(page.updated_at).to be_within(5).of(Time.now)
+        end
+      end
+
       context "when the relation is nil" do
 
         let!(:agent) do

data/spec/mongoid/{state_spec.rb → stateful_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::State do
+describe Mongoid::Stateful do
 
   describe "#new_record?" do
 
@@ -99,4 +99,29 @@ describe Mongoid::State do
       end
     end
   end
+
+  describe "#readonly?" do
+
+    let(:document) do
+      Band.new
+    end
+
+    context "when the document is readonly" do
+
+      before do
+        document.__selected_fields = { test: 1 }
+      end
+
+      it "returns true" do
+        expect(document).to be_readonly
+      end
+    end
+
+    context "when no readonly has been set" do
+
+      it "returns false" do
+        expect(document).to_not be_readonly
+      end
+    end
+  end
 end

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -0,0 +1,285 @@
+require "rake"
+require "spec_helper"
+
+unless defined?(Rails)
+  module Rails
+  end
+end
+
+shared_context "rake task" do
+  let(:task_name) { self.class.top_level_description }
+  let(:task) { Rake.application[task_name] }
+  let(:task_file) { "mongoid/tasks/database" }
+
+  let(:logger) do
+    double("logger").tap do |log|
+      allow(log).to receive(:info)
+    end
+  end
+
+  before do
+    rake = Rake::Application.new
+    Rake.application = rake
+    rake.rake_require(task_file, $LOAD_PATH, [])
+    Rake::Task.define_task(:environment)
+
+    allow(Mongoid::Tasks::Database).to receive(:logger).and_return(logger)
+  end
+
+  shared_examples_for "create_indexes" do
+
+    it "receives create_indexes" do
+      expect(Mongoid::Tasks::Database).to receive(:create_indexes)
+      task.invoke
+    end
+  end
+end
+
+shared_context "rails rake task" do
+  let(:task_file) { "mongoid/railties/database" }
+
+  let(:application) do
+    app = double("application")
+    allow(app).to receive(:eager_load!)
+    app
+  end
+end
+
+describe "db:drop" do
+  include_context "rake task"
+  include_context "rails rake task"
+
+  it "calls mongoid:drop" do
+    expect(task.prerequisites).to include("mongoid:drop")
+  end
+
+  it "works" do
+    task.invoke
+  end
+end
+
+describe "db:purge" do
+  include_context "rake task"
+  include_context "rails rake task"
+
+  it "calls mongoid:drop" do
+    expect(task.prerequisites).to include("mongoid:purge")
+  end
+
+  it "works" do
+    task.invoke
+  end
+end
+
+describe "db:seed" do
+  include_context "rake task"
+  include_context "rails rake task"
+
+  it "calls environment" do
+    expect(task.prerequisites).to include("environment")
+  end
+
+  it "works" do
+    expect(Rails).to receive(:root).and_return(".")
+    task.invoke
+  end
+end
+
+describe "db:setup" do
+  include_context "rake task"
+  include_context "rails rake task"
+
+  it "calls db:create" do
+    expect(task.prerequisites).to include("db:create")
+  end
+
+  it "calls db:mongoid:create_indexes" do
+    expect(task.prerequisites).to include("mongoid:create_indexes")
+  end
+
+  it "calls db:seed" do
+    expect(task.prerequisites).to include("db:seed")
+  end
+
+  it_behaves_like "create_indexes" do
+
+    before do
+      expect(Rails).to receive(:root).and_return(".")
+      expect(Rails).to receive(:application).and_return(application)
+    end
+  end
+
+  it "works" do
+    expect(Mongoid::Tasks::Database).to receive(:create_indexes)
+    expect(Rails).to receive(:root).and_return(".")
+    expect(Rails).to receive(:application).and_return(application)
+    task.invoke
+  end
+end
+
+describe "db:reset" do
+  include_context "rake task"
+  include_context "rails rake task"
+
+  it "calls db:drop" do
+    expect(task.prerequisites).to include("db:drop")
+  end
+
+  it "calls db:seed" do
+    expect(task.prerequisites).to include("db:seed")
+  end
+
+  it "works" do
+    expect(Rails).to receive(:root).and_return(".")
+    task.invoke
+  end
+end
+
+describe "db:create" do
+  include_context "rake task"
+  include_context "rails rake task"
+
+  it "works" do
+    task.invoke
+  end
+end
+
+describe "db:migrate" do
+  include_context "rake task"
+  include_context "rails rake task"
+
+  it "works" do
+    task.invoke
+  end
+end
+
+describe "db:test:prepare" do
+  include_context "rake task"
+  include_context "rails rake task"
+
+  it_behaves_like "create_indexes" do
+    before do
+      expect(Rails).to receive(:application).and_return(application)
+    end
+  end
+
+  it "calls mongoid:create_indexes" do
+    expect(task.prerequisites).to include("mongoid:create_indexes")
+  end
+
+  it "works" do
+    expect(Rails).to receive(:application).and_return(application)
+    expect(Mongoid::Tasks::Database).to receive(:create_indexes)
+    task.invoke
+  end
+end
+
+describe "db:mongoid:create_indexes" do
+  include_context "rake task"
+
+  it_behaves_like "create_indexes"
+
+  it "calls load_models" do
+    expect(task.prerequisites).to include("load_models")
+  end
+
+  it "calls environment" do
+    expect(task.prerequisites).to include("environment")
+  end
+
+  context "when using rails task" do
+    include_context "rails rake task"
+
+    before do
+      expect(Rails).to receive(:application).and_return(application)
+    end
+
+    it_behaves_like "create_indexes"
+  end
+end
+
+describe "db:mongoid:remove_undefined_indexes" do
+  include_context "rake task"
+
+  it "receives remove_undefined_indexes" do
+    expect(Mongoid::Tasks::Database).to receive(:remove_undefined_indexes)
+    task.invoke
+  end
+
+  it "calls environment" do
+    expect(task.prerequisites).to include("environment")
+  end
+
+  context "when using rails task" do
+    include_context "rails rake task"
+
+    before do
+      expect(Rails).to receive(:application).and_return(application)
+    end
+
+    it "receives remove_undefined_indexes" do
+      expect(Mongoid::Tasks::Database).to receive(:remove_undefined_indexes)
+      task.invoke
+    end
+  end
+end
+
+describe "db:mongoid:remove_indexes" do
+  include_context "rake task"
+
+  it "receives remove_indexes" do
+    expect(Mongoid::Tasks::Database).to receive(:remove_indexes)
+    task.invoke
+  end
+
+  it "calls environment" do
+    expect(task.prerequisites).to include("environment")
+  end
+
+  context "when using rails task" do
+    include_context "rails rake task"
+
+    before do
+      expect(Rails).to receive(:application).and_return(application)
+    end
+
+    it "receives remove_indexes" do
+      expect(Mongoid::Tasks::Database).to receive(:remove_indexes)
+      task.invoke
+    end
+  end
+end
+
+describe "db:mongoid:drop" do
+  include_context "rake task"
+
+  it "works" do
+    task.invoke
+  end
+
+  context "when using rails task" do
+    include_context "rails rake task"
+
+    it "works" do
+      task.invoke
+    end
+  end
+end
+
+describe "db:mongoid:purge" do
+  include_context "rake task"
+
+  it "receives a purge" do
+    expect(Mongoid).to receive(:purge!)
+    task.invoke
+  end
+
+  context "when using rails task" do
+    include_context "rails rake task"
+
+    it "receives a purge" do
+      expect(Mongoid).to receive(:purge!)
+      task.invoke
+    end
+  end
+end