mongo_mapper 0.8.2 → 0.8.3

data/examples/keys.rb

@@ -13,6 +13,7 @@ class User
   key :age,         Integer
   key :skills,      Array
   key :friend_ids,  Array, :typecast => 'ObjectId'
+  key :links,       Hash
   timestamps!
 end
 User.collection.remove # empties collection
@@ -22,6 +23,7 @@ john = User.create({
   :last_name  => 'Nunemaker',
   :age        => 28,
   :skills     => ['ruby', 'mongo', 'javascript'],
+  :links      => {"Google" => "http://www.google.com"}
 }) 
 
 steve = User.create({
@@ -32,6 +34,7 @@ steve = User.create({
 })
 
 john.friend_ids << steve.id.to_s # will get typecast to ObjectId
+john.links["Ruby on Rails"] = "http://www.rubyonrails.com"
 john.save
 
 pp john

data/examples/modifiers/set.rb

@@ -0,0 +1,25 @@
+$LOAD_PATH.unshift(File.expand_path('../../../lib', __FILE__))
+require 'mongo_mapper'
+require 'pp'
+
+MongoMapper.database = 'testing'
+
+class User
+  include MongoMapper::Document
+  
+  key :name, String
+  key :tags, Array
+end
+User.collection.remove # empties collection
+
+john = User.create(:name => 'John',  :tags => %w[ruby mongo], :age => 28)
+bill = User.create(:name => 'Bill',  :tags => %w[ruby mongo], :age => 30)
+
+User.set({:name => 'John'}, :tags => %[ruby])
+pp john.reload
+
+User.set(john.id, :tags => %w[ruby mongo])
+pp john.reload
+
+john.set(:tags => %w[something different])
+pp john.reload

data/lib/mongo_mapper.rb

@@ -8,7 +8,6 @@ module MongoMapper
   autoload :Connection,             'mongo_mapper/connection'
 
   autoload :Error,                  'mongo_mapper/exceptions'
-  autoload :KeyNotFound,            'mongo_mapper/exceptions'
   autoload :DocumentNotFound,       'mongo_mapper/exceptions'
   autoload :InvalidScheme,          'mongo_mapper/exceptions'
   autoload :DocumentNotValid,       'mongo_mapper/exceptions'

data/lib/mongo_mapper/exceptions.rb

@@ -3,9 +3,6 @@ module MongoMapper
   # generic MM error
   class Error < StandardError; end
 
-  # raised when key expected to exist but not found
-  class KeyNotFound < Error; end
-
   # raised when document expected but not found
   class DocumentNotFound < Error; end
 

data/lib/mongo_mapper/plugins/associations/collection.rb

@@ -12,6 +12,11 @@ module MongoMapper
           end
         end
 
+        def include?(*args)
+          load_target
+          target.include?(*args)
+        end
+
         def reset
           super
           target = []

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
@@ -290,8 +295,6 @@ module MongoMapper
               value = key.get(instance_variable_get(:"@#{key_name}"))
               set_parent_document(key, value)
               instance_variable_set(:"@#{key_name}", value)
-            else
-              raise KeyNotFound, "Could not find key: #{key_name.inspect}"
             end
           end
 

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/version.rb

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

data/test/functional/associations/test_many_documents_proxy.rb

@@ -307,6 +307,16 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       @project2.save
     end
 
+    context "include?" do
+      should "return true if in association" do
+        @project1.statuses.should include(@brand_new)
+      end
+
+      should "return false if not in association" do
+        @project1.statuses.should_not include(@in_progress)
+      end
+    end
+
     context "dynamic finders" do
       should "work with single key" do
         @project1.statuses.find_by_name('New').should == @brand_new

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_embedded_document.rb

@@ -387,9 +387,9 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
             doc[:name].should == 'string'
           end
 
-          should "raise exception when key not found" do
+          should "return nil when not found" do
             doc = @document.new(:name => 'string')
-            assert_raises(MongoMapper::KeyNotFound) { doc[:not_here] }
+            doc[:not_here].should be_nil
           end
         end
 

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

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -04:00
+date: 2010-08-09 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: jnunemaker-validatable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 1
         - 8
@@ -49,86 +54,110 @@ dependencies:
   name: plucky
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
         - 3
-        - 1
-        version: 0.3.1
+        - 3
+        version: 0.3.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         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 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jnunemaker-matchy
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
         - 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 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 2
         - 10
         - 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 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 3
         - 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 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: 
 email: 
 - nunemaker@gmail.com
@@ -141,6 +170,7 @@ extra_rdoc_files: []
 files: 
 - bin/mmconsole
 - examples/keys.rb
+- examples/modifiers/set.rb
 - examples/plugins.rb
 - examples/querying.rb
 - examples/scopes.rb
@@ -281,23 +311,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby Object Mapper for Mongo