mongoid 5.0.2 → 5.1.0

data/spec/mongoid/persistable_spec.rb

@@ -168,6 +168,30 @@ describe Mongoid::Persistable do
 
         it_behaves_like "an atomically updatable root document"
       end
+
+      context "when nesting atomically calls" do
+
+        before do
+          class Band
+            def my_updates
+              atomically do |d|
+                d.set(name: "Placebo")
+                d.unset(:origin)
+              end
+            end
+          end
+        end
+
+        let!(:update) do
+          document.atomically do |doc|
+            doc.inc(member_count: 10)
+            doc.bit(likes: { and: 13 })
+            doc.my_updates
+          end
+        end
+
+        it_behaves_like "an atomically updatable root document"
+      end
     end
 
     context "when providing no block "do

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

@@ -3592,6 +3592,22 @@ describe Mongoid::Relations::Embedded::Many do
     it "properly orders the related objects" do
       expect(criteria.to_a).to eq([message_two, message_one, message_three])
     end
+
+    context "when the field to order on is an array of documents" do
+
+      before do
+        person.aliases = [ { name: "A", priority: 3 }, { name: "B", priority: 4 }]
+        person.save
+      end
+
+      let!(:person2) do
+        Person.create( aliases: [ { name: "C", priority: 1 }, { name: "D", priority: 2 }])
+      end
+
+      it "allows ordering on a key of an embedded document" do
+        expect(Person.all.order_by("aliases.0.priority" => 1).first).to eq(person2)
+      end
+    end
   end
 
   context "when using dot notation in a criteria" do

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

@@ -200,6 +200,24 @@ describe Mongoid::Relations::Referenced::Many do
             expect(person.changed).to eq([])
           end
 
+          context "when the related item has embedded relations" do
+
+            let!(:user) do
+              User.create
+            end
+
+            before do
+              p = Post.create(roles: [ Role.create ])
+              user.posts = [ p ]
+              user.save
+            end
+
+            it "add the document to the target" do
+              expect(user.posts.size).to eq(1)
+              expect(user.posts.first.roles.size).to eq(1)
+            end
+          end
+
           context "when saving another post" do
 
             before do
@@ -3514,6 +3532,24 @@ describe Mongoid::Relations::Referenced::Many do
         expect(artist.albums).to eq([ album ])
       end
     end
+
+    context 'when the relation already exists' do
+
+      before do
+        artist.albums << album
+        album.save
+        artist.save
+        expect(artist).not_to receive(:after_add_album)
+      end
+
+      let(:reloaded_album) do
+        Album.where(artist_id: artist.id).first
+      end
+
+      it 'does not execute the callback when the relation is accessed' do
+        expect(reloaded_album.artist.after_add_referenced_called).to be(nil)
+      end
+    end
   end
 
   context "when #delete or #clear with before_remove callback" do
@@ -3732,4 +3768,28 @@ describe Mongoid::Relations::Referenced::Many do
       expect(reloaded.name).to eq(new_child_name)
     end
   end
+
+  context 'when a document has referenced and embedded relations' do
+
+    let(:agent) do
+      Agent.new
+    end
+
+    let(:basic) do
+      Basic.new
+    end
+
+    let(:address) do
+      Address.new
+    end
+
+    before do
+      agent.basics << basic
+      agent.address = address
+    end
+
+    it 'saves the document correctly' do
+      expect(agent.save).to be(true)
+    end
+  end
 end

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

@@ -3535,4 +3535,44 @@ describe Mongoid::Relations::Referenced::ManyToMany do
       end
     end
   end
+
+  context "HABTM" do
+    before do
+      class Project
+        include Mongoid::Document
+
+        field :n, type: String, as: :name
+
+        has_and_belongs_to_many :distributors,
+          foreign_key: :d_ids,
+          inverse_of: 'p',
+          inverse_class_name: 'Distributor'
+      end
+
+      class Distributor
+        include Mongoid::Document
+
+        field :n, type: String, as: :name
+
+        has_and_belongs_to_many :projects,
+          foreign_key: :p_ids,
+          inverse_of: 'd',
+          inverse_class_name: 'Project'
+      end
+    end
+
+    it "should assign relation from both sides" do
+      p1 = Project.create name: 'Foo'
+      p2 = Project.create name: 'Bar'
+      d1 = Distributor.create name: 'Rock'
+      d2 = Distributor.create name: 'Soul'
+
+      p1.distributors << d1
+      expect(p1.d_ids).to match_array([d1.id])
+      expect(d1.p_ids).to match_array([p1.id])
+      d2.projects << p2
+      expect(d2.p_ids).to match_array([p2.id])
+      expect(p2.d_ids).to match_array([d2.id])
+    end
+  end
 end

