mongoid-pre 2.0.0.beta1 → 2.0.0.pre

data/lib/mongoid/field.rb

@@ -1,25 +1,11 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   class Field
-    attr_reader :name, :type
 
-    # Determine if the field is able to be accessible via a mass update.
-    #
-    # Returns:
-    #
-    # true if accessible, false if not.
-    def accessible?
-      !!@accessible
-    end
-
-    # Get the default value for the field.
-    #
-    # Returns:
-    #
-    # The primitive value or a copy of the default.
-    def default
-      (@default.is_a?(Array) || @default.is_a?(Hash)) ? @default.dup : @default
-    end
+    attr_reader \
+      :default,
+      :name,
+      :type
 
     # Create the new field with a name and optional additional options. Valid
     # options are :default
@@ -33,9 +19,9 @@ module Mongoid #:nodoc:
     #
     # <tt>Field.new(:score, :default => 0)</tt>
     def initialize(name, options = {})
-      @name, @default = name, options[:default]
+      @name = name
+      @default = options[:default]
       @type = options[:type] || String
-      @accessible = options.has_key?(:accessible) ? options[:accessible] : true
     end
 
     # Used for setting an object in the attributes hash. If nil is provided the
@@ -48,5 +34,6 @@ module Mongoid #:nodoc:
     def get(object)
       type.get(object)
     end
+
   end
 end

data/lib/mongoid/fields.rb

@@ -5,9 +5,11 @@ module Mongoid #:nodoc
     included do
       # Set up the class attributes that must be available to all subclasses.
       # These include defaults, fields
-      class_inheritable_accessor :fields
+      class_inheritable_accessor :defaults, :fields
 
+      self.defaults = {}
       self.fields = {}
+
       delegate :defaults, :fields, :to => "self.class"
     end
 
@@ -27,15 +29,7 @@ module Mongoid #:nodoc
       def field(name, options = {})
         access = name.to_s
         set_field(access, options)
-      end
-
-      # Returns the default values for the fields on the document
-      def defaults
-        fields.inject({}) do |defs,(field_name,field)|
-          next(defs) if field.default.nil?
-          defs[field_name.to_s] = field.default
-          defs
-        end
+        set_default(access, options)
       end
 
       protected
@@ -44,19 +38,20 @@ module Mongoid #:nodoc
         meth = options.delete(:as) || name
         fields[name] = Field.new(name, options)
         create_accessors(name, meth, options)
-        add_dirty_methods(name)
       end
 
       # Create the field accessors.
       def create_accessors(name, meth, options = {})
         define_method(meth) { read_attribute(name) }
         define_method("#{meth}=") { |value| write_attribute(name, value) }
-        define_method("#{meth}?") do
-          attr = read_attribute(name)
-          (options[:type] == Boolean) ? attr == true : attr.present?
-        end
+        define_method("#{meth}?") { read_attribute(name) == true } if options[:type] == Boolean
       end
 
+      # Set up a default value for a field.
+      def set_default(name, options = {})
+        value = options[:default]
+        defaults[name] = value if value
+      end
     end
   end
 end

data/lib/mongoid/finders.rb

@@ -1,16 +1,6 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Finders #:nodoc:
-
-    # Delegate to the criteria methods that are natural for creating a new
-    # criteria.
-    [ :all_in, :any_in, :avg, :excludes, :limit, :max, :min,
-      :not_in, :only, :order_by, :skip, :sum, :where ].each do |name|
-      define_method(name) do |*args|
-        criteria.send(name, *args)
-      end
-    end
-
     # Find +Documents+ given the conditions.
     #
     # Options:
@@ -110,6 +100,54 @@ module Mongoid #:nodoc:
       find(:last, *args)
     end
 
