mongoid 2.0.0.beta.12 → 2.0.0.beta.13

data/README.rdoc

@@ -11,7 +11,7 @@ Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.
 
 == Compatibility
 
-Mongoid is developed against Ruby 1.8.7, 1.9.1, 1.9.2
+Mongoid is developed against Ruby 1.8.7, 1.9.1, 1.9.2, and REE.
 
 = Documentation
 

data/lib/mongoid/associations/embeds_many.rb

@@ -149,19 +149,18 @@ module Mongoid #:nodoc:
         extends(options)
       end
 
-
-
       # If the target array does not respond to the supplied method then try to
       # find a named scope or criteria on the class and send the call there.
       #
       # If the method exists on the array, use the default proxy behavior.
       def method_missing(name, *args, &block)
-        unless @target.respond_to?(name)
-          object = @klass.send(name, *args)
-          object.documents = @target
-          return object
+        if @target.respond_to?(name)
+          super
+        else
+          @klass.send(:with_scope, criteria) do
+            object = @klass.send(name, *args)
+          end
         end
-        super
       end
 
       # Used for setting associations via a nested attributes setter from the
@@ -242,6 +241,14 @@ module Mongoid #:nodoc:
         end; count
       end
 
+      # Returns the criteria object for the target class with its documents set
+      # to @target.
+      def criteria
+        criteria = @klass.criteria
+        criteria.documents = @target
+        criteria
+      end
+
       class << self
 
         # Preferred method of creating a new +EmbedsMany+ association. It will

data/lib/mongoid/associations/references_many_as_array.rb

@@ -32,6 +32,7 @@ module Mongoid #:nodoc:
             end
           end
           @target << object
+          object.save unless @parent.new_record?
         end
       end
 

data/lib/mongoid/config.rb

@@ -166,7 +166,7 @@ module Mongoid #:nodoc
       _master(settings)
       _slaves(settings)
       settings.except("database", "slaves").each_pair do |name, value|
-        send("#{name}=", value) if respond_to?(name)
+        send("#{name}=", value) if respond_to?("#{name}=")
       end
     end
 

data/lib/mongoid/criteria.rb

@@ -63,12 +63,6 @@ module Mongoid #:nodoc:
       end
     end
 
-    # Returns true if the supplied +Object+ is an instance of +Criteria+ or
-    # +Scope+.
-    def self.===(other)
-      super || Scope === other
-    end
-
     # Return or create the context in which this criteria should be executed.
     #
     # This will return an Enumerable context if the class is embedded,
@@ -153,9 +147,9 @@ module Mongoid #:nodoc:
     # Returns: <tt>Criteria</tt>
     def method_missing(name, *args)
       if @klass.respond_to?(name)
-        new_scope = @klass.send(name, *args)
-        new_scope.merge(self) if Criteria === new_scope
-        return new_scope
+        @klass.send(:with_scope, self) do
+          @klass.send(name, *args)
+        end
       else
         return entries.send(name, *args)
       end

data/lib/mongoid/document.rb

@@ -13,6 +13,17 @@ module Mongoid #:nodoc:
       end
     end
 
+    class << self
+
+      # Returns all classes that have included Mongoid::Document.
+      #
+      # This will not get subclasses of the top level models, for those we will
+      # use Class.descendents in the rake task for indexes.
+      def descendants
+        (@@descendants ||= {}).keys
+      end
+    end
+
     module ClassMethods #:nodoc:
 
       # Perform default behavior but mark the hierarchy as being hereditary.
@@ -42,17 +53,12 @@ module Mongoid #:nodoc:
         end
       end
 
-      # Returns the classes that have included Mongoid::Document
-      def self.descendents
-        (@@descendants ||= {}).keys
-      end
-
       # Returns all types to query for when using this class as the base.
       # *subclasses* is from activesupport. Note that a bug in *subclasses*
       # causes the first call to only return direct children, hence
       # the double call and unique.
       def _types
-        @_type ||= [subclasses + subclasses + [self.name]].flatten.uniq.map(&:to_s)
+        @_type ||= [descendants + [self]].flatten.uniq.map(&:to_s)
       end
     end
 

data/lib/mongoid/finders.rb

@@ -39,13 +39,14 @@ module Mongoid #:nodoc:
       Criteria.translate(self, *args).limit(1).count == 1
     end
 
-    # Helper to initialize a new +Criteria+ object for this class.
+    # Helper to initialize a new +Criteria+ object for this class, or return
+    # the currently scoped +Criteria+ object.
     #
     # Example:
     #
     # <tt>Person.criteria</tt>
     def criteria
-      Criteria.new(self)
+      scope_stack.last || Criteria.new(self)
     end
 
     # Find a +Document+ in several different ways.
@@ -141,5 +142,24 @@ module Mongoid #:nodoc:
     def find_or(method, attrs = {})
       first(:conditions => attrs) || send(method, attrs)
     end
