mongoid 1.0.6 → 1.1.0

data/HISTORY

@@ -1,3 +1,42 @@
+=== 1.0.7
+- Nil attributes no longer persist nil values to the
+  database - the field will just not exist.
+
+- create! and save! will now properly raise an error
+  when a database operation fails. This is handled
+  by using :safe => true as an option to
+  collection.save.
+
+- Setting blank numbers casts to nil.
+
+- Criteria and named scopes can now be used on has
+  many relationships. They can be chained with each
+  other off the association chain.
+
+- Mongoid can now determine if a document matches a
+  mongodb selector without hitting the database via
+  Document#matches?(selector).
+
+- Overall performance improvements in all areas.
+
+- Ruby 1.9 compatibility fixes.
+
+- Has many related now supports finding by id or
+  by an optional :all, :first, :last with a
+  conditions hash.
+
+=== 1.0.6
+
+- Preventing the setting of empty values in attributes.
+
+- Better inspect formatting
+
+=== 1.0.5
+
+- Has one and has many associations now set the parent
+  object first before writing the attributes on
+  #build and #create.
+
 === 1.0.4
 - Modified criteria to use the querying class
   when instantiating documents if there are no

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.homepage = "http://mongoid.org"
     gem.authors = ["Durran Jordan"]
 
-    gem.add_dependency("activesupport", ">= 2.2.2")
+    gem.add_dependency("activesupport", "<= 2.3.5")
     gem.add_dependency("mongo", ">= 0.18.2")
     gem.add_dependency("durran-validatable", ">= 2.0.1")
     gem.add_dependency("leshill-will_paginate", ">= 2.3.11")

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.1.0

data/lib/mongoid.rb

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 require "rubygems"
 
-gem "activesupport", ">= 2.2.2"
+gem "activesupport", ">= 2.2.2", "<3.0.pre"
 gem "mongo", ">= 0.18.2"
 gem "durran-validatable", ">= 2.0.1"
 gem "leshill-will_paginate", ">= 2.3.11"
@@ -43,6 +43,7 @@ require "mongoid/attributes"
 require "mongoid/callbacks"
 require "mongoid/commands"
 require "mongoid/config"
+require "mongoid/contexts"
 require "mongoid/complex_criterion"
 require "mongoid/criteria"
 require "mongoid/extensions"
@@ -52,6 +53,7 @@ require "mongoid/fields"
 require "mongoid/finders"
 require "mongoid/identity"
 require "mongoid/indexes"
+require "mongoid/matchers"
 require "mongoid/memoization"
 require "mongoid/named_scope"
 require "mongoid/scope"

data/lib/mongoid/associations.rb

@@ -13,7 +13,7 @@ module Mongoid # :nodoc:
       base.class_eval do
         # Associations need to inherit down the chain.
         class_inheritable_accessor :associations
-        self.associations = {}.with_indifferent_access
+        self.associations = {}
 
         include InstanceMethods
         extend ClassMethods
@@ -203,7 +203,7 @@ module Mongoid # :nodoc:
       #
       # <tt>Person.reflect_on_association(:addresses)</tt>
       def reflect_on_association(name)
-        association = associations[name]
+        association = associations[name.to_s]
         association ? association.macro : nil
       end
 
@@ -212,7 +212,7 @@ module Mongoid # :nodoc:
       # then adds the accessors for the association. The defined setters and
       # getters for the associations will perform the necessary memoization.
       def add_association(type, options)
-        name = options.name
+        name = options.name.to_s
         associations[name] = type
         define_method(name) do
           memoized(name) { type.instantiate(self, options) }
@@ -225,7 +225,7 @@ module Mongoid # :nodoc:
       # Adds a builder for a has_one association. This comes in the form of
       # build_name(attributes)
       def add_builder(type, options)
-        name = options.name
+        name = options.name.to_s
         define_method("build_#{name}") do |attrs|
           reset(name) { type.new(self, attrs, options) }
         end
@@ -234,7 +234,7 @@ module Mongoid # :nodoc:
       # Adds a creator for a has_one association. This comes in the form of
       # create_name(attributes)
       def add_creator(type, options)
-        name = options.name
+        name = options.name.to_s
         define_method("create_#{name}") do |attrs|
           document = send("build_#{name}", attrs)
           document.save; document

data/lib/mongoid/associations/has_many.rb

@@ -41,7 +41,6 @@ module Mongoid #:nodoc:
         object = type ? type.instantiate : @klass.instantiate
         object.parentize(@parent, @association_name)
         object.write_attributes(attrs)
-        object.identify
         @documents << object
         object
       end
@@ -84,8 +83,15 @@ module Mongoid #:nodoc:
         end : []
       end
 
-      # Delegate all missing methods over to the documents array.
+      # Delegate all missing methods over to the documents array unless a
+      # criteria or named scope exists on the association class. If that is the
+      # case then call that method.
       def method_missing(name, *args, &block)
+        unless @documents.respond_to?(name)
+          criteria = @klass.send(name, *args)
+          criteria.documents = @documents
+          return criteria
+        end
         @documents.send(name, *args, &block)
       end
 

data/lib/mongoid/associations/has_many_related.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class HasManyRelated < DelegateClass(Array) #:nodoc:
+    class HasManyRelated #:nodoc:
+      include Proxy
 
       attr_reader :klass
 
@@ -46,8 +47,9 @@ module Mongoid #:nodoc:
 
       # Finds a document in this association.
       # If an id is passed, will return the document for that id.
-      def find(id)
-        @klass.find(id)
+      def find(*args)
+        args[1][:conditions].merge!(@foreign_key.to_sym => @parent.id) if args.size > 1
+        @klass.find(*args)
       end
 
       # Initializing a related association only requires looking up the objects
@@ -61,7 +63,11 @@ module Mongoid #:nodoc:
         @parent, @klass = document, options.klass
         @foreign_key = document.class.to_s.foreign_key
         @documents = @klass.all(:conditions => { @foreign_key => document.id })
-        super(@documents)
+      end
+
+      # Delegate all missing methods over to the documents array.
+      def method_missing(name, *args, &block)
+        @documents.send(name, *args, &block)
       end
 
       # Delegates to <<

data/lib/mongoid/attributes.rb

@@ -11,12 +11,12 @@ module Mongoid #:nodoc:
       # Get the id associated with this object. This will pull the _id value out
       # of the attributes +Hash+.
       def id
-        @attributes[:_id]
+        @attributes["_id"]
       end
 
       # Set the id of the +Document+ to a new one.
       def id=(new_id)
-        @attributes[:_id] = new_id
+        @attributes["_id"] = new_id
       end
 
       alias :_id :id
@@ -26,7 +26,12 @@ module Mongoid #:nodoc:
       def method_missing(name, *args)
         attr = name.to_s
         return super unless @attributes.has_key?(attr.reader)
-        attr.writer? ? (@attributes[attr.reader] = *args) : @attributes[attr.reader]
+        if attr.writer?
+          # "args.size > 1" allows to simulate 1.8 behavior of "*args"
+          @attributes[attr.reader] = (args.size > 1) ? args : args.first
+        else
+          @attributes[attr.reader]
+        end
       end
 
       # Process the provided attributes casting them to their proper values if a
@@ -36,9 +41,9 @@ module Mongoid #:nodoc:
       def process(attrs = {})
         attrs.each_pair do |key, value|
           if Mongoid.allow_dynamic_fields && !respond_to?("#{key}=")
-            @attributes[key] = value
+            @attributes[key.to_s] = value
           else
-            send("#{key}=", value)
+            send("#{key}=", value) if value
           end
         end
       end
@@ -54,7 +59,8 @@ module Mongoid #:nodoc:
       #
       # <tt>person.read_attribute(:title)</tt>
       def read_attribute(name)
-        fields[name].get(@attributes[name])
+        access = name.to_s
+        fields[access].get(@attributes[access])
       end
 
       # Remove a value from the +Document+ attributes. If the value does not exist
@@ -68,19 +74,19 @@ module Mongoid #:nodoc:
       #
       # <tt>person.remove_attribute(:title)</tt>
       def remove_attribute(name)
-        @attributes.delete(name)
+        @attributes.delete(name.to_s)
       end
 
       # Returns the object type. This corresponds to the name of the class that
       # this +Document+ is, which is used in determining the class to
       # instantiate in various cases.
       def _type
-        @attributes[:_type]
+        @attributes["_type"]
       end
 
       # Set the type of the +Document+. This should be the name of the class.
       def _type=(new_type)
-        @attributes[:_type] = new_type
+        @attributes["_type"] = new_type
       end
 
       # Write a single attribute to the +Document+ attribute +Hash+. This will
@@ -99,10 +105,9 @@ module Mongoid #:nodoc:
       # This will also cause the observing +Document+ to notify it's parent if
       # there is any.
       def write_attribute(name, value)
-        run_callbacks(:before_update)
-        @attributes[name] = fields[name].set(value)
-        run_callbacks(:after_update)
-        notify
+        access = name.to_s
+        @attributes[access] = fields[access].set(value)
+        notify unless id.blank?
       end
 
       # Writes the supplied attributes +Hash+ to the +Document+. This will only
@@ -121,6 +126,7 @@ module Mongoid #:nodoc:
       # there is any.
       def write_attributes(attrs = nil)
         process(attrs || {})
+        identify if id.blank?
         notify
       end
 

data/lib/mongoid/commands.rb

@@ -59,10 +59,10 @@ module Mongoid #:nodoc:
       # <tt>document.save(false) # save without validations</tt>
       #
       # Returns: true if validation passes, false if not.
-      def save(validate = true)
+      def save(validate = true, safe = false)
         new = new_record?
         run_callbacks(:before_create) if new
-        saved = Save.execute(self, validate)
+        saved = Save.execute(self, validate, safe)
         run_callbacks(:after_create) if new
         saved
       end
@@ -76,7 +76,7 @@ module Mongoid #:nodoc:
       #
       # Returns: true if validation passes
       def save!
-        return save(true) || (raise Errors::Validations.new(self.errors))
+        return save(true, true) || (raise Errors::Validations.new(self.errors))
       end
 
       # Update the document attributes and persist the document to the
@@ -86,7 +86,7 @@ module Mongoid #:nodoc:
       #
       # <tt>document.update_attributes(:title => "Test")</tt>
       def update_attributes(attrs = {})
-        write_attributes(attrs); save
+        set_attributes(attrs); save
       end
 
       # Update the document attributes and persist the document to the
@@ -96,7 +96,13 @@ module Mongoid #:nodoc:
       #
       # <tt>document.update_attributes!(:title => "Test")</tt>
       def update_attributes!(attrs = {})
-        write_attributes(attrs); save!
+        set_attributes(attrs); save!
+      end
+
+      protected
+      def set_attributes(attrs = {})
+        run_callbacks(:before_update)
+        write_attributes(attrs)
       end
 
     end
@@ -126,7 +132,7 @@ module Mongoid #:nodoc:
       #
       # Returns: the +Document+.
       def create!(attributes = {})
-        document = Create.execute(new(attributes))
+        document = Create.execute(new(attributes), true, true)
         raise Errors::Validations.new(self.errors) unless document.errors.empty?
         return document
       end

data/lib/mongoid/commands/create.rb

@@ -10,9 +10,9 @@ module Mongoid #:nodoc:
       # doc: A new +Document+ that is going to be persisted.
       #
       # Returns: +Document+.
-      def self.execute(doc, validate = true)
+      def self.execute(doc, validate = true, safe = false)
         doc.run_callbacks :before_create
-        Save.execute(doc, validate)
+        Save.execute(doc, validate, safe)
         doc.run_callbacks :after_create
         return doc
       end

data/lib/mongoid/commands/delete_all.rb

@@ -15,7 +15,7 @@ module Mongoid #:nodoc:
       # <tt>DeleteAll.execute(Person, :conditions => { :field => "value" })</tt>
       def self.execute(klass, params = {})
         collection = klass.collection
-        params.any? ? collection.remove(params[:conditions].merge(:_type => klass.name)) : collection.drop
+        collection.remove((params[:conditions] || {}).merge(:_type => klass.name))
       end
     end
   end

data/lib/mongoid/commands/save.rb

@@ -10,12 +10,12 @@ module Mongoid #:nodoc:
       # doc: A +Document+ that is going to be persisted.
       #
       # Returns: +Document+ if validation passes, +false+ if not.
-      def self.execute(doc, validate = true)
+      def self.execute(doc, validate = true, safe = false)
         return false if validate && !doc.valid?
         doc.run_callbacks :before_save
         parent = doc._parent
         doc.new_record = false
-        if parent ? Save.execute(parent, validate) : doc.collection.save(doc.attributes)
+        if parent ? Save.execute(parent, validate, safe) : doc.collection.save(doc.attributes, :safe => safe)
           doc.run_callbacks :after_save
           return true
         else

data/lib/mongoid/components.rb

@@ -11,6 +11,7 @@ module Mongoid #:nodoc
         include Commands
         include Fields
         include Indexes
+        include Matchers
         include Memoization
         include Observable
         include Validatable

data/lib/mongoid/contexts.rb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+require "mongoid/contexts/paging"
+require "mongoid/contexts/enumerable"
+require "mongoid/contexts/mongo"

data/lib/mongoid/contexts/enumerable.rb

@@ -0,0 +1,105 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Contexts #:nodoc:
+    class Enumerable
+      include Paging
+      attr_reader :selector, :options, :documents
+
+      delegate :first, :last, :to => :documents
+
+      # Return aggregation counts of the grouped documents. This will count by
+      # the first field provided in the fields array.
+      #
+      # Returns:
+      #
+      # A +Hash+ with field values as keys, count as values
+      def aggregate
+        counts = {}
+        group.each_pair { |key, value| counts[key] = value.size }
+        counts
+      end
+
+      # Gets the number of documents in the array. Delegates to size.
+      def 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.
+      #
+      # Returns:
+      #
+      # An +Array+ of documents that matched the selector.
+      def execute
+        @documents.select { |document| document.matches?(@selector) }
+      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.
+      #
+      # Example:
+      #
+      # <tt>Mongoid::Contexts::Enumerable.new(selector, options, docs)</tt>
+      def initialize(selector, options, documents)
+        @selector, @options, @documents = selector, options, documents
+      end
+
+      # Get the largest value for the field in all the documents.
+      #
+      # Returns:
+      #
+      # The numerical largest value.
+      def max(field)
+        largest = @documents.inject(nil) do |memo, doc|
+          value = doc.send(field)
+          (memo && memo >= value) ? memo : value
+        end
+      end
+
+      # Get the smallest value for the field in all the documents.
+      #
+      # Returns:
+      #
+      # The numerical smallest value.
+      def min(field)
+        smallest = @documents.inject(nil) do |memo, doc|
+          value = doc.send(field)
+          (memo && memo <= value) ? memo : value
+        end
+      end
+
+      # Get one document.
+      #
+      # Returns:
+      #
+      # The first document in the +Array+
+      def one
+        @documents.first
+      end
+
+      # Get the sum of the field values for all the documents.
+      #
+      # Returns:
+      #
+      # The numerical sum of all the document field values.
+      def sum(field)
+        sum = @documents.inject(nil) do |memo, doc|
+          value = doc.send(field)
+          memo ? memo += value : value
+        end
+      end
+
+    end
+  end
+end