mongoid 2.3.5 → 2.4.0

data/lib/mongoid/fields/{serializable → internal}/array.rb

@@ -1,12 +1,44 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for array fields.
       class Array
         include Serializable
 
+        # Adds the atomic changes for this type of resizable field.
+        #
+        # @example Add the atomic changes.
+        #   field.add_atomic_changes(doc, "key", {}, [], [])
+        #
+        # @param [ Document ] document The document to add to.
+        # @param [ String ] key The name of the field.
+        # @param [ Hash ] mods The current modifications.
+        # @param [ Array ] new The new elements to add.
+        # @param [ Array ] old The old elements getting removed.
+        #
+        # @since 2.4.0
+        def add_atomic_changes(document, key, mods, new, old)
+          if new.any? && old.any?
+            mods[key] = document.attributes[key]
+          elsif new.any?
+            document.atomic_array_pushes[key] = new
+          elsif old.any?
+            document.atomic_array_pulls[key] = old
+          end
+        end
+
+        # Array fields are resizable.
+        #
+        # @example Is this field resizable?
+        #   field.resizable?
+        #
+        # @return [ true ] Always true.
+        #
+        # @since 2.4.0
+        def resizable?; true; end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/{serializable → internal}/big_decimal.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for big decimal fields.
       class BigDecimal
@@ -22,6 +22,21 @@ module Mongoid #:nodoc:
           object ? ::BigDecimal.new(object) : object
         end
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/{serializable → internal}/bignum.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
       # Defines the behaviour for bignum fields.
       class Bignum < Integer
       end

data/lib/mongoid/fields/{serializable → internal}/binary.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
       # Defines the behaviour for binary fields.
       class Binary
         include Serializable

data/lib/mongoid/fields/{serializable → internal}/boolean.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for boolean fields.
       class Boolean
@@ -22,6 +22,21 @@ module Mongoid #:nodoc:
           0.0 => false
         }
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/{serializable → internal}/date.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for date fields.
       class Date

data/lib/mongoid/fields/{serializable → internal}/date_time.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for date time fields.
       class DateTime

data/lib/mongoid/fields/{serializable → internal}/fixnum.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
       # Defines the behaviour for fixnum fields.
       class Fixnum < Integer
       end

data/lib/mongoid/fields/{serializable → internal}/float.rb

@@ -1,12 +1,27 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for float fields.
       class Float
         include Serializable
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/internal/foreign_keys/array.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Fields #:nodoc:
+    module Internal #:nodoc:
+      module ForeignKeys #:nodoc:
+
+        # Defines the behaviour for array foreign key fields.
+        class Array
+          include Serializable
+
+          # Adds the atomic changes for this type of resizable field.
+          #
+          # @example Add the atomic changes.
+          #   field.add_atomic_changes(doc, "key", {}, [], [])
+          #
+          # @param [ Document ] document The document to add to.
+          # @param [ String ] key The name of the field.
+          # @param [ Hash ] mods The current modifications.
+          # @param [ Array ] new The new elements to add.
+          # @param [ Array ] old The old elements getting removed.
+          #
+          # @since 2.4.0
+          def add_atomic_changes(document, key, mods, new, old)
+            if new.any? && old.any?
+              mods[key] = document.attributes[key]
+            elsif new.any?
+              document.atomic_array_add_to_sets[key] = new
+            elsif old.any?
+              document.atomic_array_pulls[key] = old
+            end
+          end
+
+          # Is the field a BSON::ObjectId?
+          #
+          # @example Is the field a BSON::ObjectId?
+          #   field.object_id_field?
+          #
+          # @return [ true, false ] If the field is a BSON::ObjectId.
+          #
+          # @since 2.2.0
+          def object_id_field?
+            @object_id_field ||=
+              metadata.polymorphic? ? true : metadata.klass.using_object_ids?
+          end
+
+          # Array fields are resizable.
+          #
+          # @example Is this field resizable?
+          #   field.resizable?
+          #
+          # @return [ true ] Always true.
+          #
+          # @since 2.4.0
+          def resizable?; true; end
+
+          # Serialize the object from the type defined in the model to a MongoDB
+          # compatible object to store.
+          #
+          # @example Serialize the field.
+          #   field.serialize(object)
+          #
+          # @param [ Object ] object The object to cast.
+          #
+          # @return [ Array ] The converted object.
+          #
+          # @since 2.1.0
+          def serialize(object)
+            object ? constraint.convert(object) : []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/fields/{serializable → internal}/foreign_keys/object.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
       module ForeignKeys #:nodoc:
 
         # Defines the behaviour for integer foreign key fields.
@@ -37,7 +37,16 @@ module Mongoid #:nodoc:
             if object_id_field?
               constraint.convert(object)
             else
-              metadata.klass.fields["_id"].serialize(object)
+              case object
+              when ::Array
+                object.replace(object.map { |arg| serialize(arg) })
+              when ::Hash
+                object.each_pair do |key, value|
+                  object[key] = serialize(value)
+                end
+              else
+                metadata.klass.fields["_id"].serialize(object)
+              end
             end
           end
         end

data/lib/mongoid/fields/{serializable → internal}/hash.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
       # Defines the behaviour for hash fields.
       class Hash
         include Serializable

data/lib/mongoid/fields/{serializable → internal}/integer.rb

@@ -1,12 +1,27 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for integer fields.
       class Integer
         include Serializable
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/{serializable → internal}/localized.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for localized string fields.
       class Localized
@@ -19,7 +19,28 @@ module Mongoid #:nodoc:
         #
         # @since 2.3.0
         def deserialize(object)
-          object[::I18n.locale.to_s]
+          return nil if object.nil?
+          locale = ::I18n.locale
+          if ::I18n.respond_to?(:fallbacks)
+            object[::I18n.fallbacks[locale].map(&:to_s).find{ |loc| object[loc] }]
+          else
+            object[locale.to_s]
+          end
+        end
+
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
         end
 
         # Convert the provided string into a hash for the locale.

data/lib/mongoid/fields/{serializable → internal}/nil_class.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for nil fields.
       class NilClass
@@ -20,6 +20,21 @@ module Mongoid #:nodoc:
         # @since 2.1.0
         def deserialize(object); nil; end
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/{serializable → internal}/object.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
       # Defines the behaviour for object fields.
       class Object
         include Serializable

data/lib/mongoid/fields/{serializable → internal}/object_id.rb

@@ -1,12 +1,27 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for BSON::ObjectId fields.
       class ObjectId
         include Serializable
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/{serializable → internal}/range.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for range fields.
       class Range
@@ -22,6 +22,25 @@ module Mongoid #:nodoc:
           object.nil? ? nil : ::Range.new(object["min"], object["max"])
         end
 
+        # Convert the provided object to a Mongoid criteria friendly value. For
+        # ranges this will look for something between the min and max values.
+        #
+        # @example Convert the field.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          {
+            "min" => { "$gte" => object.first },
+            "max" => { "$lte" => object.last }
+          }
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #
@@ -34,7 +53,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def serialize(object)
-          object.nil? ? nil : { "min" => object.min, "max" => object.max }
+          object.nil? ? nil : { "min" => object.first, "max" => object.last }
         end
       end
     end