mongo_mapper-unstable 2010.2.8 → 2010.2.9

data/VERSION

@@ -1 +1 @@
-2010.02.08
+2010.02.09

data/lib/mongo_mapper/document.rb

@@ -43,7 +43,7 @@ module MongoMapper
           name_or_array
         end
 
-        MongoMapper.ensure_index(self, keys_to_index, options)
+        collection.create_index(keys_to_index, options[:unique])
       end
 
       def find(*args)

data/lib/mongo_mapper.rb

@@ -17,83 +17,93 @@ require 'validatable'
 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 document not valid and using !
   class DocumentNotValid < MongoMapperError
     def initialize(document)
       super("Validation failed: #{document.errors.full_messages.join(", ")}")
     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
-  
-  # @api private
-  def self.ensured_indexes
-    @@ensured_indexes ||= []
+
+  def self.config=(hash)
+    @@config = hash
   end
-  
-  # @api private
-  def self.ensured_indexes=(value)
-    @@ensured_indexes = value
+
+  def self.config
+    raise 'Set config before connecting. MongoMapper.config = {...}' unless defined?(@@config)
+    @@config
   end
-  
-  # @api private
-  def self.ensure_index(klass, keys, options={})
-    ensured_indexes << {:klass => klass, :keys => keys, :options => options}
+
+  def self.connect(environment, options={})
+    raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
+    MongoMapper.connection = Mongo::Connection.new(config[environment]['host'], config[environment]['port'], options)
+    MongoMapper.database = config[environment]['database']
+    if config[environment]['username'].present? && config[environment]['password'].present?
+      MongoMapper.database.authenticate(config[environment]['username'], config[environment]['password'])
+    end
   end
-  
-  # @api public
-  def self.ensure_indexes!
-    ensured_indexes.each do |index|
-      unique = index[:options].delete(:unique)
-      index[:klass].collection.create_index(index[:keys], unique)
+
+  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

data/test/functional/test_document.rb

@@ -778,68 +778,55 @@ class DocumentTest < Test::Unit::TestCase
   
   context "#save (with options)" do
     setup do
-      MongoMapper.ensured_indexes = []
-      
       @document = Doc do
         key :name, String
         set_collection_name 'test_indexes'
-        ensure_index :name, :unique => true
-      end
-      if @document.database.collection_names.include?(@document.collection.name)
-        @document.collection.drop_indexes
       end
-      
-      MongoMapper.ensure_indexes!
+      drop_indexes(@document)
+      @document.ensure_index :name, :unique => true
     end
-    
+
     should "allow passing safe" do
-      doc = @document.new(:name => 'John')
-      doc.save
-      
+      @document.create(:name => 'John')
       assert_raises(Mongo::OperationFailure) do
         @document.new(:name => 'John').save(:safe => true)
       end
     end
-    
+
     should "raise argument error if options has unsupported key" do
-      doc = @document.new
-      assert_raises(ArgumentError) { doc.save(:foo => true) }
+      assert_raises(ArgumentError) do
+        @document.new.save(:foo => true)
+      end
     end
   end
   
   context "#save! (with options)" do
     setup do
-      MongoMapper.ensured_indexes = []
-      
       @document = Doc do
         key :name, String
         set_collection_name 'test_indexes'
-        ensure_index :name, :unique => true
       end
-      
-      if @document.database.collection_names.include?(@document.collection.name)
-        @document.collection.drop_indexes
-      end
-      
-      MongoMapper.ensure_indexes!
+      drop_indexes(@document)
+      @document.ensure_index :name, :unique => true
     end
-    
+
     should "allow passing safe" do
-      doc = @document.create(:name => 'John')
-      
+      @document.create(:name => 'John')
       assert_raises(Mongo::OperationFailure) do
         @document.new(:name => 'John').save!(:safe => true)
       end
     end
-    
+
     should "raise argument error if options has unsupported key" do
-      doc = @document.new
-      assert_raises(ArgumentError) { doc.save!(:foo => true) }
+      assert_raises(ArgumentError) do
+        @document.new.save!(:foo => true)
+      end
     end
-    
+
     should "raise argument error if using validate as that would be pointless with save!" do
-      doc = @document.new
-      assert_raises(ArgumentError) { doc.save!(:validate => false) }
+      assert_raises(ArgumentError) do
+        @document.new.save!(:validate => false)
+      end
     end
   end
 
@@ -1224,28 +1211,22 @@ class DocumentTest < Test::Unit::TestCase
 
   context "Indexing" do
     setup do
-      MongoMapper.ensured_indexes = []
-      @document.collection.drop_indexes
+      drop_indexes(@document)
     end
 
     should "allow creating index for a key" do
       @document.ensure_index :first_name
-      MongoMapper.ensure_indexes!
-
       @document.should have_index('first_name_1')
     end
 
     should "allow creating unique index for a key" do
       @document.ensure_index :first_name, :unique => true
-      MongoMapper.ensure_indexes!
-
       @document.should have_index('first_name_1')
     end
 
     should "allow creating index on multiple keys" do
       @document.ensure_index [[:first_name, 1], [:last_name, -1]]
-      MongoMapper.ensure_indexes!
-
+      
       # order is different for different versions of ruby so instead of
       # just checking have_index('first_name_1_last_name_-1') I'm checking
       # the values of the indexes to make sure the index creation was successful
@@ -1257,7 +1238,6 @@ class DocumentTest < Test::Unit::TestCase
 
     should "work with :index shortcut when defining key" do
       @document.key :father, String, :index => true
-      MongoMapper.ensure_indexes!
       @document.should have_index('father_1')
     end
   end

data/test/test_helper.rb

@@ -46,6 +46,12 @@ class Test::Unit::TestCase
     klass.class_eval(&block) if block_given?
     klass
   end
+
+  def drop_indexes(klass)
+    if klass.database.collection_names.include?(klass.collection.name)
+      klass.collection.drop_indexes
+    end
+  end
 end
 
 test_dir = File.expand_path(File.dirname(__FILE__) + '/../tmp')

data/test/unit/test_mongo_mapper.rb

@@ -8,58 +8,118 @@ class MongoMapperTest < Test::Unit::TestCase
     MongoMapper.connection = conn
     MongoMapper.connection.should == conn
   end
-  
+
   should "default connection to new mongo ruby driver" do
     MongoMapper.connection = nil
     MongoMapper.connection.should be_instance_of(Mongo::Connection)
   end
-  
+
   should "be able to write and read default database" do
     MongoMapper.database = 'test'
     MongoMapper.database.should be_instance_of(Mongo::DB)
     MongoMapper.database.name.should == 'test'
   end
-  
+
   should "have document not found error" do
     lambda {
       MongoMapper::DocumentNotFound
     }.should_not raise_error
   end
+
+  should "be able to read/write config" do
+    config = {
+      'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'},
+      'production'  => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test-prod'}
+    }
+
+    MongoMapper.config = config
+    MongoMapper.config.should == config
+  end
+
+  context "connecting to environment from config" do
+    should "work without authentication" do
+      MongoMapper.config = {
+        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
+      }
+
+      Mongo::Connection.expects(:new).with('127.0.0.1', 27017, {})
+      MongoMapper.expects(:database=).with('test')
+      Mongo::DB.any_instance.expects(:authenticate).never
+      MongoMapper.connect('development')
+    end
+
+    should "work with options" do
+      MongoMapper.config = {
+        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
+      }
+
+      connection, logger = mock('connection'), mock('logger')
+      Mongo::Connection.expects(:new).with('127.0.0.1', 27017, :logger => logger)
+      MongoMapper.connect('development', :logger => logger)
+    end
+
+    should "work with authentication" do
+      MongoMapper.config = {
+        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'username' => 'john', 'password' => 'secret'}
+      }
+
+      Mongo::DB.any_instance.expects(:authenticate).with('john', 'secret')
+      MongoMapper.connect('development')
+    end
+  end
+
+  context "setup" do
+    should "work as shortcut for setting config, environment and options" do
+      config, logger = mock('config'), mock('logger')
+      MongoMapper.expects(:config=).with(config)
+      MongoMapper.expects(:connect).with('development', :logger => logger)
+      MongoMapper.expects(:handle_passenger_forking).never
+      MongoMapper.setup(config, 'development', :logger => logger)
+    end
+    
+    should "handle passenger if option present" do
+      config, logger = mock('config'), mock('logger')
+      MongoMapper.expects(:config=).with(config)
+      MongoMapper.expects(:connect).with('development', :logger => logger)
+      MongoMapper.expects(:handle_passenger_forking)
+      MongoMapper.setup(config, 'development', :logger => logger, :passenger => true)
+    end
+  end
   
+
   context "use_time_zone?" do
     should "be true if Time.zone set" do
       Time.zone = 'Hawaii'
       MongoMapper.use_time_zone?.should be_true
       Time.zone = nil
     end
-    
+
     should "be false if Time.zone not set" do
       MongoMapper.use_time_zone?.should be_false
     end
   end
-  
+
   context "time_class" do
     should "be Time.zone if using time zones" do
       Time.zone = 'Hawaii'
       MongoMapper.time_class.should == Time.zone
       Time.zone = nil
     end
-    
+
     should "be Time if not using time zones" do
       MongoMapper.time_class.should == Time
     end
   end
-  
+
   context "normalize_object_id" do
     should "turn string into object id" do
       id = Mongo::ObjectID.new
       MongoMapper.normalize_object_id(id.to_s).should == id
     end
-    
+
     should "leave object id alone" do
       id = Mongo::ObjectID.new
       MongoMapper.normalize_object_id(id).should == id
     end
   end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2010.2.8
+  version: 2010.2.9
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -05:00
+date: 2010-02-09 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency