mongoid 2.0.0.rc.2 → 2.0.0.rc.3

data/lib/config/locales/kr.yml

@@ -8,43 +8,43 @@ kr:
     errors:
       messages:
         document_not_found:
-		클라스 %{klass}와 id를 %{identifiers} 위한 문서를 찾을수 없습니다.
+          클라스 %{klass}와 id를 %{identifiers} 위한 문서를 찾을수 없습니다.
           #Document not found for class %{klass} with id(s) %{identifiers}.
 
         invalid_database:
-		데이타베이스가 Mongo::DB이어야 합니다, %{name}이면 안됩니다.
+          데이타베이스가 Mongo::DB이어야 합니다, %{name}이면 안됩니다.
           #Database should be a Mongo::DB, not %{name}.
 
         invalid_type:
-		데이터 필드가 %{klass} 처럼 정의를 내립니다. 하지만 그것은  %{other}를 %{value} 으로 산출되어  받습니다
+          데이터 필드가 %{klass} 처럼 정의를 내립니다. 하지만 그것은  %{other}를 %{value} 으로 산출되어  받습니다
           #Field was defined as a(n) %{klass}, but received a %{other} with
           #the value %{value}.
 
         unsupported_version:
-		MongoDB %{version} 를 사용할수 없습니다. %{mongo_version} 으로 업그레이드 시켜주세요.
+          MongoDB %{version} 를 사용할수 없습니다. %{mongo_version} 으로 업그레이드 시켜주세요.
           #MongoDB %{version} not supported, please upgrade
           #to %{mongo_version}.
 
         validations:
-		 확인할수 없습니다 - %{errors}.
+          확인할수 없습니다 - %{errors}.
           #Validation failed - %{errors}.
 
         invalid_collection:
-		 %{klass} 를 위한 콜렉션에 접근하는것은 임베디드 문서이게 때문에 허락되지 않습니다. 루트 문서에서 콜렉션을 접근해 주세요
+          %{klass} 를 위한 콜렉션에 접근하는것은 임베디드 문서이게 때문에 허락되지 않습니다. 루트 문서에서 콜렉션을 접근해 주세요
           #Access to the collection for %{klass} is not allowed since it
           #is an embedded document, please access a collection from
           #the root document.
 
         invalid_field:
-		필드의 정의를 %{name}으로 이름짓는것은 허락되지 않습니다. 
-		Mongoid 내부의 속성과 메서드이름이 충돌이 되므로 필드의 정의를 내리지 마세요. 
-		어떤이름이 포함되는지 보려면 Document#instance_methods를 사용하세요.
+          필드의 정의를 %{name}으로 이름짓는것은 허락되지 않습니다.
+          Mongoid 내부의 속성과 메서드이름이 충돌이 되므로 필드의 정의를 내리지 마세요.
+          어떤이름이 포함되는지 보려면 Document#instance_methods를 사용하세요.
           #Defining a field named %{name} is not allowed. Do not define
           #fields that conflict with Mongoid internal attributes or method
           #names. Use Document#instance_methods to see what names this includes.
-        
-	too_many_nested_attribute_records:
-		 %{association} 을 위한 내부의 속성을 수용하는것은 %{limit}데이터로 제한되어있습니다.
+
+        too_many_nested_attribute_records:
+          %{association} 을 위한 내부의 속성을 수용하는것은 %{limit}데이터로 제한되어있습니다.
           #Accepting nested attributes for %{association} is limited
           #to %{limit} records.
 
@@ -53,13 +53,13 @@ kr:
           #Options for embedded_in association must include inverse_of.
 
         dependent_only_references_one_or_many:
-		공급되는 dependent => destroy|delete  옵션은 오직  references_one 또는 references_many 관련되는것에서만 확인 가능합니다.
+          공급되는 dependent => destroy|delete  옵션은 오직  references_one 또는 references_many 관련되는것에서만 확인 가능합니다.
           #The dependent => destroy|delete option that was supplied
           #is only valid on references_one or references_many associations.
 
         association_cant_have_inverse_of:
