mongoid 2.4.10 → 2.4.11

data/CHANGELOG.md

@@ -7,6 +7,23 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* This release forces a cap on the mongo driver version at 1.6.2 due to
+  changes in the `Mongo::Connection.from_uri` API not allowing valid
+  connection options anymore.
+
+* \#2040 Fixed bad interpolation for locale presence validation.
+
+* \#2038 Allow inverse relations to be determined by foreign keys alone
+  if defined on both sides, not just an inverse_of declaration.
+
+* \#2023 Allow serilialization of dynamic types that conflict with core
+  Ruby methods to still be serialized.
+
+* \#2008 Presence validation should hit the db to check validity if the
+  relation in memory is blank.
+
+* \#2006 Allow excluding only the _id field post execution of an #only call.
+
 ## 2.4.10
 
 ### Resolved Issues

data/Rakefile

@@ -2,7 +2,6 @@ require "bundler"
 Bundler.setup
 
 require "rake"
-require "rdoc/task"
 require "rspec"
 require "rspec/core/rake_task"
 
@@ -37,13 +36,5 @@ RSpec::Core::RakeTask.new('spec:progress') do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-RDoc::Task.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "mongoid #{Mongoid::VERSION}"
-  rdoc.rdoc_files.include("README*")
-  rdoc.rdoc_files.include("CHANGELOG*")
-  rdoc.rdoc_files.include("lib/**/*.rb")
-end
-
 task :spec => [ "spec:functional", "spec:unit" ]
 task :default => :spec

data/lib/config/locales/bg.yml

@@ -58,4 +58,4 @@ bg:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/de.yml

@@ -58,4 +58,4 @@ de:
         scope_overwrite:
           "Scope :%{scope_name} kann nicht erzeugt werden, da bereits eine Methode
           %{model_name}.%{scope_name} existiert."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/en-GB.yml

@@ -61,4 +61,4 @@ en-GB:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/es.yml

@@ -56,4 +56,4 @@ es:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/fr.yml

@@ -59,4 +59,4 @@ fr:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/hi.yml

@@ -50,4 +50,4 @@ en:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/hu.yml

@@ -61,4 +61,4 @@ hu:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/id.yml

@@ -59,4 +59,4 @@ id:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/it.yml

@@ -56,4 +56,4 @@ it:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/ja.yml

@@ -54,4 +54,4 @@ ja:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/kr.yml

@@ -51,4 +51,4 @@ kr:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/nl.yml

@@ -58,4 +58,4 @@ nl:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/pl.yml

@@ -56,4 +56,4 @@ pl:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/pt-BR.yml

@@ -57,4 +57,4 @@ pt-BR:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/pt.yml

@@ -57,4 +57,4 @@ pt:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/ro.yml

@@ -63,4 +63,4 @@ ro:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/ru.yml

@@ -58,4 +58,4 @@ ru:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/sv.yml

@@ -57,4 +57,4 @@ sv:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/vi.yml

@@ -59,4 +59,4 @@ vi:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/config/locales/zh-CN.yml

@@ -50,4 +50,4 @@ zh-CN:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/mongoid/components.rb

@@ -22,7 +22,6 @@ module Mongoid #:nodoc
     include Mongoid::Dirty
     include Mongoid::Attributes
     include Mongoid::Collections
-    include Mongoid::Copyable
     include Mongoid::DefaultScope
     include Mongoid::Extras
     include Mongoid::Fields
@@ -45,6 +44,7 @@ module Mongoid #:nodoc
     include Mongoid::Timestamps::Timeless
     include Mongoid::Validations
     include Mongoid::Callbacks
+    include Mongoid::Copyable
     include Mongoid::MultiDatabase
 
     MODULES = [

data/lib/mongoid/config/environment.rb

@@ -8,11 +8,13 @@ module Mongoid #:nodoc
 
       # Get the name of the environment that we are running under. This first
       # looks for Rails, then Sinatra, then a RACK_ENV environment variable,
-      # and if none of those are found returns "development".
+      # and if none of those are found raises an error.
       #
       # @example Get the env name.
       #   Environment.env_name
       #
+      # @raise [ Errors::NoEnvironment ] If no environment was set.
+      #
       # @return [ String ] The name of the current environment.
       #
       # @since 2.3.0

data/lib/mongoid/copyable.rb

@@ -23,13 +23,44 @@ module Mongoid #:nodoc:
     # @example Clone the document.
     #   document.clone
     #
+    # @param [ Document ] other The document getting cloned.
+    #
+    # @return [ Document ] The new document.
+    def initialize_copy(other)
+      __copy__(other)
+    end
+
+    # Clone or dup the current +Document+. This will return all attributes with
+    # the exception of the document's id and versions, and will reset all the
+    # instance variables.
+    #
+    # This clone also includes embedded documents.
+    #
     # @example Dup the document.
     #   document.dup
     #
     # @param [ Document ] other The document getting cloned.
     #
     # @return [ Document ] The new document.
-    def initialize_copy(other)
+    def initialize_dup(other)
+      __copy__(other)
+    end
+
+    private
+
+    # Handle the copy of the object.
+    #
+    # @api private
+    #
+    # @example Copy the object.
+    #   document.__copy__(other)
+    #
+    # @param [ Document ] other The other document.
+    #
+    # @return [ Document ] self.
+    #
+    # @since 3.0.0
+    def __copy__(other)
       other.as_document
       instance_variables.each { |name| remove_instance_variable(name) }
       COPYABLES.each do |name|

data/lib/mongoid/criterion/exclusion.rb

@@ -96,7 +96,9 @@ module Mongoid #:nodoc:
       def without(*args)
         clone.tap do |crit|
           if args.any?
-            crit.options[:fields] = {}
+            unless args == [ :id ] || args == [ :_id ]
+              crit.options[:fields] = {}
+            end
             args.flatten.each do |f|
               crit.options[:fields][f] = 0
             end

data/lib/mongoid/relations/metadata.rb

@@ -861,7 +861,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def determine_inverse_relation
-        default = klass.relations[inverse_klass.name.underscore]
+        default = foreign_key_match || klass.relations[inverse_klass.name.underscore]
         return default.name if default
         klass.relations.each_pair do |key, meta|
           next if meta.versioned? || meta.name == name
@@ -872,6 +872,25 @@ module Mongoid # :nodoc:
         return nil
       end
 
+      # Return metadata where the foreign key matches the foreign key on this
+      # relation.
+      #
+      # @api private
+      #
+      # @example Return a foreign key match.
+      #   meta.foreign_key_match
+      #
+      # @return [ Metadata ] A match, if any.
+      #
+      # @since 2.4.11
+      def foreign_key_match
+        if fk = self[:foreign_key]
+          klass.relations.values.detect do |meta|
+            fk == meta.foreign_key if meta.stores_foreign_key?
+          end
+        end
+      end
+
       # Determine the key for the relation in the attributes.
       #
       # @example Get the key.

data/lib/mongoid/serialization.rb

@@ -47,11 +47,13 @@ module Mongoid # :nodoc:
 
       {}.tap do |attrs|
         (attribute_names + method_names).each do |name|
-          value = send(name)
           if relations.has_key?(name)
-            attrs[name] = value.serializable_hash(options)
+            value = send(name)
+            attrs[name] = value ? value.serializable_hash(options) : nil
+          elsif attribute_names.include?(name) && !fields.has_key?(name)
+            attrs[name] = read_attribute(name)
           else
-            attrs[name] = value
+            attrs[name] = send(name)
           end
         end
         serialize_relations(attrs, options) if options[:include]

data/lib/mongoid/validations.rb

@@ -48,7 +48,7 @@ module Mongoid #:nodoc:
     # @since 2.0.0.rc.1
     def read_attribute_for_validation(attr)
       attribute = attr.to_s
-      if relations[attribute]
+      if relations.has_key?(attribute)
         begin_validate
         relation = send(attr)
         exit_validate

data/lib/mongoid/validations/presence.rb

@@ -31,6 +31,10 @@ module Mongoid #:nodoc:
           value.each_pair do |locale, value|
             document.errors.add(attribute, :blank_on_locale, options.merge(:location => locale)) if value.blank?
           end
+        elsif document.relations.has_key?(attribute.to_s)
+          if value.blank? && document.send(attribute).blank?
+            document.errors.add(attribute, :blank, options)
+          end
         else
           document.errors.add(attribute, :blank, options) if value.blank?
         end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.4.10"
+  VERSION = "2.4.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.10
+  version: 2.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -48,33 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <=
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - <=
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,23 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: ammeter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0.7'
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -461,7 +429,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2758014138080710719
+      hash: 4531209101708295137
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: