mongoid 1.2.9 → 1.2.10

data/VERSION

@@ -1 +1 @@
-1.2.9
+1.2.10

data/lib/mongoid.rb

@@ -46,6 +46,7 @@ require "mongoid/config"
 require "mongoid/contexts"
 require "mongoid/criteria"
 require "mongoid/cursor"
+require "mongoid/deprecation"
 require "mongoid/extensions"
 require "mongoid/extras"
 require "mongoid/errors"
@@ -88,10 +89,20 @@ module Mongoid #:nodoc
     #
     # The Mongoid +Config+ singleton instance.
     def configure
-      config = Config.instance
+      config = Mongoid::Config.instance
       block_given? ? yield(config) : config
     end
 
+    # Easy convenience method for having an alert generated from the
+    # deprecation module.
+    #
+    # Example:
+    #
+    # <tt>Mongoid.deprecate("Method no longer used")</tt>
+    def deprecate(message)
+      Mongoid::Deprecation.instance.alert(message)
+    end
+
     alias :config :configure
   end
 
@@ -101,7 +112,7 @@ module Mongoid #:nodoc
   # Example:
   #
   # <tt>Mongoid.database = Mongo::Connection.new.db("test")</tt>
-  Config.public_instance_methods(false).each do |name|
+  Mongoid::Config.public_instance_methods(false).each do |name|
     (class << self; self; end).class_eval <<-EOT
       def #{name}(*args)
         configure.send("#{name}", *args)

data/lib/mongoid/deprecation.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  class Deprecation #:nodoc
+    include Singleton
+
+    # Alert of a deprecation. This will delegate to the logger and call warn on
+    # it.
+    #
+    # Example:
+    #
+    # <tt>deprecation.alert("Method no longer used")</tt>
+    def alert(message)
+      @logger.warn("Deprecation: #{message}")
+    end
+
+    protected
+    # Instantiate a new logger to stdout or a rails logger if available.
+    def initialize
+      @logger = defined?(Rails) ? Rails.logger : Logger.new($stdout)
+    end
+  end
+end

data/lib/mongoid/extras.rb

@@ -35,7 +35,7 @@ module Mongoid #:nodoc:
       #
       # True if cached, false if not.
       def cached?
-        self.cached == true
+        !!self.cached
       end
 
       # Set whether or not this documents read operations should delegate to
@@ -57,7 +57,7 @@ module Mongoid #:nodoc:
       #
       # True if enslaved, false if not.
       def enslaved?
-        self.enslaved == true
+        !!self.enslaved
       end
     end
   end

data/lib/mongoid/fields.rb

@@ -6,9 +6,8 @@ module Mongoid #:nodoc
         extend ClassMethods
         # Set up the class attributes that must be available to all subclasses.
         # These include defaults, fields
-        class_inheritable_accessor :defaults, :fields
+        class_inheritable_accessor :fields
 
-        self.defaults = {}
         self.fields = {}
 
         delegate :defaults, :fields, :to => "self.class"
@@ -31,7 +30,15 @@ module Mongoid #:nodoc
       def field(name, options = {})
         access = name.to_s
         set_field(access, options)
-        set_default(access, options)
+      end
+
+      # Returns the default values for the fields on the document
+      def defaults
+        fields.inject({}) do |defs,(field_name,field)|
+          next(defs) if field.default.nil?
+          defs[field_name.to_s] = field.default
+          defs
+        end
       end
 
       protected
@@ -52,11 +59,6 @@ module Mongoid #:nodoc
         end
       end
 
-      # Set up a default value for a field.
-      def set_default(name, options = {})
-        value = options[:default]
-        defaults[name] = value unless value.nil?
-      end
     end
   end
 end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.9"
+  s.version = "1.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-03-09}
+  s.date = %q{2010-03-12}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/criterion/inclusion.rb",
      "lib/mongoid/criterion/optional.rb",
      "lib/mongoid/cursor.rb",
+     "lib/mongoid/deprecation.rb",
      "lib/mongoid/document.rb",
      "lib/mongoid/errors.rb",
      "lib/mongoid/extensions.rb",
@@ -181,6 +182,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/criterion/inclusion_spec.rb",
      "spec/unit/mongoid/criterion/optional_spec.rb",
      "spec/unit/mongoid/cursor_spec.rb",
+     "spec/unit/mongoid/deprecation_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/errors_spec.rb",
      "spec/unit/mongoid/extensions/array/accessors_spec.rb",
@@ -302,6 +304,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/criterion/inclusion_spec.rb",
      "spec/unit/mongoid/criterion/optional_spec.rb",
      "spec/unit/mongoid/cursor_spec.rb",
+     "spec/unit/mongoid/deprecation_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/errors_spec.rb",
      "spec/unit/mongoid/extensions/array/accessors_spec.rb",

data/spec/integration/mongoid/associations_spec.rb

@@ -240,6 +240,12 @@ describe Mongoid::Associations do
         @person.name.last_name.should == "Brown"
       end
 
+      it "sets the new_record values properly" do
+        from_db = Person.find(@person.id)
+        new_name = from_db.create_name(:first_name => "Flash")
+        new_name.new_record?.should be_false
+      end
+
     end
 
     context "multiple levels nested" do

data/spec/unit/mongoid/deprecation_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe Mongoid::Deprecation do
+
+  let(:logger) do
+    stub.quacks_like(Logger.allocate)
+  end
+
+  before do
+    Logger.expects(:new).with($stdout).returns(logger)
+  end
+
+  describe "#alert" do
+
+    let(:deprecation) do
+      Mongoid::Deprecation.instance
+    end
+
+    it "calls warn on the memoized logger" do
+      logger.expects(:warn).with("Deprecation: testing")
+      deprecation.alert("testing")
+    end
+  end
+end

data/spec/unit/mongoid/extras_spec.rb

@@ -20,13 +20,6 @@ describe Mongoid::Extras do
 
   end
 
-  describe ".cached" do
-
-    it "defaults to false" do
-      @klass.cached.should be_false
-    end
-  end
-
   describe ".cached?" do
 
     context "when the class is cached" do
@@ -73,13 +66,6 @@ describe Mongoid::Extras do
 
   end
 
-  describe ".enslaved" do
-
-    it "defaults to false" do
-      @klass.enslaved.should be_false
-    end
-  end
-
   describe ".enslaved?" do
 
     context "when the class is enslaved" do

data/spec/unit/mongoid/fields_spec.rb

@@ -12,6 +12,23 @@ describe Mongoid::Fields do
 
   describe "#defaults" do
 
+    context "with defaults specified as a non-primitive" do
+      before do
+        Person.field(:hash_testing, :type => Hash, :default => {})
+        Person.field(:array_testing, :type => Array, :default => [])
+        @first_person = Person.new
+        @second_person = Person.new
+      end
+
+      it "should not return the same object when calling defaults with a default hash" do
+        @first_person.hash_testing.object_id.should_not == @second_person.hash_testing.object_id
+      end
+
+      it "should not return the same object when calling defaults with a default array" do
+        @first_person.array_testing.object_id.should_not == @second_person.array_testing.object_id
+      end
+    end
+
     context "on parent classes" do
 
       before do

data/spec/unit/mongoid_spec.rb

@@ -9,7 +9,6 @@ describe Mongoid do
       it "returns the config singleton" do
         Mongoid.configure.should == Mongoid::Config.instance
       end
-
     end
 
     context "when a block is supplied" do
@@ -29,9 +28,19 @@ describe Mongoid do
       it "sets the values on the config instance" do
         Mongoid.allow_dynamic_fields.should be_false
       end
+    end
+  end
 
+  describe ".deprecate" do
+
+    before do
+      @deprecation = mock
+      Mongoid::Deprecation.expects(:instance).returns(@deprecation)
     end
 
+    it "calls alert on the deprecation singleton" do
+      @deprecation.expects(:alert).with("testing")
+      Mongoid.deprecate("testing")
+    end
   end
-
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 9
-  version: 1.2.9
+  - 10
+  version: 1.2.10
 platform: ruby
 authors: 
 - Durran Jordan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 -05:00
+date: 2010-03-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,6 +156,7 @@ files:
 - lib/mongoid/criterion/inclusion.rb
 - lib/mongoid/criterion/optional.rb
 - lib/mongoid/cursor.rb
+- lib/mongoid/deprecation.rb
 - lib/mongoid/document.rb
 - lib/mongoid/errors.rb
 - lib/mongoid/extensions.rb
@@ -275,6 +276,7 @@ files:
 - spec/unit/mongoid/criterion/inclusion_spec.rb
 - spec/unit/mongoid/criterion/optional_spec.rb
 - spec/unit/mongoid/cursor_spec.rb
+- spec/unit/mongoid/deprecation_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb
@@ -420,6 +422,7 @@ test_files:
 - spec/unit/mongoid/criterion/inclusion_spec.rb
 - spec/unit/mongoid/criterion/optional_spec.rb
 - spec/unit/mongoid/cursor_spec.rb
+- spec/unit/mongoid/deprecation_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb