mongoid 2.0.0.rc.6 → 2.0.0.rc.7

data/lib/mongoid/relations/cyclic.rb

@@ -7,6 +7,10 @@ module Mongoid # :nodoc:
     module Cyclic
       extend ActiveSupport::Concern
 
+      included do
+        class_attribute :cyclic
+      end
+
       module ClassMethods #:nodoc:
 
         # Create a cyclic embedded relation that creates a tree hierarchy for
@@ -32,6 +36,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def recursively_embeds_many
+          self.cyclic = true
           embeds_many cyclic_child_name, :class_name => self.name, :cyclic => true
           embedded_in cyclic_parent_name, :class_name => self.name, :cyclic => true
         end
@@ -59,6 +64,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def recursively_embeds_one
+          self.cyclic = true
           embeds_one cyclic_child_name(false), :class_name => self.name, :cyclic => true
           embedded_in cyclic_parent_name, :class_name => self.name, :cyclic => true
         end

data/lib/mongoid/relations/embedded/many.rb

@@ -259,15 +259,15 @@ module Mongoid # :nodoc:
         # Get this relation as as its representation in the database.
         #
         # @example Convert the relation to an attributes hash.
-        #   person.addresses.to_hash
+        #   person.addresses.as_document
         #
         # @return [ Array<Hash> ] The relation as stored in the db.
         #
         # @since 2.0.0.rc.1
-        def to_hash
+        def as_document
           target.inject([]) do |attributes, doc|
             attributes.tap do |attr|
-              attr << doc.to_hash
+              attr << doc.as_document
             end
           end
         end
@@ -354,7 +354,7 @@ module Mongoid # :nodoc:
           load!(:binding => true) and return super if target.respond_to?(name)
           klass = metadata.klass
           klass.send(:with_scope, criteria) do
-            klass.send(name, *args)
+            criteria.send(name, *args)
           end
         end
 

data/lib/mongoid/relations/macros.rb

@@ -297,7 +297,7 @@ module Mongoid # :nodoc:
         # @param [ Symbol ] name The name of the relation.
         # @param [ Metadata ] metadata The metadata for the relation.
         def relate(name, metadata)
-          relations[name.to_s] = metadata
+          self.relations = relations.merge(name.to_s => metadata)
           getter(name, metadata).setter(name, metadata)
         end
       end

data/lib/mongoid/relations/many.rb

@@ -22,6 +22,7 @@ module Mongoid #:nodoc:
       def <<(*args)
         options = default_options(args)
         args.flatten.each do |doc|
+          return doc unless doc
           append(doc, options)
           doc.save if base.persisted? && !options[:binding]
         end

data/lib/mongoid/relations/metadata.rb

@@ -6,7 +6,7 @@ module Mongoid # :nodoc:
     # contains everything you could ever possible want to know.
     class Metadata < Hash
 
-      delegate :foreign_key_default, :to => :relation
+      delegate :foreign_key_default, :stores_foreign_key?, :to => :relation
 
       # Gets a relation builder associated with the relation this metadata is
       # for.
@@ -55,6 +55,10 @@ module Mongoid # :nodoc:
         @class_name ||= (self[:class_name] || classify)
       end
 
+      def constraint
+        @constraint ||= Constraint.new(self)
+      end
+
       # Will determine if the relation is an embedded one or not. Currently
       # only checks against embeds one and many.
       #
@@ -420,12 +424,16 @@ module Mongoid # :nodoc:
         suffix = relation.foreign_key_suffix
         if relation.stores_foreign_key?
           if relation.macro == :references_and_referenced_in_many
-            name.to_s.singularize << suffix
+            "#{name.to_s.singularize}#{suffix}"
           else
-            name.to_s << suffix
+            "#{name}#{suffix}"
           end
         else
-          polymorphic? ? "#{self[:as]}#{suffix}" : inverse_class_name.foreign_key
+          if polymorphic?
+            "#{self[:as]}#{suffix}"
+          else
+            inverse_of ? "#{inverse_of}#{suffix}" : inverse_class_name.foreign_key
+          end
         end
       end
 

data/lib/mongoid/relations/nested_builder.rb

@@ -61,9 +61,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.6
       def convert_id(id)
-        return nil unless id
-        model = metadata.klass
-        model.using_object_ids? ? BSON::ObjectId.cast!(model, id) : id.class.set(id)
+        metadata.constraint.convert(id)
       end
     end
   end

data/lib/mongoid/relations/referenced/many.rb

@@ -36,9 +36,9 @@ module Mongoid #:nodoc:
         #   person.posts.clear
         #
         # @return [ Many ] The relation emptied.
-        def clear
+        def clear(options = {})
           load! and tap do |relation|
-            relation.unbind(default_options)
+            relation.unbind(default_options(options))
             target.clear
           end
         end
@@ -155,12 +155,8 @@ module Mongoid #:nodoc:
         #
         # @return [ Document, Criteria ] The matching document(s).
         def find(arg, options = {})
-          klass = metadata.klass
-          return klass.criteria.id_criteria(arg) unless arg.is_a?(Symbol)
-          selector = (options[:conditions] || {}).merge(
-            metadata.foreign_key => base.id
-          )
-          klass.find(arg, :conditions => selector)
+          return criteria.id_criteria(arg) unless arg.is_a?(Symbol)
+          criteria.find(arg, :conditions => options[:conditions] || {})
         end
 
         # Instantiate a new references_many relation. Will set the foreign key
@@ -204,13 +200,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.rc.1
         def nullify
-          load! and target.each do |doc|
-            doc.send(metadata.foreign_key_setter, nil)
-            doc.send(
-              :remove_instance_variable, "@#{metadata.inverse(doc)}"
-            )
-            doc.save
-          end
+          clear(:binding => true, :continue => true, :nullify => true)
         end
         alias :nullify_all :nullify
 
@@ -252,7 +242,10 @@ module Mongoid #:nodoc:
         # @since 2.0.0.rc.1
         def unbind(options = {})
           binding.unbind(options)
-          target.each(&:delete) if base.persisted?
+          if base.persisted?
+            target.each(&:delete) unless options[:binding]
+            target.each(&:save) if options[:nullify]
+          end
           []
         end
 
@@ -312,7 +305,7 @@ module Mongoid #:nodoc:
           load!(:binding => true) and return super if [].respond_to?(name)
           klass = metadata.klass
           klass.send(:with_scope, criteria) do
-            klass.send(name, *args)
+            criteria.send(name, *args)
           end
         end
 
@@ -347,7 +340,7 @@ module Mongoid #:nodoc:
           #
           # @since 2.0.0.rc.1
           def builder(meta, object)
-            Builders::Referenced::Many.new(meta, object)
+            Builders::Referenced::Many.new(meta, object || [])
           end
 
           # Returns true if the relation is an embedded one. In this case

data/lib/mongoid/relations/referenced/many_to_many.rb

@@ -7,6 +7,25 @@ module Mongoid # :nodoc:
       # many-to-many between documents in different collections.
       class ManyToMany < Referenced::Many
 
+        # Appends a document or array of documents to the relation. Will set
+        # the parent and update the index in the process.
+        #
+        # @example Append a document.
+        #   person.addresses << address
+        #
+        # @example Push a document.
+        #   person.addresses.push(address)
+        #
+        # @example Concat with other documents.
+        #   perosn.addresses.concat([ address_one, address_two ])
+        #
+        # @param [ Document, Array<Document> ] *args Any number of documents.
+        def <<(*args)
+          options = default_options(args)
+          super(args)
+          base.save if base.persisted? && !options[:binding]
+        end
+
         # Creates a new document on the references many relation. This will
         # save the document if the parent has been persisted.
         #
@@ -94,38 +113,6 @@ module Mongoid # :nodoc:
           metadata.klass.destroy_all(:conditions => selector.merge(scoping))
         end
 
-        # Find the matchind document on the association, either based on id or
-        # conditions.
-        #
-        # @example Find by an id.
-        #   person.preferences.find(BSON::ObjectId.new)
-        #
-        # @example Find by multiple ids.
-        #   person.preferences.find([ BSON::ObjectId.new, BSON::ObjectId.new ])
-        #
-        # @example Conditionally find all matching documents.
-        #   person.preferences.find(:all, :conditions => { :title => "Sir" })
-        #
-        # @example Conditionally find the first document.
-        #   person.preferences.find(:first, :conditions => { :title => "Sir" })
-        #
-        # @example Conditionally find the last document.
-        #   person.preferences.find(:last, :conditions => { :title => "Sir" })
-        #
-        # @param [ Symbol, BSON::ObjectId, Array<BSON::ObjectId> ] arg The
-        #   argument to search with.
-        # @param [ Hash ] options The options to search with.
-        #
-        # @return [ Document, Criteria ] The matching document(s).
-        def find(arg, options = {})
-          klass = metadata.klass
-          return klass.criteria.id_criteria(arg) unless arg.is_a?(Symbol)
-          selector = (options[:conditions] || {}).merge(
-            "_id" => { "$in" => base.send(metadata.foreign_key) }
-          )
-          klass.find(arg, :conditions => selector)
-        end
-
         # Removes all associations between the base document and the target
         # documents by deleting the foreign keys and the references, orphaning
         # the target documents in the process.

