mongoid 2.0.2 → 2.1.0

data/lib/mongoid/railties/database.rake

@@ -1,13 +1,13 @@
 namespace :db do
 
-  if not Rake::Task.task_defined?("db:drop")
+  unless Rake::Task.task_defined?("db:drop")
     desc 'Drops all the collections for the database for the current Rails.env'
     task :drop => :environment do
-      Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
+      Mongoid.master.collections.select {|c| c.name !~ /system/ }.each { |c| c.drop }
     end
   end
 
-  if not Rake::Task.task_defined?("db:seed")
+  unless Rake::Task.task_defined?("db:seed")
     # if another ORM has defined db:seed, don't run it twice.
     desc 'Load the seed data from db/seeds.rb'
     task :seed => :environment do
@@ -16,29 +16,29 @@ namespace :db do
     end
   end
 
-  if not Rake::Task.task_defined?("db:setup")
+  unless Rake::Task.task_defined?("db:setup")
     desc 'Create the database, and initialize with the seed data'
     task :setup => [ 'db:create', 'db:mongoid:create_indexes', 'db:seed' ]
   end
 
-  if not Rake::Task.task_defined?("db:reseed")
+  unless Rake::Task.task_defined?("db:reseed")
     desc 'Delete data and seed'
     task :reseed => [ 'db:drop', 'db:seed' ]
   end
 
-  if not Rake::Task.task_defined?("db:create")
+  unless Rake::Task.task_defined?("db:create")
     task :create => :environment do
       # noop
     end
   end
 
-  if not Rake::Task.task_defined?("db:migrate")
+  unless Rake::Task.task_defined?("db:migrate")
     task :migrate => :environment do
       # noop
     end
   end
 
-  if not Rake::Task.task_defined?("db:schema:load")
+  unless Rake::Task.task_defined?("db:schema:load")
     namespace :schema do
       task :load do
         # noop
@@ -46,7 +46,7 @@ namespace :db do
     end
   end
 
-  if not Rake::Task.task_defined?("db:test:prepare")
+  unless Rake::Task.task_defined?("db:test:prepare")
     namespace :test do
       task :prepare do
         # noop
@@ -54,7 +54,7 @@ namespace :db do
     end
   end
 
-  if not Rake::Task.task_defined?("db:create_indexes")
+  unless Rake::Task.task_defined?("db:create_indexes")
     task :create_indexes => "mongoid:create_indexes"
   end
 
@@ -65,7 +65,7 @@ namespace :db do
       Dir.glob("app/models/**/*.rb").sort.each do |file|
         model_path = file[0..-4].split('/')[2..-1]
         begin
-          klass = model_path.map(&:classify).join('::').constantize
+          klass = model_path.map { |path| path.camelize }.join('::').constantize
           if klass.ancestors.include?(Mongoid::Document) && !klass.embedded
             documents << klass
           end
@@ -90,7 +90,7 @@ namespace :db do
           convert_ids(v)
         end
       elsif obj.is_a?(Hash)
-        obj.each do |k, v|
+        obj.each_pair do |k, v|
           obj[k] = convert_ids(v)
         end
       else

data/lib/mongoid/relations.rb

@@ -9,7 +9,9 @@ require "mongoid/relations/bindings"
 require "mongoid/relations/builders"
 require "mongoid/relations/many"
 require "mongoid/relations/one"
+require "mongoid/relations/options"
 require "mongoid/relations/polymorphic"
+require "mongoid/relations/targets/enumerable"
 require "mongoid/relations/embedded/atomic"
 require "mongoid/relations/embedded/in"
 require "mongoid/relations/embedded/many"
@@ -20,6 +22,7 @@ require "mongoid/relations/referenced/many"
 require "mongoid/relations/referenced/many_to_many"
 require "mongoid/relations/referenced/one"
 require "mongoid/relations/reflections"
+require "mongoid/relations/synchronization"
 require "mongoid/relations/metadata"
 require "mongoid/relations/macros"
 
@@ -38,6 +41,7 @@ module Mongoid # :nodoc:
     include Macros
     include Polymorphic
     include Reflections
+    include Synchronization
 
     included do
       attr_accessor :metadata
@@ -53,7 +57,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def embedded?
-      cyclic ? _parent.present? : self.class.embedded?
+      @embedded ||= (cyclic ? _parent.present? : self.class.embedded?)
     end
 
     # Determine if the document is part of an embeds_many relation.
@@ -65,7 +69,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def embedded_many?
-      metadata && metadata.macro == :embeds_many
+      @embedded_many ||= (metadata && metadata.macro == :embeds_many)
     end
 
     # Determine if the document is part of an embeds_one relation.
