mongoid 2.0.0.rc.3 → 2.0.0.rc.4

data/lib/mongoid.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (c) 2009, 2010 Durran Jordan
+# Copyright (c) 2009 - 2011 Durran Jordan and friends.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -52,7 +52,6 @@ require "mongoid/contexts"
 require "mongoid/copyable"
 require "mongoid/criteria"
 require "mongoid/cursor"
-require "mongoid/deprecation"
 require "mongoid/default_scope"
 require "mongoid/dirty"
 require "mongoid/extras"
@@ -122,17 +121,6 @@ module Mongoid #:nodoc
       block_given? ? yield(config) : config
     end
     alias :config :configure
-
-    # Easy convenience method for generating an alert from the
-    # deprecation module.
-    #
-    # @example Alert a deprecation.
-    #   Mongoid.deprecate("Method no longer used")
-    #
-    # @param [ String ] message The message to print.
-    def deprecate(message)
-      Mongoid::Deprecation.alert(message)
-    end
   end
 
   # Take all the public instance methods from the Config singleton and allow

data/lib/mongoid/attributes.rb

@@ -218,7 +218,7 @@ module Mongoid #:nodoc:
         if value.is_a?(Hash)
           metadata.nested_builder(value, {}).build(self)
         else
-          send("#{name}=", value)
+          send("#{name}=", value, :building => true)
         end
       end
     end

data/lib/mongoid/contexts/mongo.rb

@@ -303,6 +303,26 @@ module Mongoid #:nodoc:
         options.dup
       end
 
+      # Very basic update that will perform a simple atomic $set of the
+      # attributes provided in the hash. Can be expanded to later for more
+      # robust functionality.
+      #
+      # @example Update all matching documents.
+      #   context.update_all(:title => "Sir")
+      #
+      # @param [ Hash ] attributes The sets to perform.
+      #
+      # @since 2.0.0.rc.4
+      def update_all(attributes = {})
+        klass.collection.update(
+          selector,
+          { "$set" => attributes },
+          :multi => true,
+          :safe => Mongoid.persist_in_safe_mode
+        )
+      end
+      alias :update :update_all
+
       protected
 
       # Iterate over each +Document+ in the results and cache the collection.

data/lib/mongoid/criteria.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require "mongoid/criterion/creational"
 require "mongoid/criterion/complex"
-require "mongoid/criterion/destructive"
 require "mongoid/criterion/exclusion"
 require "mongoid/criterion/inclusion"
 require "mongoid/criterion/inspection"
@@ -27,7 +26,6 @@ module Mongoid #:nodoc:
   class Criteria
     include Enumerable
     include Criterion::Creational
-    include Criterion::Destructive
     include Criterion::Exclusion
     include Criterion::Inclusion
     include Criterion::Inspection
@@ -35,9 +33,32 @@ module Mongoid #:nodoc:
 
     attr_accessor :collection, :documents, :embedded, :ids, :klass, :options, :selector
 
-    delegate :aggregate, :avg, :blank?, :count, :distinct, :empty?,
-             :execute, :first, :group, :id_criteria, :last, :max,
-             :min, :one, :page, :paginate, :per_page, :shift, :sum, :to => :context
+    delegate \
+      :aggregate,
+      :avg,
+      :blank?,
+      :count,
+      :delete,
+      :delete_all,
+      :destroy,
+      :destroy_all,
+      :distinct,
+      :empty?,
+      :execute,
+      :first,
+      :group,
+      :id_criteria,
+      :last,
+      :max,
+      :min,
+      :one,
+      :page,
+      :paginate,
+      :per_page,
+      :shift,
+      :sum,
+      :update,
+      :update_all, :to => :context
 
     # Concatinate the criteria with another enumerable. If the other is a
     # +Criteria+ then it needs to get the collection from it.

data/lib/mongoid/document.rb

@@ -204,6 +204,20 @@ module Mongoid #:nodoc:
 
     module ClassMethods #:nodoc:
 
+      # Performs class equality checking.
+      #
+      # @example Compare the classes.
+      #   document === other
+      #
+      # @param [ Document, Object ] other The other object to compare with.
+      #
+      # @return [ true, false ] True if the classes are equal, false if not.
+      #
+      # @since 2.0.0.rc.4
+      def ===(other)
+        self == (other.is_a?(Class) ? other : other.class)
+      end
+
       # Instantiate a new object, only when loaded from the database or when
       # the attributes have already been typecast.
       #

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

@@ -11,7 +11,7 @@ module Mongoid #:nodoc:
             ::Set.new(value)
           end
           def set(value)
-            value
+            value.to_a
           end
         end
       end

data/lib/mongoid/field.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   class Field
-    attr_reader :copyable, :klass, :name, :options, :type
+    attr_reader :copyable, :klass, :label, :name, :options, :type
 
     # Get the default value for the field.
     #
@@ -28,6 +28,7 @@ module Mongoid #:nodoc:
       @type = options[:type] || Object
       @name, @default = name, options[:default]
       @copyable = (@default.is_a?(Array) || @default.is_a?(Hash))
+      @label = options[:label]
       @options = options
       check_default!
     end

data/lib/mongoid/persistence.rb

@@ -95,7 +95,7 @@ module Mongoid #:nodoc:
     #
     # @return [ true, false ] True if validation passed, false if not.
     def update_attributes(attributes = {})
-      write_attributes(attributes); update
+      write_attributes(attributes); save
     end
 
     # Update the document attributes in the database and raise an error if
@@ -106,10 +106,11 @@ module Mongoid #:nodoc:
     #
     # @param [ Hash ] attributes The attributes to update.
     #
+    # @raise [ Errors::Validations ] If validation failed.
+    #
     # @return [ true, false ] True if validation passed.
     def update_attributes!(attributes = {})
-      write_attributes(attributes)
-      update.tap do |result|
+      update_attributes(attributes).tap do |result|
         self.class.fail_validate!(self) unless result
       end
     end

data/lib/mongoid/railtie.rb

@@ -10,7 +10,20 @@ module Rails #:nodoc:
   module Mongoid #:nodoc:
     class Railtie < Rails::Railtie #:nodoc:
 
-      config.app_generators.orm :mongoid, :migration => false
+      # Determine which generator to use. app_generators was introduced after
+      # 3.0.0.
+      #
+      # @example Get the generators method.
+      #   railtie.generators
+      #
+      # @return [ Symbol ] The method name to use.
+      #
+      # @since 2.0.0.rc.4
+      def self.generator
+        config.respond_to?(:app_generators) ? :app_generators : :generators
+      end
+
+      config.send(generator).orm :mongoid, :migration => false
 
       rake_tasks do
         load "mongoid/railties/database.rake"
@@ -18,8 +31,7 @@ module Rails #:nodoc:
 
       # Exposes Mongoid's configuration to the Rails application configuration.
       #
-      # Example:
-      #
+      # @example Set up configuration in the Rails app.
       #   module MyApplication
       #     class Application < Rails::Application
       #       config.mongoid.logger = Logger.new($stdout, :warn)
@@ -31,7 +43,7 @@ module Rails #:nodoc:
       # Initialize Mongoid. This will look for a mongoid.yml in the config
       # directory and configure mongoid appropriately.
       #
-      # Example mongoid.yml:
+      # @example mongoid.yml
       #
       #   defaults: &defaults
       #     host: localhost
@@ -93,6 +105,8 @@ module Rails #:nodoc:
         end
       end
 
+      # When workers are forked in passenger and unicorn, we need to reconnect
+      # to the database to all the workers do not share the same connection.
       initializer "reconnect to master if application is preloaded" do
         config.after_initialize do
 

data/lib/mongoid/relations/builder.rb

@@ -33,6 +33,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def query?
+        return true unless object.respond_to?(:to_a)
         obj = object.to_a.first
         !obj.respond_to?(:attributes) && !obj.nil?
       end

data/lib/mongoid/relations/embedded/in.rb

