mongoid 4.0.0.alpha1 → 4.0.0.alpha2

data/lib/mongoid/relations/embedded/many.rb

@@ -401,7 +401,7 @@ module Mongoid
         def method_missing(name, *args, &block)
           return super if target.respond_to?(name)
           klass.send(:with_scope, criteria) do
-            criteria.send(name, *args, &block)
+            criteria.public_send(name, *args, &block)
           end
         end
 

data/lib/mongoid/relations/metadata.rb

@@ -910,9 +910,13 @@ module Mongoid
       # @since 3.0.0
       def find_from_parts(modules)
         modules.find do |mod|
-          ActiveSupport::Inflector.constantize(mod).constants.include?(
-            name.to_s.classify.to_sym
-          )
+          if mod.blank?
+            false
+          else
+            ActiveSupport::Inflector.constantize(mod).constants.include?(
+              name.to_s.classify.to_sym
+            )
+          end
         end
       end
 
@@ -1044,7 +1048,7 @@ module Mongoid
       def inverse_relation_candidates
         relations_metadata.select do |meta|
           next if meta.name == name
-          meta.class_name == inverse_class_name
+          (meta.class_name == inverse_class_name) && !meta.forced_nil_inverse?
         end
       end
 

data/lib/mongoid/relations/referenced/many.rb

@@ -410,7 +410,7 @@ module Mongoid
             target.send(name, *args, &block)
           else
             klass.send(:with_scope, criteria) do
-              criteria.send(name, *args, &block)
+              criteria.public_send(name, *args, &block)
             end
           end
         end

data/lib/mongoid/relations/touchable.rb

@@ -54,7 +54,7 @@ module Mongoid
           if metadata.touchable?
             name = metadata.name
             method_name = define_relation_touch_method(name)
-            after_create method_name
+            after_save method_name
             after_destroy method_name
             after_touch method_name
           end

data/lib/mongoid/scopable.rb

@@ -143,7 +143,7 @@ module Mongoid
         check_scope_validity(value)
         check_scope_name(normalized)
         _declared_scopes[normalized] = {
-          scope: strip_default_scope(value),
+          scope: value,
           extension: Module.new(&block)
         }
         define_scope_method(normalized)
@@ -302,7 +302,7 @@ module Mongoid
       #
       # @since 3.0.0
       def check_scope_validity(value)
-        unless value.respond_to?(:to_proc)
+        unless value.respond_to?(:call)
           raise Errors::InvalidScope.new(self, value)
         end
       end
@@ -350,30 +350,6 @@ module Mongoid
           value.to_proc
         end
       end
-
-      # Strip the default scope from the provided value, if it is a criteria.
-      # This is used by named scopes - they should not have the default scoping
-      # applied to them.
-      #
-      # @api private
-      #
-      # @example Strip the default scope.
-      #   Model.strip_default_scope
-      #
-      # @param [ Proc, Criteria ] value The value to strip from.
-      #
-      # @return [ Proc ] The stripped criteria, as a proc.
-      #
-      # @since 3.0.0
-      def strip_default_scope(value)
-        if value.is_a?(Criteria)
-          default = default_scoping.try(:call)
-          value.remove_scoping(default)
-          value.to_proc
-        else
-          value
-        end
-      end
     end
   end
 end

data/lib/mongoid/validatable/uniqueness.rb

@@ -13,6 +13,16 @@ module Mongoid
     #
     #     validates_uniqueness_of :title
     #   end
+    #
+    # It is also possible to limit the uniqueness constraint to a set of
+    # records matching certain conditions:
+    #   class Person
+    #     include Mongoid::Document
+    #     field :title
+    #     field :active, type: Boolean
+    #
+    #     validates_uniqueness_of :title, conditions: -> {where(active: true)}
+    #   end
     class UniquenessValidator < ActiveModel::EachValidator
       include Queryable
 
@@ -253,6 +263,7 @@ module Mongoid
         return if skip_validation?(document)
         relation = document._parent.send(document.metadata_name)
         criteria = create_criteria(relation, document, attribute, value)