+
+    # Initializes and returns the current scope stack.
+    def scope_stack
+      scope_stack_for = Thread.current[:mongoid_scope_stack] ||= {}
+      scope_stack_for[object_id] ||= []
+    end
+
+    # Pushes the provided criteria onto the scope stack, and removes it after the
+    # provided block is yielded.
+    def with_scope(criteria)
+      scope_stack = self.scope_stack
+      scope_stack << criteria
+
+      begin
+        yield criteria
+      ensure
+        scope_stack.pop
+      end
+    end
   end
 end

data/lib/mongoid/indexes.rb

@@ -12,9 +12,9 @@ module Mongoid #:nodoc
       # Send the actual index creation comments to the MongoDB driver
       def create_indexes
         return unless index_options
-
+        current_collection = self._collection || set_collection
         index_options.each do |name, options|
-          self._collection.create_index(name, options)
+          current_collection.create_index(name, options)
         end
       end
 

data/lib/mongoid/logger.rb

@@ -14,6 +14,5 @@ module Mongoid
     def inspect
       "#<Mongoid::Logger:0x#{object_id.to_s(16)} @logger=#{logger.inspect}>"
     end
-
   end
 end

data/lib/mongoid/named_scope.rb

@@ -16,14 +16,13 @@ module Mongoid #:nodoc:
     #     named_scope :count_gt_one, :where => { :count.gt => 1 }
     #     named_scope :at_least_count, lambda { |count| { :where => { :count.gt => count } } }
     #   end
-    def named_scope(name, options = {}, &block)
+    def named_scope(name, conditions = {}, &block)
       name = name.to_sym
-      scopes[name] = lambda do |parent, *args|
-        Scope.new(parent, options.scoped(*args), &block)
-      end
+      scopes[name] = Scope.new(conditions, &block)
       (class << self; self; end).class_eval <<-EOT
         def #{name}(*args)
