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

data/lib/mongoid/associations/embeds_one.rb

@@ -58,9 +58,14 @@ module Mongoid #:nodoc:
       #
       # A new target document.
       def nested_build(attributes, options = nil)
-        unless @target.blank? && options[:update_only]
+        options ||= {}
+        _destroy = Boolean.set(attributes.delete('_destroy'))
+        if options[:allow_destroy] && _destroy
+          @target = nil
+        elsif @target.present? || !options[:update_only]
           @target.write_attributes(attributes)
-        end; @target
+        end
+        target
       end
 
       class << self
@@ -89,6 +94,17 @@ module Mongoid #:nodoc:
           child.assimilate(parent, options)
           new(parent, options, child.is_a?(Hash) ? nil : child)
         end
+
+        # Validate the options passed to the embeds one macro, to encapsulate
+        # the behavior in this class instead of the associations module.
+        #
+        # Options:
+        #
+        # options: Thank you captain obvious.
+        def validate_options(options = {})
+          check_dependent_not_allowed!(options)
+          check_inverse_not_allowed!(options)
+        end
       end
     end
   end

data/lib/mongoid/associations/proxy.rb

@@ -3,7 +3,7 @@ module Mongoid #:nodoc
   module Associations #:nodoc
     class Proxy #:nodoc
       instance_methods.each do |method|
-        undef_method(method) unless method =~ /(^__|^nil\?$|^send$|^object_id$|^extend$)/
+        undef_method(method) unless method =~ /(^__|^send$|^object_id$|^extend$)/
       end
       attr_reader \
         :options,
@@ -28,6 +28,33 @@ module Mongoid #:nodoc
         @foreign_key = options.foreign_key
         extends(options)
       end
+
+      protected
+      class << self
+        def check_dependent_not_allowed!(options)
+          if options.has_key?(:dependent)
+            raise Errors::InvalidOptions.new(
+              "dependent_only_references_one_or_many", {}
+            )
+          end
+        end
+
+        def check_inverse_not_allowed!(options)
+          if options.has_key?(:inverse_of)
+            raise Errors::InvalidOptions.new(
+              "association_cant_have_inverse_of", {}
+            )
+          end
+        end
+
+        def check_inverse_must_be_defined!(options)
+          unless options.has_key?(:inverse_of)
+            raise Errors::InvalidOptions.new(
+              "embedded_in_must_have_inverse_of", {}
+            )
+          end
+        end
+      end
     end
   end
 end

data/lib/mongoid/associations/referenced_in.rb

@@ -54,6 +54,16 @@ module Mongoid #:nodoc:
           document.send("#{options.foreign_key}=", target ? target.id : nil)
           new(document, options, target)
         end
+
+        # Validate the options passed to the referenced in macro, to encapsulate
+        # the behavior in this class instead of the associations module.
+        #
+        # Options:
+        #
+        # options: Thank you captain obvious.
+        def validate_options(options = {})
+          check_dependent_not_allowed!(options)
+        end
       end
     end
   end

data/lib/mongoid/associations/references_many.rb

@@ -227,19 +227,22 @@ module Mongoid #:nodoc:
         protected
         def determine_name(document, options)
           target = document.class
-
           if (inverse = options.inverse_of) && inverse.is_a?(Array)
             inverse = [*inverse].detect { |name| target.respond_to?(name) }
           end
-
           if !inverse
-            association = options.klass.associations.values.detect do |metadata|
-              metadata.options.klass == target
-            end
-            inverse = association.name if association
+            association = detect_association(target, options, false)
+            association = detect_association(target, options, true) if association.blank?
+            inferred = association.name if association
           end
+          inverse || inferred || target.to_s.underscore
+        end
 
-          inverse || target.to_s.underscore
+        def detect_association(target, options, with_class_name = false)
+          association = options.klass.associations.values.detect do |metadata|
+            metadata.options.klass == target &&
+              (with_class_name ? true : metadata.options[:class_name].nil?)
+          end
         end
       end
     end

data/lib/mongoid/associations/references_many_as_array.rb

@@ -34,6 +34,7 @@ module Mongoid #:nodoc:
           @target << object
           object.save unless @parent.new_record?
         end
+        @parent.save unless @parent.new_record?
       end
 
       alias :concat :<<
@@ -50,6 +51,34 @@ module Mongoid #:nodoc:
         push(document); document
       end
 
+      # Destroy all the associated objects.
+      #
+      # Example:
+      #
+      # <tt>person.posts.destroy_all</tt>
+      #
+      # Returns:
+      #
+      # The number of objects destroyed.
+      def destroy_all(conditions = {})
+        removed = query.call.destroy_all(:conditions => conditions)
+        reset; removed
+      end
+
+      # Delete all the associated objects.
+      #
+      # Example:
+      #
+      # <tt>person.posts.delete_all</tt>
+      #
+      # Returns:
+      #
+      # The number of objects deleted.
+      def delete_all(conditions = {})
+        removed = query.call.delete_all(:conditions => conditions)
+        reset; removed
+      end
+
       protected
 
       # Find the inverse key for the supplied document.

