mongo_mapper-unstable 2010.08.08 → 2010.08.09

data/lib/mongo_mapper/plugins/keys/key.rb

@@ -21,6 +21,10 @@ module MongoMapper
           type.embeddable?
         end
 
+        def can_default_id?
+          type && [ObjectId, BSON::ObjectID, String].include?(type)
+        end
+
         def number?
           [Integer, Float].include?(type)
         end

data/lib/mongo_mapper/plugins/keys.rb

@@ -44,6 +44,11 @@ module MongoMapper
           object_id_keys.include?(name.to_sym)
         end
 
+        # API Private
+        def can_default_id?
+          keys['_id'].can_default_id?
+        end
+
         def to_mongo(instance)
           return nil if instance.nil?
           instance.to_mongo
@@ -268,8 +273,8 @@ module MongoMapper
 
           def default_id_value(attrs)
             unless attrs.nil?
-              provided_keys = attrs.keys.map { |k| k.to_s }
-              unless provided_keys.include?('_id') || provided_keys.include?('id')
+              id_provided = attrs.keys.map { |k| k.to_s }.detect { |k| k == 'id' || k == '_id' }
+              if !id_provided && self.class.can_default_id?
                 write_key :_id, BSON::ObjectID.new
               end
             end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.8.2'
+  Version = '0.8.3'
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 gem 'activesupport',     ENV['ACTIVE_SUPPORT_VERSION']
-gem 'json',              '~> 1.2.3'
+gem 'json'
 gem 'jnunemaker-matchy', '~> 0.4.0'
 gem 'shoulda',           '~> 2.10.2'
 gem 'timecop',           '~> 0.3.1'
@@ -10,10 +10,10 @@ $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'mongo_mapper'
 require 'fileutils'
 require 'ostruct'
-require 'pp'
 
 require 'active_support/version'
 require 'json'
+require 'log_buddy'
 require 'matchy'
 require 'shoulda'
 require 'timecop'
@@ -97,6 +97,7 @@ log_dir = File.expand_path('../../log', __FILE__)
 FileUtils.mkdir_p(log_dir) unless File.exist?(log_dir)
 logger = Logger.new(log_dir + '/test.log')
 
+LogBuddy.init(:logger => logger)
 MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, :logger => logger)
 MongoMapper.database = "mm-test-#{RUBY_VERSION.gsub('.', '-')}"
 MongoMapper.database.collections.each { |c| c.drop_indexes }

data/test/unit/test_keys.rb

@@ -4,6 +4,40 @@ require 'models'
 class KeyTest < Test::Unit::TestCase
   include MongoMapper::Plugins::Keys
 
+  context ".new with no id and _id of type integer" do
+    should "not error" do
+      lambda {
+        klass = Doc() do
+          key :_id, Integer
+        end
+        # No sensible default id for integer, people better pass them in if they user this
+        klass.new.id.should be_nil
+      }.should_not raise_error
+    end
+  end
+
+  context ".new with no id and _id of type string" do
+    should "not error" do
+      lambda {
+        klass = Doc() do
+          key :_id, String
+        end
+        klass.new.id.should_not be_nil
+      }.should_not raise_error
+    end
+  end
+
+  context ".new with no id and _id of type object id" do
+    should "not error" do
+      lambda {
+        klass = Doc() do
+          key :_id, ObjectId
+        end
+        klass.new.should_not be_nil
+      }.should_not raise_error
+    end
+  end
+
   context ".key?(:symbol)" do
     should "be true if document has key" do
       Address.key?(:city).should be_true

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2010
   - 8
-  - 8
-  version: 2010.08.08
+  - 9
+  version: 2010.08.09
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -05:00
+date: 2010-08-09 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 1
-        version: 0.3.1
+        - 3
+        version: 0.3.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -64,19 +64,29 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 2
-        - 3
-        version: 1.2.3
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: jnunemaker-matchy
+  name: log_buddy
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jnunemaker-matchy
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -86,11 +96,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -100,11 +110,11 @@ dependencies:
         - 2
         version: 2.10.2
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -114,11 +124,11 @@ dependencies:
         - 1
         version: 0.3.1
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -128,7 +138,7 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: 
 email: 
 - nunemaker@gmail.com