mongoid 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e112d2050bea71c9b4ec085c77518391924fd579
-  data.tar.gz: 7b83e17ffe01d545d5a08833d1a07e8ef120a2bb
+  metadata.gz: 45a87057b0667e0b764ac4cd7816d93ecbbacbed
+  data.tar.gz: 7ca89da136c467233031ddec0c17eb77cb103019
 SHA512:
-  metadata.gz: 0344a52659debedd1ed969e05676a35c65edd806471bdcb9d8045e8404293b27451449d434d9f1d6c2174f3dc8475a9eff978bcbbaabd3f54f0a53f980b8a625
-  data.tar.gz: e196f3ebc85543dc36a9e6f49f1f024c993d626ab4990604ad5061961ed3e8a0cfecbfd6f3a18c048127819d9897b1f0eb25d588ed141dc4d9f8b96d7c38fbaf
+  metadata.gz: ebbee26a46ea97357737bdccad4cf96a1f6e57d815a8d68f1bac91d5c62c40b3c31812e90266860d5da23b65cccc540a62f5aba0d728ab64ba604405925cf8d2
+  data.tar.gz: 3abd08faeb591bd9cf71cd976f5d8e99063fed8f2830ea916fb720464eebf4e0525b6135963f0a9c0f674fbf154091b185f0372285c9980e088dc63b1e271f56

data/CHANGELOG.md

@@ -3,6 +3,40 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
+## 3.1.5
+
+### Resolved Issues
+
+* \#3231 Allow evolution of proxy documents to work in criteria.
+
+* \#3247 Bump dependency on tzinfo to 0.3.29.
+
+* \#3203 Fixed `index: true` specification for polymorphic relations.
+
+* \#3192 Fixed aliased fields + localized fields combinations with
+  validation. (Johnny Shields)
+
+* \#3173 Fixed issues around many to many relations with custom primary keys.
+  (Bowen Sun)
+
+* \#3159 Upserting now properly flags documents as persisted.
+
+* \#3137 Allow multiple `belongs_to` sets in a row with ids.
+
+* \#3079 Embbed docs with paranoia parents, were losing the _id when
+  reloading from db, as they didnt have the right persisted? value. (Arthur Neves)
+
+* \#3081 Criteria's `method_missing` now checks if an array responds to the provided
+  method before calling entries in order to not hit the database if a `NoMethodError`
+  was to get raised.
+
+* \#3068 Fixed spec runs on non standard MongoDB ports if `MONGOID_SPEC_PORT` is
+  set.
+
+* \#3047 Ensure `blank?` and `empty?` don't fall through method missing on criteria.
+
+* Include updated_at on cache_key even when is a short timestamp (Arthur Neves)
+
 ## 3.1.4
 
 ### Resolved Issues

data/lib/mongoid/contextual.rb

@@ -18,6 +18,9 @@ module Mongoid
     # including destructive, modification, and optional methods.
     delegate(*(Mongo.public_instance_methods(false) - [ :skip, :limit ]), to: :context)
 
+    # This gets blank and empty included.
+    delegate(*Queryable.public_instance_methods(false), to: :context)
+
     # Get the context in which criteria queries should execute. This is either
     # in memory (for embedded documents) or mongo (for root level documents.)
     #

data/lib/mongoid/criteria.rb

@@ -23,6 +23,12 @@ module Mongoid
     include Criterion::Modifiable
     include Criterion::Scoping
 
+    # Static array used to check with method missing - we only need to ever
+    # instantiate once.
+    #
+    # @since 4.0.0
+    CHECK = []
+
     attr_accessor :embedded, :klass
 
     # Returns true if the supplied +Enumerable+ or +Criteria+ is equal to the results
@@ -322,7 +328,7 @@ module Mongoid
     #
     # @return [ true, false ] If the criteria responds to the method.
     def respond_to?(name, include_private = false)
-      super || klass.respond_to?(name) || entries.respond_to?(name, include_private)
+      super || klass.respond_to?(name) || CHECK.respond_to?(name, include_private)
     end
 
     alias :to_ary :to_a
@@ -506,8 +512,10 @@ module Mongoid
         klass.send(:with_scope, self) do
           klass.send(name, *args, &block)
         end
-      else
+      elsif CHECK.respond_to?(name)
         return entries.send(name, *args, &block)
+      else
+        super
       end
     end
 

data/lib/mongoid/document.rb

@@ -222,7 +222,7 @@ module Mongoid
     # @since 2.4.0
     def cache_key
       return "#{model_key}/new" if new_record?
-      return "#{model_key}/#{id}-#{updated_at.utc.to_s(:number)}" unless self[:updated_at].nil?
+      return "#{model_key}/#{id}-#{updated_at.utc.to_s(:number)}" if do_or_do_not(:updated_at)
       "#{model_key}/#{id}"
     end
 

data/lib/mongoid/paranoia.rb

@@ -82,6 +82,10 @@ module Mongoid
     end
     alias :deleted? :destroyed?
 
+    def persisted?
+      !new_record? && !(@destroyed ||= false)
+    end
+
     # Restores a previously soft-deleted document. Handles this by removing the
     # deleted_at flag.
     #

data/lib/mongoid/persistence/upsertion.rb

@@ -23,6 +23,7 @@ module Mongoid
           yield(document); true
         end
         document.post_persist unless result == false
+        document.new_record = false
         result
       end
     end

data/lib/mongoid/relations/bindings/referenced/many_to_many.rb

@@ -20,7 +20,7 @@ module Mongoid
             binding do
               inverse_keys = doc.you_must(metadata.inverse_foreign_key)
               if inverse_keys
-                inverse_keys.push(record_id(base))
+                inverse_keys.push(inverse_record_id(doc))
                 doc.reset_relation_criteria(metadata.inverse)
               end
               base.synced[metadata.foreign_key] = true
@@ -39,13 +39,27 @@ module Mongoid
               base.send(metadata.foreign_key).delete_one(record_id(doc))
               inverse_keys = doc.you_must(metadata.inverse_foreign_key)
               if inverse_keys
-                inverse_keys.delete_one(record_id(base))
+                inverse_keys.delete_one(inverse_record_id(doc))
                 doc.reset_relation_criteria(metadata.inverse)
               end
               base.synced[metadata.foreign_key] = true
               doc.synced[metadata.inverse_foreign_key] = true
             end
           end
+
+          # Find the inverse id referenced by inverse_keys
+          def inverse_record_id(doc)
+            inverse_metadata = determine_inverse_metadata(doc)
+            if inverse_metadata
+              base.__send__(inverse_metadata.primary_key)
+            else
+              base.id
+            end
+          end
+
+          def determine_inverse_metadata(doc)
+            doc.relations[base.class.name.demodulize.underscore.pluralize]
+          end
         end
       end
     end

data/lib/mongoid/relations/macros.rb

@@ -311,7 +311,7 @@ module Mongoid
             )
             if metadata.indexed?
               if metadata.polymorphic?
-                index({ key => 1, metadata.type => 1 }, { background: true })
+                index({ key => 1, metadata.inverse_type => 1 }, { background: true })
               else
                 index({ key => 1 }, { background: true })
               end

data/lib/mongoid/relations/one.rb

@@ -43,6 +43,18 @@ module Mongoid
       def respond_to?(name, include_private = false)
         target.respond_to?(name, include_private) || super
       end
+
+      # Evolve the proxy document into an object id.
+      #
+      # @example Evolve the proxy document.
+      #   proxy.__evolve_object_id__
+      #
+      # @return [ Object ] The proxy document's id.
+      #
+      # @since 4.0.0
+      def __evolve_object_id__
+        target.id
+      end
     end
   end
 end

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