@@ -77,7 +81,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def embedded_one?
-      metadata && metadata.macro == :embeds_one
+      @embedded_one ||= (metadata && metadata.macro == :embeds_one)
     end
 
     # Determine if the document is part of an references_many relation.
@@ -89,7 +93,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def referenced_many?
-      metadata && metadata.macro == :references_many
+      @referenced_many ||= (metadata && metadata.macro == :references_many)
     end
 
     # Determine if the document is part of an references_one relation.
@@ -101,7 +105,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def referenced_one?
-      metadata && metadata.macro == :references_one
+      @referenced_one ||= (metadata && metadata.macro == :references_one)
     end
   end
 end

data/lib/mongoid/relations/accessors.rb

@@ -23,24 +23,8 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def build(name, object, metadata, options = {})
-        relation = create_relation(object, metadata)
-        set(name, relation).tap do |relation|
-          relation.load!(options) if relation && options[:eager]
-        end
-      end
-
-      # Return the options passed to the builders.
-      #
-      # @example Get the options.
-      #   person.configurables(document, :continue => true)
-      #
-      # @param [ Array ] args The arguments to check.
-      #
-      # @return [ Hash ] The options.
-      #
-      # @since 2.0.0.rc.1
-      def options(args)
-        Mongoid.binding_defaults.merge(args.extract_options!)
+        relation = create_relation(object, metadata, options[:loading])
+        set_relation(name, relation)
       end
 
       # Create a relation from an object and metadata.
@@ -54,9 +38,9 @@ module Mongoid # :nodoc:
       # @return [ Proxy ] The relation.
       #
       # @since 2.0.0.rc.1
-      def create_relation(object, metadata)
+      def create_relation(object, metadata, loading = false)
         type = @attributes[metadata.inverse_type]
-        target = metadata.builder(object).build(type)
+        target = metadata.builder(object, loading).build(type)
         target ? metadata.relation.new(self, target, metadata) : nil
       end
 
@@ -86,7 +70,7 @@ module Mongoid # :nodoc:
       # @return [ Proxy ] The relation.
       #
       # @since 2.0.0.rc.1
-      def set(name, relation)
+      def set_relation(name, relation)
         instance_variable_set("@#{name}", relation)
       end
 
@@ -97,11 +81,11 @@ module Mongoid # :nodoc:
       #
       # @param [ String ] name The name of the relation.
       # @param [ Document ] object The document to replace with.
-      # @options [ Hash ] options The options.
+      # @param [ Hash ] options The options.
       #
       # @since 2.0.0
-      def substitute(name, object, options)
-        set(name, ivar(name).substitute(object, options))
+      def substitute(name, object)
+        set_relation(name, ivar(name).substitute(object))
       end
 
       module ClassMethods #:nodoc:
@@ -123,16 +107,12 @@ module Mongoid # :nodoc:
           tap do
             define_method(name) do |*args|
               reload, variable = args.first, "@#{name}"
-              options = options(args)
               if instance_variable_defined?(variable) && !reload
                 instance_variable_get(variable)
               else
-                build(
-                  name,
-                  @attributes[metadata.key],
-                  metadata,
-                  options.merge(:binding => true, :eager => metadata.embedded?)
-                )
+                building do
+                  build(name, attributes[metadata.key], metadata, :loading => true)
+                end
               end
             end
           end
@@ -155,15 +135,14 @@ module Mongoid # :nodoc:
         def setter(name, metadata)
           tap do
             define_method("#{name}=") do |*args|
-              object, options = args.first, options(args)
-              variable = "@#{name}"
+              object = args.first
               if relation_exists?(name) && !object.is_a?(Hash)
-                substitute(name, object, options)
+                substitute(name, object)
               else
                 if metadata.embedded? && object.blank? && send(name)
-                  substitute(name, object, options)
+                  substitute(name, object)
                 else
-                  build(name, object, metadata, options.merge(:eager => true))
+                  build(name, object, metadata)
                 end
               end
             end

data/lib/mongoid/relations/auto_save.rb

@@ -22,9 +22,9 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def autosave(metadata)
           if metadata.autosave?
-            set_callback :create, :after do |document|
+            set_callback :save, :after do |document|
               relation = document.send(metadata.name)
-              relation.to_a.each(&:save) if relation
+              relation.in_memory.each { |doc| doc.save } if relation
             end
           end
         end

data/lib/mongoid/relations/binding.rb

@@ -6,7 +6,34 @@ module Mongoid # :nodoc:
     class Binding
       attr_reader :base, :target, :metadata
 
-      OPTIONS = { :binding => true, :continue => false }
+      # Execute a block in binding mode.
+      #
+      # @example Execute in binding mode.
+      #   binding do
+      #     relation.push(doc)
+      #   end
+      #
+      # @return [ Object ] The return value of the block.
+      #
+      # @since 2.1.0
+      def binding
+        Threaded.binding = true
+        yield
+      ensure
+        Threaded.binding = false
+      end
+
+      # Is the current thread in binding mode?
+      #
+      # @example Is the thread in binding mode?
+      #   binding.binding?
+      #
+      # @return [ true, false ] If the thread is binding.
+      #
+      # @since 2.1.0
+      def binding?
+        Threaded.binding?
+      end
 
       # Create the new binding.
       #

data/lib/mongoid/relations/bindings/embedded/in.rb

@@ -23,25 +23,16 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def bind(options = {})
-            inverse = metadata.inverse(target)
-            base.metadata = target.reflect_on_association(inverse)
+          def bind
+            base.metadata = metadata.inverse_metadata(target)
             base.parentize(target)
-            if options[:continue]
-              if base.embedded_many?
-                target.do_or_do_not(
-                  inverse,
-                  false,
-                  :binding => true,
-                  :continue => false
-                ).push(base, :binding => true, :continue => false)
-              else
-                target.do_or_do_not(
-                  metadata.inverse_setter(target),
-                  base,
-                  :binding => true,
-                  :continue => false
-                )
+            unless binding?
+              binding do
+                if base.embedded_many?
+                  target.do_or_do_not(metadata.inverse(target)).push(base)
+                else
+                  target.do_or_do_not(metadata.inverse_setter(target), base)
+                end
               end
             end
           end
@@ -59,18 +50,14 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :continue Do we continue unbinding?
           #
           # @since 2.0.0.rc.1
-          def unbind(options = {})
-            if options[:continue]
-              if base.embedded_many?
-                inverse = metadata.inverse(target)
-                target.do_or_do_not(inverse).delete(base)
-              else
-                target.do_or_do_not(
-                  metadata.inverse_setter(target),
-                  nil,
-                  :binding => true,
-                  :continue => false
-                )
+          def unbind
+            unless binding?
+              binding do
+                if base.embedded_many?
+                  target.do_or_do_not(metadata.inverse(target)).delete(base)
+                else
+                  target.do_or_do_not(metadata.inverse_setter(target), nil)
+                end
               end
             end
           end

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

@@ -23,8 +23,8 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def bind(options = {})
-            target.each { |doc| bind_one(doc, options) }
+          def bind
+            target.each { |doc| bind_one(doc) }
           end
 
           # Binds a single document with the inverse relation. Used
@@ -40,16 +40,14 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def bind_one(doc, options = {})
+          def bind_one(doc)
             doc.parentize(base)
-            if options[:continue]
-              name = metadata.inverse_setter(target)
-              doc.do_or_do_not(
-                name,
-                base,
-                :binding => true,
-                :continue => false
-              ) unless name == "versions="
+            unless binding?
+              binding do
+                unless metadata.versioned?
+                  doc.do_or_do_not(metadata.inverse_setter(target), base)
+                end
+              end
             end
           end
 
@@ -66,8 +64,8 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def unbind(options = {})
-            target.each { |doc| unbind_one(doc, options) }
+          def unbind
+            target.each { |doc| unbind_one(doc) }
           end
 
           # Unbind a single document.
@@ -81,14 +79,11 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def unbind_one(doc, options = {})
-            if options[:continue]
-              doc.do_or_do_not(
-                metadata.inverse_setter(target),
-                nil,
-                :binding => true,
-                :continue => false
-              )
+          def unbind_one(doc)
+            unless binding?
+              binding do
+                doc.do_or_do_not(metadata.inverse_setter(target), nil)
+              end
             end
           end
         end

data/lib/mongoid/relations/bindings/embedded/one.rb

@@ -23,14 +23,12 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def bind(options = {})
-            if options[:continue]
-              target.do_or_do_not(
-                metadata.inverse_setter(target),
-                base,
-                :binding => true,
-                :continue => false
-              )
+          def bind
+            target.parentize(base)
+            unless binding?
+              binding do
+                target.do_or_do_not(metadata.inverse_setter(target), base)
+              end
             end
           end
           alias :bind_one :bind
@@ -48,14 +46,11 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def unbind(options = {})
-            if options[:continue]
-              target.do_or_do_not(
-                metadata.inverse_setter(target),
-                nil,
-                :binding => true,
-                :continue => false
-              )
+          def unbind
+            unless binding?
+              binding do
+                target.do_or_do_not(metadata.inverse_setter(target), nil)
+              end
             end
           end
           alias :unbind_one :unbind