mongoid 2.0.0.rc.7 → 2.0.0.rc.8

data/lib/mongoid/state.rb

@@ -30,14 +30,15 @@ module Mongoid #:nodoc:
       @new_record = saved
     end
 
-    # Checks if the document has been saved to the database.
+    # Checks if the document has been saved to the database. Returns false
+    # if the document has been destroyed.
     #
     # @example Is the document persisted?
     #   person.persisted?
     #
     # @return [ true, false ] True if persisted, false if not.
     def persisted?
-      !new_record?
+      !new_record? && !destroyed?
     end
 
     # Returns true if the +Document+ has been succesfully destroyed, and false

data/lib/mongoid/timestamps.rb

@@ -1,38 +1,14 @@
 # encoding: utf-8
+require "mongoid/timestamps/created"
+require "mongoid/timestamps/updated"
+
 module Mongoid #:nodoc:
 
   # This module handles the behaviour for setting up document created at and
   # updated at timestamps.
   module Timestamps
     extend ActiveSupport::Concern
-
-    included do
-      field :created_at, :type => Time
-      field :updated_at, :type => Time
-
-      set_callback :create, :before, :set_created_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
-    end
-
-    # Update the created_at field on the Document to the current time. This is
-    # only called on create.
-    #
-    # @example Set the created at time.
-    #   person.set_created_at
-    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.
-    #
-    # @example Set the updated at time.
-    #   person.set_updated_at
-    def set_updated_at
-      self.updated_at = Time.now.utc
-    end
+    include Created
+    include Updated
   end
 end

data/lib/mongoid/timestamps/created.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+
+  module Timestamps
+    # This module handles the behaviour for setting up document created at
+    # timestamp.
+    module Created
+      extend ActiveSupport::Concern
+
+      included do
+        field :created_at, :type => Time
+
+        set_callback :create, :before, :set_created_at
+
+        unless methods.include? 'record_timestamps'
+          class_attribute :record_timestamps
+          self.record_timestamps = true
+        end
+      end
+
+      # Update the created_at field on the Document to the current time. This is
+      # only called on create.
+      #
+      # @example Set the created at time.
+      #   person.set_created_at
+      def set_created_at
+        self.created_at = Time.now.utc if !created_at
+      end
+    end
+  end
+end

data/lib/mongoid/timestamps/updated.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+
+  module Timestamps
+    # This module handles the behaviour for setting up document updated at
+    # timestamp.
+    module Updated
+      extend ActiveSupport::Concern
+
+      included do
+        field :updated_at, :type => Time
+
+        set_callback :save, :before, :set_updated_at, :if => Proc.new { |doc|
+          doc.new_record? || doc.changed?
+        }
+
+        unless methods.include? 'record_timestamps'
+          class_attribute :record_timestamps
+          self.record_timestamps = true
+        end
+      end
+
+      # Update the updated_at field on the Document to the current time.
+      # This is only called on create and on save.
+      #
+      # @example Set the updated at time.
+      #   person.set_updated_at
+      def set_updated_at
+        self.updated_at = Time.now.utc
+      end
+    end
+  end
+end

data/lib/mongoid/validations.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "mongoid/validations/associated"
+require "mongoid/validations/referenced"
 require "mongoid/validations/uniqueness"
 
 module Mongoid #:nodoc:
@@ -104,13 +105,19 @@ module Mongoid #:nodoc:
       # was not provided or set to true.
       #
       # @example Set up validation.
-      #   Person.validate_relation(metadata)
+      #   Person.validates_relation(metadata)
       #
       # @param [ Metadata ] metadata The relation metadata.
       #
       # @since 2.0.0.rc.1
-      def validate_relation(metadata)
-        validates_associated(metadata.name) if metadata.validate?
+      def validates_relation(metadata)
+        if metadata.validate?
+          if metadata.embedded?
+            validates_associated(metadata.name)
+          else
+            validates_with(ReferencedValidator, _merge_attributes([metadata.name]))
+          end
+        end
       end
     end
   end

