mongoid 2.0.0.rc.1 → 2.0.0.rc.2

data/lib/mongoid/errors/document_not_found.rb

@@ -11,7 +11,7 @@ module Mongoid #:nodoc
     # <tt>DocumentNotFound.new(Person, ["1", "2"])</tt>
     class DocumentNotFound < MongoidError
 
-      attr_reader :klass, :indentifiers
+      attr_reader :klass, :identifiers
 
       def initialize(klass, ids)
         @klass = klass

data/lib/mongoid/errors/validations.rb

@@ -2,7 +2,7 @@
 module Mongoid #:nodoc
   module Errors #:nodoc
 
-    # Raised when a persisence method ending in ! fails validation. The message
+    # Raised when a persistence method ending in ! fails validation. The message
     # will contain the full error messages from the +Document+ in question.
     #
     # Example:

data/lib/mongoid/nested_attributes.rb

@@ -4,6 +4,7 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
 
     module ClassMethods
+      REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |_, value| value.blank? } }
 
       # Used when needing to update related models from a parent relation. Can
       # be used on embedded or referenced relations.
@@ -29,6 +30,7 @@ module Mongoid #:nodoc:
       # @option *args [ true, false ] :update_only Only update existing docs.
       def accepts_nested_attributes_for(*args)
         options = args.extract_options!
+        options[:reject_if] = REJECT_ALL_BLANK_PROC if options[:reject_if] == :all_blank
         args.each do |name|
           define_method("#{name}_attributes=") do |attrs|
             relation = relations[name.to_s]

data/lib/mongoid/railtie.rb

@@ -10,7 +10,7 @@ module Rails #:nodoc:
   module Mongoid #:nodoc:
     class Railtie < Rails::Railtie #:nodoc:
 
-      config.generators.orm :mongoid, :migration => false
+      config.app_generators.orm :mongoid, :migration => false
 
       rake_tasks do
         load "mongoid/railties/database.rake"
@@ -81,6 +81,15 @@ module Rails #:nodoc:
           ::Rails::Mongoid.load_models(app) unless $rails_rake_task
         end
       end
+      
+      initializer "load http errors" do |app|
+        config.after_initialize do
+          ActionDispatch::ShowExceptions.rescue_responses.update({
+            "Mongoid::Errors::DocumentNotFound" => :not_found,
+            "Mongoid::Errors::Validations" => 422
+          })
+        end
+      end
 
       initializer "reconnect to master if application is preloaded" do
         config.after_initialize do

data/lib/mongoid/validations.rb

@@ -12,6 +12,8 @@ module Mongoid #:nodoc:
     included do
       include ActiveModel::Validations
 
+      attr_accessor :validated
+
       # Overrides the default ActiveModel behaviour since we need to handle
       # validations of relations slightly different than just calling the
       # getter.
@@ -25,11 +27,25 @@ module Mongoid #:nodoc:
       # @param [ Symbol ] attr The name of the field or relation.
       #
       # @return [ Object ] The value of the field or the relation.
+      #
+      # @since 2.0.0.rc.1
       def read_attribute_for_validation(attr)
         relations[attr.to_s] ? send(attr, false, :continue => false) : send(attr)
       end
     end
 
+    # Used to prevent infinite loops in associated validations.
+    #
+    # @example Is the document validated?
+    #   document.validated?
+    #
+    # @return [ true, false ] Has the document already been validated?
+    #
+    # @since 2.0.0.rc.2
+    def validated?
+      !!@validated
+    end
+
     module ClassMethods #:nodoc:
 
       # Validates whether or not an association is valid or not. Will correctly

data/lib/mongoid/validations/associated.rb

@@ -27,8 +27,13 @@ module Mongoid #:nodoc:
       # @param [ Symbol ] attribute The relation to validate.
       # @param [ Object ] value The value of the relation.
       def validate_each(document, attribute, value)
-        return if value.to_a.collect { |doc| doc.nil? || doc.valid? }.all?
-        document.errors.add(attribute, :invalid, options.merge(:value => value))
+        unless document.validated?
+          document.validated = true
+          return if value.to_a.collect { |doc| doc.nil? || doc.valid? }.all?
+          document.errors.add(attribute, :invalid, options.merge(:value => value))
+        else
+          document.validated = false
+        end
       end
     end
   end

data/lib/mongoid/version.rb

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

data/lib/rails/mongoid.rb

@@ -9,7 +9,7 @@ module Rails #:nodoc:
       def load_models(app)
         app.config.paths['app/models'].each do |path|
           Dir.glob("#{path}/**/*.rb").sort.each do |file|
-            require_dependency(file)
+            require_dependency(File.basename(file, ".rb"))
           end
         end
       end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 1
-  version: 2.0.0.rc.1
+  - 2
+  version: 2.0.0.rc.2
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -356,7 +356,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1989103359598370074
+      hash: 3519923910425248457
       segments: 
       - 0
       version: "0"