mongoid 2.0.0.beta.16 → 2.0.0.beta.17

data/lib/config/locales/kr.yml

@@ -0,0 +1,65 @@
+kr:
+  activemodel:
+    errors:
+      messages:
+        taken: 이미 사용하고있습니다 #is already taken
+
+  mongoid:
+    errors:
+      messages:
+        document_not_found:
+		클라스 %{klass}와 id를 %{identifiers} 위한 문서를 찾을수 없습니다.
+          #Document not found for class %{klass} with id(s) %{identifiers}.
+
+        invalid_database:
+		데이타베이스가 Mongo::DB이어야 합니다, %{name}이면 안됩니다.
+          #Database should be a Mongo::DB, not %{name}.
+
+        invalid_type:
+		데이터 필드가 %{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} not supported, please upgrade
+          #to %{mongo_version}.
+
+        validations:
+		 확인할수 없습니다 - %{errors}.
+          #Validation failed - %{errors}.
+
+        invalid_collection:
+		 %{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를 사용하세요.
+          #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}데이터로 제한되어있습니다.
+          #Accepting nested attributes for %{association} is limited
+          #to %{limit} records.
+
+        embedded_in_must_have_inverse_of:
+          embedded_in 관련되는 옵션은 inverse_of 를 포함해야만 합니다.
+          #Options for embedded_in association must include inverse_of.
+
+        dependent_only_references_one_or_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 옵션을 사용하세요
+          #Defining an inverse_of on this association is not allowed. Only
+          #use this option on embedded_in or references_many as array.
+

data/lib/config/locales/pt-br.yml

@@ -0,0 +1,40 @@
+pt-br:
+  activemodel:
+    errors:
+      messages:
+        taken: já está utilizada
+
+  mongoid:
+    errors:
+      messages:
+        document_not_found:
+          Nenhum documento encontrado para a classe %{klass} com os id(s) %{identifiers}.
+        invalid_database:
+          A base de dados deverá ser uma Mongo::DB, em vez de %{name}.
+        invalid_type:
+          O campo foi definido como %{klass}, mas recebeu uma instância de %{other} com
+          o valor %{value}.
+        unsupported_version:
+          MongoDB %{version} não é suportada, por favor atualize para a 
+          versão %{mongo_version}.
+        validations:
+          A validação falhou - %{errors}.
+        invalid_collection:
+          O acesso à colecção para %{klass} não é permitido porque
+          é um documento embutido, por favor acesse à colecção através
+          do documento raiz.
+        invalid_field:
+          Não é permitido definir um campo com o nome %{name}. Não defina
+          campos que entrem em conflito com os nomes dos atributos internos e métodos 
+          do Mongoid. Use Document#instance_methods para consultar esses nomes.
+        too_many_nested_attribute_records:
+          A aceitação de atributos encadeados para %{association} encontra-se limitada
+          a %{limit} registros.
+        embedded_in_must_have_inverse_of:
+          As opções para uma associação embedded_in devem incluir inverse_of.
+        dependent_only_references_one_or_many:
+          A opção The dependent => destroy|delete que é fornecida
+          é apenas válida para associações references_one ou references_many.
+        association_cant_have_inverse_of:
+          A definição de inverse_of nesta associação não é permitida. Apenas
+          use esta opção em embedded_in ou references_many as array.

data/lib/config/locales/pt.yml

@@ -29,7 +29,7 @@ pt:
           do Mongoid. Use Document#instance_methods para consultar esses nomes.
         too_many_nested_attribute_records:
           A aceitação de atributos encadeados para %{association} encontra-se limitada
-          a %{limit} registos.
+          a %{limit} registros.
         embedded_in_must_have_inverse_of:
           As opções para uma associação embedded_in devem incluir inverse_of.
         dependent_only_references_one_or_many:

data/lib/mongoid/attributes.rb

@@ -30,8 +30,8 @@ module Mongoid #:nodoc:
     end
 
     # Override respond_to? so it responds properly for dynamic attributes
-    def respond_to?(sym)
-      (Mongoid.allow_dynamic_fields && @attributes && @attributes.has_key?(sym.to_s)) || super
+    def respond_to?(*args)
+      (Mongoid.allow_dynamic_fields && @attributes && @attributes.has_key?(args.first.to_s)) || super
     end
 
     # Process the provided attributes casting them to their proper values if a
@@ -73,6 +73,7 @@ module Mongoid #:nodoc:
       typed_value = fields.has_key?(access) ? fields[access].get(value) : value
       accessed(access, typed_value)
     end
+    alias :[] :read_attribute
 
     # Remove a value from the +Document+ attributes. If the value does not exist
     # it will fail gracefully.
@@ -131,6 +132,7 @@ module Mongoid #:nodoc:
       modify(access, @attributes[access], typed_value_for(access, value))
       notify if !id.blank? && new_record?
     end
+    alias :[]= :write_attribute
 
     # Writes the supplied attributes +Hash+ to the +Document+. This will only
     # overwrite existing attributes if they are present in the new +Hash+, all

data/lib/mongoid/config.rb

@@ -162,11 +162,11 @@ module Mongoid #:nodoc
     #
     # <tt>Mongoid::Config.instance.from_hash({})</tt>
     def from_hash(settings)
-      _master(settings)
-      _slaves(settings)
       settings.except("database", "slaves").each_pair do |name, value|
         send("#{name}=", value) if respond_to?("#{name}=")
       end
+      _master(settings)
+      _slaves(settings)
     end
 
     # Adds a new I18n locale file to the load path

data/lib/mongoid/criterion/inclusion.rb

@@ -59,7 +59,8 @@ module Mongoid #:nodoc:
       # Returns: <tt>self</tt>
       def any_of(*args)
         criterion = @selector["$or"] || []
-        @selector["$or"] = criterion.concat(args)
+        expanded = args.collect(&:expand_complex_criteria)
+        @selector["$or"] = criterion.concat(expanded)
         self
       end
       alias :or :any_of

data/lib/mongoid/criterion/selector.rb

@@ -44,7 +44,7 @@ module Mongoid #:nodoc:
         when Regexp
           value
         else
-          field.set(value)
+          field.type == Array ? value.class.set(value) : field.set(value)
         end
       end
 

data/lib/mongoid/errors/mongoid_error.rb

@@ -20,7 +20,7 @@ module Mongoid #:nodoc
       #
       # A localized error message string.
       def translate(key, options)
-        I18n.translate("#{BASE_KEY}.#{key}", options)
+        ::I18n.translate("#{BASE_KEY}.#{key}", options)
       end
     end
   end

data/lib/mongoid/railtie.rb

@@ -65,7 +65,7 @@ module Rails #:nodoc:
           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"
+              puts "to generate one run: rails generate mongoid:config\n\n"
             end
           end
         end

data/lib/mongoid/safety.rb

@@ -12,13 +12,13 @@ module Mongoid #:nodoc:
     # Example:
     #
     # <tt>person.safely.upsert</tt>
-    # <tt>person.safely.destroy</tt>
+    # <tt>person.safely(:w => 2, :fsync => true).destroy</tt>
     #
     # Returns:
     #
     # A +Proxy+ to the +Document+.
-    def safely
-      Proxy.new(self)
+    def safely(safety = true)
+      Proxy.new(self, safety)
     end
 
     module ClassMethods #:nodoc:
@@ -28,13 +28,13 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>Person.safely.create(:name => "John")</tt>
-      # <tt>Person.safely.delete_all</tt>
+      # <tt>Person.safely(:w => 2, :fsync => true).delete_all</tt>
       #
       # Returns:
       #
       # A +Proxy+ to the +Document+ class.
-      def safely
-        Proxy.new(self)
+      def safely(safety = true)
+        Proxy.new(self, safety)
       end
     end
 
@@ -48,15 +48,17 @@ module Mongoid #:nodoc:
     # not safe mode is allowed.
     class Proxy
 
-      attr_reader :target
+      attr_reader :target, :safety_options
 
       # Create the new +Proxy+.
       #
       # Options:
       #
       # target: Either the class or the instance.
-      def initialize(target)
+      # safety_options: true or a hash of options
+      def initialize(target, safety_options)
         @target = target
+        @safety_options = safety_options
       end
 
       # We will use method missing to proxy calls to the target.
@@ -67,7 +69,7 @@ module Mongoid #:nodoc:
       def method_missing(*args)
         name = args[0]
         attributes = args[1] || {}
-        @target.send(name, attributes.merge(:safe => true))
+        @target.send(name, attributes.merge(:safe => safety_options))
       end
 
       # Increment the field by the provided value, else if it doesn't exists set
@@ -79,7 +81,7 @@ module Mongoid #:nodoc:
       # value: The value to increment by.
       # options: Options to pass through to the driver.
       def inc(field, value, options = {})
-        @target.inc(field, value, :safe => true)
+        @target.inc(field, value, :safe => safety_options)
       end
 
       # Update the +Document+ attributes in the datbase.
@@ -93,7 +95,7 @@ module Mongoid #:nodoc:
       # +true+ if validation passed, +false+ if not.
       def update_attributes(attributes = {})
         @target.write_attributes(attributes)
-        @target.update(:safe => true)
+        @target.update(:safe => safety_options)
       end
 
       # Update the +Document+ attributes in the datbase.
@@ -107,7 +109,7 @@ module Mongoid #:nodoc:
       # +true+ if validation passed, raises an error if not
       def update_attributes!(attributes = {})
         @target.write_attributes(attributes)
-        result = update(:safe => true)
+        result = update(:safe => safety_options)
         @target.class.fail_validate!(self) unless result
         result
       end
@@ -122,7 +124,7 @@ module Mongoid #:nodoc:
       #
       # Returns: the +Document+.
       def create(attributes = {})
-        @target.new(attributes).tap { |doc| doc.insert(:safe => true) }
+        @target.new(attributes).tap { |doc| doc.insert(:safe => safety_options) }
       end
 
       # Create a new +Document+. This will instantiate a new document and
@@ -137,7 +139,7 @@ module Mongoid #:nodoc:
       # Returns: the +Document+.
       def create!(attributes = {})
         document = @target.new(attributes)
-        fail_validate!(document) if document.insert(:safe => true).errors.any?
+        fail_validate!(document) if document.insert(:safe => safety_options).errors.any?
         document
       end
 
@@ -154,7 +156,7 @@ module Mongoid #:nodoc:
       def delete_all(conditions = {})
         Mongoid::Persistence::RemoveAll.new(
           @target,
-          { :validate => false, :safe => true },
+          { :validate => false, :safe => safety_options },
           conditions[:conditions] || {}
         ).persist
       end
@@ -172,7 +174,7 @@ module Mongoid #:nodoc:
       def destroy_all(conditions = {})
         documents = @target.all(conditions)
         count = documents.count
-        documents.each { |doc| doc.destroy(:safe => true) }
+        documents.each { |doc| doc.destroy(:safe => safety_options) }
         count
       end
     end

data/lib/mongoid/version.rb

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

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 16
-  version: 2.0.0.beta.16
+  - 17
+  version: 2.0.0.beta.17
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -04:00
+date: 2010-08-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        version: 3.0.0.rc
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -40,7 +39,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -185,7 +184,9 @@ files:
 - lib/config/locales/es.yml
 - lib/config/locales/fr.yml
 - lib/config/locales/it.yml
+- lib/config/locales/kr.yml
 - lib/config/locales/pl.yml
+- lib/config/locales/pt-br.yml
 - lib/config/locales/pt.yml
 - lib/config/locales/sv.yml
 - lib/mongoid/associations/embedded_in.rb
@@ -333,7 +334,7 @@ has_rdoc: true
 homepage: http://mongoid.org
 licenses: []
 
-post_install_message: "   _________________________________\n  |:::::::::::::::::::::::::::::::::| \"I find your lack of faith disturbing.\"\n  |:::::::::::::;;::::::::::::::::::|\n  |:::::::::::'~||~~~``:::::::::::::| Mongoid 2 introduces\n  |::::::::'   .':     o`:::::::::::| a different way of defining how\n  |:::::::' oo | |o  o    ::::::::::| ids are stored on documents, as\n  |::::::: 8  .'.'    8 o  :::::::::| well as how foreign key fields\n  |::::::: 8  | |     8    :::::::::| and indexes are stored.\n  |::::::: _._| |_,...8    :::::::::|\n  |::::::'~--.   .--. `.   `::::::::| If you were using String\n  |:::::'     =8     ~  \\ o ::::::::| representations of BSON::ObjectIDs\n  |::::'       8._ 88.   \\ o::::::::| as your document ids, all of your\n  |:::'   __. ,.ooo~~.    \\ o`::::::| documents will now need to tell\n  |:::   . -. 88`78o/:     \\  `:::::| Mongoid to use Strings like so:\n  |::'     /. o o \\ ::      \\88`::::|\n  |:;     o|| 8 8 |d.        `8 `:::| class User\n  |:.       - ^ ^ -'           `-`::|   include Mongoid::Document\n  |::.                          .:::|   identity :type => String\n  |:::::.....           ::'     ``::| end\n  |::::::::-'`-        88          `|\n  |:::::-'.          -       ::     | All ids will default to\n  |:-~. . .                   :     | BSON:ObjectIDs from now on, and\n  | .. .   ..:   o:8      88o       | Config#use_object_ids has been\n  |. .     :::   8:P     d888. . .  | removed.\n  |.   .   :88   88      888'  . .  |\n  |   o8  d88P . 88   ' d88P   ..   | Foreign key fields for relational\n  |  88P  888   d8P   ' 888         | associations no longer index by\n  |   8  d88P.'d:8  .- dP~ o8       | default - you will need to pass\n  |      888   888    d~ o888    LS | :index => true to the association\n  |_________________________________| definition to have the field indexed\n\n  or create the index manually, which is the preferred method. Note that\n  if you were using String ids and now want to use object ids instead you\n  will have to migrate your database manually - Mongoid cannot perform\n  this for you automatically. If you were using custom composite keys,\n  these will need to be defined as Strings since they cannot be converted.\n\n  You can run a rake task to convert all your string object ids to ObjectID (thanks to Kyle Banker):\n\n  rake db:mongoid:objectid_convert\n\n  Your old collections will be backed up to their original names appended with \"_old\".\n  If you verify your site is still working good with the ObjectIDs, you can clean them up using:\n\n  rake db:mongoid:cleanup_old_collections\n\n"
+post_install_message: 
 rdoc_options: []
 
 require_paths: 
@@ -343,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2440289374354549879
+      hash: 408136898212555646
       segments: 
       - 0
       version: "0"