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

data/lib/mongoid/errors/mongoid_error.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # Default parent Mongoid error for all custom errors. This handles the base
+    # key for the translations and provides the convenience method for
+    # translating the messages.
+    class MongoidError < StandardError
+      BASE_KEY = "mongoid.errors.messages"
+
+      # Given the key of the specific error and the options hash, translate the
+      # message.
+      #
+      # Options:
+      #
+      # key: The key of the error in the locales.
+      # options: The objects to pass to create the message.
+      #
+      # Returns:
+      #
+      # A localized error message string.
+      def translate(key, options)
+        I18n.translate("#{BASE_KEY}.#{key}", options)
+      end
+    end
+  end
+end

data/lib/mongoid/errors/too_many_nested_attribute_records.rb

@@ -0,0 +1,21 @@
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # This error is raised when trying to create set nested records above the
+    # specified :limit
+    #
+    # Example:
+    #
+    #<tt>TooManyNestedAttributeRecords.new('association', limit)
+    class TooManyNestedAttributeRecords < MongoidError
+      def initialize(association, limit)
+        super(
+          translate(
+            "too_many_nested_attribute_records",
+            { :association => association, :limit => limit }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/unsupported_version.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # 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(
+          translate(
+            "unsupported_version",
+            { :version => version, :mongo_version => Mongoid::MONGODB_VERSION }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/validations.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # 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
+      def initialize(document)
+        super(
+          translate(
+            "validations",
+            { :errors => document.errors.full_messages.join(", ") }
+          )
+        )
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Mongoid #:nodoc:
         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
+          self.merge("_type" => klass.name) if klass.hereditary?
           init(parent, child, options)
         end
 

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

@@ -5,9 +5,11 @@ module Mongoid #:nodoc:
       module CriteriaHelpers #:nodoc:
         def expand_complex_criteria
           hsh = {}
-          self.each_pair do |k,v|
-            if k.class == Mongoid::Criterion::Complex
-              hsh[k.key] = {"$#{k.operator}" => v}
+          each_pair do |k,v|
+            case k
+            when Mongoid::Criterion::Complex
+              hsh[k.key] ||= {}
+              hsh[k.key].merge!({"$#{k.operator}" => v})
             else
               hsh[k] = v
             end

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

@@ -12,7 +12,11 @@ module Mongoid #:nodoc:
           end
 
           def get(value)
-            value ? self.instantiate(value) : value
+            if value && respond_to?(:instantiate)
+              instantiate(value)
+            else
+              value
+            end
           end
         end
       end

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

@@ -3,12 +3,54 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module ObjectID #:nodoc:
       module Conversions #:nodoc:
+
         def set(value)
-          value
+          if value.is_a?(::String)
+            BSON::ObjectID.from_string(value) unless value.blank?
+          else
+            value
+          end
         end
+
         def get(value)
           value
         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!(klass, args, cast = true)
+          if !klass.using_object_ids? || args.is_a?(::BSON::ObjectID) || !cast
+            return args
+          end
+          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
       end
     end
   end

data/lib/mongoid/field.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   class Field
-    attr_reader :name, :type
+    attr_reader :klass, :name, :type
 
     # Get the declared options for this field
     #
     # Returns:
     #
-    # a hash of options 
+    # a hash of options
     def options
       @options
     end
@@ -16,9 +16,9 @@ module Mongoid #:nodoc:
     #
     # Returns:
     #
-    # The primitive value or a copy of the default.
+    # The typecast default value.
     def default
-      copy
+      copy.respond_to?(:call) ? copy : set(copy)
     end
 
     # Create the new field with a name and optional additional options. Valid
@@ -44,7 +44,12 @@ 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)
-      type.set(object)
+      unless @options[:identity]
+        type.set(object)
+      else
+        inverse = @options[:inverse_class_name].constantize
+        object.blank? ? type.set(object) : BSON::ObjectID.cast!(inverse, object)
+      end
     end
 
     # Used for retrieving the object out of the attributes hash.
@@ -60,7 +65,9 @@ module Mongoid #:nodoc:
 
     # Check if the name is valid.
     def check_name!(name)
-      raise Mongoid::Errors::InvalidField.new(name) if Mongoid.destructive_fields.include?(name.to_s)
+      if Mongoid.destructive_fields.include?(name.to_s)
+        raise Mongoid::Errors::InvalidField.new(name)
+      end
     end
 
     def check_default!

data/lib/mongoid/finders.rb

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
 
     # Delegate to the criteria methods that are natural for creating a new
     # criteria.
-    [ :all_in, :any_in, :asc, :ascending, :avg, :desc, :descending,
+    [ :all_in, :any_in, :any_of, :asc, :ascending, :avg, :desc, :descending,
       :excludes, :limit, :max, :min, :not_in, :only, :order_by,
       :skip, :sum, :where, :near ].each do |name|
       define_method(name) do |*args|

data/lib/mongoid/hierarchy.rb

@@ -3,12 +3,17 @@ module Mongoid #:nodoc
   module Hierarchy #:nodoc
     extend ActiveSupport::Concern
     included do
-      cattr_accessor :hereditary
-      self.hereditary = false
-
       attr_accessor :_parent
     end
 
+    module ClassMethods #:nodoc:
+      # Returns <tt>true</tt> if the document inherits from another
+      # Mongoid::Document.
+      def hereditary?
+        Mongoid::Document > superclass
+      end
+    end
+
     module InstanceMethods #:nodoc:
 
       # Get all child +Documents+ to this +Document+, going n levels deep if
@@ -43,7 +48,7 @@ module Mongoid #:nodoc
       #
       # <tt>true</tt> if inheritance used, <tt>false</tt> if not.
       def hereditary?
-        !!self.hereditary
+        self.class.hereditary?
       end
 
       # Sets up a child/parent association. This is used for newly created

data/lib/mongoid/identity.rb

@@ -34,9 +34,9 @@ module Mongoid #:nodoc:
       @document.id = generate_id if @document.id.blank?
     end
 
-    # Set the _type field on the @document.ment.
+    # Set the _type field on the @document.
     def type!
-      @document._type = @document.class.name if @document.hereditary?
+      @document._type = @document.class.name if @document.hereditary? || @document.class.descendants.any?
     end
 
     # Generates the composite key for a @document.ment.

data/lib/mongoid/indexes.rb

@@ -21,7 +21,7 @@ module Mongoid #:nodoc
       # Add the default indexes to the root document if they do not already
       # exist. Currently this is only _type.
       def add_indexes
-        if hereditary && !index_options[:_type]
+        if hereditary? && !index_options[:_type]
           self.index_options[:_type] = {:unique => false, :background => true}
         end
         create_indexes if Mongoid.autocreate_indexes

data/lib/mongoid/matchers/default.rb

@@ -8,7 +8,7 @@ module Mongoid #:nodoc:
       end
       # Return true if the attribute and value are equal.
       def matches?(value)
-        @attribute == value
+        value === @attribute
       end
 
       protected

data/lib/mongoid/modifiers.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require "mongoid/modifiers/command"
+require "mongoid/modifiers/inc"
+
+module Mongoid #:nodoc:
+  module Modifiers #:nodoc:
+    extend ActiveSupport::Concern
+
+    # Increment the field by the provided value, else if it doesn't exists set
+    # it to that value.
+    #
+    # Options:
+    #
+    # field: The field to increment.
+    # value: The value to increment by.
+    # options: Options to pass through to the driver.
+    def inc(field, value, options = {})
+      current = send(field)
+      write_attribute(field, (current ? (current + value) : value))
+      Inc.new(self, options).persist(field, value)
+      current + value
+    end
+  end
+end

data/lib/mongoid/modifiers/command.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Modifiers #:nodoc:
+    class Command #:nodoc:
+      include Mongoid::Safe
+
+      # Instantiate the new $inc modifier.
+      #
+      # Options:
+      #
+      # klass: The class to get the collection from.
+      # options: The options to get passed through to the driver.
+      def initialize(document, options = {})
+        @document, @options = document, options
+      end
+    end
+  end
+end

data/lib/mongoid/modifiers/inc.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Modifiers #:nodoc:
+    class Inc < Command #:nodoc:
+
+      # Execute the persistence operation. This will increment the provided
+      # field by the supplied value. If no field exists, it will be created and
+      # set to the value provided.
+      #
+      # Options:
+      #
+      # field: The field to increment.
+      # value: The number to increment by.
+      def persist(field, value)
+        @document.collection.update(
+          @document._selector,
+          { "$inc" => { field => value } },
+          :safe => safe_mode?(@options),
+          :multi => false
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/command.rb

@@ -4,6 +4,8 @@ module Mongoid #:nodoc:
     # Persistence commands extend from this class to get basic functionality on
     # initialization.
     class Command
+      include Mongoid::Safe
+
       attr_reader \
         :collection,
         :document,
@@ -36,16 +38,6 @@ module Mongoid #:nodoc:
         @validate = (validate.nil? ? true : validate)
         @options = { :safe => safe_mode?(options) }
       end
-
-      protected
-      # Determine based on configuration if we are persisting in safe mode or
-      # not.
-      #
-      # The query option will always override the global configuration.
-      def safe_mode?(options)
-        safe = options[:safe]
-        safe.nil? ? Mongoid.persist_in_safe_mode : safe
-      end
     end
   end
 end

data/lib/mongoid/persistence/remove_all.rb

@@ -28,7 +28,7 @@ module Mongoid #:nodoc:
       protected
       # Remove the document from the database.
       def remove
-        selector = (@klass.hereditary ? @selector.merge(:_type => @klass.name) : @selector)
+        selector = (@klass.hereditary? ? @selector.merge(:_type => @klass.name) : @selector)
         count = @collection.find(selector).count
         @collection.remove(selector, @options)
         count

data/lib/mongoid/railtie.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 require "singleton"
+require "mongoid"
 require "mongoid/config"
+require "mongoid/railties/document"
 require "rails"
 require "rails/mongoid"
 

data/lib/mongoid/railties/database.rake

@@ -18,7 +18,7 @@ namespace :db do
 
   if not Rake::Task.task_defined?("db:setup")
     desc 'Create the database, and initialize with the seed data'
-    task :setup => [ 'db:create', 'db:create_indexes', 'db:seed' ]
+    task :setup => [ 'db:create', 'db:mongoid:create_indexes', 'db:seed' ]
   end
 
   if not Rake::Task.task_defined?("db:reseed")
@@ -55,25 +55,116 @@ namespace :db do
   end
 
   if not Rake::Task.task_defined?("db:create_indexes")
-    desc 'Create the indexes defined on your mongoid models'
-    task :create_indexes => :environment do
+    task :create_indexes => "mongoid:create_indexes"
+  end
+
+  namespace :mongoid do
+    # gets a list of the mongoid models defined in the app/models directory
+    def get_mongoid_models
       documents = []
       Dir.glob("app/models/**/*.rb").sort.each do |file|
-        model = file.match(/\/(\w+).rb$/)[1]
-        klass = model.classify.constantize
+        model_path = file[0..-4].split('/')[2..-1]
         begin
-          documents << klass unless klass.embedded
+          klass = model_path.map(&:classify).join('::').constantize
+          if klass.ancestors.include?(Mongoid::Document) && !klass.embedded
+            documents << klass
+          end
         rescue => e
           # Just for non-mongoid objects that dont have the embedded
           # attribute at the class level.
         end
       end
-      ::Rails::Mongoid.index_children(documents)
+      documents
     end
-  end
 
+    desc 'Create the indexes defined on your mongoid models'
+    task :create_indexes => :environment do
+      ::Rails::Mongoid.index_children(get_mongoid_models)
+    end
+
+    def convert_ids(obj)
+      if obj.is_a?(String) && obj =~ /^[a-f0-9]{24}$/
+        BSON::ObjectID(obj)
+      elsif obj.is_a?(Array)
+        obj.map do |v|
+          convert_ids(v)
+        end
+      elsif obj.is_a?(Hash)
+        obj.each do |k, v|
+          obj[k] = convert_ids(v)
+        end
+      else
+        obj
+      end
+    end
+
+    desc "Convert string objectids in mongo database to ObjectID type"
+    task :objectid_convert => :environment do
+      documents = get_mongoid_models
+      documents.each do |document|
+        puts "Converting #{document.to_s} to use ObjectIDs"
+
+        # get old collection
+        collection_name = document.collection.name
+        collection = Mongoid.master.collection(collection_name)
+
+        # get new collection (a clean one)
+        collection.db["#{collection_name}_new"].drop
+        new_collection = collection.db["#{collection_name}_new"]
+
+        # convert collection documents
+        collection.find({}, :timeout => false, :sort => "_id") do |cursor|
+           cursor.each do |doc|
+            new_doc = convert_ids(doc)
+            new_collection.insert(new_doc, :safe => true)
+          end
+        end
+
+        puts "Done! Converted collection is in #{new_collection.name}\n\n"
+      end
+
+      # no errors. great! now rename _new to collection_name
+      documents.each do |document|
+        collection_name = document.collection.name
+        collection = Mongoid.master.collection(collection_name)
+        new_collection = collection.db["#{collection_name}_new"]
+
+        # swap collection to _old
+        puts "Moving #{collection.name} to #{collection_name}_old"
+        collection.db["#{collection_name}_old"].drop
+
+        begin
+          collection.rename("#{collection_name}_old")
+        rescue Exception => e
+          puts "Unable to rename database #{collection_name} to #{collection_name}_old"
+          puts "reason: #{e.message}\n\n"
+        end
+
+        # swap _new to collection
+        puts "Moving #{new_collection.name} to #{collection_name}\n\n"
+
+        begin
+          new_collection.rename(collection_name)
+        rescue Exception => e
+          puts "Unable to rename database #{new_collection.name} to #{collection_name}_old"
+          puts "reason: #{e.message}\n\n"
+        end
+      end
+
+      puts "DONE! Run `rake db:mongoid:cleanup_old_collections` to remove old collections"
+    end
+
+    desc "Clean up old collections backed up by objectid_convert"
+    task :cleanup_old_collections => :environment do
+      get_mongoid_models.each do |document|
+        collection = document.collection
+        collection.db["#{collection.name}_old"].drop
+      end
+    end
+
+    ########
+    # TODO: lots more useful db tasks can be added here. stuff like copyDatabase, etc
+    ########
+  end
 
-  ########
-  # TODO: lots more useful db tasks can be added here. stuff like copyDatabase, etc
-  ########
 end