- 		 이관련된것에서 inverse_of 처럼  정의내리는것은 허락되지 않습니다. 
-		 오직 embedded_in 에있는 옵션 또는 array된 references_many 옵션을 사용하세요
+          이관련된것에서 inverse_of 처럼  정의내리는것은 허락되지 않습니다.
+          오직 embedded_in 에있는 옵션 또는 array된 references_many 옵션을 사용하세요
           #Defining an inverse_of on this association is not allowed. Only
           #use this option on embedded_in or references_many as array.
 

data/lib/mongoid/railtie.rb

@@ -81,7 +81,9 @@ module Rails #:nodoc:
           ::Rails::Mongoid.load_models(app) unless $rails_rake_task
         end
       end
-      
+
+      # Set the proper error types for Rails. DocumentNotFound errors should be
+      # 404s and not 500s, validation errors are 422s.
       initializer "load http errors" do |app|
         config.after_initialize do
           ActionDispatch::ShowExceptions.rescue_responses.update({

data/lib/mongoid/relations/macros.rb

@@ -134,6 +134,7 @@ module Mongoid # :nodoc:
           end
         end
         alias :belongs_to_related :referenced_in
+        alias :belongs_to :referenced_in
 
         # Adds a relational association from a parent Document to many
         # Documents in another database or collection.
@@ -163,6 +164,7 @@ module Mongoid # :nodoc:
           end
         end
         alias :has_many_related :references_many
+        alias :has_many :referenced_in
 
         # Adds a relational many-to-many association between many of this
         # Document and many of another Document.
@@ -190,6 +192,7 @@ module Mongoid # :nodoc:
             reference(meta)
           end
         end
+        alias :has_and_belongs_to_many :references_and_referenced_in_many
 
         # Adds a relational association from the child Document to a Document in
         # another database or collection.
@@ -218,6 +221,7 @@ module Mongoid # :nodoc:
           end
         end
         alias :has_one_related :references_one
+        alias :has_one :references_one
 
         private
 

data/lib/mongoid/validations.rb

@@ -32,18 +32,18 @@ module Mongoid #:nodoc:
       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
+      # 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
     end
 
     module ClassMethods #:nodoc:

data/lib/mongoid/validations/associated.rb

@@ -29,7 +29,9 @@ module Mongoid #:nodoc:
       def validate_each(document, attribute, value)
         unless document.validated?
           document.validated = true
-          return if value.to_a.collect { |doc| doc.nil? || doc.valid? }.all?
+          valid = value.to_a.collect { |doc| doc.nil? || doc.valid? }.all?
+          document.validated = false
+          return if valid
           document.errors.add(attribute, :invalid, options.merge(:value => value))
         else
           document.validated = false

data/lib/mongoid/version.rb

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

data/lib/rails/mongoid.rb

@@ -1,33 +1,57 @@
 # encoding: utf-8
 module Rails #:nodoc:
   module Mongoid #:nodoc:
-    class << self
+    extend 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.basename(file, ".rb"))
-          end
+    # 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.
+    #
+    # @example Load all the application models.
+    #   Rails::Mongoid.load_models(app)
+    #
+    # @param [ Application ] app The rails application.
+    def load_models(app)
+      app.config.paths["app/models"].each do |path|
+        Dir.glob("#{path}/**/*.rb").sort.each do |file|
+          load_model(file.gsub("#{path}/" , "").gsub(".rb", ""))
         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
+    # 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.
+    #
+    # @example Index the children.
+    #   Rails::Mongoid.index_children(classes)
+    #
+    # @param [ Array<Class> ] children The child model classes.
+    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
+
+    private
+
+    # I don't want to mock out kernel for unit testing purposes, so added this
+    # method as a convenience.
+    #
+    # @example Load the model.
+    #   Mongoid.load_model("/mongoid/behaviour")
+    #
+    # @param [ String ] file The base filename.
+    #
+    # @since 2.0.0.rc.3
+    def load_model(file)
+      require_dependency(file)
+    end
   end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 2
-  version: 2.0.0.rc.2
+  - 3
+  version: 2.0.0.rc.3
 platform: ruby
 authors: 
 - Durran Jordan
@@ -356,7 +356,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3519923910425248457
+      hash: -1678984237143289701
       segments: 
       - 0
       version: "0"