data/lib/mongoid/relations/referenced/one.rb

@@ -77,7 +77,9 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def unbind(old_target, options = {})
           binding(old_target).unbind(options)
-          old_target.delete if base.persisted? && !old_target.destroyed?
+          if base.persisted? && !old_target.destroyed? && !options[:binding]
+            old_target.delete
+          end
         end
 
         private

data/lib/mongoid/timestamps.rb

@@ -11,7 +11,7 @@ module Mongoid #:nodoc:
       field :updated_at, :type => Time
 
       set_callback :create, :before, :set_created_at
-      set_callback :save, :before, :set_updated_at
+      set_callback :save, :before, :set_updated_at, :if => Proc.new {|d| d.new_record? || d.changed? }
 
       class_attribute :record_timestamps
       self.record_timestamps = true

data/lib/mongoid/validations/associated.rb

@@ -27,15 +27,17 @@ module Mongoid #:nodoc:
       # @param [ Symbol ] attribute The relation to validate.
       # @param [ Object ] value The value of the relation.
       def validate_each(document, attribute, value)
-        unless document.validated?
-          document.validated = true
-          valid = value.to_a.collect { |doc| doc.nil? || doc.valid? }.all?
-          document.validated = false
-          return if valid
-          document.errors.add(attribute, :invalid, options.merge(:value => value))
-        else
-          document.validated = false
-        end
+        document.validated = true
+        valid = Array.wrap(value).collect do |doc|
+          if doc.nil?
+            true
+          else
+            doc.validated? ? true : doc.valid?
+          end
+        end.all?
+        document.validated = false
+        return if valid
+        document.errors.add(attribute, :invalid, options.merge(:value => value))
       end
     end
   end

data/lib/mongoid/validations/uniqueness.rb

@@ -51,7 +51,7 @@ module Mongoid #:nodoc:
           document.errors.add(
             attribute,
             :taken,
-            options.except(:case_sensistive, :scope).merge(:value => value)
+            options.except(:case_sensitive, :scope).merge(:value => value)
           )
         end
       end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.rc.6"
+  VERSION = "2.0.0.rc.7"
 end

data/lib/mongoid/versioning.rb

@@ -10,7 +10,7 @@ module Mongoid #:nodoc:
     included do
       field :version, :type => Integer, :default => 1
       embeds_many :versions, :class_name => self.name, :validate => false
-      set_callback :save, :before, :revise
+      set_callback :save, :before, :revise, :if => :changed?
 
       delegate :version_max, :to => "self.class"
     end
@@ -28,7 +28,7 @@ module Mongoid #:nodoc:
         versions.target << last_version.clone
         versions.shift if version_max.present? && versions.length > version_max
         self.version = (version || 1 ) + 1
-        @modifications["versions"] = [ nil, versions.to_hash ] if @modifications
+        @modifications["versions"] = [ nil, versions.as_document ] if @modifications
       end
     end
 

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 6
-  version: 2.0.0.rc.6
+  - 7
+  version: 2.0.0.rc.7
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +01:00
+date: 2011-01-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,9 +157,11 @@ files:
 - lib/config/locales/pt-br.yml
 - lib/config/locales/pt.yml
 - lib/config/locales/ro.yml
+- lib/config/locales/ru.yml
 - lib/config/locales/sv.yml
 - lib/config/locales/zh-CN.yml
 - lib/mongoid/atomicity.rb
+- lib/mongoid/attributes/processing.rb
 - lib/mongoid/attributes.rb
 - lib/mongoid/callbacks.rb
 - lib/mongoid/collection.rb
@@ -254,7 +256,9 @@ files:
 - lib/mongoid/matchers/lte.rb
 - lib/mongoid/matchers/ne.rb
 - lib/mongoid/matchers/nin.rb
+- lib/mongoid/matchers/or.rb
 - lib/mongoid/matchers/size.rb
+- lib/mongoid/matchers/strategies.rb
 - lib/mongoid/matchers.rb
 - lib/mongoid/modifiers/command.rb
 - lib/mongoid/modifiers/inc.rb
@@ -303,6 +307,7 @@ files:
 - lib/mongoid/relations/cascading/nullify.rb
 - lib/mongoid/relations/cascading/strategy.rb
 - lib/mongoid/relations/cascading.rb
+- lib/mongoid/relations/constraint.rb
 - lib/mongoid/relations/cyclic.rb
 - lib/mongoid/relations/embedded/in.rb
 - lib/mongoid/relations/embedded/many.rb
@@ -355,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1229276417221731393
+      hash: -2421077816225192598
       segments: 
       - 0
       version: "0"