data/spec/mongoid/scopable_spec.rb

@@ -27,6 +27,29 @@ describe Mongoid::Scopable do
       end
     end
 
+    context "when provided a block" do
+
+      let(:criteria) do
+        Band.where(name: "Depeche Mode")
+      end
+
+      before do
+        Band.default_scope { criteria }
+      end
+
+      after do
+        Band.default_scoping = nil
+      end
+
+      it "adds the default scope to the class" do
+        expect(Band.default_scoping.call).to eq(criteria)
+      end
+
+      it "flags as being default scoped" do
+        expect(Band).to be_default_scoping
+      end
+    end
+
     context "when provided a non proc" do
 
       it "raises an error" do
@@ -135,6 +158,31 @@ describe Mongoid::Scopable do
       it "returns an empty criteria" do
         expect(Band.queryable.selector).to be_empty
       end
+
+      context "when the class is not embedded" do
+
+        it "returns a criteria with embedded set to nil" do
+          expect(Band.queryable.embedded).to be(nil)
+        end
+      end
+
+      context "when the class is embedded" do
+
+        it "returns a criteria with embedded set to true" do
+          expect(Address.queryable.embedded).to be(true)
+        end
+
+        context "when scopes are chained" do
+
+          let(:person) do
+            Person.create
+          end
+
+          it "constructs a criteria for an embedded relation" do
+            expect(person.addresses.without_postcode_ordered.embedded).to be(true)
+          end
+        end
+      end
     end
 
     context "when a criteria exists on the stack" do
@@ -179,6 +227,25 @@ describe Mongoid::Scopable do
 
     context "when provided a criteria" do
 
+      context "when the lambda includes a geo_near query" do
+
+        before do
+          Bar.scope(:near_by, lambda{ |location| geo_near(location) })
+        end
+
+        after do
+          class << Bar
+            undef_method :near_by
+          end
+          Bar._declared_scopes.clear
+        end
+
+        it "allows the scope to be defined" do
+          expect(Bar.near_by([ 51.545099, -0.0106 ])).to be_a(Mongoid::Contextual::GeoNear)
+        end
+
+      end
+
       context "when a block is provided" do
 
         before do

data/spec/spec_helper.rb

@@ -71,6 +71,10 @@ def non_legacy_server?
   Mongoid::Clients.default.cluster.servers.first.features.write_command_enabled?
 end
 
+def testing_locally?
+  !(ENV['CI'] == 'travis')
+end
+
 # Set the database that the spec suite connects to.
 Mongoid.configure do |config|
   config.load_configuration(CONFIG)

data/spec/support/authorization.rb

@@ -7,6 +7,7 @@ MONGOID_ROOT_USER = Mongo::Auth::User.new(
     Mongo::Auth::Roles::USER_ADMIN_ANY_DATABASE,
     Mongo::Auth::Roles::DATABASE_ADMIN_ANY_DATABASE,
     Mongo::Auth::Roles::READ_WRITE_ANY_DATABASE,
-    Mongo::Auth::Roles::HOST_MANAGER
+    Mongo::Auth::Roles::HOST_MANAGER,
+    Mongo::Auth::Roles::CLUSTER_MONITOR
   ]
 )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -80,14 +80,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -143,6 +143,7 @@ files:
 - lib/mongoid/copyable.rb
 - lib/mongoid/criteria.rb
 - lib/mongoid/criteria/findable.rb
+- lib/mongoid/criteria/includable.rb
 - lib/mongoid/criteria/inspectable.rb
 - lib/mongoid/criteria/marshalable.rb
 - lib/mongoid/criteria/modifiable.rb
@@ -810,7 +811,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.