mongoid 4.0.1 → 4.0.2

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

@@ -2560,6 +2560,136 @@ describe Mongoid::Relations::Referenced::Many do
     end
   end
 
+  describe "#find_or_create_by!" do
+
+    context "when the relation is not polymorphic" do
+
+      let(:person) do
+        Person.create
+      end
+
+      let!(:post) do
+        person.posts.create(title: "Testing")
+      end
+
+      context "when the document exists" do
+
+        let(:found) do
+          person.posts.find_or_create_by!(title: "Testing")
+        end
+
+        it "returns the document" do
+          expect(found).to eq(post)
+        end
+
+        it "keeps the document in the relation" do
+          expect(found.person).to eq(person)
+        end
+      end
+
+      context "when the document does not exist" do
+
+        context "when there is no criteria attached" do
+
+          let(:found) do
+            person.posts.find_or_create_by!(title: "Test") do |post|
+              post.content = "The Content"
+            end
+          end
+
+          it "sets the new document attributes" do
+            expect(found.title).to eq("Test")
+          end
+
+          it "returns a newly persisted document" do
+            expect(found).to be_persisted
+          end
+
+          it "calls the passed block" do
+            expect(found.content).to eq("The Content")
+          end
+
+          it "keeps the document in the relation" do
+            expect(found.person).to eq(person)
+          end
+        end
+
+        context "when a criteria is attached" do
+
+          let(:found) do
+            person.posts.recent.find_or_create_by!(title: "Test")
+          end
+
+          it "sets the new document attributes" do
+            expect(found.title).to eq("Test")
+          end
+
+          it "returns a newly persisted document" do
+            expect(found).to be_persisted
+          end
+
+          it "keeps the document in the relation" do
+            expect(found.person).to eq(person)
+          end
+        end
+      end
+    end
+
+    context "when the relation is polymorphic" do
+
+      let(:movie) do
+        Movie.create
+      end
+
+      let!(:rating) do
+        movie.ratings.create(value: 1)
+      end
+
+      context "when the document exists" do
+
+        let(:found) do
+          movie.ratings.find_or_create_by!(value: 1)
+        end
+
+        it "returns the document" do
+          expect(found).to eq(rating)
+        end
+
+        it "keeps the document in the relation" do
+          expect(found.ratable).to eq(movie)
+        end
+      end
+
+      context "when the document does not exist" do
+
+        let(:found) do
+          movie.ratings.find_or_create_by!(value: 3)
+        end
+
+        it "sets the new document attributes" do
+          expect(found.value).to eq(3)
+        end
+
+        it "returns a newly persisted document" do
+          expect(found).to be_persisted
+        end
+
+        it "keeps the document in the relation" do
+          expect(found.ratable).to eq(movie)
+        end
+
+        context "when validation fails" do
+
+          it "raises an error" do
+            expect {
+              movie.comments.find_or_create_by!(title: "")
+            }.to raise_error(Mongoid::Errors::Validations)
+          end
+        end
+      end
+    end
+  end
+
   describe "#find_or_initialize_by" do
 
     context "when the relation is not polymorphic" do

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

@@ -2466,6 +2466,55 @@ describe Mongoid::Relations::Referenced::ManyToMany do
     end
   end
 
+  describe "#find_or_create_by!" do
+
+    context "when the relation is not polymorphic" do
+
+      let(:person) do
+        Person.create
+      end
+
+      let!(:preference) do
+        person.preferences.create(name: "Testing")
+      end
+
+      context "when the document exists" do
+
+        let(:found) do
+          person.preferences.find_or_create_by!(name: "Testing")
+        end
+
+        it "returns the document" do
+          expect(found).to eq(preference)
+        end
+      end
+
+      context "when the document does not exist" do
+
+        let(:found) do
+          person.preferences.find_or_create_by!(name: "Test")
+        end
+
+        it "sets the new document attributes" do
+          expect(found.name).to eq("Test")
+        end
+
+        it "returns a newly persisted document" do
+          expect(found).to be_persisted
+        end
+
+        context "when validation fails" do
+
+          it "raises an error" do
+            expect {
+              person.preferences.find_or_create_by!(name: "A")
+            }.to raise_error(Mongoid::Errors::Validations)
+          end
+        end
+      end
+    end
+  end
+
   describe "#find_or_initialize_by" do
 
     context "when the relation is not polymorphic" do

data/spec/mongoid/sessions/options_spec.rb

@@ -65,7 +65,8 @@ describe Mongoid::Sessions::Options do
     end
 
     it "passes down the options to collection" do
-      expect_any_instance_of(Moped::Session).to receive(:with).with(options).and_return({})
+      session = Band.mongo_session
+      expect_any_instance_of(Moped::Session).to receive(:with).with(options).and_return(session)
       instance.collection
     end
   end

data/spec/mongoid/sessions_spec.rb

@@ -409,6 +409,36 @@ describe Mongoid::Sessions do
       end
     end
 
+    context "when overridden the database with store_in" do
+
+      before do
+        Band.store_in(database: database_id_alt)
+      end
+
+      context "on instance level" do
+
+        let(:band) do
+          Band.new.with({:read=>:primary})
+        end
+
+        it "uses the new database" do
+          expect(band.mongo_session.send(:current_database).name).to eq database_id_alt
+        end
+
+        context "when using another database before" do
+
+          before do
+            band
+            User.create!
+          end
+
+          it "uses the new database" do
+            expect(band.mongo_session.send(:current_database).name).to eq database_id_alt
+          end
+        end
+      end
+    end
+
     context "when overriding to a monghq single server", config: :mongohq do
 
       shared_examples_for "an overridden session to a mongohq single server" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -390,6 +390,7 @@ files:
 - spec/app/models/circus.rb
 - spec/app/models/code.rb
 - spec/app/models/comment.rb
+- spec/app/models/contextable_item.rb
 - spec/app/models/contractor.rb
 - spec/app/models/cookie.rb
 - spec/app/models/country_code.rb
@@ -783,7 +784,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Elegant Persistance in Ruby for MongoDB.
@@ -834,6 +835,7 @@ test_files:
 - spec/app/models/circus.rb
 - spec/app/models/code.rb
 - spec/app/models/comment.rb
+- spec/app/models/contextable_item.rb
 - spec/app/models/contractor.rb
 - spec/app/models/cookie.rb
 - spec/app/models/country_code.rb