@@ -53,7 +53,7 @@ module Mongoid
         def substitute(replacement)
           unbind_one
           return nil unless replacement
-          self.target = replacement
+          self.target = normalize(replacement)
           bind_one
           self
         end
@@ -74,6 +74,23 @@ module Mongoid
           Bindings::Referenced::In.new(base, target, metadata)
         end
 
+        # Normalize the value provided as a replacement for substitution.
+        #
+        # @api private
+        #
+        # @example Normalize the substitute.
+        #   proxy.normalize(id)
+        #
+        # @param [ Document, Object ] replacement The replacement object.
+        #
+        # @return [ Document ] The document.
+        #
+        # @since 3.1.5
+        def normalize(replacement)
+          return replacement if replacement.is_a?(Document)
+          metadata.builder(klass, replacement).build
+        end
+
         # Are we able to persist this relation?
         #
         # @example Can we persist the relation?

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

@@ -29,7 +29,7 @@ module Mongoid
           return concat(docs) if docs.size > 1
           if doc = docs.first
             append(doc)
-            base.add_to_set(foreign_key, doc.id)
+            base.add_to_set(foreign_key, doc.send(metadata.primary_key))
             if child_persistable?(doc)
               doc.save
             end
@@ -120,7 +120,7 @@ module Mongoid
         def delete(document)
           doc = super
           if doc && persistable?
-            base.pull(foreign_key, doc.id)
+            base.pull(foreign_key, doc.send(metadata.primary_key))
             target._unloaded = criteria
             unsynced(base, foreign_key)
           end

data/lib/mongoid/validations.rb

@@ -54,7 +54,7 @@ module Mongoid
     #
     # @since 2.0.0.rc.1
     def read_attribute_for_validation(attr)
-      attribute = attr.to_s
+      attribute = database_field_name(attr)
       if relations.has_key?(attribute)
         begin_validate
         relation = without_autobuild { send(attr) }

data/lib/mongoid/validations/localizable.rb

@@ -16,7 +16,7 @@ module Mongoid
       #
       # @since 2.4.2
       def validate_each(document, attribute, value)
-        field = document.fields[attribute.to_s]
+        field = document.fields[document.database_field_name(attribute)]
         if field.try(:localized?) && !value.blank?
           value.values.each do |_value|
             super(document, attribute, _value)

data/lib/mongoid/validations/presence.rb

@@ -26,7 +26,7 @@ module Mongoid
       #
       # @since 2.4.0
       def validate_each(document, attribute, value)
-        field = document.fields[attribute.to_s]
+        field = document.fields[document.database_field_name(attribute)]
         if field.try(:localized?) && !value.blank?
           value.each_pair do |_locale, _value|
             document.errors.add(

data/lib/mongoid/validations/uniqueness.rb

@@ -323,7 +323,7 @@ module Mongoid
       #
       # @since 4.0.0
       def localized?(document, attribute)
-        document.fields[attribute.to_s].try(:localized?)
+        document.fields[document.database_field_name(attribute)].try(:localized?)
       end
     end
   end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

data/lib/support/ruby_version.rb

@@ -2,7 +2,7 @@
 # squarm for answers
 def raise_version_error(message)
   puts message
-  Rails.logger.info(message) if defined?(Rails)
+  Rails.logger.info(message) if defined?(Rails) && Rails.logger
   raise
 end
 

data/spec/app/models/account.rb

@@ -0,0 +1,32 @@
+class Account
+  include Mongoid::Document
+
+  field :_id, type: String, default: ->{ name.try(:parameterize) }
+
+  field :number, type: String
+  field :balance, type: String
+  field :nickname, type: String
+  field :name, type: String
+  field :balanced, type: Boolean, default: ->{ balance? ? true : false }
+
+  field :overridden, type: String
+
+  embeds_many :memberships
+  belongs_to :creator, class_name: "User", foreign_key: :creator_id
+  belongs_to :person
+  has_many :alerts, autosave: false
+  has_and_belongs_to_many :agents
+  has_one :comment, validate: false
+
+  attr_accessible :nickname, as: [ :default, :admin ]
+  attr_accessible :name, as: [ :default, :admin ]
+  attr_accessible :balance, as: :default
+
+  validates_presence_of :name
+  validates_presence_of :nickname, on: :upsert
+  validates_length_of :name, maximum: 10, on: :create
+
+  def overridden
+    self[:overridden] = "not recommended"
+  end
+end

data/spec/app/models/acolyte.rb

@@ -0,0 +1,16 @@
+class Acolyte
+  include Mongoid::Document
+  field :status
+  field :name
+
+  embeds_many :versions, as: :memorable
+  belongs_to :church
+
+  default_scope asc(:name)
+  scope :active, ->{ where(status: "active") }
+  scope :named, ->{ where(:name.exists => true) }
+
+  def callback_test?
+    name == "callback-test"
+  end
+end

data/spec/app/models/actor.rb

@@ -0,0 +1,19 @@
+class Actor
+  include Mongoid::Document
+  field :name
+  field :after_custom_count, type: Integer, default: 0
+  has_and_belongs_to_many :tags
+  embeds_many :things, validate: false, cascade_callbacks: true
+  accepts_nested_attributes_for :things, allow_destroy: true
+
+  define_model_callbacks :custom
+  observable :custom
+
+  def do_something
+    run_callbacks(:custom) do
+      self.name = "custom"
+    end
+  end
+end
+
+require "app/models/actress"

data/spec/app/models/actor_observer.rb

@@ -0,0 +1,15 @@
+class ActorObserver < Mongoid::Observer
+  attr_reader :last_after_create_record
+
+  def after_create(record)
+    @last_after_create_record = record
+  end
+
+  def after_custom(record)
+    record.after_custom_count += 1
+  end
+
+  def before_custom(record)
+    @after_custom_called = true
+  end
+end

data/spec/app/models/actress.rb

@@ -0,0 +1,2 @@
+class Actress < Actor
+end

data/spec/app/models/address.rb

@@ -0,0 +1,72 @@
+class Address
+  include Mongoid::Document
+
+  field :_id, type: String, default: ->{ street.try(:parameterize) }
+
+  attr_accessor :mode
+
+  field :address_type
+  field :number, type: Integer
+  field :street
+  field :city
+  field :state
+  field :post_code
+  field :parent_title
+  field :services, type: Array
+  field :latlng, type: Array
+  field :map, type: Hash
+  field :move_in, type: DateTime
+  field :s, type: String, as: :suite
+  field :name, localize: true
+
+  embeds_many :locations, validate: false
+  embeds_one :code, validate: false
+  embeds_one :target, as: :targetable, validate: false
+
+  embedded_in :addressable, polymorphic: true do
+    def extension
+      "Testing"
+    end
+    def doctor?
+      title == "Dr"
+    end
+  end
+
+  accepts_nested_attributes_for :code, :target
+  accepts_nested_attributes_for :locations, allow_destroy: true
+
+  belongs_to :account
+  belongs_to :band
+
+  scope :without_postcode, where(postcode: nil)
+  scope :rodeo, where(street: "Rodeo Dr") do
+    def mansion?
+      all? { |address| address.street == "Rodeo Dr" }
+    end
+  end
+
+  validates_presence_of :street, on: :update
+  validates_format_of :street, with: /\D/, allow_nil: true
+
+  def set_parent=(set = false)
+    self.parent_title = addressable.title if set
+  end
+
+  def <=>(other)
+    street <=> other.street
+  end
+
+  class << self
+    def california
+      where(state: "CA")
+    end
+
+    def homes
+      where(address_type: "Home")
+    end
+
+    def streets
+      all.map(&:street)
+    end
+  end
+end