mongoid 2.0.0.beta.5 → 2.0.0.beta.7

data/lib/mongoid/persistence/insert.rb

@@ -22,7 +22,7 @@ module Mongoid #:nodoc:
       #
       # The +Document+, whether the insert succeeded or not.
       def persist
-        return @document if @validate && !@document.valid?
+        return @document if @validate && @document.invalid?(:create)
         @document.run_callbacks(:create) do
           @document.run_callbacks(:save) do
             if insert

data/lib/mongoid/persistence/insert_embedded.rb

@@ -24,12 +24,17 @@ module Mongoid #:nodoc:
       #
       # The +Document+, whether the insert succeeded or not.
       def persist
+        return @document if @validate && @document.invalid?(:create)
         parent = @document._parent
-        if parent.new_record?
-          parent.insert
-        else
-          update = { @document._inserter => { @document._position => @document.raw_attributes } }
-          @collection.update(parent._selector, update, @options.merge(:multi => false))
+        @document.run_callbacks(:create) do
+          @document.run_callbacks(:save) do
+            if parent.new_record?
+              parent.insert
+            else
+              update = { @document._inserter => { @document._position => @document.raw_attributes } }
+              @collection.update(parent._selector, update, @options.merge(:multi => false))
+            end
+          end
         end
         @document.new_record = false; @document
       end

data/lib/mongoid/persistence/remove_all.rb

@@ -28,8 +28,9 @@ module Mongoid #:nodoc:
       protected
       # Remove the document from the database.
       def remove
-        count = @collection.find(@selector.merge(:_type => @klass.name)).count
-        @collection.remove(@selector, @options)
+        selector = (@klass.hereditary ? @selector.merge(:_type => @klass.name) : @selector)
+        count = @collection.find(selector).count
+        @collection.remove(selector, @options)
         count
       end
     end

data/lib/mongoid/persistence/update.rb

@@ -39,11 +39,15 @@ module Mongoid #:nodoc:
       #
       # +true+ or +false+, depending on validation.
       def persist
-        return false if validate && !@document.valid?
+        return false if validate && @document.invalid?(:update)
         @document.run_callbacks(:save) do
           @document.run_callbacks(:update) do
             if update
               @document.move_changes
+              @document._children.each do |child|
+                child.move_changes
+                child.new_record = false if child.new_record?
+              end
             else
               return false
             end
@@ -54,8 +58,9 @@ module Mongoid #:nodoc:
       protected
       # Update the document in the database atomically.
       def update
-        if @document.changed?
-          @collection.update(@document._selector, { "$set" => @document.setters }, @options.merge(:multi => false))
+        updates = @document._updates
+        unless updates.empty?
+          @collection.update(@document._selector, updates, @options.merge(:multi => false))
         end; true
       end
     end

data/lib/mongoid/railtie.rb

@@ -1,3 +1,4 @@
+require "rails"
 module Rails #:nodoc:
   module Mongoid #:nodoc:
     class Railtie < Rails::Railtie #:nodoc:
@@ -5,6 +6,8 @@ module Rails #:nodoc:
       # do we want a custom log subscriber for mongoid?
       # log_subscriber :mongoid, ::Mongoid::Railties::LogSubscriber.new
 
+      config.generators.orm :mongoid, :migration => false
+
       rake_tasks do
         load "mongoid/railties/database.rake"
       end

data/lib/mongoid/railties/database.rake

@@ -1,36 +1,51 @@
 namespace :db do
 
-  desc 'Drops all the collections for the database for the current Rails.env'
-  task :drop => :environment do
-    Mongoid.master.collections.each{|col| col.drop unless col.name == 'system.users' }
+  if not 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.each{|col| col.drop unless col.name == 'system.users' || col.name == "system.indexes" }
+    end
   end
 
-  desc 'Load the seed data from db/seeds.rb'
-  task :seed => :environment do
-    seed_file = File.join(Rails.root, 'db', 'seeds.rb')
-    load(seed_file) if File.exist?(seed_file)
+  if not 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
+      seed_file = File.join(Rails.root, 'db', 'seeds.rb')
+      load(seed_file) if File.exist?(seed_file)
+    end
   end
 
-  desc 'Create the database, and initialize with the seed data'
-  task :setup => [ 'db:create', 'db:seed' ]
-
-  desc 'Delete data and seed'
-  task :reseed => [ 'db:drop', 'db:seed' ]
+  if not Rake::Task.task_defined?("db:setup")
+    desc 'Create the database, and initialize with the seed data'
+    task :setup => [ 'db:create', 'db:seed' ]
+  end
 
-  task :create => :environment do
-    # noop
+  if not Rake::Task.task_defined?("db:reseed")
+    desc 'Delete data and seed'
+    task :reseed => [ 'db:drop', 'db:seed' ]
   end
 
-  task :migrate => :environment do
-    # noop
+  if not Rake::Task.task_defined?("db:create")
+    task :create => :environment do
+      # noop
+    end
   end
 
-  namespace :schema do
-    task :load do
+  if not Rake::Task.task_defined?("db:migrate")
+    task :migrate => :environment do
       # noop
     end
   end
 
+  if not Rake::Task.task_defined?("db:schema:load")
+    namespace :schema do
+      task :load do
+        # noop
+      end
+    end
+  end
+
   ########
   # TODO: lots more useful db tasks can be added here. stuff like copyDatabase, etc
   ########

data/lib/mongoid/timestamps.rb

@@ -9,19 +9,16 @@ module Mongoid #:nodoc:
       set_callback :save, :before, :set_updated_at
     end
 
-    module InstanceMethods
-
-      # Update the created_at field on the Document to the current time. This is
-      # only called on create.
-      def set_created_at
-        self.created_at = Time.now.utc if !created_at
-      end
+    # Update the created_at field on the Document to the current time. This is
+    # only called on create.
+    def set_created_at
+      self.created_at = Time.now.utc if !created_at
+    end
 
-      # Update the updated_at field on the Document to the current time.
-      # This is only called on create and on save.
-      def set_updated_at
-        self.updated_at = Time.now.utc
-      end
+    # Update the updated_at field on the Document to the current time.
+    # This is only called on create and on save.
+    def set_updated_at
+      self.updated_at = Time.now.utc
     end
   end
 end

data/lib/mongoid/validations/uniqueness.rb

@@ -13,11 +13,23 @@ module Mongoid #:nodoc:
     #     validates_uniqueness_of :title
     #   end
     class UniquenessValidator < ActiveModel::EachValidator
+      # Unfortunately, we have to tie Uniqueness validators to a class.
+      def setup(klass)
+        @klass = klass
+      end
+      
       def validate_each(document, attribute, value)
-        conditions = {attribute => value}
-        conditions[options[:scope]] = document.attributes[options[:scope]] if options.has_key? :scope
-        return if document.class.where(conditions).empty?
-        if document.new_record? || key_changed?(document)
+        criteria = @klass.where(attribute => value)
+        
+        Array.wrap(options[:scope]).each do |item|
+          criteria = criteria.where(item => document.attributes[item])
+        end
+        
+        unless document.new_record?
+          criteria = criteria.where(:_id => {'$ne' => document._id})
+        end
+        
+        if criteria.exists?
           document.errors.add(attribute, :taken, :default => options[:message], :value => value)
         end
       end

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -10,17 +10,16 @@ module Mongoid #:nodoc:
       embeds_many :versions, :class_name => self.name
       set_callback :save, :before, :revise
     end
