mongoid 1.9.5 → 2.0.0.alpha

data/lib/mongoid/criterion/optional.rb

@@ -62,7 +62,7 @@ module Mongoid #:nodoc:
       #
       # Options:
       #
-      # object_id: A +String+ representation of a <tt>BSON::ObjectId</tt>
+      # object_id: A +String+ representation of a <tt>Mongo::ObjectID</tt>
       #
       # Example:
       #

data/lib/mongoid/cursor.rb

@@ -5,6 +5,7 @@ module Mongoid #:nodoc
     # Operations on the Mongo::Cursor object that will not get overriden by the
     # Mongoid::Cursor are defined here.
     OPERATIONS = [
+      :admin,
       :close,
       :closed?,
       :count,

data/lib/mongoid/document.rb

@@ -2,16 +2,19 @@
 module Mongoid #:nodoc:
   module Document
     extend ActiveSupport::Concern
-    include Mongoid::Components
     included do
       include Mongoid::Components
 
-      cattr_accessor :primary_key, :hereditary
+      cattr_accessor :_collection, :collection_name, :embedded, :primary_key, :hereditary
+
+      self.embedded = false
       self.hereditary = false
+      self.collection_name = self.name.collectionize
 
       attr_accessor :association_name, :_parent
+      attr_reader :new_record
 
-      delegate :db, :primary_key, :to => "self.class"
+      delegate :collection, :db, :embedded, :primary_key, :to => "self.class"
     end
 
     module ClassMethods
@@ -20,21 +23,23 @@ module Mongoid #:nodoc:
         collection.db
       end
 
+      # Returns the collection associated with this +Document+. If the
+      # document is embedded, there will be no collection associated
+      # with it.
+      #
+      # Returns: <tt>Mongo::Collection</tt>
+      def collection
+        raise Errors::InvalidCollection.new(self) if embedded
+        self._collection ||= Mongoid::Collection.new(self, self.collection_name)
+        add_indexes; self._collection
+      end
+
       # Perform default behavior but mark the hierarchy as being hereditary.
       def inherited(subclass)
         super(subclass)
         self.hereditary = true
       end
 
-      # Returns a human readable version of the class.
-      #
-      # Example:
-      #
-      # <tt>MixedDrink.human_name # returns "Mixed Drink"</tt>
-      def human_name
-        name.labelize
-      end
-
       # Instantiate a new object, only when loaded from the database or when
       # the attributes have already been typecast.
       #
@@ -46,7 +51,6 @@ module Mongoid #:nodoc:
         if attributes["_id"] || allocating
           document = allocate
           document.instance_variable_set(:@attributes, attributes)
-          document.setup_modifications
           return document
         else
           return new(attrs)
@@ -69,14 +73,25 @@ module Mongoid #:nodoc:
         before_save :identify
       end
 
+      # Macro for setting the collection name to store in.
+      #
+      # Example:
+      #
+      # <tt>Person.store_in :populdation</tt>
+      def store_in(name)
+        self.collection_name = name.to_s
+        self._collection = Mongoid::Collection.new(self, name.to_s)
+      end
+
       # Returns all types to query for when using this class as the base.
       def _types
-        @_type ||= (self.subclasses + [ self.name ])
+        @_type ||= (subclasses_of(self).map { |o| o.to_s } + [ self.name ])
       end
 
       # return the list of subclassses for an object
       def subclasses_of(*superclasses) #:nodoc:
         subclasses = []
+
         superclasses.each do |sup|
           ObjectSpace.each_object(class << sup; self; end) do |k|
             if k != sup && (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
@@ -84,16 +99,18 @@ module Mongoid #:nodoc:
             end
           end
         end
+
         subclasses
       end
     end
 
     module InstanceMethods
-      # Performs equality checking on the document ids. For more robust
-      # equality checking please override this method.
+      # Performs equality checking on the attributes. For now we chack against
+      # all attributes excluding timestamps on the object.
       def ==(other)
         return false unless other.is_a?(Document)
-        id == other.id
+        attributes.except(:modified_at).except(:created_at) ==
+          other.attributes.except(:modified_at).except(:created_at)
       end
 
       # Delegates to ==
@@ -107,15 +124,6 @@ module Mongoid #:nodoc:
         id.hash
       end
 
-      # Is inheritance in play here?
-      #
-      # Returns:
-      #
-      # <tt>true</tt> if inheritance used, <tt>false</tt> if not.
-      def hereditary?
-        !!self.hereditary
-      end
-
       # Introduces a child object into the +Document+ object graph. This will
       # set up the relationships between the parent and child and update the
       # attributes of the parent +Document+.
@@ -149,27 +157,24 @@ module Mongoid #:nodoc:
       # an empty +Hash+.
       #
       # If a primary key is defined, the document's id will be set to that key,
-      # otherwise it will be set to a fresh +BSON::ObjectId+ string.
+      # otherwise it will be set to a fresh +Mongo::ObjectID+ string.
       #
       # Options:
       #
       # attrs: The attributes +Hash+ to set up the document with.
       def initialize(attrs = nil)
-        @attributes = default_attributes
+        @attributes = {}
         process(attrs)
-        @new_record = true
+        @attributes = attributes_with_defaults(@attributes)
+        @new_record = true if id.nil?
         document = yield self if block_given?
         identify
       end
 
       # Returns the class name plus its attributes.
       def inspect
-        attrs = fields.map { |name, field| "#{name}: #{@attributes[name].inspect}" }
-        if Mongoid.allow_dynamic_fields
-          dynamic_keys = @attributes.keys - fields.keys - associations.keys - ["_id", "_type"]
-          attrs += dynamic_keys.map { |name| "#{name}: #{@attributes[name].inspect}" }
-        end
-        "#<#{self.class.name} _id: #{id}, #{attrs * ', '}>"
+        attrs = fields.map { |name, field| "#{name}: #{@attributes[name].inspect}" } * ", "
+        "#<#{self.class.name} _id: #{id}, #{attrs}>"
       end
 
       # Notify observers of an update.
@@ -206,12 +211,8 @@ module Mongoid #:nodoc:
 
       # Reloads the +Document+ attributes from the database.
       def reload
-        reloaded = collection.find_one(:_id => id)
-        if Mongoid.raise_not_found_error
-          raise Errors::DocumentNotFound.new(self.class, id) if reloaded.nil?
-        end
-        @attributes = {}.merge(reloaded || {})
-        self.associations.keys.each { |association_name| unmemoize(association_name) }; self
+        @attributes = collection.find_one(:_id => id)
+        self
       end
 
       # Remove a child document from this parent +Document+. Will reset the
@@ -286,25 +287,20 @@ module Mongoid #:nodoc:
       #
       # This will also cause the observing +Document+ to notify it's parent if
       # there is any.
-      def observe(child, clear = false)
+      def update(child, clear = false)
         name = child.association_name
         attrs = child.instance_variable_get(:@attributes)
-        if clear
-          @attributes.delete(name)
-        else
-          @attributes.insert(name, attrs) unless @attributes[name] && @attributes[name].include?(attrs)
-        end
+        clear ? @attributes.delete(name) : @attributes.insert(name, attrs)
         notify
       end
 
       protected
       # apply default values to attributes - calling procs as required
       def attributes_with_defaults(attributes = {})
-        default_values = defaults
+        default_values = defaults.merge(attributes)
         default_values.each_pair do |key, val|
           default_values[key] = val.call if val.respond_to?(:call)
         end
-        default_values.merge(attributes)
       end
     end
   end

data/lib/mongoid/errors.rb

@@ -41,20 +41,6 @@ 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.
     #
@@ -66,7 +52,7 @@ module Mongoid #:nodoc
         @errors = errors
       end
       def message
-        "Validation Failed: #{@errors.full_messages.join(", ")}"
+        "Validation failed: #{@errors.full_messages}"
       end
     end
 
@@ -87,22 +73,5 @@ 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,5 +1,4 @@
 # encoding: utf-8
-require "mongoid/extensions/time_conversions"
 require "mongoid/extensions/array/accessors"
 require "mongoid/extensions/array/aliasing"
 require "mongoid/extensions/array/assimilation"
@@ -23,6 +22,7 @@ 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,16 +44,14 @@ class Boolean #:nodoc
   extend Mongoid::Extensions::Boolean::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 DateTime #:nodoc
+  extend Mongoid::Extensions::DateTime::Conversions
+end
+
 class Float #:nodoc
   extend Mongoid::Extensions::Float::Conversions
 end
@@ -63,7 +61,7 @@ class Hash #:nodoc
   include Mongoid::Extensions::Hash::Assimilation
   include Mongoid::Extensions::Hash::CriteriaHelpers
   include Mongoid::Extensions::Hash::Scoping
-  include Mongoid::Extensions::Hash::Conversions
+  extend Mongoid::Extensions::Hash::Conversions
 end
 
 class Integer #:nodoc
@@ -93,9 +91,9 @@ class Symbol #:nodoc
 end
 
 class Time #:nodoc
-  extend Mongoid::Extensions::TimeConversions
+  extend Mongoid::Extensions::Time::Conversions
 end
 
-class BSON::ObjectId #:nodoc
-  extend Mongoid::Extensions::ObjectId::Conversions
-end
+class Mongo::ObjectID #:nodoc
+  extend Mongoid::Extensions::ObjectID::Conversions
+end

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

@@ -4,18 +4,16 @@ module Mongoid #:nodoc:
     module Array #:nodoc:
       # This module converts arrays into mongoid related objects.
       module Conversions #:nodoc:
-        # Converts this array into an array of hashes.
-        def mongoidize
-          collect { |obj| obj.attributes }
-        end
+        extend ActiveSupport::Concern
 
-        def self.included(base)
-          base.class_eval do
-            extend ClassMethods
+        module InstanceMethods #:nodoc:
+          # Converts this array into an array of hashes.
+          def mongoidize
+            collect { |obj| obj.attributes }
           end
         end
 
-        module ClassMethods
+        module ClassMethods #:nodoc:
           def get(value)
             value
           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)
-          value ? ::BigDecimal.new(value) : value
+          ::BigDecimal.new(value)
         end
         # Set the value in the hash as a string.
         def set(value)
-          value ? value.to_s : value
+          value.to_s
         end
       end
     end

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

@@ -3,15 +3,9 @@ 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)
-          value = BOOLEAN_MAP[value]
-          value.nil? ? nil : value
+          val = value.to_s
+          val == "true" || val == "1"
         end
         def get(value)
           value

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

@@ -3,20 +3,11 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Date #:nodoc:
       module Conversions #:nodoc:
-        def get(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
+        def set(value)
+          value.to_date.at_midnight.to_time unless value.blank?
         end
-
-        protected
-
-        def convert_to_time(value)
-          value = ::Date.parse(value) if value.is_a?(::String)
-          ::Time.utc(value.year, value.month, value.day)
+        def get(value)
+          value ? value.getlocal.to_date : value
         end
       end
     end

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

@@ -3,8 +3,13 @@ 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)
-          super.try(:to_datetime)
+          return nil if value.blank?
+          ::Time.zone ? ::Time.parse(value.to_s).getlocal.to_datetime : value.to_datetime
         end
       end
     end

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

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

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

@@ -18,19 +18,10 @@ module Mongoid #:nodoc:
         #
         # Returns: The child +Document+.
         def assimilate(parent, options, type = nil)
-          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)
+          klass = type ? type : options.klass
+          child = klass.instantiate(:_parent => parent)
+          child.write_attributes(self.merge("_type" => klass.name))
           child.identify
-          child.reset_modifications
           child.assimilate(parent, options)
         end
       end