data/lib/mongoid/validations/referenced.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Validations #:nodoc:
+
+    # Validates whether or not an association is valid or not. Will correctly
+    # handle has one and has many associations. Will *not* load associations if
+    # they aren't already in memory.
+    #
+    # @example Set up the association validations.
+    #
+    #   class Person
+    #     include Mongoid::Document
+    #     references_many :posts, :validate => true
+    #   end
+    class ReferencedValidator < ActiveModel::EachValidator
+
+      # Validate the document for the initialized attributes. Will not load
+      # any association that's not currently loaded.
+      #
+      # @param [ Document ] document The document to validate.
+      def validate(document)
+        attributes.each do |attribute|
+          value = document.instance_variable_get("@#{attribute}".to_sym)
+          validate_each(document, attribute, value)
+        end
+      end
+
+      # Validates that the already loaded associations provided are either all
+      # nil or unchanged or all valid. If neither is true then the appropriate
+      # errors will be added to the parent document.
+      #
+      # @example Validate the loaded association.
+      #   validator.validate_each(document, :name, name)
+      #
+      # @param [ Document ] document The document to validate.
+      # @param [ Symbol ] attribute The relation to validate.
+      # @param [ Object ] value The value of the relation.
+      def validate_each(document, attribute, value)
+        document.validated = true
+        valid =
+          if !value || !value.target
+            true
+          else
+            Array.wrap(value).collect do |doc|
+              if doc.nil? || (!doc.changed? && !doc.new_record?)
+                true
+              else
+                doc.validated? ? true : doc.valid?
+              end
+            end.all?
+          end
+        document.validated = false
+        return if valid
+        document.errors.add(attribute, :invalid, options.merge(:value => value))
+      end
+    end
+  end
+end

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -9,9 +9,11 @@ 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, :if => :changed?
+      set_callback :save, :before, :revise, :if => :revisable?
 
+      class_attribute :version_max
       delegate :version_max, :to => "self.class"
     end
 
@@ -22,18 +24,78 @@ module Mongoid #:nodoc:
     #
     # @example Revise the document.
     #   person.revise
+    #
+    # @since 1.0.0
     def revise
-      last_version = self.class.first(:conditions => { :_id => id, :version => version })
-      if last_version
-        versions.target << last_version.clone
+      previous = find_last_version
+      if previous
+        versions.target << previous.clone
         versions.shift if version_max.present? && versions.length > version_max
         self.version = (version || 1 ) + 1
         @modifications["versions"] = [ nil, versions.as_document ] if @modifications
       end
     end
 
+    # Executes a block that temporarily disables versioning. This is for cases
+    # where you do not want to version on every save.
+    #
+    # @example Execute a save without versioning.
+    #   person.versionless(&:save)
+    #
+    # @return [ Object ] The document or result of the block execution.
+    #
+    # @since 2.0.0
+    def versionless
+      @versionless = true
+      result = yield(self) if block_given?
+      @versionless = false
+      result || self
+    end
+
+    private
+
+    # Find the previous version of this document in the database, or if the
+    # document had been saved without versioning return the persisted one.
+    #
+    # @example Find the last version.
+    #   document.find_last_version
+    #
+    # @return [ Document, nil ] The previously saved document.
+    #
+    # @since 2.0.0
+    def find_last_version
+      self.class.
+        where(:_id => id).
+        any_of({ :version => version }, { :version => nil }).first
+    end
+
+    # Is the document able to be revised? This is true if the document has
+    # changed and we have not explicitly told it not to version.
+    #
+    # @example Is the document revisable?
+    #   document.revisable?
+    #
+    # @return [ true, false ] If the document is revisable.
+    #
+    # @since 2.0.0
+    def revisable?
+      changed? && !versionless?
+    end
+
+    # Are we in versionless mode? This is true if in a versionless block on the
+    # document.
+    #
+    # @example Is the document in versionless mode?
+    #   document.versionless?
+    #
+    # @return [ true, false ] Is the document not currently versioning.
+    #
+    # @since 2.0.0
+    def versionless?
+      !!@versionless
+    end
+
     module ClassMethods #:nodoc:
-      attr_accessor :version_max
 
       # Sets the maximum number of versions to store.
       #

data/lib/rails/generators/mongoid/model/templates/model.rb

@@ -1,3 +1,4 @@
+<% module_namespacing do -%>
 class <%= class_name %><%= " < #{options[:parent].classify}" if options[:parent] %>
 <% unless options[:parent] -%>
   include Mongoid::Document
@@ -15,3 +16,4 @@ class <%= class_name %><%= " < #{options[:parent].classify}" if options[:parent]
   embedded_in :<%= attribute.name%>, :inverse_of => :<%= class_name.tableize %>
 <% end -%>
 end
+<% end -%>

data/lib/rails/generators/mongoid/observer/observer_generator.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+require "rails/generators/mongoid_generator"
+
+module Mongoid #:nodoc:
+  module Generators #:nodoc:
+    class ObserverGenerator < Base #:nodoc:
+
+      check_class_collision :suffix => "Observer"
+
+      def create_observer_file
+        template 'observer.rb', File.join('app/models', class_path, "#{file_name}_observer.rb")
+      end
+
+      hook_for :test_framework
+    end
+  end
+end

data/lib/rails/generators/mongoid/observer/templates/observer.rb

@@ -0,0 +1,4 @@
+<% module_namespacing do -%>
+class <%= class_name %>Observer < Mongoid::Observer
+end
+<% end -%>

data/lib/rails/generators/mongoid_generator.rb

@@ -8,7 +8,16 @@ module Mongoid #:nodoc:
 
       def self.source_root
         @_mongoid_source_root ||=
-        File.expand_path("../#{base_name}/#{generator_name}/templates", __FILE__)
+          File.expand_path("../#{base_name}/#{generator_name}/templates", __FILE__)
+      end
+
+      unless methods.include?(:module_namespacing)
+
+        # This is only defined on Rails edge at the moment, so include here now
+        # as per: https://github.com/mongoid/mongoid/issues/744
+        def module_namespacing(&block)
+          yield if block
+        end
       end
     end
 

data/lib/rails/mongoid.rb

@@ -12,6 +12,7 @@ module Rails #:nodoc:
     #
     # @param [ Application ] app The rails application.
     def load_models(app)
+      return unless ::Mongoid.preload_models
       app.config.paths["app/models"].each do |path|
         Dir.glob("#{path}/**/*.rb").sort.each do |file|
           load_model(file.gsub("#{path}/" , "").gsub(".rb", ""))

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 7
-  version: 2.0.0.rc.7
+  - 8
+  version: 2.0.0.rc.8
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 +01:00
+date: 2011-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,7 +150,9 @@ files:
 - lib/config/locales/es.yml
 - lib/config/locales/fr.yml
 - lib/config/locales/hu.yml
+- lib/config/locales/id.yml
 - lib/config/locales/it.yml
+- lib/config/locales/ja.yml
 - lib/config/locales/kr.yml
 - lib/config/locales/nl.yml
 - lib/config/locales/pl.yml
@@ -159,6 +161,7 @@ files:
 - lib/config/locales/ro.yml
 - lib/config/locales/ru.yml
 - lib/config/locales/sv.yml
+- lib/config/locales/vi.yml
 - lib/config/locales/zh-CN.yml
 - lib/mongoid/atomicity.rb
 - lib/mongoid/attributes/processing.rb
@@ -168,6 +171,7 @@ files:
 - lib/mongoid/collections/cyclic_iterator.rb
 - lib/mongoid/collections/master.rb
 - lib/mongoid/collections/operations.rb
+- lib/mongoid/collections/retry.rb
 - lib/mongoid/collections/slaves.rb
 - lib/mongoid/collections.rb
 - lib/mongoid/components.rb
@@ -176,12 +180,12 @@ files:
 - lib/mongoid/config.rb
 - lib/mongoid/contexts/enumerable/sort.rb
 - lib/mongoid/contexts/enumerable.rb
-- lib/mongoid/contexts/ids.rb
 - lib/mongoid/contexts/mongo.rb
 - lib/mongoid/contexts/paging.rb
 - lib/mongoid/contexts.rb
 - lib/mongoid/copyable.rb
 - lib/mongoid/criteria.rb
+- lib/mongoid/criterion/builder.rb
 - lib/mongoid/criterion/complex.rb
 - lib/mongoid/criterion/creational.rb
 - lib/mongoid/criterion/exclusion.rb
@@ -199,6 +203,7 @@ files:
 - lib/mongoid/errors/invalid_field.rb
 - lib/mongoid/errors/invalid_options.rb
 - lib/mongoid/errors/invalid_type.rb
+- lib/mongoid/errors/mixed_relations.rb
 - lib/mongoid/errors/mongoid_error.rb
 - lib/mongoid/errors/too_many_nested_attribute_records.rb
 - lib/mongoid/errors/unsaved_document.rb
@@ -260,15 +265,19 @@ files:
 - lib/mongoid/matchers/size.rb
 - lib/mongoid/matchers/strategies.rb
 - lib/mongoid/matchers.rb
-- lib/mongoid/modifiers/command.rb
-- lib/mongoid/modifiers/inc.rb
-- lib/mongoid/modifiers.rb
 - lib/mongoid/multi_database.rb
 - lib/mongoid/multi_parameter_attributes.rb
 - lib/mongoid/named_scope.rb
 - lib/mongoid/nested_attributes.rb
+- lib/mongoid/observer.rb
 - lib/mongoid/paranoia.rb
 - lib/mongoid/paths.rb
+- lib/mongoid/persistence/atomic/add_to_set.rb
+- lib/mongoid/persistence/atomic/inc.rb
+- lib/mongoid/persistence/atomic/operation.rb
+- lib/mongoid/persistence/atomic/pull_all.rb
+- lib/mongoid/persistence/atomic/push.rb
+- lib/mongoid/persistence/atomic.rb
 - lib/mongoid/persistence/command.rb
 - lib/mongoid/persistence/insert.rb
 - lib/mongoid/persistence/insert_embedded.rb
@@ -309,6 +318,12 @@ files:
 - lib/mongoid/relations/cascading.rb
 - lib/mongoid/relations/constraint.rb
 - lib/mongoid/relations/cyclic.rb
+- lib/mongoid/relations/embedded/atomic/operation.rb
+- lib/mongoid/relations/embedded/atomic/pull.rb
+- lib/mongoid/relations/embedded/atomic/push_all.rb
+- lib/mongoid/relations/embedded/atomic/set.rb
+- lib/mongoid/relations/embedded/atomic/unset.rb
+- lib/mongoid/relations/embedded/atomic.rb
 - lib/mongoid/relations/embedded/in.rb
 - lib/mongoid/relations/embedded/many.rb
 - lib/mongoid/relations/embedded/one.rb
@@ -329,9 +344,13 @@ files:
 - lib/mongoid/safety.rb
 - lib/mongoid/scope.rb
 - lib/mongoid/serialization.rb
+- lib/mongoid/sharding.rb
 - lib/mongoid/state.rb
+- lib/mongoid/timestamps/created.rb
+- lib/mongoid/timestamps/updated.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/validations/associated.rb
+- lib/mongoid/validations/referenced.rb
 - lib/mongoid/validations/uniqueness.rb
 - lib/mongoid/validations.rb
 - lib/mongoid/version.rb
@@ -341,6 +360,8 @@ files:
 - lib/rails/generators/mongoid/config/templates/mongoid.yml
 - lib/rails/generators/mongoid/model/model_generator.rb
 - lib/rails/generators/mongoid/model/templates/model.rb
+- lib/rails/generators/mongoid/observer/observer_generator.rb
+- lib/rails/generators/mongoid/observer/templates/observer.rb
 - lib/rails/generators/mongoid_generator.rb
 - lib/rails/mongoid.rb
 - LICENSE
@@ -360,7 +381,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2421077816225192598
+      hash: 2466233120358762618
       segments: 
       - 0
       version: "0"