@@ -42,6 +42,7 @@ module Mongoid # :nodoc:
         # @return [ In ] The proxy.
         def initialize(base, target, metadata)
           init(base, target, metadata) do
+            characterize_one(target)
             base.parentize(target)
           end
         end

data/lib/mongoid/relations/embedded/many.rb

@@ -174,6 +174,7 @@ module Mongoid # :nodoc:
         def initialize(base, target, metadata)
           init(base, target, metadata) do
             target.each_with_index do |doc, index|
+              characterize_one(doc)
               doc.parentize(base)
               doc._index = index
             end
@@ -275,7 +276,7 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def append(document, options = {})
           target << document
-          metadatafy(document)
+          characterize_one(document)
           bind_one(document, options)
           document._index = target.size - 1
         end

data/lib/mongoid/relations/embedded/one.rb

@@ -39,6 +39,7 @@ module Mongoid # :nodoc:
         # @param [ Metadata ] metadata The relation's metadata
         def initialize(base, target, metadata)
           init(base, target, metadata) do
+            characterize_one(target)
             target.parentize(base)
           end
         end

data/lib/mongoid/relations/macros.rb

@@ -50,7 +50,7 @@ module Mongoid # :nodoc:
         # @param [ Hash ] options The relation options.
         # @param [ Proc ] block Optional block for defining extensions.
         def embedded_in(name, options = {}, &block)
-          metadatafy(name, Embedded::In, options, &block).tap do |meta|
+          characterize(name, Embedded::In, options, &block).tap do |meta|
             self.embedded = true
             relate(name, meta)
           end
@@ -76,7 +76,7 @@ module Mongoid # :nodoc:
         # @param [ Hash ] options The relation options.
         # @param [ Proc ] block Optional block for defining extensions.
         def embeds_many(name, options = {}, &block)
-          metadatafy(name, Embedded::Many, options, &block).tap do |meta|
+          characterize(name, Embedded::Many, options, &block).tap do |meta|
             relate(name, meta)
             validate_relation(meta)
           end
@@ -102,7 +102,7 @@ module Mongoid # :nodoc:
         # @param [ Hash ] options The relation options.
         # @param [ Proc ] block Optional block for defining extensions.
         def embeds_one(name, options = {}, &block)
-          metadatafy(name, Embedded::One, options, &block).tap do |meta|
+          characterize(name, Embedded::One, options, &block).tap do |meta|
             relate(name, meta)
             builder(name).creator(name)
             validate_relation(meta)
@@ -128,7 +128,7 @@ module Mongoid # :nodoc:
         # @param [ Hash ] options The relation options.
         # @param [ Proc ] block Optional block for defining extensions.
         def referenced_in(name, options = {}, &block)
-          metadatafy(name, Referenced::In, options, &block).tap do |meta|
+          characterize(name, Referenced::In, options, &block).tap do |meta|
             relate(name, meta)
             reference(meta)
           end
@@ -156,7 +156,7 @@ module Mongoid # :nodoc:
         # @param [ Proc ] block Optional block for defining extensions.
         def references_many(name, options = {}, &block)
           check_options(options)
-          metadatafy(name, Referenced::Many, options, &block).tap do |meta|
+          characterize(name, Referenced::Many, options, &block).tap do |meta|
             relate(name, meta)
             reference(meta)
             autosave(meta)
@@ -187,7 +187,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def references_and_referenced_in_many(name, options = {}, &block)
-          metadatafy(name, Referenced::ManyToMany, options, &block).tap do |meta|
+          characterize(name, Referenced::ManyToMany, options, &block).tap do |meta|
             relate(name, meta)
             reference(meta)
           end
@@ -213,7 +213,7 @@ module Mongoid # :nodoc:
         # @param [ Hash ] options The relation options.
         # @param [ Proc ] block Optional block for defining extensions.
         def references_one(name, options = {}, &block)
-          metadatafy(name, Referenced::One, options, &block).tap do |meta|
+          characterize(name, Referenced::One, options, &block).tap do |meta|
             relate(name, meta)
             reference(meta)
             builder(name).creator(name).autosave(meta)
