mongoid 2.0.0.alpha → 2.0.0.beta.5

data/lib/mongoid/persistence/insert_embedded.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    # Insert is a persistence command responsible for taking a document that
+    # has not been saved to the database and saving it. This specific class
+    # handles the case when the document is embedded in another.
+    #
+    # The underlying query resembles the following MongoDB query:
+    #
+    #   collection.insert(
+    #     { "_id" : 1, "field" : "value" },
+    #     false
+    #   );
+    class InsertEmbedded < Command
+      # Insert the new document in the database. If the document's parent is a
+      # new record, we will call save on the parent, otherwise we will $push
+      # the document onto the parent.
+      #
+      # Example:
+      #
+      # <tt>Insert.persist</tt>
+      #
+      # Returns:
+      #
+      # The +Document+, whether the insert succeeded or not.
+      def persist
+        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))
+        end
+        @document.new_record = false; @document
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/remove.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    # Remove is a persistence command responsible for deleting a document from
+    # the database.
+    #
+    # The underlying query resembles the following MongoDB query:
+    #
+    #   collection.remove(
+    #     { "_id" : 1 },
+    #     false
+    #   );
+    class Remove < Command
+      # Remove the document from the database: delegates to the MongoDB
+      # collection remove method.
+      #
+      # Example:
+      #
+      # <tt>Remove.persist</tt>
+      #
+      # Returns:
+      #
+      # +true+ if success, +false+ if not.
+      def persist
+        remove
+      end
+
+      protected
+      # Remove the document from the database.
+      def remove
+        if @document.embedded?
+          Persistence::RemoveEmbedded.new(@document, @validate).persist
+        else
+          @collection.remove({ :_id => @document.id }, @options)
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/remove_all.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    # Remove is a persistence command responsible for deleting a document from
+    # the database.
+    #
+    # The underlying query resembles the following MongoDB query:
+    #
+    #   collection.remove(
+    #     { "field" : value },
+    #     false
+    #   );
+    class RemoveAll < Command
+      # Remove the document from the database: delegates to the MongoDB
+      # collection remove method.
+      #
+      # Example:
+      #
+      # <tt>Remove.persist</tt>
+      #
+      # Returns:
+      #
+      # +true+ if success, +false+ if not.
+      def persist
+        remove
+      end
+
+      protected
+      # Remove the document from the database.
+      def remove
+        count = @collection.find(@selector.merge(:_type => @klass.name)).count
+        @collection.remove(@selector, @options)
+        count
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/remove_embedded.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    # Remove is a persistence command responsible for deleting a document from
+    # the database.
+    #
+    # The underlying query resembles the following MongoDB query:
+    #
+    #   collection.remove(
+    #     { "_id" : 1 },
+    #     false
+    #   );
+    class RemoveEmbedded < Command
+      # Insert the new document in the database. If the document's parent is a
+      # new record, we will call save on the parent, otherwise we will $push
+      # the document onto the parent.
+      #
+      # Remove the document from the database. If the parent is a new record,
+      # it will get removed in Ruby only. If the parent is not a new record
+      # then either an $unset or $set will occur, depending if it's an
+      # embeds_one or embeds_many.
+      #
+      # Example:
+      #
+      # <tt>RemoveEmbedded.persist</tt>
+      #
+      # Returns:
+      #
+      # +true+ or +false+, depending on if the removal passed.
+      def persist
+        parent = @document._parent
+        parent.remove(@document)
+        unless parent.new_record?
+          update = { @document._remover => removal_selector }
+          @collection.update(parent._selector, update, @options.merge(:multi => false))
+        end; true
+      end
+
+      protected
+      # Get the value to pass to the removal modifier.
+      def setter
+        @document._index ? @document.id : true
+      end
+
+      def removal_selector
+        @document._index ? { @document._pull => { "_id" => @document.id } } : { @document._path => setter }
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/update.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    # Update is a persistence command responsible for taking a document that
+    # has already been saved to the database and saving it, depending on
+    # whether or not the document has been modified.
+    #
+    # Before persisting the command will check via dirty attributes if the
+    # document has changed, if not, it will simply return true. If it has it
+    # will go through the validation steps, run callbacks, and set the changed
+    # fields atomically on the document. The underlying query resembles the
+    # following MongoDB query:
+    #
+    #   collection.update(
+    #     { "_id" : 1,
+    #     { "$set" : { "field" : "value" },
+    #     false,
+    #     false
+    #   );
+    #
+    # For embedded documents it will use the positional locator:
+    #
+    #   collection.update(
+    #     { "_id" : 1, "addresses._id" : 2 },
+    #     { "$set" : { "addresses.$.field" : "value" },
+    #     false,
+    #     false
+    #   );
+    #
+    class Update < Command
+      # Persist the document that is to be updated to the database. This will
+      # only write changed fields via MongoDB's $set modifier operation.
+      #
+      # Example:
+      #
+      # <tt>Update.persist</tt>
+      #
+      # Returns:
+      #
+      # +true+ or +false+, depending on validation.
+      def persist
+        return false if validate && !@document.valid?
+        @document.run_callbacks(:save) do
+          @document.run_callbacks(:update) do
+            if update
+              @document.move_changes
+            else
+              return false
+            end
+          end
+        end; true
+      end
+
+      protected
+      # Update the document in the database atomically.
+      def update
+        if @document.changed?
+          @collection.update(@document._selector, { "$set" => @document.setters }, @options.merge(:multi => false))
+        end; true
+      end
+    end
+  end
+end

data/lib/mongoid/railtie.rb

@@ -0,0 +1,53 @@
+module Rails #:nodoc:
+  module Mongoid #:nodoc:
+    class Railtie < Rails::Railtie #:nodoc:
+
+      # do we want a custom log subscriber for mongoid?
+      # log_subscriber :mongoid, ::Mongoid::Railties::LogSubscriber.new
+
+      rake_tasks do
+        load "mongoid/railties/database.rake"
+      end
+
+      # Initialize Mongoid. This will look for a mongoid.yml in the config
+      # directory and configure mongoid appropriately.
+      #
+      # Example mongoid.yml:
+      #
+      #   defaults: &defaults
+      #     host: localhost
+      #     slaves:
+      #       # - host: localhost
+      #         # port: 27018
+      #       # - host: localhost
+      #         # port: 27019
+      #     allow_dynamic_fields: false
+      #     parameterize_keys: false
+      #     persist_in_safe_mode: false
+      #
+      #   development:
+      #     <<: *defaults
+      #     database: mongoid
+      initializer "setup database" do
+        config_file = Rails.root.join("config", "mongoid.yml")
+        if config_file.file?
+          settings = YAML.load(ERB.new(config_file.read).result)[Rails.env]
+          ::Mongoid.from_hash(settings) if settings.present?
+        end
+      end
+
+      initializer "verify that mongoid is configured" do
+        config.after_initialize do
+          begin
+            ::Mongoid.master
+          rescue ::Mongoid::Errors::InvalidDatabase => e
+            unless Rails.root.join("config", "mongoid.yml").file?
+              puts "\nMongoid config not found. Create a config file at: config/mongoid.yml"
+              puts "to generate one run: script/rails generate mongoid:config\n\n"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/railties/database.rake

@@ -0,0 +1,37 @@
+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' }
+  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)
+  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' ]
+
+  task :create => :environment do
+    # noop
+  end
+
+  task :migrate => :environment do
+    # noop
+  end
+
+  namespace :schema do
+    task :load do
+      # noop
+    end
+  end
+
+  ########
+  # TODO: lots more useful db tasks can be added here. stuff like copyDatabase, etc
+  ########
+end

data/lib/mongoid/timestamps.rb

@@ -5,7 +5,8 @@ module Mongoid #:nodoc:
     included do
       field :created_at, :type => Time
       field :updated_at, :type => Time
-      before_save :set_created_at, :set_updated_at
+      set_callback :create, :before, :set_created_at
+      set_callback :save, :before, :set_updated_at
     end
 
     module InstanceMethods
@@ -22,6 +23,5 @@ module Mongoid #:nodoc:
         self.updated_at = Time.now.utc
       end
     end
-
   end
 end

data/lib/mongoid/validations.rb

@@ -23,8 +23,8 @@ module Mongoid #:nodoc:
       #
       #   class Person
       #     include Mongoid::Document
-      #     embed_one :name
-      #     embed_many :addresses
+      #     embeds_one :name
+      #     embeds_many :addresses
       #
       #     validates_associated :name, :addresses
       #   end

data/lib/mongoid/validations/associated.rb

@@ -8,8 +8,8 @@ module Mongoid #:nodoc:
     #
     #   class Person
     #     include Mongoid::Document
-    #     embed_one :name
-    #     embed_many :addresses
+    #     embeds_one :name
+    #     embeds_many :addresses
     #
     #     validates_associated :name, :addresses
     #   end

data/lib/mongoid/validations/uniqueness.rb

@@ -14,8 +14,19 @@ module Mongoid #:nodoc:
     #   end
     class UniquenessValidator < ActiveModel::EachValidator
       def validate_each(document, attribute, value)
-        return if document.class.where(attribute => value, :_id.ne => document._id).empty?
-        document.errors.add(attribute, :taken, :default => options[:message], :value => 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)
+          document.errors.add(attribute, :taken, :default => options[:message], :value => value)
+        end
+      end
+
+      protected
+      def key_changed?(document)
+        (document.primary_key || {}).each do |key|
+          return true if document.send("#{key}_changed?")
+        end; false
       end
     end
   end

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -7,8 +7,8 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
     included do
       field :version, :type => Integer, :default => 1
-      embed_many :versions, :class_name => self.name
-      before_save :revise
+      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
@@ -19,6 +19,7 @@ module Mongoid #:nodoc:
         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

@@ -0,0 +1,41 @@
+# encoding: utf-8
+require 'rails/generators/mongoid_generator'
+
+module Mongoid
+  module Generators
+    class ConfigGenerator < Rails::Generators::Base
+      desc "Creates a Mongoid configuration file at config/mongoid.yml"
+
+      argument :database_name, :type => :string, :optional => true
+
+      def self.source_root
+        @_mongoid_source_root ||= File.expand_path("../templates", __FILE__)
+      end
+
+      def app_name
+        Rails::Application.subclasses.first.parent.to_s.underscore
+      end
+
+      def create_config_file
+        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