mongoid 1.2.14 → 1.9.0

data/lib/mongoid/errors.rb

@@ -41,6 +41,20 @@ module Mongoid #:nodoc
       end
     end
 
+    # Raised when the database version is not supported by Mongoid.
+    #
+    # Example:
+    #
+    # <tt>UnsupportedVersion.new(Mongo::ServerVersion.new("1.3.1"))</tt>
+    class UnsupportedVersion < RuntimeError
+      def initialize(version)
+        @version = version
+      end
+      def message
+        "MongoDB #{@version} not supported, please upgrade to #{Mongoid::MONGODB_VERSION}"
+      end
+    end
+
     # Raised when a persisence method ending in ! fails validation. The message
     # will contain the full error messages from the +Document+ in question.
     #
@@ -52,7 +66,7 @@ module Mongoid #:nodoc
         @errors = errors
       end
       def message
-        "Validation failed: #{@errors.full_messages}"
+        "Validation Failed: #{@errors.full_messages.join(", ")}"
       end
     end
 
@@ -73,5 +87,22 @@ module Mongoid #:nodoc
       end
     end
 
+    # This error is raised when trying to create a field that conflicts with
+    # a Mongoid internal attribute or method.
+    #
+    # Example:
+    #
+    # <tt>InvalidField.new('collection')</tt>
+    class InvalidField < RuntimeError
+      def initialize(name)
+        @name = name
+      end
+      def message
+        "Defining a field named '#{@name}' is not allowed. " +
+          "Do not define fields that conflict with Mongoid internal attributes " +
+          "or method names. Use Document#instance_methods to see what " +
+          "names this includes."
+      end
+    end
   end
 end

data/lib/mongoid/extensions.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "mongoid/extensions/time_conversions"
 require "mongoid/extensions/array/accessors"
 require "mongoid/extensions/array/aliasing"
 require "mongoid/extensions/array/assimilation"
@@ -22,7 +23,6 @@ require "mongoid/extensions/proc/scoping"
 require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
-require "mongoid/extensions/time/conversions"
 require "mongoid/extensions/objectid/conversions"
 
 class Array #:nodoc
@@ -44,14 +44,16 @@ class Boolean #:nodoc
   extend Mongoid::Extensions::Boolean::Conversions
 end
 
-class Date #:nodoc
-  extend Mongoid::Extensions::Date::Conversions
-end
-
 class DateTime #:nodoc
+  extend Mongoid::Extensions::TimeConversions
   extend Mongoid::Extensions::DateTime::Conversions
 end
 
+class Date #:nodoc
+  extend Mongoid::Extensions::TimeConversions
+  extend Mongoid::Extensions::Date::Conversions
+end
+
 class Float #:nodoc
   extend Mongoid::Extensions::Float::Conversions
 end
@@ -61,7 +63,7 @@ class Hash #:nodoc
   include Mongoid::Extensions::Hash::Assimilation
   include Mongoid::Extensions::Hash::CriteriaHelpers
   include Mongoid::Extensions::Hash::Scoping
-  extend Mongoid::Extensions::Hash::Conversions
+  include Mongoid::Extensions::Hash::Conversions
 end
 
 class Integer #:nodoc
@@ -91,9 +93,9 @@ class Symbol #:nodoc
 end
 
 class Time #:nodoc
-  extend Mongoid::Extensions::Time::Conversions
+  extend Mongoid::Extensions::TimeConversions
 end
 
-class Mongo::ObjectID #:nodoc
+class BSON::ObjectID #:nodoc
   extend Mongoid::Extensions::ObjectID::Conversions
-end
+end

data/lib/mongoid/extensions/big_decimal/conversions.rb

@@ -7,11 +7,11 @@ module Mongoid #:nodoc:
       module Conversions #:nodoc:
         # Get the string as a +BigDecimal+
         def get(value)
-          ::BigDecimal.new(value)
+          value ? ::BigDecimal.new(value) : value
         end
         # Set the value in the hash as a string.
         def set(value)
-          value.to_s
+          value ? value.to_s : value
         end
       end
     end

data/lib/mongoid/extensions/boolean/conversions.rb

@@ -3,9 +3,15 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Boolean #:nodoc:
       module Conversions #:nodoc:
+
+        BOOLEAN_MAP = {
+          true => true, "true" => true, "TRUE" => true, "1" => true, 1 => true, 1.0 => true,
+          false => false, "false" => false, "FALSE" => false, "0" => false, 0 => false, 0.0 => false
+        }
+
         def set(value)
-          val = value.to_s
-          val == "true" || val == "1"
+          value = BOOLEAN_MAP[value]
+          value.nil? ? nil : value
         end
         def get(value)
           value

data/lib/mongoid/extensions/date/conversions.rb