@@ -248,7 +248,7 @@ module Mongoid # :nodoc:
         # Create the metadata for the relation.
         #
         # @example Create the metadata.
-        #   Person.metadatafy(:posts, Referenced::Many, {})
+        #   Person.characterize(:posts, Referenced::Many, {})
         #
         # @param [ Symbol ] name The name of the relation.
         # @param [ Object ] relation The type of relation.
@@ -256,7 +256,7 @@ module Mongoid # :nodoc:
         # @param [ Proc ] block Optional block for defining extensions.
         #
         # @return [ Metadata ] The metadata for the relation.
-        def metadatafy(name, relation, options, &block)
+        def characterize(name, relation, options, &block)
           Metadata.new(
             options.merge(
               :relation => relation,

data/lib/mongoid/relations/proxy.rb

@@ -32,7 +32,6 @@ module Mongoid # :nodoc:
       # @since 2.0.0.rc.1
       def init(base, target, metadata, &block)
         @base, @building, @target, @metadata = base, false, target, metadata
-        metadatafy(target)
         yield block if block_given?
         extend Module.new(&metadata.extension) if metadata.extension?
       end
@@ -93,20 +92,29 @@ module Mongoid # :nodoc:
         !target.is_a?(Mongoid::Criteria)
       end
 
-      # Takes the supplied document and sets the metadata on it. Used when
+      # Takes the supplied documents and sets the metadata on them. Used when
       # creating new documents and adding them to the relation.
       #
       # @example Set the metadata.
-      #   proxy.metadatafy(address)
+      #   proxy.characterize(addresses)
       #
-      # @param [ Document, Array<Document> ] object The object to set the
-      #   metadata on.
+      # @param [ Array<Document> ] documents The documents to set metadata on.
       #
-      # @since 2.0.0.rc.1
-      def metadatafy(object)
-        object.to_a.each do |obj|
-          obj.metadata = metadata unless obj.metadata
-        end
+      # @since 2.0.0.rc.4
+      def characterize(documents)
+        documents.each { |doc| characterize_one(doc) }
+      end
+
+      # Takes the supplied document and sets the metadata on it.
+      #
+      # @example Set the metadata.
+      #   proxt.characterize_one(name)
+      #
+      # @param [ Document ] document The document to set on.
+      #
+      # @since 2.0.0.rc.4
+      def characterize_one(document)
+        document.metadata = metadata unless document.metadata
       end
 
       # Default behavior of method missing should be to delegate all calls

data/lib/mongoid/relations/referenced/in.rb

@@ -40,7 +40,9 @@ module Mongoid # :nodoc:
         #   relation.
         # @param [ Metadata ] metadata The relation's metadata.
         def initialize(base, target, metadata)
-          init(base, target, metadata)
+          init(base, target, metadata) do
+            characterize_one(target)
+          end
         end
 
         # Substitutes the supplied target documents for the existing document

data/lib/mongoid/relations/referenced/many.rb

@@ -25,7 +25,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.rc.1
         def bind(options = {})
-          binding.bind(options)
+          loaded and binding.bind(options)
           target.map(&:save) if base.persisted? && !options[:building]
         end
 
@@ -202,7 +202,7 @@ module Mongoid #:nodoc:
         # @since 2.0.0.rc.1
         def append(document, options = {})
           loaded and target.push(document)
-          metadatafy(document)
+          characterize_one(document)
           binding.bind_one(document, options)
         end
 
@@ -242,7 +242,7 @@ module Mongoid #:nodoc:
         # @since 2.0.0.rc.1
         def loaded
           tap do |relation|
-            relation.target = target.entries if target.is_a?(Mongoid::Criteria)
+            relation.target = target.entries unless loaded?
           end
         end
 

data/lib/mongoid/relations/referenced/many_to_many.rb

@@ -25,7 +25,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def bind(options = {})
-          binding.bind(options)
+          loaded and binding.bind(options)
           target.map(&:save) if base.persisted? && !options[:building]
         end
 
@@ -173,8 +173,16 @@ module Mongoid # :nodoc:
         # @return [ Many ] The relation.
         #
         # @since 2.0.0.rc.1
-        def substitute(target, options = {})
-          tap { target ? (@target = target.to_a; bind(options)) : (@target = unbind(options)) }
+        def substitute(new_target, options = {})
+          tap do |relation|
+            if new_target
+              binding.unbind(options)
+              relation.target = new_target.to_a
+              bind(options)
+            else
+              relation.target = unbind(options)
+            end
+          end
         end
 
         # Unbinds the base object to the inverse of the relation. This occurs
@@ -211,7 +219,7 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def append(document, options = {})
           loaded and target.push(document)
-          metadatafy(document)
+          characterize_one(document)
           binding.bind_one(document, options)
         end
 

data/lib/mongoid/relations/referenced/one.rb

@@ -39,7 +39,9 @@ module Mongoid # :nodoc:
         # @param [ Document ] target The target (child) of the relation.
         # @param [ Metadata ] metadata The relation's metadata.
         def initialize(base, target, metadata)
-          init(base, target, metadata)
+          init(base, target, metadata) do
+            characterize_one(target)
+          end
         end
 
         # Removes the association between the base document and the target

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.rc.3"
+  VERSION = "2.0.0.rc.4"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 3
-  version: 2.0.0.rc.3
+  - 4
+  version: 2.0.0.rc.4
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-01-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -183,7 +183,6 @@ files:
 - lib/mongoid/criteria.rb
 - lib/mongoid/criterion/complex.rb
 - lib/mongoid/criterion/creational.rb
-- lib/mongoid/criterion/destructive.rb
 - lib/mongoid/criterion/exclusion.rb
 - lib/mongoid/criterion/inclusion.rb
 - lib/mongoid/criterion/inspection.rb
@@ -191,7 +190,6 @@ files:
 - lib/mongoid/criterion/selector.rb
 - lib/mongoid/cursor.rb
 - lib/mongoid/default_scope.rb
-- lib/mongoid/deprecation.rb
 - lib/mongoid/dirty.rb
 - lib/mongoid/document.rb
 - lib/mongoid/errors/document_not_found.rb
@@ -356,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1678984237143289701
+      hash: 588977190582466333
       segments: 
       - 0
       version: "0"

data/lib/mongoid/criterion/destructive.rb

@@ -1,37 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  module Criterion #:nodoc:
-
-    # This module defines criteria behavior for deleting or destroying
-    # documents.
-    module Destructive
-
-      # Delete all documents in the database that match the criteria.
-      #
-      # @example Delete all matching documents.
-      #   Person.where(:title => "Sir").and(:age.gt => 5).delete_all
-      #
-      # @return [ Integer ] The number of documents deleted.
-      #
-      # @since 2.0.0.rc.1
-      def delete_all
-        context.delete_all
-      end
-      alias :delete :delete_all
-
-      # Destroy all documents in the database that match the criteria. Will run
-      # the destruction callbacks on each document as well.
-      #
-      # @example Destroy all matching documents.
-      #   Person.where(:title => "Sir").and(:age.gt => 5).destroy_all
-      #
-      # @return [ Integer ] The number of documents destroyed.
-      #
-      # @since 2.0.0.rc.1
-      def destroy_all
-        context.destroy_all
-      end
-      alias :destroy :destroy_all
-    end
-  end
-end

data/lib/mongoid/deprecation.rb

@@ -1,21 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  module Deprecation #:nodoc
-    extend self
-
-    # Alert of a deprecation. This will delegate to the logger and call warn on
-    # it.
-    #
-    # Example:
-    #
-    # <tt>deprecation.alert("Method no longer used")</tt>
-    def alert(message)
-      logger.warn("Deprecation: #{message}")
-    end
-
-    protected
-    def logger
-      @logger ||= Mongoid::Logger.new
-    end
-  end
-end