mongoid-pre 2.0.0.beta1 → 2.0.0.pre

data/lib/mongoid/associations/{embeds_one.rb → has_one.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class EmbedsOne #:nodoc:
+    class HasOne #:nodoc:
       include Proxy
 
       # Build a new object for the association.
@@ -46,7 +46,7 @@ module Mongoid #:nodoc:
       end
 
       class << self
-        # Preferred method of instantiating a new +EmbedsOne+, since nil values
+        # Preferred method of instantiating a new +HasOne+, since nil values
         # will be handled properly.
         #
         # Options:
@@ -56,7 +56,7 @@ module Mongoid #:nodoc:
         #
         # Returns:
         #
-        # A new +EmbedsOne+ association proxy.
+        # A new +HasOne+ association proxy.
         def instantiate(document, options)
           attributes = document.raw_attributes[options.name]
           return nil if attributes.blank?
@@ -65,7 +65,7 @@ module Mongoid #:nodoc:
 
         # Returns the macro used to create the association.
         def macro
-          :embeds_one
+          :has_one
         end
 
         # Perform an update of the relationship of the parent and child. This
@@ -79,11 +79,11 @@ module Mongoid #:nodoc:
         #
         # Example:
         #
-        # <tt>EmbedsOne.update({:first_name => "Hank"}, person, options)</tt>
+        # <tt>HasOne.update({:first_name => "Hank"}, person, options)</tt>
         #
         # Returns:
         #
-        # A new +EmbedsOne+ association proxy.
+        # A new +HasOne+ association proxy.
         def update(child, parent, options)
           child.assimilate(parent, options)
           instantiate(parent, options)

data/lib/mongoid/associations/options.rb

@@ -21,7 +21,7 @@ module Mongoid #:nodoc:
 
       # Return the foreign key based off the association name.
       def foreign_key
-        @attributes[:foreign_key] || klass.name.to_s.foreign_key
+        name.to_s.foreign_key
       end
 
       # Returns the name of the inverse_of association
@@ -42,6 +42,11 @@ module Mongoid #:nodoc:
         @attributes[:name].to_s
       end
 
+      # Returns the parent foreign key association name.
+      def parent_key
+        @attributes[:parent_key]
+      end
+
       # Returns whether or not this association is polymorphic.
       def polymorphic
         @attributes[:polymorphic] == true

data/lib/mongoid/associations.rb

@@ -1,13 +1,11 @@
 # encoding: utf-8
 require "mongoid/associations/proxy"
+require "mongoid/associations/belongs_to"
 require "mongoid/associations/belongs_to_related"
-require "mongoid/associations/embedded_in"
-require "mongoid/associations/embeds_many"
-require "mongoid/associations/embeds_one"
+require "mongoid/associations/has_many"
 require "mongoid/associations/has_many_related"
+require "mongoid/associations/has_one"
 require "mongoid/associations/has_one_related"
-require "mongoid/associations/options"
-require "mongoid/associations/meta_data"
 
 module Mongoid # :nodoc:
   module Associations #:nodoc:
@@ -26,18 +24,17 @@ module Mongoid # :nodoc:
 
       # Updates all the one-to-many relational associations for the name.
       def update_associations(name)
-        send(name).each { |doc| doc.save } if new_record?
+        send(name).each { |doc| doc.save }
       end
 
       # Update the one-to-one relational association for the name.
       def update_association(name)
         association = send(name)
-        association.save if new_record? && !association.nil?
+        association.save unless association.nil?
       end
     end
 
     module ClassMethods
-
       # Adds the association back to the parent document. This macro is
       # necessary to set the references from the child back to the parent
       # document. If a child does not define this association calling
@@ -51,20 +48,20 @@ module Mongoid # :nodoc:
       #
       #   class Person
       #     include Mongoid::Document
-      #     embeds_many :addresses
+      #     has_many :addresses
       #   end
       #
       #   class Address
       #     include Mongoid::Document
-      #     embedded_in :person, :inverse_of => :addresses
+      #     belongs_to :person, :inverse_of => :addresses
       #   end
-      def embedded_in(name, options = {}, &block)
+      def belongs_to(name, options = {}, &block)
         unless options.has_key?(:inverse_of)
           raise Errors::InvalidOptions.new("Options for belongs_to association must include :inverse_of")
         end
         self.embedded = true
         add_association(
-          Associations::EmbeddedIn,
+          Associations::BelongsTo,
           Associations::Options.new(
             options.merge(:name => name, :extend => block)
           )
@@ -86,12 +83,14 @@ module Mongoid # :nodoc:
       #   end
       #
       def belongs_to_related(name, options = {}, &block)
-        opts = Associations::Options.new(
-            options.merge(:name => name, :extend => block, :foreign_key => foreign_key(name, options))
+        field "#{name.to_s}_id"
+        index "#{name.to_s}_id" unless self.embedded
+        add_association(
+          Associations::BelongsToRelated,
+          Associations::Options.new(
+            options.merge(:name => name, :extend => block)
           )
-        add_association(Associations::BelongsToRelated, opts)
-        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
@@ -106,24 +105,22 @@ module Mongoid # :nodoc:
       #
       #   class Person
       #     include Mongoid::Document
-      #     embeds_many :addresses
+      #     has_many :addresses
       #   end
       #
       #   class Address
       #     include Mongoid::Document
-      #     embedded_in :person, :inverse_of => :addresses
+      #     belongs_to :person, :inverse_of => :addresses
       #   end
-      def embeds_many(name, options = {}, &block)
+      def has_many(name, options = {}, &block)
         add_association(
-          Associations::EmbedsMany,
+          Associations::HasMany,
           Associations::Options.new(
             options.merge(:name => name, :extend => block)
           )
         )
       end
 
-      alias :embed_many :embeds_many
-
       # Adds a relational association from the Document to many Documents in
       # another database or collection.
       #
@@ -139,9 +136,10 @@ module Mongoid # :nodoc:
       #   end
       #
       def has_many_related(name, options = {}, &block)
-        add_association(Associations::HasManyRelated,
+        add_association(
+          Associations::HasManyRelated,
           Associations::Options.new(
-            options.merge(:name => name, :foreign_key => foreign_key(self.name, options), :extend => block)
+            options.merge(:name => name, :parent_key => self.name.foreign_key, :extend => block)
           )
         )
         before_save do |document|
@@ -161,25 +159,23 @@ module Mongoid # :nodoc:
       #
       #   class Person
       #     include Mongoid::Document
-      #     embeds_one :name
+      #     has_many :addresses
       #   end
       #
-      #   class Name
+      #   class Address
       #     include Mongoid::Document
-      #     embedded_in :person
+      #     belongs_to :person
       #   end
-      def embeds_one(name, options = {}, &block)
+      def has_one(name, options = {}, &block)
         opts = Associations::Options.new(
           options.merge(:name => name, :extend => block)
         )
-        type = Associations::EmbedsOne
+        type = Associations::HasOne
         add_association(type, opts)
         add_builder(type, opts)
         add_creator(type, opts)
       end
 
-      alias :embed_one :embeds_one
-
       # Adds a relational association from the Document to one Document in
       # another database or collection.
       #
@@ -197,7 +193,7 @@ module Mongoid # :nodoc:
         add_association(
           Associations::HasOneRelated,
           Associations::Options.new(
-            options.merge(:name => name, :foreign_key => foreign_key(name, options), :extend => block)
+            options.merge(:name => name, :parent_key => self.name.foreign_key, :extend => block)
           )
         )
         before_save do |document|
@@ -226,7 +222,7 @@ module Mongoid # :nodoc:
       # getters for the associations will perform the necessary memoization.
       def add_association(type, options)
         name = options.name.to_s
-        associations[name] = MetaData.new(type, options)
+        associations[name] = type
         define_method(name) do
           memoized(name) { type.instantiate(self, options) }
         end
@@ -240,7 +236,7 @@ module Mongoid # :nodoc:
       def add_builder(type, options)
         name = options.name.to_s
         define_method("build_#{name}") do |attrs|
-          reset(name) { type.new(self, (attrs || {}).stringify_keys, options) }
+          reset(name) { type.new(self, attrs.stringify_keys, options) }
         end
       end
 
@@ -250,14 +246,9 @@ module Mongoid # :nodoc:
         name = options.name.to_s
         define_method("create_#{name}") do |attrs|
           document = send("build_#{name}", attrs)
-          document.run_callbacks(:create) { document.save }; document
+          document.save; document
         end
       end
-
-      # Find the foreign key.
-      def foreign_key(name, options)
-        options[:foreign_key] || name.to_s.foreign_key
-      end
     end
   end
 end

data/lib/mongoid/attributes.rb

@@ -37,11 +37,10 @@ module Mongoid #:nodoc:
         (attrs || {}).each_pair do |key, value|
           if set_allowed?(key)
             @attributes[key.to_s] = value
-          elsif write_allowed?(key)
-            send("#{key}=", value)
+          else
+            send("#{key}=", value) if value
           end
         end
-        setup_modifications
       end
 
       # Read a value from the +Document+ attributes. If the value does not exist
@@ -102,7 +101,7 @@ module Mongoid #:nodoc:
       # there is any.
       def write_attribute(name, value)
         access = name.to_s
-        modify(access, @attributes[access], fields[access].set(value))
+        @attributes[access] = fields[access].set(value)
         notify unless id.blank?
       end
 
@@ -125,7 +124,6 @@ module Mongoid #:nodoc:
         identify if id.blank?
         notify
       end
-      alias :attributes= :write_attributes
 
       protected
       # Return true if dynamic field setting is enabled.
@@ -144,11 +142,6 @@ 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
@@ -159,8 +152,8 @@ module Mongoid #:nodoc:
       #
       #   class Person
       #     include Mongoid::Document
-      #     embeds_one :name
-      #     embeds_many :addresses
+      #     has_one :name
+      #     has_many :addresses
       #
       #     accepts_nested_attributes_for :name, :addresses
       #   end
@@ -172,7 +165,7 @@ module Mongoid #:nodoc:
             reject(attrs, options)
             association = send(name)
             if association
-              observe(association, true)
+              update(association, true)
               association.nested_build(attrs)
             else
               send("build_#{name}", attrs)

data/lib/mongoid/collection.rb

@@ -30,8 +30,7 @@ module Mongoid #:nodoc
     #
     # Either a +Master+ or +Slaves+ collection.
     def directed(options = {})
-      options.delete(:cache)
-      enslave = options.delete(:enslave) || @klass.enslaved?
+      enslave = options.delete(:enslave)
       enslave ? master_or_slaves : master
     end
 

data/lib/mongoid/commands/delete.rb

@@ -9,7 +9,7 @@ module Mongoid #:nodoc:
       #
       # doc: A new +Document+ that is going to be deleted.
       def self.execute(doc)
-        doc.destroyed = true if delete(doc)
+        delete(doc)
       end
     end
   end

data/lib/mongoid/commands/delete_all.rb

@@ -14,11 +14,8 @@ module Mongoid #:nodoc:
       #
       # <tt>DeleteAll.execute(Person, :conditions => { :field => "value" })</tt>
       def self.execute(klass, params = {})
-        safe = Mongoid.persist_in_safe_mode
         collection = klass.collection
-        selector = (params[:conditions] || {}).merge(:_type => klass.name)
-        matching = collection.find(selector).count
-        collection.remove(selector, :safe => safe) ? matching : 0
+        collection.remove((params[:conditions] || {}).merge(:_type => klass.name))
       end
     end
   end

data/lib/mongoid/commands/destroy.rb

@@ -10,7 +10,7 @@ module Mongoid #:nodoc:
       #
       # doc: A new +Document+ that is going to be destroyed.
       def self.execute(doc)
-        doc.run_callbacks(:destroy) { doc.destroyed = true if delete(doc) }
+        doc.run_callbacks(:destroy) { delete(doc) }
       end
     end
   end

data/lib/mongoid/commands/destroy_all.rb

@@ -16,9 +16,7 @@ module Mongoid #:nodoc:
       def self.execute(klass, params)
         conditions = params[:conditions] || {}
         params[:conditions] = conditions.merge(:_type => klass.name)
-        documents = klass.find(:all, params)
-        matching = documents.count
-        documents.each { |doc| Destroy.execute(doc) }; matching
+        klass.find(:all, params).each { |doc| Destroy.execute(doc) }
       end
     end
   end

data/lib/mongoid/commands/save.rb

@@ -20,7 +20,6 @@ module Mongoid #:nodoc:
           else
             doc.collection.save(doc.raw_attributes, :safe => Mongoid.persist_in_safe_mode)
           end
-          doc.move_changes if saved
           return false unless saved
         end
         return true

data/lib/mongoid/commands.rb

@@ -55,7 +55,12 @@ module Mongoid #:nodoc:
       # Returns: true if validation passes, false if not.
       def save(validate = true)
         save = lambda { Save.execute(self, validate) }
-        new_record? ? run_callbacks(:create, &save) : save.call
+        begin
+          return new_record? ? run_callbacks(:create, &save) : save.call
+        rescue Mongo::OperationFailure => e
+          errors.add(:mongoid, e.message)
+          return false
+        end
       end
 
       # Save the +Document+, dangerously. Before and after save callbacks will
@@ -110,7 +115,11 @@ module Mongoid #:nodoc:
       # Returns: the +Document+.
       def create(attributes = {})
         document = new(attributes)
-        Create.execute(document)
+        begin
+          Create.execute(document)
+        rescue Mongo::OperationFailure => e
+          document.errors.add(:mongoid, e.message)
+        end
         document
       end
 
@@ -156,6 +165,8 @@ module Mongoid #:nodoc:
       def destroy_all(conditions = {})
         DestroyAll.execute(self, conditions)
       end
+
     end
+
   end
 end

data/lib/mongoid/components.rb

@@ -12,17 +12,12 @@ module Mongoid #:nodoc
       include Mongoid::Attributes
       include Mongoid::Callbacks
       include Mongoid::Commands
-      include Mongoid::Dirty
-      include Mongoid::Extras
       include Mongoid::Fields
       include Mongoid::Indexes
       include Mongoid::Matchers
       include Mongoid::Memoization
-      include Mongoid::Observable
-      include Mongoid::Paths
-      include Mongoid::Persistence
-      include Mongoid::State
       include Mongoid::Validations
+      include Observable
       extend ActiveModel::Translation
       extend Mongoid::Finders
       extend Mongoid::NamedScope

data/lib/mongoid/config.rb

@@ -8,19 +8,15 @@ module Mongoid #:nodoc
       :reconnect_time,
       :parameterize_keys,
       :persist_in_safe_mode,
-      :persist_types,
-      :raise_not_found_error,
-      :use_object_ids
+      :raise_not_found_error
 
     # Defaults the configuration options to true.
     def initialize
       @allow_dynamic_fields = true
       @parameterize_keys = true
       @persist_in_safe_mode = true
-      @persist_types = true
       @raise_not_found_error = true
       @reconnect_time = 3
-      @use_object_ids = false
     end
 
     # Sets the Mongo::DB master database to be used. If the object trying to me

data/lib/mongoid/contexts/enumerable.rb

@@ -2,11 +2,10 @@
 module Mongoid #:nodoc:
   module Contexts #:nodoc:
     class Enumerable
-      include Ids, Paging
-      attr_reader :criteria
+      include Paging
+      attr_reader :selector, :options, :documents
 
-      delegate :blank?, :empty?, :first, :last, :to => :execute
-      delegate :documents, :options, :selector, :to => :criteria
+      delegate :first, :last, :to => :execute
 
       # Return aggregation counts of the grouped documents. This will count by
       # the first field provided in the fields array.
@@ -20,33 +19,19 @@ module Mongoid #:nodoc:
         counts
       end
 
-      # Get the average value for the supplied field.
-      #
-      # Example:
-      #
-      # <tt>context.avg(:age)</tt>
-      #
-      # Returns:
-      #
-      # A numeric value that is the average.
-      def avg(field)
-        total = sum(field)
-        total ? (total.to_f / count) : nil
-      end
-
       # Gets the number of documents in the array. Delegates to size.
       def count
-        @count ||= documents.size
+        @count ||= @documents.size
       end
 
-      # Gets an array of distinct values for the supplied field across the
-      # entire array or the susbset given the criteria.
+      # Groups the documents by the first field supplied in the field options.
       #
-      # Example:
+      # Returns:
       #
-      # <tt>context.distinct(:title)</tt>
-      def distinct(field)
-        execute.collect { |doc| doc.send(field) }.uniq
+      # 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
@@ -56,17 +41,7 @@ module Mongoid #:nodoc:
       #
       # An +Array+ of documents that matched the selector.
       def execute(paginating = false)
-        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) }
+        limit(@documents.select { |document| document.matches?(@selector) })
       end
 
       # Create the new enumerable context. This will need the selector and
@@ -75,19 +50,9 @@ module Mongoid #:nodoc:
       #
       # Example:
       #
-      # <tt>Mongoid::Contexts::Enumerable.new(criteria)</tt>
-      def initialize(criteria)
-        @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)
+      # <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.
@@ -121,7 +86,7 @@ module Mongoid #:nodoc:
       #
       # The numerical sum of all the document field values.
       def sum(field)
-        sum = documents.inject(nil) do |memo, doc|
+        sum = @documents.inject(nil) do |memo, doc|
           value = doc.send(field)
           memo ? memo += value : value
         end
@@ -130,7 +95,7 @@ module Mongoid #:nodoc:
       protected
       # If the field exists, perform the comparison and set if true.
       def determine(field, operator)
-        matching = documents.inject(nil) do |memo, doc|
+        matching = @documents.inject(nil) do |memo, doc|
           value = doc.send(field)
           (memo && memo.send(operator, value)) ? memo : value
         end
@@ -138,11 +103,9 @@ module Mongoid #:nodoc:
 
       # Limits the result set if skip and limit options.
       def limit(documents)
-        skip, limit = options[:skip], options[:limit]
+        skip, limit = @options[:skip], @options[:limit]
         if skip && limit
           return documents.slice(skip, limit)
-        elsif limit
-          return documents.first(limit)
         end
         documents
       end