-    module InstanceMethods
-      # Create a new version of the +Document+. This will load the previous
-      # document from the database and set it as the next version before saving
-      # the current document. It then increments the version number.
-      def revise
-        last_version = self.class.first(:conditions => { :_id => id, :version => version })
-        if last_version
-          self.versions << last_version.clone
-          self.version = version + 1
-          @modifications["versions"] = [ nil, @attributes["versions"] ] if @modifications
-        end
+
+    # Create a new version of the +Document+. This will load the previous
+    # document from the database and set it as the next version before saving
+    # the current document. It then increments the version number.
+    def revise
+      last_version = self.class.first(:conditions => { :_id => id, :version => version })
+      if last_version
+        self.versions << last_version.clone
+        self.version = version + 1
+        @modifications["versions"] = [ nil, @attributes["versions"] ] if @modifications
       end
     end
   end

data/lib/rails/generators/mongoid/config/config_generator.rb

@@ -20,22 +20,6 @@ module Mongoid
         template 'mongoid.yml', File.join('config', "mongoid.yml")
       end
 
-      def inject_mongoid_into_application
-        config_application_path = File.join("config", "application.rb")
-        config_contents = File.read(config_application_path)
-
-        mongoid_require = "\n\nrequire 'mongoid/railtie'"
-
-        # check to see if its already been included
-        return if config_contents.include?(mongoid_require)
-
-        if config_contents.include?("require 'rails/all'")
-          inject_into_file config_application_path, mongoid_require, :after => "require 'rails/all'"
-        elsif config_contents.include?("require \"action_controller/railtie\"")
-          inject_into_file config_application_path, mongoid_require, :after => "require \"action_controller/railtie\""
-        end
-      end
-
     end
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
+  hash: 62196461
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 5
-  version: 2.0.0.beta.5
+  - 7
+  version: 2.0.0.beta.7
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,94 +17,124 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -04:00
+date: 2010-07-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31098225
         segments: 
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta
+        version: 3.0.0.beta
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: tzinfo
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 3
+        - 22
+        version: 0.3.22
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: will_paginate
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 961915916
         segments: 
         - 3
         - 0
         - pre
         version: 3.0.pre
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mongo
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
         - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bson
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
         - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 62196475
         segments: 
-        - 1
-        - 3
+        - 2
+        - 0
         - 0
-        version: 1.3.0
+        - beta
+        - 12
+        version: 2.0.0.beta.12
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written in Ruby.
 email: 
 - durran@gmail.com
@@ -114,16 +145,19 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/mongoid/associations/belongs_to_related.rb
 - lib/mongoid/associations/embedded_in.rb
 - lib/mongoid/associations/embeds_many.rb
 - lib/mongoid/associations/embeds_one.rb
-- lib/mongoid/associations/has_many_related.rb
-- lib/mongoid/associations/has_one_related.rb
+- lib/mongoid/associations/foreign_key.rb
 - lib/mongoid/associations/meta_data.rb
 - lib/mongoid/associations/options.rb
 - lib/mongoid/associations/proxy.rb
+- lib/mongoid/associations/referenced_in.rb
+- lib/mongoid/associations/references_many.rb
+- lib/mongoid/associations/references_many_as_array.rb
+- lib/mongoid/associations/references_one.rb
 - lib/mongoid/associations.rb
+- lib/mongoid/atomicity.rb
 - lib/mongoid/attributes.rb
 - lib/mongoid/callbacks.rb
 - lib/mongoid/collection.rb
@@ -170,6 +204,7 @@ files:
 - lib/mongoid/extensions/object/conversions.rb
 - lib/mongoid/extensions/objectid/conversions.rb
 - lib/mongoid/extensions/proc/scoping.rb
+- lib/mongoid/extensions/set/conversions.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb
 - lib/mongoid/extensions/symbol/inflections.rb
@@ -180,6 +215,7 @@ files:
 - lib/mongoid/field.rb
 - lib/mongoid/fields.rb
 - lib/mongoid/finders.rb
+- lib/mongoid/hierarchy.rb
 - lib/mongoid/identity.rb
 - lib/mongoid/indexes.rb
 - lib/mongoid/javascript/functions.yml
@@ -237,16 +273,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -255,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongoid
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Elegent Persistance in Ruby for MongoDB.