mongoid 1.2.8 → 1.2.9

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.add_dependency("activesupport", "<= 2.3.5")
     gem.add_dependency("mongo", ">= 0.18.3")
     gem.add_dependency("durran-validatable", ">= 2.0.1")
-    gem.add_dependency("will_paginate", "< 3.0.pre")
+    gem.add_dependency("will_paginate", "< 2.9")
 
     gem.add_development_dependency("rspec", ">= 1.2.9")
     gem.add_development_dependency("mocha", ">= 0.9.8")

data/VERSION

@@ -1 +1 @@
-1.2.8
+1.2.9

data/lib/mongoid.rb

@@ -24,7 +24,7 @@ require "rubygems"
 gem "activesupport", ">= 2.2.2", "<3.0.pre"
 gem "mongo", ">= 0.18.3"
 gem "durran-validatable", ">= 2.0.1"
-gem "will_paginate", ">= 2.3.11", "<3.0.pre"
+gem "will_paginate", ">= 2.3.11", "< 2.9"
 
 require "delegate"
 require "observer"
@@ -39,7 +39,6 @@ require "will_paginate/collection"
 require "mongo"
 require "mongoid/associations"
 require "mongoid/attributes"
-require "mongoid/caching"
 require "mongoid/callbacks"
 require "mongoid/collection"
 require "mongoid/commands"
@@ -47,8 +46,8 @@ require "mongoid/config"
 require "mongoid/contexts"
 require "mongoid/criteria"
 require "mongoid/cursor"
-require "mongoid/enslavement"
 require "mongoid/extensions"
+require "mongoid/extras"
 require "mongoid/errors"
 require "mongoid/factory"
 require "mongoid/field"

data/lib/mongoid/associations.rb

@@ -93,8 +93,8 @@ module Mongoid # :nodoc:
             options.merge(:name => name, :extend => block, :foreign_key => foreign_key(name, options))
           )
         add_association(Associations::BelongsToRelated, opts)
-        field opts.foreign_key
-        index opts.foreign_key unless self.embedded
+        field(opts.foreign_key, :type => Mongoid.use_object_ids ? Mongo::ObjectID : String)
+        index(opts.foreign_key) unless self.embedded
       end
 
       # Adds the association from a parent document to its children. The name
@@ -249,7 +249,9 @@ module Mongoid # :nodoc:
         name = options.name.to_s
         define_method("create_#{name}") do |attrs|
           document = send("build_#{name}", attrs)
-          document.save; document
+          document.run_callbacks(:before_create)
+          document.save
+          document.run_callbacks(:after_create); document
         end
       end
 

data/lib/mongoid/associations/belongs_to_related.rb

@@ -41,19 +41,16 @@ module Mongoid #:nodoc:
         #
         # Options:
         #
-        # related: The related object
-        # parent: The parent +Document+ to update.
+        # target: The target(parent) object
+        # document: The +Document+ to update.
         # options: The association +Options+
         #
         # Example:
         #
-        # <tt>BelongsToRelated.update(game, person, options)</tt>
-        def update(target, parent, options)
-          if target
-            parent.send("#{options.foreign_key}=", target.id)
-            return instantiate(parent, options, target)
-          end
-          target
+        # <tt>BelongsToRelated.update(person, game, options)</tt>
+        def update(target, document, options)
+          document.send("#{options.foreign_key}=", target ? target.id : nil)
+          instantiate(document, options, target)
         end
       end
 

data/lib/mongoid/associations/has_many.rb

@@ -54,7 +54,9 @@ module Mongoid #:nodoc:
       # Rhe newly created Document.
       def create(attrs = {}, type = nil)
         object = build(attrs, type)
+        object.run_callbacks(:before_create)
         object.save
+        object.run_callbacks(:after_create)
         object
       end
 

data/lib/mongoid/associations/has_many_related.rb

@@ -7,6 +7,7 @@ module Mongoid #:nodoc:
       # Appends the object to the +Array+, setting its parent in
       # the process.
       def <<(*objects)
+        load_target
         objects.flatten.each do |object|
           object.send("#{@foreign_key}=", @parent.id)
           @target << object
@@ -20,6 +21,7 @@ module Mongoid #:nodoc:
       #
       # Returns the newly created object.
       def build(attributes = {})
+        load_target
         name = @parent.class.to_s.underscore
         object = @klass.instantiate(attributes.merge(name => @parent))
         @target << object
@@ -39,7 +41,9 @@ module Mongoid #:nodoc:
       # Returns the newly created object.
       def create(attributes)
         object = build(attributes)
+        object.run_callbacks(:before_create)
         object.save
+        object.run_callbacks(:after_create)
         object
       end
 
@@ -69,6 +73,12 @@ module Mongoid #:nodoc:
         self << objects
       end
 
+      protected
+      # Load the target entries if the document is new.
+      def load_target
+        @target = @target.entries if @parent.new_record?
+      end
+
       class << self
         # Preferred method for creating the new +HasManyRelated+ association.
         #

data/lib/mongoid/attributes.rb

@@ -42,7 +42,7 @@ module Mongoid #:nodoc:
         (attrs || {}).each_pair do |key, value|
           if set_allowed?(key)
             @attributes[key.to_s] = value
-          else
+          elsif write_allowed?(key)
             send("#{key}=", value)
           end
         end
@@ -148,6 +148,11 @@ module Mongoid #:nodoc:
         end
       end
 
+      # Return true if writing to the given field is allowed
+      def write_allowed?(key)
+        return true unless fields[key.to_s]
+        fields[key.to_s].accessible?
+      end
     end
 
     module ClassMethods

data/lib/mongoid/commands.rb

@@ -62,11 +62,7 @@ module Mongoid #:nodoc:
       def save(validate = true)
         new = new_record?
         run_callbacks(:before_create) if new
-        begin
-          saved = Save.execute(self, validate)
-        rescue Mongo::OperationFailure => e
-          errors.add(:mongoid, e.message)
-        end
+        saved = Save.execute(self, validate)
         run_callbacks(:after_create) if new && saved
         saved
       end
@@ -125,11 +121,7 @@ module Mongoid #:nodoc:
       # Returns: the +Document+.
       def create(attributes = {})
         document = new(attributes)
-        begin
-          Create.execute(document)
-        rescue Mongo::OperationFailure => e
-          document.errors.add(:mongoid, e.message)
-        end
+        Create.execute(document)
         document
       end
 

data/lib/mongoid/components.rb

@@ -5,20 +5,19 @@ module Mongoid #:nodoc
       base.class_eval do
         # All modules that a +Document+ is composed of are defined in this
         # module, to keep the document class from getting too cluttered.
-        include Associations
-        include Attributes
-        include Caching
-        include Callbacks
-        include Commands
-        include Enslavement
-        include Fields
-        include Indexes
-        include Matchers
-        include Memoization
+        include Mongoid::Associations
+        include Mongoid::Attributes
+        include Mongoid::Callbacks
+        include Mongoid::Commands
+        include Mongoid::Extras
+        include Mongoid::Fields
+        include Mongoid::Indexes
+        include Mongoid::Matchers
+        include Mongoid::Memoization
         include Observable
         include Validatable
-        extend Finders
-        extend NamedScope
+        extend Mongoid::Finders
+        extend Mongoid::NamedScope
       end
     end
   end

data/lib/mongoid/contexts/enumerable.rb

@@ -5,7 +5,7 @@ module Mongoid #:nodoc:
       include Ids, Paging
       attr_reader :criteria
 
-      delegate :first, :last, :to => :execute
+      delegate :blank?, :empty?, :first, :last, :to => :execute
       delegate :documents, :options, :selector, :to => :criteria
 
       # Return aggregation counts of the grouped documents. This will count by
@@ -25,16 +25,6 @@ module Mongoid #:nodoc:
         @count ||= documents.size
       end
 
-      # Groups the documents by the first field supplied in the field options.
-      #
-      # Returns:
-      #
-      # A +Hash+ with field values as keys, arrays of documents as values.
-      def group
-        field = options[:fields].first
-        documents.group_by { |doc| doc.send(field) }
-      end
-
       # Enumerable implementation of execute. Returns matching documents for
       # the selector, and adds options if supplied.
       #
@@ -45,6 +35,16 @@ module Mongoid #:nodoc:
         limit(documents.select { |document| document.matches?(selector) })
       end
 
+      # Groups the documents by the first field supplied in the field options.
+      #
+      # Returns:
+      #
+      # A +Hash+ with field values as keys, arrays of documents as values.
+      def group
+        field = options[:fields].first
+        documents.group_by { |doc| doc.send(field) }
+      end
+
       # Create the new enumerable context. This will need the selector and
       # options from a +Criteria+ and a documents array that is the underlying
       # array of embedded documents from a has many association.
@@ -56,6 +56,16 @@ module Mongoid #:nodoc:
         @criteria = criteria
       end
 
+      # Iterate over each +Document+ in the results. This can take an optional
+      # block to pass to each argument in the results.
+      #
+      # Example:
+      #
+      # <tt>context.iterate { |doc| p doc }</tt>
+      def iterate(&block)
+        execute.each(&block)
+      end
+
       # Get the largest value for the field in all the documents.
       #
       # Returns:

data/lib/mongoid/contexts/mongo.rb

@@ -23,6 +23,18 @@ module Mongoid #:nodoc:
         klass.collection.group(options[:fields], selector, { :count => 0 }, Javascript.aggregate, true)
       end
 
+      # Determine if the context is empty or blank given the criteria. Will
+      # perform a quick has_one asking only for the id.
+      #
+      # Example:
+      #
+      # <tt>context.blank?</tt>
+      def blank?
+        klass.collection.find_one(selector, { :fields => [ :_id ] }).nil?
+      end
+
+      alias :empty? :blank?
+
       # Get the count of matching documents in the database for the context.
       #
       # Example:
@@ -43,7 +55,7 @@ module Mongoid #:nodoc:
       #
       # Example:
       #
-      # <tt>mongo.execute</tt>
+      # <tt>context.execute</tt>
       #
       # Returns:
       #
@@ -100,6 +112,19 @@ module Mongoid #:nodoc:
         criteria.cache if klass.cached?
       end
 
+      # Iterate over each +Document+ in the results. This can take an optional
+      # block to pass to each argument in the results.
+      #
+      # Example:
+      #
+      # <tt>context.iterate { |doc| p doc }</tt>
+      def iterate(&block)
+        return caching(&block) if criteria.cached?
+        if block_given?
+          execute.each { |doc| yield doc }
+        end
+      end
+
       # Return the last result for the +Context+. Essentially does a find_one on
       # the collection with the sorting reversed. If no sorting parameters have
       # been provided it will default to ids.
@@ -214,6 +239,20 @@ module Mongoid #:nodoc:
         options.dup
       end
 
+      protected
+
+      # Iterate over each +Document+ in the results and cache the collection.
+      def caching(&block)
+        if defined? @collection
+          @collection.each(&block)
+        else
+          @collection = []
+          execute.each do |doc|
+            @collection << doc
+            yield doc if block_given?
+          end
+        end
+      end
     end
   end
 end

data/lib/mongoid/criteria.rb

@@ -31,7 +31,9 @@ module Mongoid #:nodoc:
 
     delegate \
       :aggregate,
+      :blank?,
       :count,
+      :empty?,
       :execute,
       :first,
       :group,
@@ -76,17 +78,6 @@ module Mongoid #:nodoc:
       end
     end
 
-    # Returns true if the criteria is empty.
-    #
-    # Example:
-    #
-    # <tt>criteria.blank?</tt>
-    def blank?
-      count < 1
-    end
-
-    alias :empty? :blank?
-
     # Return or create the context in which this criteria should be executed.
     #
     # This will return an Enumerable context if the class is embedded,
@@ -102,10 +93,7 @@ module Mongoid #:nodoc:
     #
     # <tt>criteria.each { |doc| p doc }</tt>
     def each(&block)
-      return caching(&block) if cached?
-      if block_given?
-        execute.each { |doc| yield doc }
-      end
+      context.iterate(&block)
       self
     end
 
@@ -213,20 +201,6 @@ module Mongoid #:nodoc:
 
     protected
 
-    # Iterate over each +Document+ in the results and cache the collection.
-    def caching(&block)
-      @collection ||= execute
-      if block_given?
-        docs = []
-        @collection.each do |doc|
-          docs << doc
-          yield doc
-        end
-        @collection = docs
-      end
-      self
-    end
-
     # Filters the unused options out of the options +Hash+. Currently this
     # takes into account the "page" and "per_page" options that would be passed
     # in if using will_paginate.

data/lib/mongoid/criterion/inclusion.rb

@@ -22,6 +22,7 @@ module Mongoid #:nodoc:
       def all(attributes = {})
         update_selector(attributes, "$all")
       end
+      alias :all_in :all
 
       # Adds a criterion to the +Criteria+ that specifies values that must
       # be matched in order to return results. This is similar to a SQL "WHERE"
@@ -61,7 +62,7 @@ module Mongoid #:nodoc:
       def in(attributes = {})
         update_selector(attributes, "$in")
       end
-      alias any_in in
+      alias :any_in :in
 
       # Adds a criterion to the +Criteria+ that specifies values that must
       # be matched in order to return results. This is similar to a SQL "WHERE"

data/lib/mongoid/document.rb

@@ -78,8 +78,6 @@ module Mongoid #:nodoc:
       #
       #   class Person
       #     include Mongoid::Document
-      #     field :first_name
-      #     field :last_name
       #     key :first_name, :last_name
       #   end
       def key(*fields)
@@ -132,10 +130,6 @@ module Mongoid #:nodoc:
       #
       # parent: The +Document+ to assimilate with.
       # options: The association +Options+ for the child.
-      #
-      # Example:
-      #
-      # <tt>name.assimilate(person, options)</tt>
       def assimilate(parent, options)
         parentize(parent, options.name); notify; self
       end
@@ -193,6 +187,11 @@ module Mongoid #:nodoc:
         @new_record = saved
       end
 
+      # Checks if the document has been saved to the database.
+      def persisted?
+        !new_record?
+      end
+
       # Set the changed state of the +Document+ then notify observers that it has changed.
       #
       # Example: