mongoid 2.0.0.beta.15 → 2.0.0.beta.16

data/lib/mongoid/criterion/optional.rb

@@ -38,40 +38,6 @@ module Mongoid #:nodoc:
         @options[:cache] == true
       end
 
-      # If the document is using BSON::ObjectIDs the convert the argument to
-      # either an object id or an array of them if the supplied argument is an
-      # Array. Otherwise just return.
-      #
-      # Options:
-      #  args: A +String+ or an +Array+ convert to +BSON::ObjectID+
-      #  cast: A +Boolean+ define if we can or not cast to BSON::ObjectID.
-      #        If false, we use the default type of args
-      #
-      # Example:
-      #
-      # <tt>Mongoid.cast_ids!("4ab2bc4b8ad548971900005c", true)</tt>
-      # <tt>Mongoid.cast_ids!(["4ab2bc4b8ad548971900005c"])</tt>
-      #
-      # Returns:
-      #
-      # If using object ids:
-      #   An +Array+ of +BSON::ObjectID+ of each element if params is an +Array+
-      #   A +BSON::ObjectID+ from params if params is +String+
-      # Otherwise:
-      #   <tt>args</tt>
-      def cast_ids!(args, cast = true)
-        return args if !using_object_ids? || args.is_a?(BSON::ObjectID) || !cast
-        if args.is_a?(String)
-          BSON::ObjectID(args)
-        elsif args.is_a?(Array)
-          args.map{ |a|
-            a.is_a?(BSON::ObjectID) ? a : BSON::ObjectID(a)
-          }
-        else
-          args
-        end
-      end
-
       # Adds fields to be sorted in descending order. Will add them in the order
       # they were passed into the method.
       #
@@ -136,9 +102,12 @@ module Mongoid #:nodoc:
       def id(*ids)
         ids.flatten!
         if ids.size > 1
-          self.in(:_id => cast_ids!(ids, self.klass.primary_key.nil?))
+          self.in(
+            :_id => ::BSON::ObjectID.cast!(@klass, ids, @klass.primary_key.nil?)
+          )
         else
-          @selector[:_id] = cast_ids!(ids.first, self.klass.primary_key.nil?)
+          @selector[:_id] =
+            ::BSON::ObjectID.cast!(@klass, ids.first, @klass.primary_key.nil?)
         end
         self
       end
@@ -183,10 +152,16 @@ module Mongoid #:nodoc:
         @options[:sort] = [] unless @options[:sort] || args.first.nil?
         arguments = args.first
         case arguments
-        when Hash then arguments.each { |field, direction| @options[:sort] << [ field, direction ] }
-        when Array then @options[:sort].concat(arguments)
+        when Hash
+          arguments.each do |field, direction|
+            @options[:sort] << [ field, direction ]
+          end
+        when Array
+          @options[:sort].concat(arguments)
         when Complex
-          args.flatten.each { |complex| @options[:sort] << [ complex.key, complex.operator.to_sym ] }
+          args.flatten.each do |complex|
+            @options[:sort] << [ complex.key, complex.operator.to_sym ]
+          end
         end; self
       end
 

data/lib/mongoid/criterion/selector.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Criterion #:nodoc:
+
+    class Selector < Hash
+      attr_reader :klass
+
+      def initialize(klass)
+        @klass = klass
+      end
+
+      def []=(key, value)
+        super(key, try_to_typecast(key, value))
+      end
+
+      def merge!(other)
+        other.each_pair do |key, value|
+          self[key] = value
+        end
+        self
+      end
+      alias update merge!
+
+      private
+
+      def try_to_typecast(key, value)
+        access = key.to_s
+        return value unless klass.fields.has_key?(access)
+
+        field = klass.fields[access]
+        typecast_value_for(field, value)
+      end
+
+      def typecast_value_for(field, value)
+        return field.set(value) if field.type === value
+        case value
+        when Hash
+          value = value.dup
+          value.each_pair do |k, v|
+            value[k] = typecast_hash_value(field, k, v)
+          end
+        when Array
+          value.map { |v| typecast_value_for(field, v) }
+        when Regexp
+          value
+        else
+          field.set(value)
+        end
+      end
+
+      def typecast_hash_value(field, key, value)
+        case key
+        when "$exists"
+          Boolean.set(value)
+        when "$size"
+          Integer.set(value)
+        else
+          typecast_value_for(field, value)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/mongoid/document.rb

