mongoid 3.0.14 → 3.0.15

data/CHANGELOG.md

@@ -3,6 +3,46 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 3.0.15
+
+### Resolved Issues
+
+* \#2630 Fix cascading when the metadata exists but no cascade defined.
+
+* \#2625 Fix `Marshal.dump` and `Marshal.load` of proxies and criteria
+  objects.
+
+* \#2619 Fixed the classes returned by `observed_classes` on an observer
+  when it is observing custom models.
+
+* \#2612 `DocumentNotFound` errors now expose the class in the error
+  instance.
+
+* \#2610 Ensure calling `first` after a `last` that had sorting options resets
+  the sort.
+
+* \#2604 Check pulls and pushes for conflicting updates. (Lucas Souza)
+
+* \#2600 Instantiate the proper class type for attributes when using
+  multi parameter attributes. (xxswingxx)
+
+* \#2598 Fixed sorting on localized fields with embedded docs.
+
+* \#2588 Block defining methods for dynamic attributes that would be invalid
+  ruby methods. (Matt Sanford)
+
+* \#2587 Fix method clash with `belongs_to` proxies when resetting relation
+  unloaded criteria.
+
+* \#2585 Ensure session configuration options get passed to Moped as symbols.
+
+* \#2584 Allow map/reduce to operate on secondaries if output is set to `inline`.
+
+* \#2582 Ensure `nil` session override can never cause to access a session with
+  name `nil`.
+
+* \#2581 Use strong consistency when reloading documents. (Mark Kremer)
+
 ## 3.0.14
 
 ### Resolved Issues

data/lib/mongoid/atomic/modifiers.rb

@@ -149,7 +149,8 @@ module Mongoid
       #
       # @since 2.2.0
       def set_conflict?(field)
-        pull_fields.has_key?(field.split(".", 2)[0])
+        name = field.split(".", 2)[0]
+        pull_fields.has_key?(name) || push_fields.has_key?(name)
       end
 
       # Is the operation going to be a conflict for a $push?

data/lib/mongoid/attributes.rb

@@ -58,7 +58,12 @@ module Mongoid
     #
     # @since 1.0.0
     def read_attribute(name)
-      attributes[name.to_s]
+      normalized = name.to_s
+      if hash_dot_syntax?(normalized)
+        attributes.__nested__(normalized)
+      else
+        attributes[normalized]
+      end
     end
     alias :[] :read_attribute
 
@@ -100,7 +105,8 @@ module Mongoid
       super || (
         Mongoid.allow_dynamic_fields &&
         attributes &&
-        attributes.has_key?(name.to_s.reader)
+        attributes.has_key?(name.to_s.reader) &&
+        name.to_s.valid_method_name?
       )
     end
 
@@ -191,6 +197,8 @@ module Mongoid
     #
     # @since 3.0.0
     def define_dynamic_reader(name)
+      return unless name.valid_method_name?
+
       class_eval <<-READER
         def #{name}
           read_attribute(#{name.inspect})
@@ -209,6 +217,8 @@ module Mongoid
     #
     # @since 3.0.0
     def define_dynamic_writer(name)
+      return unless name.valid_method_name?
+
       class_eval <<-WRITER
         def #{name}=(value)
           write_attribute(#{name.inspect}, value)
@@ -216,6 +226,20 @@ module Mongoid
       WRITER
     end
 
+    # Does the string contain dot syntax for accessing hashes?
+    #
+    # @api private
+    #
+    # @example Is the string in dot syntax.
+    #   model.hash_dot_syntax?
+    #
+    # @return [ true, false ] If the string contains a "."
+    #
+    # @since 3.0.15
+    def hash_dot_syntax?(string)
+      string =~ /\./
+    end
+
     # Used for allowing accessor methods for dynamic attributes.
     #
     # @param [ String, Symbol ] name The name of the method.

data/lib/mongoid/attributes/processing.rb

@@ -118,12 +118,13 @@ module Mongoid
       #
       # @since 2.0.0.rc.7
       def process_attribute(name, value)
-        responds = respond_to?("#{name}=")
+        writer_method = "#{name}="
+        responds = respond_to?(writer_method)
         if Mongoid.allow_dynamic_fields && !responds
           write_attribute(name, value)
         else
           raise Errors::UnknownAttribute.new(self.class, name) unless responds
-          send("#{name}=", value)
+          send(writer_method, value)
         end
       end
 

data/lib/mongoid/contextual/map_reduce.rb

@@ -286,7 +286,27 @@ module Mongoid
       # @since 3.0.0
       def results
         raise Errors::NoMapReduceOutput.new(command) unless command[:out]
-        @results ||= session.with(consistency: :strong).command(command)
+        @results ||= __session__.command(command)
+      end
+
+      # Get the session with the proper consistency.
+      #
+      # @api private
+      #
+      # @note We can use eventual if the output is set to inline.
+      #
+      # @example Get the session.
+      #   map_reduce.__session__
+      #
+      # @return [ Session ] The session with consistency set.
+      #
+      # @since 3.0.15
+      def __session__
+        if command[:out][:inline] != 1
+          session.with(consistency: :strong)
+        else
+          session
+        end
       end
     end
   end

data/lib/mongoid/contextual/mongo.rb

@@ -197,6 +197,7 @@ module Mongoid
       #
       # @since 3.0.0
       def first
+        apply_sorting
         apply_id_sorting
         with_eager_loading(query.first)
       end

data/lib/mongoid/criteria.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "mongoid/criterion/inspection"
+require "mongoid/criterion/marshalable"
 require "mongoid/criterion/scoping"
 
 module Mongoid
@@ -15,6 +16,7 @@ module Mongoid
     include Contextual
     include Origin::Queryable
     include Criterion::Inspection
+    include Criterion::Marshalable
     include Criterion::Scoping
 
     attr_accessor :embedded, :klass

data/lib/mongoid/criterion/marshalable.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+module Mongoid
+  module Criterion
+    module Marshalable
+
+      # Provides the data needed to Marshal.dump a criteria.
+      #
+      # @example Dump the criteria.
+      #   Marshal.dump(criteria)
+      #
+      # @return [ Array<Object> ] The dumped data.
+      #
+      # @since 3.0.15
+      def marshal_dump
+        data = [ klass, driver, inclusions, documents, strategy, negating ]
+        data.push(scoping_options).push(dump_hash(:selector)).push(dump_hash(:options))
+      end
+
+      # Resets the criteria object after a Marshal.load
+      #
+      # @example Load the criteria.
+      #   Marshal.load(criteria)
+      #
+      # @since 3.0.15
+      def marshal_load(data)
+        @scoping_options, raw_selector, raw_options = data.pop(3)
+        @klass, @driver, @inclusions, @documents, @strategy, @negating = data
+        @selector = load_hash(Origin::Selector, raw_selector)
+        @options = load_hash(Origin::Options, raw_options)
+      end
+
+      private
+
+      def dump_hash(name)
+        send(name).inject({}) do |raw, (key, value)|
+          raw[key] = value
+          raw
+        end
+      end
+
+      def load_hash(hash_class, raw)
+        hash = hash_class.new(klass.aliased_fields, klass.fields)
+        hash.merge!(raw)
+        hash
+      end
+    end
+  end
+end

data/lib/mongoid/errors/document_not_found.rb

@@ -7,7 +7,7 @@ module Mongoid
     # it will display all of those.
     class DocumentNotFound < MongoidError
 
-      attr_reader :params
+      attr_reader :klass, :params
 
       # Create the new error.
       #
@@ -24,7 +24,7 @@ module Mongoid
         if !unmatched && !params.is_a?(Hash)
           raise ArgumentError, 'please also supply the unmatched ids'
         end
-        @params = params
+        @klass, @params = klass, params
         super(
           compose_message(
             message_key(params),

data/lib/mongoid/extensions/hash.rb

@@ -72,6 +72,25 @@ module Mongoid
         self["_id"] || self["id"] || self[:id] || self[:_id]
       end
 
+      # Fetch a nested value via dot syntax.
+      #
+      # @example Fetch a nested value via dot syntax.
+      #   { "name" => { "en" => "test" }}.__nested__("name.en")
+      #
+      # @param [ String ] string the dot syntax string.
+      #
+      # @return [ Object ] The matching value.
+      #
+      # @since 3.0.15
+      def __nested__(string)
+        keys = string.split(".")
+        value = self
+        keys.each do |key|
+          value = value[key]
+        end
+        value
+      end
+
       # Turn the object from the ruby type we deal with to a Mongo friendly
       # type.
       #

data/lib/mongoid/extensions/string.rb

@@ -120,6 +120,18 @@ module Mongoid
         include?("=")
       end
 
+      # Is this string a valid_method_name?
+      #
+      # @example Is the string a valid Ruby idenfier for use as a method name
+      #   "model=".valid_method_name?
+      #
+      # @return [ true, false ] If the string contains a valid Ruby identifier.
+      #
+      # @since 3.0.15
+      def valid_method_name?
+        /[@$"]/ !~ to_sym.inspect
+      end
+
       # Is the object not to be converted to bson on criteria creation?
       #
       # @example Is the object unconvertable?

data/lib/mongoid/multi_parameter_attributes.rb

@@ -51,7 +51,8 @@ module Mongoid
     def process_attributes(attrs = nil, role = :default, guard_protected_attributes = true)
       if attrs
         errors = []
-        attributes = {}
+        attributes = attrs.class.new
+        attributes.permitted = true if attrs.respond_to?(:permitted?) && attrs.permitted?
         multi_parameter_attributes = {}
 
         attrs.each_pair do |key, value|
@@ -79,7 +80,7 @@ module Mongoid
           raise Errors::MultiparameterAssignmentErrors.new(errors),
             "#{errors.size} error(s) on assignment of multiparameter attributes"
         end
-
+        
         super attributes, role, guard_protected_attributes
       else
         super

data/lib/mongoid/observer.rb

@@ -176,5 +176,26 @@ module Mongoid
       return false unless klass.respond_to?(:observers)
       klass.observers.disabled_for?(self) || Mongoid.observers.disabled_for?(self)
     end
+
+    class << self
+
+      # Attaches the observer to the specified classes.
+      #
+      # @example Attach the BandObserver to the class Artist.
+      #   class BandObserver < Mongoid::Observer
+      #     observe :artist
+      #   end
+      #
+      # @param [ Array<Symbol> ] models The names of the models.
+      #
+      # @since 3.0.15
+      def observe(*models)
+        models.flatten!
+        models.collect! do |model|
+          model.respond_to?(:to_sym) ? model.to_s.camelize.constantize : model
+        end
+        singleton_class.redefine_method(:observed_classes) { models }
+      end
+    end
   end
 end

data/lib/mongoid/relations/accessors.rb

@@ -69,7 +69,7 @@ module Mongoid
       # @since 3.0.14
       def reset_relation_criteria(name)
         if instance_variable_defined?("@#{name}")
-          send(name).reset_relation_criteria
+          send(name).reset_unloaded
         end
       end
 

data/lib/mongoid/relations/cascading.rb

@@ -29,7 +29,7 @@ module Mongoid
           if !metadata || !metadata.versioned?
             if meta = relations[name]
               strategy = meta.cascade_strategy
-              strategy.new(self, meta).cascade
+              strategy.new(self, meta).cascade if strategy
             end
           end
         end

data/lib/mongoid/relations/marshalable.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+module Mongoid
+  module Relations
+    module Marshalable
+
+      # Provides the data needed to Marshal.dump a relation proxy.
+      #
+      # @example Dump the proxy.
+      #   Marshal.dump(proxy)
+      #
+      # @return [ Array<Object> ] The dumped data.
+      #
+      # @since 3.0.15
+      def marshal_dump
+        [ base, target, metadata ]
+      end
+
+      # Takes the provided data and sets it back on the proxy.
+      #
+      # @example Load the proxy.
+      #   Marshal.load(proxy)
+      #
+      # @return [ Array<Object> ] The loaded data.
+      #
+      # @since 3.0.15
+      def marshal_load(data)
+        @base, @target, @metadata = data
+      end
+    end
+  end
+end

data/lib/mongoid/relations/proxy.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require "mongoid/relations/marshalable"
+
 module Mongoid
   module Relations
 
@@ -14,11 +16,12 @@ module Mongoid
       end
 
       include Threaded::Lifecycle
+      include Marshalable
 
       attr_accessor :base, :loaded, :metadata, :target
 
       # Backwards compatibility with Mongoid beta releases.
-      delegate :klass, :foreign_key, :inverse_foreign_key, to: :metadata
+      delegate :foreign_key, :inverse_foreign_key, to: :metadata
       delegate :bind_one, :unbind_one, to: :binding
       delegate :collection_name, to: :base
 
@@ -39,6 +42,18 @@ module Mongoid
         extend_proxy(metadata.extension) if metadata.extension?
       end
 
+      # Get the class from the metadata, or return nil if no metadata present.
+      #
+      # @example Get the class.
+      #   proxy.klass
+      #
+      # @return [ Class ] The relation class.
+      #
+      # @since 3.0.15
+      def klass
+        metadata ? metadata.klass : nil
+      end
+
       # Resets the criteria inside the relation proxy. Used by many to many
       # relations to keep the underlying ids array in sync.
       #
@@ -46,7 +61,7 @@ module Mongoid
       #   person.preferences.reset_relation_criteria
       #
       # @since 3.0.14
-      def reset_relation_criteria
+      def reset_unloaded
         target.reset_unloaded(criteria)
       end
 

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

@@ -173,7 +173,7 @@ module Mongoid
           unless replacement.blank?
             push(replacement.compact.uniq)
           else
-            reset_relation_criteria
+            reset_unloaded
           end
           self
         end

data/lib/mongoid/relations/targets/enumerable.rb

@@ -309,6 +309,30 @@ module Mongoid
           !!@executed
         end
 
+        # Provides the data needed to Marshal.dump an enumerable proxy.
+        #
+        # @example Dump the proxy.
+        #   Marshal.dump(proxy)
+        #
+        # @return [ Array<Object> ] The dumped data.
+        #
+        # @since 3.0.15
+        def marshal_dump
+          [ _added, _loaded, _unloaded ]
+        end
+
+        # Loads the data needed to Marshal.load an enumerable proxy.
+        #
+        # @example Load the proxy.
+        #   Marshal.load(proxy)
+        #
+        # @return [ Array<Object> ] The dumped data.
+        #
+        # @since 3.0.15
+        def marshal_load(data)
+          @_added, @_loaded, @_unloaded = data
+        end
+
         # Reset the enumerable back to its persisted state.
         #
         # @example Reset the enumerable.

data/lib/mongoid/sessions.rb

@@ -370,7 +370,7 @@ module Mongoid
       #
       # @since 3.0.0
       def __session__
-        if name = session_override
+        if !(name = session_override).nil?
           Sessions.with_name(name)
         elsif storage_options && name = storage_options[:session]
           Sessions.with_name(name)

data/lib/mongoid/sessions/factory.rb

@@ -101,7 +101,7 @@ module Mongoid
       def parse(config)
         options = config[:options].try(:dup) || {}
         parsed = config.has_key?(:uri) ? MongoUri.new(config[:uri]).to_hash : config
-        [ parsed, options ]
+        [ parsed, options.symbolize_keys ]
       end
     end
   end

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -115,6 +115,7 @@ files:
 - lib/mongoid/copyable.rb
 - lib/mongoid/criteria.rb
 - lib/mongoid/criterion/inspection.rb
+- lib/mongoid/criterion/marshalable.rb
 - lib/mongoid/criterion/scoping.rb
 - lib/mongoid/dirty.rb
 - lib/mongoid/document.rb
@@ -281,6 +282,7 @@ files:
 - lib/mongoid/relations/embedded/one.rb
 - lib/mongoid/relations/macros.rb
 - lib/mongoid/relations/many.rb
+- lib/mongoid/relations/marshalable.rb
 - lib/mongoid/relations/metadata.rb
 - lib/mongoid/relations/nested_builder.rb
 - lib/mongoid/relations/one.rb
@@ -350,10 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 4134482588596477262
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: