mongoid 9.0.0 → 9.0.2

data/spec/mongoid/scopable_spec.rb

@@ -3,6 +3,19 @@
 
 require "spec_helper"
 
+# Retrieve the singleton class for the given class.
+def singleton_class_for(klass)
+  class <<klass; self; end
+end
+
+# Helper method for removing a declared scope
+def remove_scope(klass, scope)
+  if klass._declared_scopes[scope]
+    singleton_class_for(klass).remove_method(scope)
+    klass._declared_scopes.delete(scope)
+  end
+end
+
 describe Mongoid::Scopable do
 
   describe ".default_scope" do
@@ -349,6 +362,10 @@ describe Mongoid::Scopable do
           Band.create!(name: 'testing')
         end
 
+        after do
+          remove_scope(Band, :tests)
+        end
+
         it 'applies the collation' do
           expect(Band.tests.first['name']).to eq('testing')
         end
@@ -365,10 +382,7 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :active
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :active)
         end
 
         let(:scope) do
@@ -390,10 +404,7 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Record
-            undef_method :tool
-          end
-          Record._declared_scopes.clear
+          remove_scope(Record, :tool)
         end
 
         context "when calling the scope" do
@@ -423,10 +434,7 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :active
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :active)
         end
 
         it "adds a method for the scope" do
@@ -461,10 +469,7 @@ describe Mongoid::Scopable do
             end
 
             after do
-              class << Band
-                undef_method :english
-              end
-              Band._declared_scopes.clear
+              remove_scope(Band, :english)
             end
 
             let(:scope) do
@@ -527,10 +532,7 @@ describe Mongoid::Scopable do
           config_override :scope_overwrite_exception, true
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           it "raises an exception" do
@@ -545,10 +547,7 @@ describe Mongoid::Scopable do
           config_override :scope_overwrite_exception, false
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           it "raises no exception" do
@@ -589,10 +588,7 @@ describe Mongoid::Scopable do
           end
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           let(:scope) do
@@ -652,11 +648,8 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :active
-            undef_method :named_by
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :active)
+          remove_scope(Band, :named_by)
         end
 
         it "adds a method for the scope" do
@@ -698,10 +691,7 @@ describe Mongoid::Scopable do
             end
 
             after do
-              class << Band
-                undef_method :english
-              end
-              Band._declared_scopes.clear
+              remove_scope(Band, :english)
             end
 
             let(:scope) do
@@ -775,15 +765,9 @@ describe Mongoid::Scopable do
             end
 
             after do
-              class << Article
-                undef_method :is_public
-                undef_method :authored
-              end
-              Article._declared_scopes.clear
-              class << Author
-                undef_method :author
-              end
-              Author._declared_scopes.clear
+              remove_scope(Article, :is_public)
+              remove_scope(Article, :authored)
+              remove_scope(Author, :author)
             end
 
             context "when calling another model's scope from within a scope" do
@@ -816,10 +800,7 @@ describe Mongoid::Scopable do
           config_override :scope_overwrite_exception, true
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           it "raises an exception" do
@@ -834,10 +815,7 @@ describe Mongoid::Scopable do
           config_override :scope_overwrite_exception, false
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           it "raises no exception" do
@@ -867,11 +845,8 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :xxx
-            undef_method :yyy
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :xxx)
+          remove_scope(Band, :yyy)
         end
 
         let(:criteria) do
@@ -901,15 +876,8 @@ describe Mongoid::Scopable do
       end
 
       after do
-        class << Shape
-          undef_method :located_at
-        end
-        Shape._declared_scopes.clear
-
-        class << Circle
-          undef_method :with_radius
-        end
-        Circle._declared_scopes.clear
+        remove_scope(Shape, :located_at)
+        remove_scope(Circle, :with_radius)
       end
 
       let(:shape_scope_keys) do
@@ -950,16 +918,9 @@ describe Mongoid::Scopable do
       end
 
       after do
-        class << Shape
-          undef_method :visible
-          undef_method :large
-        end
-        Shape._declared_scopes.clear
-
-        class << Circle
-          undef_method :large
-        end
-        Circle._declared_scopes.clear
+        remove_scope(Shape, :visible)
+        remove_scope(Shape, :large)
+        remove_scope(Circle, :large)
       end
 
       it "uses subclass context for all the other used scopes" do
@@ -1099,9 +1060,7 @@ describe Mongoid::Scopable do
           end
 
           after do
-            class << Band
-              undef_method :active
-            end
+            remove_scope(Band, :active)
           end
 
           let(:unscoped) do
@@ -1143,10 +1102,7 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :skipped
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :skipped)
         end
 
         it "does not allow the default scope to be applied" do
@@ -1290,4 +1246,51 @@ describe Mongoid::Scopable do
       end
     end
   end
+
+  describe "scoped queries" do
+    context "with a default scope" do
+      let(:criteria) do
+        Band.where(name: "Depeche Mode")
+      end
+
+      before do
+        Band.default_scope ->{ criteria }
+        Band.scope :unscoped_everyone, -> { unscoped }
+        Band.scope :removed_default, -> { scoped.remove_scoping(all) }
+
+        Band.create name: 'Depeche Mode'
+        Band.create name: 'They Might Be Giants'
+      end
+
+      after do
+        Band.default_scoping = nil
+        remove_scope Band, :unscoped_everyone
+        remove_scope Band, :removed_default
+      end
+
+      context "when allow_scopes_to_unset_default_scope == false" do # default for <= 9
+        config_override :allow_scopes_to_unset_default_scope, false
+
+        it 'merges the default scope into the query with unscoped' do
+          expect(Band.unscoped_everyone.selector).to include('name' => 'Depeche Mode')
+        end
+
+        it 'merges the default scope into the query with remove_scoping' do
+          expect(Band.removed_default.selector).to include('name' => 'Depeche Mode')
+        end
+      end
+
+      context "when allow_scopes_to_unset_default_scope == true" do # default for >= 10
+        config_override :allow_scopes_to_unset_default_scope, true
+
+        it 'does not merge the default scope into the query with unscoped' do
+          expect(Band.unscoped_everyone.selector).not_to include('name' => 'Depeche Mode')
+        end
+
+        it 'does not merge merges the default scope into the query with remove_scoping' do
+          expect(Band.removed_default.selector).not_to include('name' => 'Depeche Mode')
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/serializable_spec.rb

@@ -511,13 +511,15 @@ describe Mongoid::Serializable do
             end
 
             it "includes the first relation" do
-              expect(relation_hash[0]).to include
+              expect(relation_hash[0]).to include(
                 { "_id" => "kudamm", "street" => "Kudamm" }
+              )
             end
 
             it "includes the second relation" do
-              expect(relation_hash[1]).to include
+              expect(relation_hash[1]).to include(
                 { "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
+              )
             end
           end
 
@@ -528,13 +530,15 @@ describe Mongoid::Serializable do
             end
 
             it "includes the first relation" do
-              expect(relation_hash[0]).to include
+              expect(relation_hash[0]).to include(
                 { "_id" => "kudamm", "street" => "Kudamm" }
+              )
             end
 
             it "includes the second relation" do
-              expect(relation_hash[1]).to include
+              expect(relation_hash[1]).to include(
                 { "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
+              )
             end
           end
 
@@ -653,8 +657,9 @@ describe Mongoid::Serializable do
             end
 
             it "includes the specified relation" do
-              expect(relation_hash).to include
-                { "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              expect(relation_hash).to include(
+                { "_id" => "Leo-Marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              )
             end
           end
 
@@ -665,8 +670,9 @@ describe Mongoid::Serializable do
             end
 
             it "includes the specified relation" do
-              expect(relation_hash).to include
-                { "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              expect(relation_hash).to include(
+                { "_id" => "Leo-Marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              )
             end
           end
 
@@ -677,8 +683,9 @@ describe Mongoid::Serializable do
             end
 
             it "includes the specified relation sans exceptions" do
-              expect(relation_hash).to include
+              expect(relation_hash).to include(
                 { "first_name" => "Leo", "last_name" => "Marvin" }
+              )
             end
           end
         end

data/spec/mongoid/touchable_spec.rb

@@ -733,6 +733,81 @@ describe Mongoid::Touchable do
       end
     end
 
+    context "when a custom field is specified" do
+
+      shared_examples "updates the child's updated_at" do
+
+        let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }
+
+        let(:update_time) { Timecop.freeze(Time.at(Time.now.to_i) + 2) }
+
+        after do
+          Timecop.return
+        end
+
+        let!(:label) do
+          TouchableSpec::Referenced::Label.create!
+        end
+
+        let(:band) do
+          TouchableSpec::Referenced::Band.create!(label: label)
+        end
+
+        before do
+          update_time
+          band.send(meth)
+        end
+
+        it "updates the child's timestamp" do
+          expect(band.updated_at).to eq(update_time)
+          expect(band.reload.updated_at).to eq(update_time)
+        end
+      end
+
+      shared_examples "updates the parent's custom field and updated_at" do
+
+        let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }
+
+        let(:update_time) { Timecop.freeze(Time.at(Time.now.to_i) + 2) }
+
+        after do
+          Timecop.return
+        end
+
+        let!(:label) do
+          TouchableSpec::Referenced::Label.create!
+        end
+
+        let!(:band) do
+          TouchableSpec::Referenced::Band.create!(label: label)
+        end
+
+        before do
+          update_time
+          band.send(meth)
+        end
+
+        it "updates the parent's custom field" do
+          expect(label.bands_updated_at).to eq(update_time)
+          expect(label.reload.bands_updated_at).to eq(update_time)
+        end
+
+        it "updates the parent's timestamp" do
+          expect(label.updated_at).to eq(update_time)
+          expect(label.reload.updated_at).to eq(update_time)
+        end
+
+      end
+
+      [:save, :destroy, :touch].each do |meth|
+        context "with #{meth} on referenced associations" do
+          let(:meth) { meth }
+          include_examples "updates the child's updated_at" unless meth == :destroy
+          include_examples "updates the parent's custom field and updated_at"
+        end
+      end
+    end
+
     context 'multi-level' do
 
       let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }

data/spec/mongoid/touchable_spec_models.rb

@@ -150,5 +150,21 @@ module TouchableSpec
 
       embedded_in :floor, touch: true, class_name: "TouchableSpec::Referenced::Floor"
     end
+
+    class Label
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      field :bands_updated_at, type: DateTime
+      has_many :bands, class_name: "TouchableSpec::Referenced::Band"
+    end
+    
+    class Band
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :label, touch: :bands_updated_at, class_name: "TouchableSpec::Referenced::Label"
+    end
+    
   end
 end

data/spec/support/models/band.rb

@@ -26,6 +26,7 @@ class Band
   field :mojo, type: Object
   field :tags, type: Hash
   field :fans
+  field :location, type: LatLng
 
   alias_attribute :d, :deleted
 

data/spec/support/models/lat_lng.rb

@@ -5,6 +5,8 @@ class LatLng
   attr_accessor :lat, :lng
 
   def self.demongoize(object)
+    return if object.nil?
+
     LatLng.new(object[1], object[0])
   end
 
@@ -15,4 +17,8 @@ class LatLng
   def mongoize
     [ lng, lat ]
   end
+
+  def ==(other)
+    lat == other.lat && lng == other.lng
+  end
 end