@@ -11,15 +11,6 @@ module Mongoid #:nodoc:
 
     module ClassMethods #:nodoc:
 
-      # Perform default behavior but mark the hierarchy as being hereditary.
-      #
-      # This method must remain in the +Document+ module, even though its
-      # behavior affects items in the Hierarchy module.
-      def inherited(subclass)
-        self.hereditary = true
-        super
-      end
-
       # Instantiate a new object, only when loaded from the database or when
       # the attributes have already been typecast.
       #
@@ -32,9 +23,9 @@ module Mongoid #:nodoc:
           document = allocate
           document.instance_variable_set(:@attributes, attributes)
           document.setup_modifications
-          return document
+          document
         else
-          return new(attrs)
+          new(attrs)
         end
       end
 
@@ -114,6 +105,9 @@ module Mongoid #:nodoc:
       @new_record = true
       document = yield self if block_given?
       identify
+      run_callbacks(:initialize) do
+        document
+      end
     end
 
     # Returns the class name plus its attributes.

data/lib/mongoid/errors.rb

@@ -1,131 +1,11 @@
 # encoding: utf-8
-module Mongoid #:nodoc
-  module Errors #:nodoc
-
-    # Default parent Mongoid error for all custom errors
-    class MongoidError < StandardError; end
-
-    # Raised when querying the database for a document by a specific id which
-    # does not exist. If multiple ids were passed then it will display all of
-    # those.
-    #
-    # Example:
-    #
-    # <tt>DocumentNotFound.new(Person, ["1", "2"])</tt>
-    class DocumentNotFound < MongoidError
-      attr_reader :klass, :indentifiers
-      def initialize(klass, ids)
-        @klass = klass
-        @identifiers = ids.is_a?(Array) ? ids.join(", ") : ids
-        super("Document not found for class #{@klass} with id(s) #{@identifiers}")
-      end
-    end
-
-    # Raised when invalid options are passed into a constructor or method.
-    #
-    # Example:
-    #
-    # <tt>InvalidOptions.new</tt>
-    class InvalidOptions < MongoidError; end
-
-    # Raised when the database connection has not been set up properly, either
-    # by attempting to set an object on the db that is not a +Mongo::DB+, or
-    # not setting anything at all.
-    #
-    # Example:
-    #
-    # <tt>InvalidDatabase.new("Not a DB")</tt>
-    class InvalidDatabase < MongoidError
-      attr_reader :database
-      def initialize(database)
-        @database = database
-        super("Database should be a Mongo::DB, not #{@database.class.name}")
-      end
-    end
-
-    # Raised when trying to get or set a value for a defined field, where the
-    # type of the object does not match the defined field type.
-    #
-    # Example:
-    #
-    # <tt>InvalidType.new(Array, "Not an Array")</tt>
-    class InvalidType < MongoidError
-      def initialize(klass, value)
-        super("Field was defined as a(n) #{klass.name}, but received a #{value.class.name} " +
-              "with the value #{value.inspect}.")
-      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 < MongoidError
-      def initialize(version)
-        super("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.
-    #
-    # Example:
-    #
-    # <tt>Validations.new(person.errors)</tt>
-    class Validations < MongoidError
-      attr_reader :document
-      def initialize(document)
-        @document = document
-        super("Validation Failed: #{@document.errors.full_messages.join(", ")}")
-      end
-    end
-
-    # This error is raised when trying to access a Mongo::Collection from an
-    # embedded document.
-    #
-    # Example:
-    #
-    # <tt>InvalidCollection.new(Address)</tt>
-    class InvalidCollection < MongoidError
-      attr_reader :klass
-      def initialize(klass)
-        @klass = klass
-        super("Access to the collection for #{@klass.name} is not allowed " +
-              "since it is an embedded document, please access a collection from " +
-              "the root document")
-      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 < MongoidError
-      attr_reader :name
-      def initialize(name)
-        @name = name
-        super("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
-
-    # This error is raised when trying to create set nested records above the
-    # specified :limit
-    #
-    # Example:
-    #
-    #<tt>TooManyNestedAttributeRecords.new('association', limit)
-    class TooManyNestedAttributeRecords < MongoidError
-      attr_reader :association, :limit
-      def initialize(association, limit)
-        @association, @limit = association.to_s.humanize.capitalize, limit
-        super("Accept Nested Attributes for #{@association} is limited to #{@limit} records")
-      end
-    end
-  end
-end
+require "mongoid/errors/mongoid_error"
+require "mongoid/errors/document_not_found"
+require "mongoid/errors/invalid_collection"
+require "mongoid/errors/invalid_database"
+require "mongoid/errors/invalid_field"
+require "mongoid/errors/invalid_options"
+require "mongoid/errors/invalid_type"
+require "mongoid/errors/too_many_nested_attribute_records"
+require "mongoid/errors/unsupported_version"
+require "mongoid/errors/validations"

data/lib/mongoid/errors/document_not_found.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # Raised when querying the database for a document by a specific id which
+    # does not exist. If multiple ids were passed then it will display all of
+    # those.
+    #
+    # Example:
+    #
+    # <tt>DocumentNotFound.new(Person, ["1", "2"])</tt>
+    class DocumentNotFound < MongoidError
+
+      attr_reader :klass, :indentifiers
+
+      def initialize(klass, ids)
+        @klass = klass
+        @identifiers = ids.is_a?(Array) ? ids.join(", ") : ids
+
+        super(
+          translate(
+            "document_not_found",
+            { :klass => klass.name, :identifiers => @identifiers }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/invalid_collection.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # This error is raised when trying to access a Mongo::Collection from an
+    # embedded document.
+    #
+    # Example:
+    #
+    # <tt>InvalidCollection.new(Address)</tt>
+    class InvalidCollection < MongoidError
+      def initialize(klass)
+        super(
+          translate("invalid_collection", { :klass => klass.name })
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/invalid_database.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # Raised when the database connection has not been set up properly, either
+    # by attempting to set an object on the db that is not a +Mongo::DB+, or
+    # not setting anything at all.
+    #
+    # Example:
+    #
+    # <tt>InvalidDatabase.new("Not a DB")</tt>
+    class InvalidDatabase < MongoidError
+      def initialize(database)
+        super(
+          translate("invalid_database", { :name => database.class.name })
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/invalid_field.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # 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 < MongoidError
+      def initialize(name)
+        super(
+          translate("invalid_field", { :name => name })
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/invalid_options.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # Raised when invalid options are passed into a constructor or method.
+    #
+    # Example:
+    #
+    # <tt>InvalidOptions.new</tt>
+    class InvalidOptions < MongoidError
+      def initialize(key, options)
+        super(translate(key, options))
+      end
+    end
+  end
+end

data/lib/mongoid/errors/invalid_type.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # Raised when trying to get or set a value for a defined field, where the
+    # type of the object does not match the defined field type.
+    #
+    # Example:
+    #
+    # <tt>InvalidType.new(Array, "Not an Array")</tt>
+    class InvalidType < MongoidError
+      def initialize(klass, value)
+        super(
+          translate(
+            "invalid_type",
+            {
+              :klass => klass.name,
+              :other => value.class.name,
+              :value => value.inspect
+            }
+          )
+        )
+      end
+    end
+  end
+end