+    # Convenience method for returning the max value of a field.
+    #
+    # Options:
+    #
+    # field: The field to use when calculating the max.
+    #
+    # Example:
+    #
+    # <tt>Person.max(:age)</tt>
+    #
+    # Returns: <tt>Float</tt> max value.
+    def max(field)
+      Criteria.new(self).max(field)
+    end
+
+    # Will execute a +Criteria+ based on the +DynamicFinder+ that gets
+    # generated.
+    #
+    # Options:
+    #
+    # name: The finder method name
+    # args: The arguments to pass to the method.
+    #
+    # Example:
+    #
+    # <tt>Person.find_all_by_title_and_age("Sir", 30)</tt>
+    # def method_missing(name, *args)
+      # dyna = DynamicFinder.new(name, *args)
+      # finder, conditions = dyna.finder, dyna.conditions
+      # results = find(finder, :conditions => conditions)
+      # results ? results : dyna.create(self)
+    # end
+
+    # Convenience method for returning the min value of a field.
+    #
+    # Options:
+    #
+    # field: The field to use when calculating the min.
+    #
+    # Example:
+    #
+    # <tt>Person.min(:age)</tt>
+    #
+    # Returns: <tt>Float</tt> min value.
+    def min(field)
+      Criteria.new(self).min(field)
+    end
+
     # Find all documents in paginated fashion given the supplied arguments.
     # If no parameters are passed just default to offset 0 and limit 20.
     #
@@ -127,6 +165,56 @@ module Mongoid #:nodoc:
       Criteria.translate(self, params).paginate
     end
 
+    # Entry point for creating a new criteria from a Document. This will
+    # instantiate a new +Criteria+ object with the supplied select criterion
+    # already added to it.
+    #
+    # Options:
+    #
+    # args: A list of field names to retrict the returned fields to.
+    #
+    # Example:
+    #
+    # <tt>Person.only(:field1, :field2, :field3)</tt>
+    #
+    # Returns: <tt>Criteria</tt>
+    def only(*args)
+      Criteria.new(self).only(*args)
+    end
+
+    # Convenience method for returning the sum of a specified field for all
+    # documents in the database.
+    #
+    # Options:
+    #
+    # field: The field to use when calculating the sum.
+    #
+    # Example:
+    #
+    # <tt>Person.sum(:age)</tt>
+    #
+    # Returns: <tt>Float</tt> of the sum.
+    def sum(field)
+      Criteria.new(self).sum(field)
+    end
+
+    # Entry point for creating a new criteria from a Document. This will
+    # instantiate a new +Criteria+ object with the supplied select criterion
+    # already added to it.
+    #
+    # Options:
+    #
+    # selector: A where criteria to initialize.
+    #
+    # Example:
+    #
+    # <tt>Person.where(:field1 => "Value")</tt>
+    #
+    # Returns: <tt>Criteria</tt>
+    def where(selector = nil)
+      Criteria.new(self).where(selector)
+    end
+
     protected
     # Find the first object or create/initialize it.
     def find_or(method, attrs = {})

data/lib/mongoid/identity.rb

@@ -13,21 +13,15 @@ module Mongoid #:nodoc:
       end
 
       protected
-      # Return the proper id for the document.
-      def generate_id
-        id = Mongo::ObjectID.new
-        Mongoid.use_object_ids ? id : id.to_s
-      end
-
       # Set the id for the document.
       def identify(doc)
         doc.id = compose(doc).join(" ").identify if doc.primary_key
-        doc.id = generate_id unless doc.id
+        doc.id = Mongo::ObjectID.new.to_s unless doc.id
       end
 
       # Set the _type field on the document.
       def type(doc)
-        doc._type = doc.class.name if Mongoid.persist_types
+        doc._type = doc.class.name
       end
 
       # Generates the composite key for a document.

data/lib/mongoid/named_scope.rb

@@ -30,8 +30,6 @@ module Mongoid #:nodoc:
     
     alias :scope :named_scope 
 
-    alias :scope :named_scope
-
     # Return the scopes or default to an empty +Hash+.
     def scopes
       read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})

data/lib/mongoid/validations/associated.rb

@@ -8,8 +8,8 @@ module Mongoid #:nodoc:
     #
     #   class Person
     #     include Mongoid::Document
-    #     embeds_one :name
-    #     embeds_many :addresses
+    #     has_one :name
+    #     has_many :addresses
     #
     #     validates_associated :name, :addresses
     #   end
@@ -25,7 +25,12 @@ module Mongoid #:nodoc:
       def validate_each(document, attribute, value)
         values = value.is_a?(Array) ? value : [ value ]
         return if values.collect { |doc| doc.nil? || doc.valid? }.all?
-        document.errors.add(attribute, :invalid, :default => options[:message], :value => value)
+        document.errors.add(
+          attribute,
+          :invalid,
+          :default => options[:message],
+          :value => value
+        )
       end
     end
   end

data/lib/mongoid/validations/uniqueness.rb

@@ -14,8 +14,13 @@ module Mongoid #:nodoc:
     #   end
     class UniquenessValidator < ActiveModel::EachValidator
       def validate_each(document, attribute, value)
-        return if document.class.where(attribute => value, :_id.ne => document._id).empty?
-        document.errors.add(attribute, :taken, :default => options[:message], :value => value)
+        return if document.class.where(attribute => value).empty?
+        document.errors.add(
+          attribute,
+          :taken,
+          :default => options[:message],
+          :value => value
+        )
       end
     end
   end

data/lib/mongoid/validations.rb

@@ -23,8 +23,8 @@ module Mongoid #:nodoc:
       #
       #   class Person
       #     include Mongoid::Document
-      #     embeds_one :name
-      #     embeds_many :addresses
+      #     has_one :name
+      #     has_many :addresses
       #
       #     validates_associated :name, :addresses
       #   end

data/lib/mongoid/versioning.rb

@@ -7,7 +7,7 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
     included do
       field :version, :type => Integer, :default => 1
-      embeds_many :versions, :class_name => self.name
+      has_many :versions, :class_name => self.name
       before_save :revise
     end
     module InstanceMethods

data/lib/mongoid.rb

@@ -23,9 +23,10 @@ require "rubygems"
 
 gem "activemodel", ">= 3.0.pre"
 gem "will_paginate", ">= 3.0.pre"
-gem "mongo", ">= 0.19.1"
+gem "mongo", ">= 0.18.2"
 
 require "delegate"
+require "observer"
 require "singleton"
 require "time"
 require "active_support/core_ext"
@@ -45,6 +46,7 @@ require "active_model/validations"
 require "will_paginate/collection"
 require "mongo"
 require "mongoid/associations"
+require "mongoid/associations/options"
 require "mongoid/attributes"
 require "mongoid/callbacks"
 require "mongoid/collection"
@@ -53,10 +55,7 @@ require "mongoid/config"
 require "mongoid/contexts"
 require "mongoid/criteria"
 require "mongoid/cursor"
-require "mongoid/deprecation"
-require "mongoid/dirty"
 require "mongoid/extensions"
-require "mongoid/extras"
 require "mongoid/errors"
 require "mongoid/factory"
 require "mongoid/field"
@@ -64,15 +63,10 @@ require "mongoid/fields"
 require "mongoid/finders"
 require "mongoid/identity"
 require "mongoid/indexes"
-require "mongoid/javascript"
 require "mongoid/matchers"
 require "mongoid/memoization"
 require "mongoid/named_scope"
-require "mongoid/observable"
-require "mongoid/paths"
-require "mongoid/persistence"
 require "mongoid/scope"
-require "mongoid/state"
 require "mongoid/timestamps"
 require "mongoid/validations"
 require "mongoid/versioning"
@@ -102,20 +96,10 @@ module Mongoid #:nodoc
     #
     # The Mongoid +Config+ singleton instance.
     def configure
-      config = Mongoid::Config.instance
+      config = Config.instance
       block_given? ? yield(config) : config
     end
 
-    # Easy convenience method for having an alert generated from the
-    # deprecation module.
-    #
-    # Example:
-    #
-    # <tt>Mongoid.deprecate("Method no longer used")</tt>
-    def deprecate(message)
-      Mongoid::Deprecation.instance.alert(message)
-    end
-
     alias :config :configure
   end
 
@@ -125,7 +109,7 @@ module Mongoid #:nodoc
   # Example:
   #
   # <tt>Mongoid.database = Mongo::Connection.new.db("test")</tt>
-  Mongoid::Config.public_instance_methods(false).each do |name|
+  Config.public_instance_methods(false).each do |name|
     (class << self; self; end).class_eval <<-EOT
       def #{name}(*args)
         configure.send("#{name}", *args)