mongo_mapper-unstable 2010.3.8 → 2010.06.23

data/lib/mongo_mapper/plugins.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     def plugins
@@ -10,25 +11,5 @@ module MongoMapper
       mod.configure(self)          if mod.respond_to?(:configure)
       plugins << mod
     end
-
-    autoload :Callbacks,      'mongo_mapper/plugins/callbacks'
-    autoload :Clone,          'mongo_mapper/plugins/clone'
-    autoload :Descendants,    'mongo_mapper/plugins/descendants'
-    autoload :Dirty,          'mongo_mapper/plugins/dirty'
-    autoload :Equality,       'mongo_mapper/plugins/equality'
-    autoload :IdentityMap,    'mongo_mapper/plugins/identity_map'
-    autoload :Inspect,        'mongo_mapper/plugins/inspect'
-    autoload :Keys,           'mongo_mapper/plugins/keys'
-    autoload :Logger,         'mongo_mapper/plugins/logger'
-    autoload :Modifiers,      'mongo_mapper/plugins/modifiers'
-    autoload :Protected,      'mongo_mapper/plugins/protected'
-    autoload :Rails,          'mongo_mapper/plugins/rails'
-    autoload :Serialization,  'mongo_mapper/plugins/serialization'
-    autoload :Timestamps,     'mongo_mapper/plugins/timestamps'
-    autoload :Userstamps,     'mongo_mapper/plugins/userstamps'
-    autoload :Validations,    'mongo_mapper/plugins/validations'
   end
 end
-
-require 'mongo_mapper/plugins/associations'
-require 'mongo_mapper/plugins/pagination'

data/lib/mongo_mapper/support/descendant_appends.rb

@@ -1,3 +1,6 @@
+# encoding: UTF-8
+require 'set'
+
 module MongoMapper
   module Support
     module DescendantAppends
@@ -14,9 +17,7 @@ module MongoMapper
 
       # @api public
       def append_extensions(*extensions)
-        extra_extensions.concat extensions
-
-        # Add the extension to existing descendants
+        extra_extensions.concat(extensions)
         descendants.each do |model|
           extensions.each { |extension| model.extend(extension) }
         end
@@ -24,9 +25,7 @@ module MongoMapper
 
       # @api public
       def append_inclusions(*inclusions)
-        extra_inclusions.concat inclusions
-
-        # Add the inclusion to existing descendants
+        extra_inclusions.concat(inclusions)
         descendants.each do |model|
           inclusions.each { |inclusion| model.send(:include, inclusion) }
         end

data/lib/mongo_mapper/version.rb

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

data/lib/mongo_mapper.rb

@@ -1,137 +1,80 @@
-require 'set'
-require 'uri'
-
-# if Gem is defined i'll assume you are using rubygems and lock specific versions
-# call me crazy but a plain old require will just get the latest version you have installed
-# so i want to make sure that if you are using gems you do in fact have the correct versions
-# if there is a better way to do this, please enlighten me!
-if self.class.const_defined?(:Gem)
-  gem 'activesupport', '>= 2.3'
-  gem 'mongo', '0.19.1'
-  gem 'jnunemaker-validatable', '1.8.3'
-end
-
-require 'active_support/all'
-require 'mongo'
+# encoding: UTF-8
+# Make sure you have the correct versions of the gems (see gemspec) in your load path.
+require 'plucky'
 require 'validatable'
+require 'active_support/all'
 
 module MongoMapper
