mongoid 2.0.0 → 2.0.1

data/lib/mongoid/config.rb

@@ -40,13 +40,14 @@ module Mongoid #:nodoc
     option :binding_defaults, :default => { :binding => false, :continue => true }
     option :embedded_object_id, :default => true
     option :include_root_in_json, :default => false
+    option :max_retries_on_connection_failure, :default => 0
     option :parameterize_keys, :default => true
     option :persist_in_safe_mode, :default => false
     option :preload_models, :default => true
     option :raise_not_found_error, :default => true
     option :skip_version_check, :default => false
     option :time_zone, :default => nil
-    option :max_retries_on_connection_failure, :default => 0
+    option :use_utc, :default => false
 
     # Adds a new I18n locale file to the load path.
     #
@@ -114,6 +115,23 @@ module Mongoid #:nodoc
       configure_extras(options["databases"])
     end
 
+    # Load the settings from a compliant mongoid.yml file. This can be used for
+    # easy setup with frameworks other than Rails.
+    #
+    # @example Configure Mongoid.
+    #   Mongoid.load!("/path/to/mongoid.yml")
+    #
+    # @param [ String ] path The path to the file.
+    #
+    # @since 2.0.1
+    def load!(path)
+      environment = defined?(Rails) ? Rails.env : ENV["RACK_ENV"]
+      settings = YAML.load(ERB.new(File.new(path).read).result)[environment]
+      if settings.present?
+        from_hash(settings)
+      end
+    end
+
     # Returns the logger, or defaults to Rails logger or stdout logger.
     #
     # @example Get the logger.
@@ -259,30 +277,6 @@ module Mongoid #:nodoc
       @slaves
     end
 
-    # Sets whether the times returned from the database are in UTC or local time.
-    # If you omit this setting, then times will be returned in
-    # the local time zone.
-    #
-    # @example Set the use of UTC.
-    #   config.use_utc = true
-    #
-    # @param [ true, false ] value Whether to use UTC or not.
-    #
-    # @return [ true, false ] Are we using UTC?
-    def use_utc=(value)
-      @use_utc = value || false
-    end
-
-    # Returns whether times are return from the database in UTC. If
-    # this setting is false, then times will be returned in the local time zone.
-    #
-    # @example Are we using UTC?
-    #   config.use_utc
-    #
-    # @return [ true, false ] True if UTC, false if not.
-    attr_reader :use_utc
-    alias :use_utc? :use_utc
-
     protected
 
     # Check if the database is valid and the correct version.

data/lib/mongoid/fields.rb

@@ -35,7 +35,6 @@ module Mongoid #:nodoc
       def field(name, options = {})
         access = name.to_s
         set_field(access, options)
-        attr_protected name if options[:accessible] == false
       end
 
       # Return the fields for this class.
@@ -120,7 +119,11 @@ module Mongoid #:nodoc
       # @param [ Hash ] options The options.
       def create_accessors(name, meth, options = {})
         generated_field_methods.module_eval do
-          define_method(meth) { read_attribute(name) }
+          if [ Time, DateTime ].include?(options[:type])
+            define_method(meth) { Time.get(read_attribute(name)) }
+          else
+            define_method(meth) { read_attribute(name) }
+          end
           define_method("#{meth}=") { |value| write_attribute(name, value) }
           define_method("#{meth}?") do
             attr = read_attribute(name)

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -112,13 +112,10 @@ module Mongoid # :nodoc:
           # attrs: The single document attributes to process.
           def process(attrs)
             return if reject?(attrs)
-            if attrs[:id] or attrs['id'] or attrs['_id']
-              id = attrs[:id] || attrs['id'] || attrs['_id']
+            if id = attrs[:id] || attrs["id"] || attrs["_id"]
               document = existing.find(convert_id(id))
               destroyable?(attrs) ? document.destroy : document.update_attributes(attrs)
             else
-              # @todo: Durran: Tell the push not to save the base and call it
-              #   after all processing is done. This is related to #581.
               existing.push(metadata.klass.new(attrs)) unless destroyable?(attrs)
             end
           end

data/lib/mongoid/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Durran Jordan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +02:00
+date: 2011-04-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,8 +70,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 3
+        version: "1.3"
   type: :runtime
   prerelease: false
   version_requirements: *id004
@@ -84,8 +84,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 3
+        version: "1.3"
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -379,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2548695650621036943
+      hash: -858318852006999862
       segments: 
       - 0
       version: "0"