+        criteria = criteria.merge(options[:conditions].call) if options[:conditions]
         add_error(document, attribute, value) if criteria.count > 1
       end
 
@@ -270,6 +281,8 @@ module Mongoid
       # @since 2.4.10
       def validate_root(document, attribute, value)
         criteria = create_criteria(klass || document.class, document, attribute, value)
+        criteria = criteria.merge(options[:conditions].call) if options[:conditions]
+
         if criteria.with(persistence_options(criteria)).exists?
           add_error(document, attribute, value)
         end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "4.0.0.alpha1"
+  VERSION = "4.0.0.alpha2"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -53,10 +53,6 @@ development:
     # existing method. (default: false)
     # scope_overwrite_exception: false
 
-    # Skip the database version check, used when connecting to a db without
-    # admin access. (default: false)
-    # skip_version_check: false
-
     # Use Active Support's time zone in conversions. (default: true)
     # use_activesupport_time_zone: true
 

data/spec/app/models/acolyte.rb

@@ -7,7 +7,7 @@ class Acolyte
   embeds_many :versions, as: :memorable
   belongs_to :church
 
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
   scope :active, ->{ where(status: "active") }
   scope :named, ->{ where(:name.exists => true) }
 

data/spec/app/models/address.rb

@@ -43,8 +43,8 @@ class Address
   belongs_to :account
   belongs_to :band
 
-  scope :without_postcode, where(postcode: nil)
-  scope :rodeo, where(street: "Rodeo Dr") do
+  scope :without_postcode, ->{ where(postcode: nil) }
+  scope :rodeo, ->{ where(street: "Rodeo Dr") } do
     def mansion?
       all? { |address| address.street == "Rodeo Dr" }
     end

data/spec/app/models/appointment.rb

@@ -3,5 +3,5 @@ class Appointment
   field :active, type: Mongoid::Boolean, default: true
   field :timed, type: Mongoid::Boolean, default: true
   embedded_in :person
-  default_scope where(active: true)
+  default_scope ->{ where(active: true) }
 end

data/spec/app/models/audio.rb

@@ -1,5 +1,5 @@
 class Audio
   include Mongoid::Document
   field :likes, type: Integer
-  default_scope where(:likes.gt => 100)
+  default_scope ->{ where(:likes.gt => 100) }
 end

data/spec/app/models/dog.rb

@@ -3,5 +3,5 @@ class Dog
   field :name, type: String
   has_and_belongs_to_many :breeds
   has_and_belongs_to_many :fire_hydrants, primary_key: :location
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/event.rb

@@ -17,6 +17,6 @@ class Event
     end
   end
 
-  scope :best, where(:kind.in => [ "party", "concert" ])
+  scope :best, ->{ where(:kind.in => [ "party", "concert" ]) }
   scope :by_kind, ->(kind){ where(:kind.in => [kind]) }
 end

data/spec/app/models/house.rb

@@ -2,5 +2,5 @@ class House
   include Mongoid::Document
   field :name, type: String
   field :model, type: String
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/message.rb

@@ -0,0 +1,8 @@
+class Message
+  include Mongoid::Document
+
+  field :body, type: String
+
+  embedded_in :person
+  has_and_belongs_to_many :receviers, class_name: "Person", inverse_of: nil
+end

data/spec/app/models/person.rb

@@ -64,6 +64,7 @@ class Person
   embeds_many :services, cascade_callbacks: true, validate: false
   embeds_many :symptoms, validate: false
   embeds_many :appointments, validate: false
+  embeds_many :messages, validate: false
 
   embeds_one :passport, autobuild: true, store_as: :pass, validate: false
   embeds_one :pet, class_name: "Animal", validate: false
@@ -124,8 +125,8 @@ class Person
   accepts_nested_attributes_for :quiz
   accepts_nested_attributes_for :services, allow_destroy: true
 