@@ -3,11 +3,20 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Date #:nodoc:
       module Conversions #:nodoc:
-        def set(value)
-          value.to_date.at_midnight.to_time unless value.blank?
-        end
         def get(value)
-          value ? value.getlocal.to_date : value
+          return nil if value.blank?
+          if Mongoid::Config.instance.use_utc?
+            value.to_date
+          else
+            ::Date.new(value.year, value.month, value.day)
+          end
+        end
+
+        protected
+
+        def convert_to_time(value)
+          value = ::Date.parse(value) if value.is_a?(::String)
+          ::Time.utc(value.year, value.month, value.day)
         end
       end
     end

data/lib/mongoid/extensions/datetime/conversions.rb

@@ -3,13 +3,8 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module DateTime #:nodoc:
       module Conversions #:nodoc:
-        def set(value)
-          return nil if value.blank?
-          ::DateTime.parse(value.to_s).utc
-        end
         def get(value)
-          return nil if value.blank?
-          ::Time.zone ? ::Time.parse(value.to_s).getlocal.to_datetime : value.to_datetime
+          super.try(:to_datetime)
         end
       end
     end

data/lib/mongoid/extensions/float/conversions.rb

@@ -5,7 +5,11 @@ module Mongoid #:nodoc:
       module Conversions #:nodoc:
         def set(value)
           return nil if value.blank?
-          value =~ /\d/ ? value.to_f : value
+          begin
+            Float(value)
+          rescue ArgumentError => e
+            puts(e.message); value
+          end
         end
         def get(value)
           value

data/lib/mongoid/extensions/hash/assimilation.rb

@@ -18,10 +18,19 @@ module Mongoid #:nodoc:
         #
         # Returns: The child +Document+.
         def assimilate(parent, options, type = nil)
-          klass = type ? type : options.klass
-          child = klass.instantiate(:_parent => parent)
-          child.write_attributes(self.merge("_type" => klass.name))
+          klass = self.klass || (type ? type : options.klass)
+          child = klass.instantiate("_id" => self["_id"])
+          self.merge("_type" => klass.name) if klass.hereditary
+          init(parent, child, options)
+        end
+
+        protected
+
+        def init(parent, child, options)
+          child._parent = parent
+          child.write_attributes(self)
           child.identify
+          child.reset_modifications
           child.assimilate(parent, options)
         end
       end

data/lib/mongoid/extensions/hash/conversions.rb

@@ -3,11 +3,41 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Hash #:nodoc:
       module Conversions #:nodoc:
-        def get(value)
-          value
+        extend ActiveSupport::Concern
+
+        module InstanceMethods #:nodoc:
+
+          # Get the difference between 2 hashes. This will give back a new hash
+          # with the keys and pairs of [ old, new ] values.
+          #
+          # Example:
+          #
+          #   first = { :field => "value" }
+          #   second = { :field => "new" }
+          #   first.difference(second) # => { :field => [ "value", "new" ] }
+          #
+          # Returns:
+          #
+          # A +Hash+ of modifications.
+          def difference(other)
+            changes = {}
+            each_pair do |key, value|
+              if other.has_key?(key)
+                new_value = other[key]
+                changes[key] = [ value, new_value ] if new_value != value
+              end
+            end
+            changes
+          end
         end
-        def set(value)
-          value
+
+        module ClassMethods #:nodoc:
+          def get(value)
+            value
+          end
+          def set(value)
+            value
+          end
         end
       end
     end

data/lib/mongoid/extensions/integer/conversions.rb

@@ -5,7 +5,11 @@ module Mongoid #:nodoc:
       module Conversions #:nodoc:
         def set(value)
           return nil if value.blank?
-          value =~ /\d/ ? value.to_i : value
+          begin
+            Integer(value)
+          rescue ArgumentError => e
+            puts(e.message); value
+          end
         end
         def get(value)
           value

data/lib/mongoid/extensions/nil/assimilation.rb

@@ -7,6 +7,10 @@ module Mongoid #:nodoc:
         def assimilate(parent, options, type = nil)
           parent.remove_attribute(options.name); self
         end
+
+        def collectionize
+          to_s.collectionize
+        end
       end
     end
   end

data/lib/mongoid/extensions/object/conversions.rb

@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
           end
 
           def get(value)
-            self.new(value)
+            value ? self.new(value) : value
           end
         end
       end

data/lib/mongoid/extensions/string/conversions.rb

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
     module String #:nodoc:
       module Conversions #:nodoc:
         def set(value)
-          value.to_s
+          value.to_s unless value.nil?
         end
         def get(value)
           value

data/lib/mongoid/extensions/symbol/inflections.rb

@@ -23,7 +23,7 @@ module Mongoid #:nodoc:
           to_s.plural?
         end
 
-        ["gt", "lt", "gte", "lte", "ne", "in", "nin", "mod", "all", "size", "exists"].each do |oper|
+        ["gt", "lt", "gte", "lte", "ne", "near", "in", "nin", "mod", "all", "size", "exists", "within"].each do |oper|
           class_eval <<-OPERATORS
             def #{oper}
               Criterion::Complex.new(:key => self, :operator => "#{oper}")

data/lib/mongoid/extensions/time_conversions.rb

@@ -0,0 +1,35 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module TimeConversions #:nodoc:
+      def set(value)
+        return nil if value.blank?
+        time = convert_to_time(value)
+        strip_milliseconds(time).utc
+      end
+
+      def get(value)
+        return nil if value.blank?
+        if Mongoid::Config.instance.use_utc?
+          value
+        else
+          value.getlocal
+        end
+      end
+
+      protected
+
+      def strip_milliseconds(time)
+        ::Time.at(time.to_i)
+      end
+
+      def convert_to_time(value)
+        case value
+          when ::String then ::Time.parse(value)
+          when ::DateTime then ::Time.utc(value.year, value.month, value.day, value.hour, value.min, value.sec)
+          when ::Date then ::Time.utc(value.year, value.month, value.day)
+          else value
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extras.rb

@@ -1,15 +1,12 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Extras #:nodoc:
-    def self.included(base)
-      base.class_eval do
-        extend ClassMethods
-        class_inheritable_accessor :cached, :enslaved
-        self.cached = false
-        self.enslaved = false
-
-        delegate :cached?, :enslaved?, :to => "self.class"
-      end
+    extend ActiveSupport::Concern
+    included do
+      class_inheritable_accessor :cached, :enslaved
+      self.cached = false
+      self.enslaved = false
+      delegate :cached?, :enslaved?, :to => "self.class"
     end
 
     module ClassMethods #:nodoc

data/lib/mongoid/factory.rb

@@ -11,7 +11,8 @@ module Mongoid #:nodoc:
     #
     # klass: The class to instantiate from if _type is not present.
     # attributes: The +Document+ attributes.
-    def self.build(klass, attrs)
+    def self.build(klass, attributes)
+      attrs = {}.merge(attributes)
       type = attrs["_type"]
       type ? type.constantize.instantiate(attrs) : klass.instantiate(attrs)
     end

data/lib/mongoid/field.rb

@@ -18,7 +18,7 @@ module Mongoid #:nodoc:
     #
     # The primitive value or a copy of the default.
     def default
-      (@default.is_a?(Array) || @default.is_a?(Hash)) ? @default.dup : @default
+      copy
     end
 
     # Create the new field with a name and optional additional options. Valid
@@ -34,6 +34,7 @@ module Mongoid #:nodoc:
     # <tt>Field.new(:score, :default => 0)</tt>
     def initialize(name, options = {})
       @name, @default = name, options[:default]
+      @copyable = (@default.is_a?(Array) || @default.is_a?(Hash))
       @type = options[:type] || String
       @accessible = options.has_key?(:accessible) ? options[:accessible] : true
     end
@@ -41,12 +42,18 @@ module Mongoid #:nodoc:
     # Used for setting an object in the attributes hash. If nil is provided the
     # default will get returned if it exists.
     def set(object)
-      object.nil? ? default : type.set(object)
+      type.set(object)
     end
 
     # Used for retrieving the object out of the attributes hash.
     def get(object)
       type.get(object)
     end
+
+    protected
+    # Slightly faster default check.
+    def copy
+      @copyable ? @default.dup : @default
+    end
   end
 end

data/lib/mongoid/fields.rb

@@ -47,6 +47,7 @@ module Mongoid #:nodoc
         meth = options.delete(:as) || name
         fields[name] = Field.new(name, options)
         create_accessors(name, meth, options)
+        add_dirty_methods(name)
       end
 
       # Create the field accessors.

data/lib/mongoid/identity.rb

@@ -15,19 +15,19 @@ module Mongoid #:nodoc:
       protected
       # Return the proper id for the document.
       def generate_id
-        id = Mongo::ObjectID.new
+        id = BSON::ObjectID.new
         Mongoid.use_object_ids ? id : id.to_s
       end
 
       # Set the id for the document.
       def identify(doc)
         doc.id = compose(doc).join(" ").identify if doc.primary_key
-        doc.id = generate_id unless doc.id
+        doc.id = generate_id if doc.id.blank?
       end
 
       # Set the _type field on the document.
       def type(doc)
-        doc._type = doc.class.name if Mongoid.persist_types
+        doc._type = doc.class.name if doc.hereditary?
       end
 
       # Generates the composite key for a document.