-          scopes[:#{name}].call(self, *args)
+          scope = scopes[:#{name}]
+          scope.extend(criteria.fuse(scope.conditions.scoped(*args)))
         end
       EOT
     end

data/lib/mongoid/railtie.rb

@@ -1,6 +1,9 @@
+# encoding: utf-8
 require "singleton"
-require "rails"
 require "mongoid/config"
+require "rails"
+require "rails/mongoid"
+
 module Rails #:nodoc:
   module Mongoid #:nodoc:
     class Railtie < Rails::Railtie #:nodoc:
@@ -50,6 +53,9 @@ module Rails #:nodoc:
         end
       end
 
+      # After initialization we will attempt to connect to the database, if
+      # we get an exception and can't find a mongoid.yml we will alert the user
+      # to generate one.
       initializer "verify that mongoid is configured" do
         config.after_initialize do
           begin
@@ -63,8 +69,20 @@ module Rails #:nodoc:
         end
       end
 
+      # Due to all models not getting loaded and messing up inheritance queries
+      # and indexing, we need to preload the models in order to address this.
+      #
+      # This will happen every request in development, once in ther other
+      # environments.
+      initializer "preload all application models" do |app|
+        config.to_prepare do
+          ::Rails::Mongoid.load_models(app)
+        end
+      end
+
       initializer "reconnect to master if application is preloaded" do
         config.after_initialize do
+
           # Unicorn clears the START_CTX when a worker is forked, so if we have
           # data in START_CTX then we know we're being preloaded. Unicorn does
           # not provide application-level hooks for executing code after the

data/lib/mongoid/railties/database.rake

@@ -57,9 +57,7 @@ namespace :db do
   if not Rake::Task.task_defined?("db:create_indexes")
     desc 'Create the indexes defined on your mongoid models'
     task :create_indexes => :environment do
-      Mongoid::Document.descendents.each do |model|
-        model.create_indexes
-      end
+      ::Rails::Mongoid.index_children(Mongoid::Document.descendants)
     end
   end
 

data/lib/mongoid/scope.rb

@@ -2,74 +2,25 @@
 module Mongoid #:nodoc:
   class Scope #:nodoc:
 
-    delegate :scopes, :to => :parent
+    attr_reader :conditions, :extensions
 
-    attr_reader :parent, :conditions
-
-    # If the other is a scope then compare the parent and conditions, otherwise
-    # if its enumerable collect and compare.
-    def ==(other)
-      case other
-      when Scope
-        @parent == other.parent && @conditions == other.conditions
-      when Enumerable
-        @collection ||= entries
-        return (@collection == other)
-      else
-        return false
-      end
-    end
-
-    # Create the new +Scope+. If a block is passed in, this Scope will extend
-    # the block.
+    # Create the new +Scope+. If a block is passed in, this Scope will store
+    # the block for future calls to #extend.
     #
     # Options:
     #
-    # parent: The class the scope belongs to, or a parent +Scope+.
     # conditions: A +Hash+ of conditions.
+    # block:      A +block+ of extension methods (optional)
     #
-    # Example:
-    #
-    #   Mongoid::Scope.new(Person, { :title => "Sir" }) do
-    #     def knighted?
-    #       title == "Sir"
-    #     end
-    #   end
-    def initialize(parent, conditions, &block)
-      @parent, @conditions = parent, conditions
-      extend Module.new(&block) if block_given?
+    def initialize(conditions = {}, &block)
+      @conditions = conditions
+      @extensions = Module.new(&block) if block_given?
     end
 
-    # Return the class for the +Scope+. This will be the parent if the parent
-    # is a class, otherwise will be nil.
-    def klass
-      @klass ||= @parent unless @parent.is_a?(Scope)
+    def extend(criteria)
+      @extensions ? criteria.extend(@extensions) : criteria
     end
 
-    # Chaining is supported through method_missing. If a scope is already
-    # defined with the method name the call will be passed there, otherwise it
-    # will be passed to the target or parent.
-    def method_missing(name, *args, &block)
-      if scopes.include?(name)
-        scopes[name].call(self, *args)
-      elsif klass
-        target.send(name, *args, &block)
-      else
-        @parent.fuse(@conditions); @parent.send(name, *args, &block)
-      end
-    end
-
-    # The +Scope+ must respond like a +Criteria+ object. If this is a parent
-    # criteria delegate to the target, otherwise bubble up to the parent.
-    def respond_to?(name)
-      super || (klass ? target.respond_to?(name) : @parent.respond_to?(name))
-    end
-
-    # Returns the target criteria if it has already been set or creates a new
-    # criteria from the parent class.
-    def target
-      @target ||= klass.criteria.fuse(@conditions)
-    end
   end
 end
 

data/lib/mongoid/validations/uniqueness.rb

@@ -21,16 +21,12 @@ module Mongoid #:nodoc:
       def validate_each(document, attribute, value)
         if document.embedded?
           return if document._parent.nil?
-
           criteria = document._parent.send(document.association_name)
-
           # If the parent document embeds_one, no need to validate uniqueness
           return if criteria.is_a?(Mongoid::Document)
-
           criteria = criteria.where(attribute => value, :_id => {'$ne' => document._id})
         else
           criteria = @klass.where(attribute => value)
-
           unless document.new_record?
             criteria = criteria.where(:_id => {'$ne' => document._id})
           end
@@ -39,9 +35,12 @@ module Mongoid #:nodoc:
         Array.wrap(options[:scope]).each do |item|
           criteria = criteria.where(item => document.attributes[item])
         end
-
         if criteria.exists?
-          document.errors.add(attribute, :taken, :default => options[:message], :value => value)
+          document.errors.add(
+            attribute,
+            :taken,
+            options.except(:case_sensistive, :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.beta.12"
+  VERSION = "2.0.0.beta.13"
 end

data/lib/rails/mongoid.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+module Rails #:nodoc:
+  module Mongoid #:nodoc:
+    class << self
+
+      # Use the application configuration to get every model and require it, so
+      # that indexing and inheritance work in both development and production
+      # with the same results.
+      def load_models(app)
+        app.config.paths.app.models.each do |path|
+          Dir.glob("#{path}/**/*.rb").sort.each do |file|
+            require_dependency(file)
+          end
+        end
+      end
+
+      # Recursive function to create all the indexes for the model, then
+      # potentially and subclass of the model since both are still root
+      # documents in the hierarchy.
+      #
+      # Note there is a tricky naming scheme going on here that needs to be
+      # revisisted. Module.descendants vs Class.descendents is way too
+      # confusing.
+      def index_children(children)
+        children.each do |model|
+          Logger.new($stdout).info("Generating indexes for #{model}")
+          model.create_indexes
+          index_children(model.descendants)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  hash: 62196475
+  hash: 62196473
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 12
-  version: 2.0.0.beta.12
+  - 13
+  version: 2.0.0.beta.13
 platform: ruby
 authors: 
 - Durran Jordan
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -04:00
+date: 2010-07-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,15 +26,15 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 31098225
+        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - beta
-        version: 3.0.0.beta
+        - rc
+        version: 3.0.0.rc
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 63
         segments: 
@@ -75,14 +75,14 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 1
         - 0
-        - 5
-        version: 1.0.5
+        - 6
+        version: 1.0.6
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 31
         segments: 
@@ -107,7 +107,7 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 31
         segments: 
@@ -141,14 +141,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196419
+        hash: 62196421
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 16
-        version: 2.0.0.beta.16
+        - 19
+        version: 2.0.0.beta.19
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -297,6 +297,7 @@ files:
 - lib/rails/generators/mongoid/model/model_generator.rb
 - lib/rails/generators/mongoid/model/templates/model.rb
 - lib/rails/generators/mongoid_generator.rb
+- lib/rails/mongoid.rb
 - MIT_LICENSE
 - README.rdoc
 has_rdoc: true