-  scope :minor, where(:age.lt => 18)
-  scope :without_ssn, without(:ssn)
+  scope :minor, ->{ where(:age.lt => 18) }
+  scope :without_ssn, ->{ without(:ssn) }
   scope :search, ->(query){ any_of({ title: query }) }
 
   def score_with_rescoring=(score)

data/spec/app/models/player.rb

@@ -6,13 +6,13 @@ class Player
   field :impressions, type: Integer, default: 0
   field :status
 
-  scope :active, where(active: true) do
+  scope :active, ->{ where(active: true) } do
     def extension
       "extension"
     end
   end
 
-  scope :inactive, where(active: false)
+  scope :inactive, ->{ where(active: false) }
   scope :frags_over, ->(count) { where(:frags.gt => count) }
   scope :deaths_under, ->(count) { where(:deaths.lt => count) }
   scope :deaths_over, ->(count) { where(:deaths.gt => count) }

data/spec/app/models/post.rb

@@ -15,8 +15,9 @@ class Post
   has_many :videos, validate: false
   has_many :roles, validate: false
 
-  scope :recent, where(created_at: { "$lt" => Time.now, "$gt" => 30.days.ago })
-  scope :posting, where(:content.in => [ "Posting" ])
+  scope :recent, ->{ where(created_at: { "$lt" => Time.now, "$gt" => 30.days.ago }) }
+  scope :posting, ->{ where(:content.in => [ "Posting" ]) }
+  scope :open, ->{ where(title: "open") }
 
   validates_format_of :title, without: /\$\$\$/
 

data/spec/app/models/preference.rb

@@ -5,5 +5,5 @@ class Preference
   field :ranking, type: Integer
   has_and_belongs_to_many :people, validate: false
   validates_length_of :name, minimum: 2, allow_nil: true
-  scope :posting, where(:value.in => [ "Posting" ])
+  scope :posting, ->{ where(:value.in => [ "Posting" ]) }
 end

data/spec/app/models/sound.rb

@@ -1,5 +1,5 @@
 class Sound
   include Mongoid::Document
   field :active, type: Mongoid::Boolean
-  default_scope where(active: true)
+  default_scope ->{ where(active: true) }
 end

data/spec/app/models/symptom.rb

@@ -2,5 +2,5 @@ class Symptom
   include Mongoid::Document
   field :name, type: String
   embedded_in :person
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/tree.rb

@@ -4,6 +4,6 @@ class Tree
   field :name
   field :evergreen, type: Mongoid::Boolean
 
-  scope :verdant, where(evergreen: true)
-  default_scope asc(:name)
+  scope :verdant, ->{ where(evergreen: true) }
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/video.rb

@@ -9,5 +9,5 @@ class Video
   belongs_to :post
   belongs_to :game
 
-  default_scope asc(:title)
+  default_scope ->{ asc(:title) }
 end

data/spec/mongoid/attributes_spec.rb

@@ -1044,7 +1044,7 @@ describe Mongoid::Attributes do
       end
 
       it "can set a Hash value" do
-        person.map.should eq( { somekey: "somevalue" } )
+        expect(person.map).to eq( { somekey: "somevalue" } )
       end
     end
 
@@ -1052,7 +1052,7 @@ describe Mongoid::Attributes do
       let(:person) { Person.new aliases: [ :alias_1 ] }
 
       it "can set an Array Value" do
-        person.aliases.should eq [ :alias_1 ]
+        expect(person.aliases).to eq([ :alias_1 ])
       end
 
       it "raises an error when try to set an invalid value" do
@@ -1079,7 +1079,7 @@ describe Mongoid::Attributes do
     context "when the key has not been specified as a field" do
 
       before do
-        person.stub(:fields).and_return({})
+        allow(person).to receive(:fields).and_return({})
       end
 
       it "returns the value" do

data/spec/mongoid/changeable_spec.rb

@@ -627,7 +627,7 @@ describe Mongoid::Changeable do
 
         before do
           person.changed_attributes["aliases"] = aliases
-          aliases.should_receive(:clone).never
+          expect(aliases).to receive(:clone).never
           person.aliases_will_change!
         end
 
@@ -757,8 +757,8 @@ describe Mongoid::Changeable do
         end
 
         it "returns true" do
-          person.changes.should_not be_empty
-          person.should be_changed
+          expect(person.changes).to_not be_empty
+          expect(person).to be_changed
         end
       end
     end

data/spec/mongoid/contextual/mongo_spec.rb

@@ -107,7 +107,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       before do
-        context.query.should_receive(:count).once.and_return(1)
+        expect(context.query).to receive(:count).once.and_return(1)
       end
 
       it "returns the count cached value after first call" do
@@ -438,7 +438,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it "does not make any additional database queries" do
-        game_metadata.should_receive(:eager_load).never
+        expect(game_metadata).to receive(:eager_load).never
         context.send(:eager_load, [])
       end
     end
@@ -497,8 +497,8 @@ describe Mongoid::Contextual::Mongo do
         end
 
         it "hits the database again" do
-          context.should_receive(:query).once.and_call_original
-          context.should be_exists
+          expect(context).to receive(:query).once.and_call_original
+          expect(context).to be_exists
         end
       end
     end
@@ -520,7 +520,7 @@ describe Mongoid::Contextual::Mongo do
         end
 
         it "does not hit the database" do
-          context.should_receive(:query).never
+          expect(context).to receive(:query).never
           expect(context).to be_exists
         end
       end
@@ -534,7 +534,7 @@ describe Mongoid::Contextual::Mongo do
           end
 
           it "does not hit the database" do
-            context.should_receive(:query).never
+            expect(context).to receive(:query).never
             expect(context).to be_exists
           end
         end
@@ -807,7 +807,7 @@ describe Mongoid::Contextual::Mongo do
           end
 
           it "returns the first document without touching the database" do
-            context.should_receive(:query).never
+            expect(context).to receive(:query).never
             expect(context.send(method)).to eq(depeche_mode)
           end
         end
@@ -819,8 +819,8 @@ describe Mongoid::Contextual::Mongo do
           end
 
           it "returns the first document without touching the database" do
-            context.should_receive(:query).never
-            context.send(method).should eq(depeche_mode)
+            expect(context).to receive(:query).never
+            expect(context.send(method)).to eq(depeche_mode)
           end
         end
       end
@@ -957,7 +957,7 @@ describe Mongoid::Contextual::Mongo do
         context "when calling more than once" do
 
           before do
-            context.query.should_receive(:count).once.and_return(2)
+            expect(context.query).to receive(:count).once.and_return(2)
           end
 
           it "returns the cached value for subsequent calls" do
@@ -969,7 +969,7 @@ describe Mongoid::Contextual::Mongo do
 
           before do
             context.entries
-            context.query.should_receive(:count).once.and_return(2)
+            expect(context.query).to receive(:count).once.and_return(2)
           end
 
           it "returns the cached value for all calls" do
@@ -1006,7 +1006,7 @@ describe Mongoid::Contextual::Mongo do
         context "when calling more than once" do
 
           before do
-            context.query.should_receive(:count).once.and_return(1)
+            expect(context.query).to receive(:count).once.and_return(1)
           end
 
           it "returns the cached value for subsequent calls" do
@@ -1018,7 +1018,7 @@ describe Mongoid::Contextual::Mongo do
 
           before do
             context.entries
-            context.query.should_receive(:count).once.and_return(1)
+            expect(context.query).to receive(:count).once.and_return(1)
           end
 
           it "returns the cached value for all calls" do
@@ -1081,7 +1081,7 @@ describe Mongoid::Contextual::Mongo do
     context "when passed the symbol field name" do
 
       it "limits query to that field" do
-        criteria.should_receive(:only).with(:name).and_call_original
+        expect(criteria).to receive(:only).with(:name).and_call_original
         context.map(:name)
       end