-  # generic MM error
-  class MongoMapperError < StandardError; end
-
-  # raised when key expected to exist but not found
-  class KeyNotFound < MongoMapperError; end
-
-  # raised when document expected but not found
-  class DocumentNotFound < MongoMapperError; end
-
-  # raised when trying to connect using uri with incorrect scheme
-  class InvalidScheme < MongoMapperError; end
-
-  # raised when document not valid and using !
-  class DocumentNotValid < MongoMapperError
-    def initialize(document)
-      super("Validation failed: #{document.errors.full_messages.join(", ")}")
+  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'
+  autoload :AccessibleOrProtected,  'mongo_mapper/exceptions'
+
+  autoload :Document,               'mongo_mapper/document'
+  autoload :EmbeddedDocument,       'mongo_mapper/embedded_document'
+  autoload :Plugins,                'mongo_mapper/plugins'
+  autoload :Version,                'mongo_mapper/version'
+
+  module Plugins
+    autoload :Associations,     'mongo_mapper/plugins/associations'
+    autoload :Accessible,       'mongo_mapper/plugins/accessible'
+    autoload :Callbacks,        'mongo_mapper/plugins/callbacks'
+    autoload :Caching,          'mongo_mapper/plugins/caching'
+    autoload :Clone,            'mongo_mapper/plugins/clone'
+    autoload :Descendants,      'mongo_mapper/plugins/descendants'
+    autoload :Dirty,            'mongo_mapper/plugins/dirty'
+    autoload :Document,         'mongo_mapper/plugins/document'
+    autoload :DynamicQuerying,  'mongo_mapper/plugins/dynamic_querying'
+    autoload :EmbeddedDocument, 'mongo_mapper/plugins/embedded_document'
+    autoload :Equality,         'mongo_mapper/plugins/equality'
+    autoload :IdentityMap,      'mongo_mapper/plugins/identity_map'
+    autoload :Inspect,          'mongo_mapper/plugins/inspect'
+    autoload :Indexes,          'mongo_mapper/plugins/indexes'
+    autoload :Keys,             'mongo_mapper/plugins/keys'
+    autoload :Logger,           'mongo_mapper/plugins/logger'
+    autoload :Modifiers,        'mongo_mapper/plugins/modifiers'
+    autoload :Pagination,       'mongo_mapper/plugins/pagination'
+    autoload :Persistence,      'mongo_mapper/plugins/persistence'
+    autoload :Protected,        'mongo_mapper/plugins/protected'
+    autoload :Querying,         'mongo_mapper/plugins/querying'
+    autoload :Rails,            'mongo_mapper/plugins/rails'
+    autoload :Safe,             'mongo_mapper/plugins/safe'
+    autoload :Sci,              'mongo_mapper/plugins/sci'
+    autoload :Scopes,           'mongo_mapper/plugins/scopes'
+    autoload :Serialization,    'mongo_mapper/plugins/serialization'
+    autoload :Timestamps,       'mongo_mapper/plugins/timestamps'
+    autoload :Userstamps,       'mongo_mapper/plugins/userstamps'
+    autoload :Validations,      'mongo_mapper/plugins/validations'
+
+    module Associations
+      autoload :Base,                         'mongo_mapper/plugins/associations/base'
+      autoload :Collection,                   'mongo_mapper/plugins/associations/collection'
+      autoload :EmbeddedCollection,           'mongo_mapper/plugins/associations/embedded_collection'
+      autoload :ManyDocumentsProxy,           'mongo_mapper/plugins/associations/many_documents_proxy'
+      autoload :BelongsToProxy,               'mongo_mapper/plugins/associations/belongs_to_proxy'
+      autoload :BelongsToPolymorphicProxy,    'mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy'
+      autoload :ManyPolymorphicProxy,         'mongo_mapper/plugins/associations/many_polymorphic_proxy'
+      autoload :ManyEmbeddedProxy,            'mongo_mapper/plugins/associations/many_embedded_proxy'
+      autoload :ManyEmbeddedPolymorphicProxy, 'mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy'
+      autoload :ManyDocumentsAsProxy,         'mongo_mapper/plugins/associations/many_documents_as_proxy'
+      autoload :OneProxy,                     'mongo_mapper/plugins/associations/one_proxy'
+      autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/one_embedded_proxy'
+      autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
     end
   end
 
-  # @api public
-  def self.connection
-    @@connection ||= Mongo::Connection.new
-  end
-
-  # @api public
-  def self.connection=(new_connection)
-    @@connection = new_connection
-  end
-
-  # @api public
-  def self.logger
-    connection.logger
-  end
-
-  # @api public
-  def self.database=(name)
-    @@database = nil
-    @@database_name = name
-  end
-
-  # @api public
-  def self.database
-    if @@database_name.blank?
-      raise 'You forgot to set the default database name: MongoMapper.database = "foobar"'
-    end
-
-    @@database ||= MongoMapper.connection.db(@@database_name)
-  end
-
-  def self.config=(hash)
-    @@config = hash
-  end
-
-  def self.config
-    raise 'Set config before connecting. MongoMapper.config = {...}' unless defined?(@@config)
-    @@config
-  end
-
-  # @api private
-  def self.config_for_environment(environment)
-    env = config[environment]
-    return env if env['uri'].blank?
-    
-    uri = URI.parse(env['uri'])
-    raise InvalidScheme.new('must be mongodb') unless uri.scheme == 'mongodb'
-    {
-      'host'     => uri.host,
-      'port'     => uri.port,
-      'database' => uri.path.gsub(/^\//, ''),
-      'username' => uri.user,
-      'password' => uri.password,
-    }
-  end
-
-  def self.connect(environment, options={})
-    raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
-    env = config_for_environment(environment)
-    MongoMapper.connection = Mongo::Connection.new(env['host'], env['port'], options)
-    MongoMapper.database = env['database']
-    MongoMapper.database.authenticate(env['username'], env['password']) if env['username'] && env['password']
-  end
-
-  def self.setup(config, environment, options={})
-    using_passenger = options.delete(:passenger)
-    handle_passenger_forking if using_passenger
-    self.config = config
-    connect(environment, options)
-  end
-
-  def self.handle_passenger_forking
-    if defined?(PhusionPassenger)
-      PhusionPassenger.on_event(:starting_worker_process) do |forked|
-        connection.connect_to_master if forked
-      end
-    end
-  end
-
-  # @api private
-  def self.use_time_zone?
-    Time.respond_to?(:zone) && Time.zone ? true : false
-  end
-
-  # @api private
-  def self.time_class
-    use_time_zone? ? Time.zone : Time
-  end
-
-  # @api private
-  def self.normalize_object_id(value)
-    value.is_a?(String) ? Mongo::ObjectID.from_string(value) : value
-  end
+  extend Connection
+end
 
-  autoload :Query,            'mongo_mapper/query'
-  autoload :Document,         'mongo_mapper/document'
-  autoload :EmbeddedDocument, 'mongo_mapper/embedded_document'
+Dir[File.join(File.dirname(__FILE__), 'mongo_mapper', 'extensions', '*.rb')].each do |extension|
+  require extension
 end
 
-require 'mongo_mapper/support'
-require 'mongo_mapper/plugins'
+require 'mongo_mapper/support/descendant_appends'
+
+# FIXME: autoload with proxy is failing, need to investigate
+require 'mongo_mapper/plugins/associations/proxy'

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -6,17 +6,17 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     Status.collection.remove
     Project.collection.remove
   end
-  
+
   should "default to nil" do
     status = Status.new
     status.target.nil?.should be_true
     status.target.inspect.should == "nil"
   end
-  
+
   should "have boolean presence method" do
     status = Status.new
     status.target?.should be_false
-    
+
     status.target = Project.new(:name => 'mongomapper')
     status.target?.should be_true
   end
@@ -46,7 +46,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     status.target_id.nil?.should be_true
     status.target.nil?.should be_true
   end
-  
+
   context "association id set but document not found" do
     setup do
       @status = Status.new(:name => 'Foo!')
@@ -60,4 +60,4 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
       @status.target.nil?.should be_true
     end
   end
-end
+end

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -2,60 +2,52 @@ require 'test_helper'
 require 'models'
 
 class BelongsToProxyTest < Test::Unit::TestCase
-  def setup    
+  def setup
     @post_class = Doc()
     @comment_class = Doc do
       key :post_id, String
     end
-    
+
     @comment_class.belongs_to :post, :class => @post_class
   end
-  
+
   should "default to nil" do
     @comment_class.new.post.nil?.should be_true
   end
-  
-  should "send object id to target" do
-    post = @post_class.new(:name => 'mongomapper')
-    comment = @comment_class.new(:name => 'Foo!', :post => post)
-    comment.save
-    
-    comment.post.object_id.should == comment.post.target.object_id
-  end
-  
+
   should "have boolean presence method" do
     comment = @comment_class.new(:name => 'Foo!')
     comment.post?.should be_false
-    
+
     comment.post = @post_class.new(:name => 'mongomapper')
     comment.post?.should be_true
   end
-  
+
   should "be able to replace the association" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
     comment.save.should be_true
-    
+
     comment = comment.reload
     comment.post.should == post
     comment.post.nil?.should be_false
   end
-  
+
   should "unset the association" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
     comment.save.should be_true
-    
+
     comment = comment.reload
     comment.post = nil
     comment.post.nil?.should be_true
   end
-  
+
   should "return nil if id set but document not found" do
-    id = Mongo::ObjectID.new
+    id = BSON::ObjectID.new
     @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_true
   end
-  
+
   context ":dependent" do
     setup do
       # FIXME: make use of already defined models
@@ -75,7 +67,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
       Object.send :remove_const, 'Property' if defined?(::Property)
       Object.send :remove_const, 'Thing' if defined?(::Thing)
     end
-    
+
     context "=> destroy" do
       setup do
         Property.key :thing_id, ObjectId

data/test/functional/associations/test_in_array_proxy.rb

@@ -22,7 +22,7 @@ class InArrayProxyTest < Test::Unit::TestCase
       Object.send :remove_const, 'List' if defined?(::List)
       Object.send :remove_const, 'User' if defined?(::User)
     end
-    
+
     should "default reader to empty array" do
       User.new.lists.should == []
     end
@@ -34,14 +34,14 @@ class InArrayProxyTest < Test::Unit::TestCase
       user.lists.concat List.new(:name => 'Foo3!')
       user.lists.size.should == 3
     end
-    
+
     should "ignore adding duplicate ids" do
       user = User.create(:name => 'John')
       list = List.create(:name => 'Foo')
       user.lists << list
       user.lists << list
       user.lists << list
-      
+
       user.list_ids.should == [list.id]
       user.lists.count.should == 1
     end
@@ -135,36 +135,30 @@ class InArrayProxyTest < Test::Unit::TestCase
 
       context "all" do
         should "work" do
-          @user.lists.find(:all, :order => :position.asc).should == [@list1, @list2]
           @user.lists.all(:order => :position.asc).should == [@list1, @list2]
         end
 
         should "work with conditions" do
-          @user.lists.find(:all, :name => 'Foo 1').should == [@list1]
           @user.lists.all(:name => 'Foo 1').should == [@list1]
         end
       end
 
       context "first" do
         should "work" do
-          @user.lists.find(:first, :order => 'position').should == @list1
           @user.lists.first(:order => 'position').should == @list1
         end
 
         should "work with conditions" do
-          @user.lists.find(:first, :position => 2).should == @list2
           @user.lists.first(:position => 2).should == @list2
         end
       end
 
       context "last" do
         should "work" do
-          @user.lists.find(:last, :order => 'position').should == @list2
           @user.lists.last(:order => 'position').should == @list2
         end
 
         should "work with conditions" do
-          @user.lists.find(:last, :position => 2, :order => 'position').should == @list2
           @user.lists.last(:position => 2, :order => 'position').should == @list2
         end
       end
@@ -174,6 +168,10 @@ class InArrayProxyTest < Test::Unit::TestCase
           @user.lists.find(@list1.id).should == @list1
         end
 
+        should "work with string ids" do
+          @user.lists.find(@list1.id.to_s).should == @list1
+        end
+
         should "not work for id not in association" do
           @user.lists.find(@list3.id).should be_nil
         end

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -35,7 +35,7 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
         PostComment.new(:body => 'baz')
       ]
     }.should change { PostComment.count }.by(3)
-    
+
     post = post.reload
     post.comments.size.should == 3
     bodies = post.comments.collect(&:body)
@@ -172,24 +172,24 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
         end
       end
     end
-    
+
     context "dynamic finders" do
       should "work with single key" do
         @post.comments.find_by_body('comment1').should == @comment1
         @post2.comments.find_by_body('comment1').should == @comment4
       end
-      
+
       should "work with multiple keys" do
         @post.comments.find_by_body_and_name('comment1', 'John').should == @comment1
         @post.comments.find_by_body_and_name('comment1', 'Frank').should be_nil
       end
-      
+
       should "raise error when using !" do
         lambda {
           @post.comments.find_by_body!('asdf')
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
-      
+
       context "find_or_create_by" do
         should "not create document if found" do
           lambda {