data/lib/mongoid/associations/references_one.rb

@@ -61,7 +61,15 @@ module Mongoid #:nodoc:
       #
       # A new target document.
       def nested_build(attributes, options = nil)
-        build(attributes) unless @target.blank? && options[:update_only]
+        options ||= {}
+        _destroy = Boolean.set(attributes.delete('_destroy'))
+        if options[:allow_destroy] && _destroy
+          @target.destroy
+          @target = nil
+        elsif @target.present? || !options[:update_only]
+          build(attributes)
+        end
+        @target
       end
 
       class << self

data/lib/mongoid/attributes.rb

@@ -29,6 +29,11 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Override respond_to? so it responds properly for dynamic attributes
+    def respond_to?(sym)
+      (Mongoid.allow_dynamic_fields && @attributes && @attributes.has_key?(sym.to_s)) || super
+    end
+
     # Process the provided attributes casting them to their proper values if a
     # field exists for them on the +Document+. This will be limited to only the
     # attributes provided in the suppied +Hash+ so that no extra nil values get
@@ -123,8 +128,7 @@ module Mongoid #:nodoc:
     # there is any.
     def write_attribute(name, value)
       access = name.to_s
-      typed_value = fields.has_key?(access) ? fields[access].set(value) : value
-      modify(access, @attributes[access], typed_value)
+      modify(access, @attributes[access], typed_value_for(access, value))
       notify if !id.blank? && new_record?
     end
 
@@ -152,11 +156,17 @@ module Mongoid #:nodoc:
     alias :attributes= :write_attributes
 
     protected
+
+    # Return the typecast value for a field.
+    def typed_value_for(key, value)
+      fields.has_key?(key) ? fields[key].set(value) : value
+    end
+
     # apply default values to attributes - calling procs as required
     def default_attributes
       default_values = defaults
       default_values.each_pair do |key, val|
-        default_values[key] = val.call if val.respond_to?(:call)
+        default_values[key] = typed_value_for(key, val.call) if val.respond_to?(:call)
       end
       default_values || {}
     end

data/lib/mongoid/callbacks.rb

@@ -9,6 +9,7 @@ module Mongoid #:nodoc:
       define_model_callbacks \
         :create,
         :destroy,
+        :initialize,
         :save,
         :update,
         :validation

data/lib/mongoid/collections.rb

@@ -56,7 +56,7 @@ module Mongoid #:nodoc
       #
       # Example:
       #
-      # <tt>Person.store_in :populdation</tt>
+      # <tt>Person.store_in :population</tt>
       def store_in(name)
         self.collection_name = name.to_s
         set_collection

data/lib/mongoid/components.rb

@@ -24,6 +24,7 @@ module Mongoid #:nodoc
       include Mongoid::Keys
       include Mongoid::Matchers
       include Mongoid::Memoization
+      include Mongoid::Modifiers
       include Mongoid::Paths
       include Mongoid::Persistence
       include Mongoid::Safety

data/lib/mongoid/config.rb

@@ -169,6 +169,21 @@ module Mongoid #:nodoc
       end
     end
 
+    # Adds a new I18n locale file to the load path
+    #
+    # Example:
+    #
+    # Add portuguese locale
+    # <tt>Mongoid::config.add_language('pt')</tt>
+    #
+    # Adds all available languages
+    # <tt>Mongoid::Config.add_language('*')</tt>
+    def add_language(language_code = nil)
+      Dir[File.join(File.dirname(__FILE__), "..", "config", "locales", "#{language_code}.yml")].each do |file|
+        I18n.load_path << File.expand_path(file)
+      end
+    end
+
     # Convenience method for connecting to the master database after forking a
     # new process.
     #
@@ -177,7 +192,7 @@ module Mongoid #:nodoc
     # <tt>Mongoid.reconnect!</tt>
     def reconnect!(now = true)
       if now
-        master.connection.connect_to_master
+        master.connection.connect
       else
         # We set a @reconnect flag so that #master knows to reconnect the next
         # time the connection is accessed.

data/lib/mongoid/contexts/enumerable.rb

@@ -1,4 +1,7 @@
 # encoding: utf-8
+
+require 'mongoid/contexts/enumerable/sort'
+
 module Mongoid #:nodoc:
   module Contexts #:nodoc:
     class Enumerable
@@ -56,7 +59,7 @@ module Mongoid #:nodoc:
       #
       # An +Array+ of documents that matched the selector.
       def execute(paginating = false)
-        limit(filter) || []
+        limit(sort(filter)) || []
       end
 
       # Groups the documents by the first field supplied in the field options.
@@ -115,6 +118,18 @@ module Mongoid #:nodoc:
       # The first document in the +Array+
       alias :one :first
 
+      # Get one document and tell the criteria to skip this record on
+      # successive calls.
+      #
+      # Returns:
+      #
+      # The first document in the +Array+
+      def shift
+        document = first
+        criteria.skip((options[:skip] || 0) + 1)
+        document
+      end
+
       # Get the sum of the field values for all the documents.
       #
       # Returns:
@@ -148,9 +163,21 @@ module Mongoid #:nodoc:
           return documents.slice(skip, limit)
         elsif limit
           return documents.first(limit)
+        elsif skip
+          return documents.slice(skip..-1)
         end
         documents
       end
+
+      # Sorts the result set if sort options have been set.
+      def sort(documents)
+        return documents if options[:sort].blank?
+        documents.sort_by do |document|
+          options[:sort].map do |key, direction|
+            Sort.new(document.read_attribute(key), direction)
+          end
+        end
+      end
     end
   end
 end

data/lib/mongoid/contexts/enumerable/sort.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Contexts #:nodoc:
+    class Enumerable
+      class Sort
+        attr_reader :value, :direction
+
+        # Create a new sorting object. This requires a value and a sort
+        # direction of +:asc+ or +:desc+.
+        def initialize(value, direction)
+          @value     = value
+          @direction = direction
+        end
+
+        # Return +true+ if the direction is +:asc+, otherwise false.
+        def ascending?
+          direction == :asc
+        end
+
+        # Compare two +Sort+ objects against each other, taking into
+        # consideration the direction of the sorting.
+        def <=>(other)
+          cmp = compare(value, other.value)
+          ascending? ? cmp : cmp * -1
+        end
+
+        private
+
+        # Compare two values allowing for nil values.
+        def compare(a, b)
+          case
+          when a.nil?
+            b.nil? ? 0 : 1
+          when b.nil?
+            -1
+          else
+            a <=> b
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/contexts/mongo.rb

@@ -133,7 +133,7 @@ module Mongoid #:nodoc:
       # <tt>Mongoid::Contexts::Mongo.new(criteria)</tt>
       def initialize(criteria)
         @criteria = criteria
-        if klass.hereditary && !criteria.selector.keys.include?(:_type)
+        if klass.hereditary? && !criteria.selector.keys.include?(:_type)
           criteria.in(:_type => criteria.klass._types)
         end
         criteria.enslave if klass.enslaved?
@@ -225,6 +225,18 @@ module Mongoid #:nodoc:
 
       alias :first :one
 
+      # Return the first result for the +Context+ and skip it
+      # for successive calls.
+      #
+      # Returns:
+      #
+      # The first document in the collection.
+      def shift
+        document = first
+        criteria.skip((options[:skip] || 0) + 1)
+        document
+      end
+
       # Sum the context.
       #
       # This will take the internally built selector and options

data/lib/mongoid/criteria.rb

@@ -3,6 +3,7 @@ require "mongoid/criterion/complex"
 require "mongoid/criterion/exclusion"
 require "mongoid/criterion/inclusion"
 require "mongoid/criterion/optional"
+require "mongoid/criterion/selector"
 
 module Mongoid #:nodoc:
   # The +Criteria+ class is the core object needed in Mongoid to retrieve
@@ -30,7 +31,7 @@ module Mongoid #:nodoc:
 
     delegate :aggregate, :avg, :blank?, :count, :distinct, :empty?,
              :execute, :first, :group, :id_criteria, :last, :max,
-             :min, :one, :page, :paginate, :per_page, :sum, :to => :context
+             :min, :one, :page, :paginate, :per_page, :shift, :sum, :to => :context
 
     # Concatinate the criteria with another enumerable. If the other is a
     # +Criteria+ then it needs to get the collection from it.
@@ -116,7 +117,8 @@ module Mongoid #:nodoc:
     # type: One of :all, :first:, or :last
     # klass: The class to execute on.
     def initialize(klass)
-      @selector, @options, @klass, @documents = {}, {}, klass, []
+      @selector = Mongoid::Criterion::Selector.new(klass)
+      @options, @klass, @documents = {}, klass, []
     end
 
     # Merges another object into this +Criteria+. The other object may be a

data/lib/mongoid/criterion/inclusion.rb

@@ -43,6 +43,27 @@ module Mongoid #:nodoc:
         where(selector)
       end
 
+      # Adds a criterion to the +Criteria+ that specifies a set of expressions
+      # to match if any of them return true. This is a $or query in MongoDB and
+      # is similar to a SQL OR. This is named #any_of and aliased "or" for
+      # readability.
+      #
+      # Options:
+      #
+      # selector: Multiple +Hash+ expressions that any can match.
+      #
+      # Example:
+      #
+      # <tt>criteria.any_of({ :field1 => "value" }, { :field2 => "value2" })</tt>
+      #
+      # Returns: <tt>self</tt>
+      def any_of(*args)
+        criterion = @selector["$or"] || []
+        @selector["$or"] = criterion.concat(args)
+        self
+      end
+      alias :or :any_of
+
       # Adds a criterion to the +Criteria+ that specifies values where any can
       # be matched in order to return results. This is similar to an SQL "IN"
       # clause. The MongoDB conditional operator that will be used is "$in".
@@ -89,7 +110,7 @@ module Mongoid #:nodoc:
       #
       # Options:
       #
-      # selectior: A +Hash+ that must match the attributes of the +Document+.
+      # selector: A +Hash+ that must match the attributes of the +Document+.
       #
       # Example:
       #