lib/mongo_mapper.rb in mongo_mapper-0.6.10 vs lib/mongo_mapper.rb in mongo_mapper-0.7.0

@@ -1,126 +1,118 @@
+require 'set'
+
 # 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.18.2'
+  gem 'mongo', '0.18.3'
   gem 'jnunemaker-validatable', '1.8.1'
 end
 
 require 'active_support'
 require 'mongo'
 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
   end
+  
+  autoload :Query,            'mongo_mapper/query'
+  autoload :Document,         'mongo_mapper/document'
+  autoload :EmbeddedDocument, 'mongo_mapper/embedded_document'
 end
 
 require 'mongo_mapper/support'
-require 'mongo_mapper/callbacks'
-require 'mongo_mapper/finder_options'
-require 'mongo_mapper/dirty'
-require 'mongo_mapper/dynamic_finder'
-require 'mongo_mapper/key'
-require 'mongo_mapper/pagination'
-require 'mongo_mapper/serialization'
-require 'mongo_mapper/validations'
-require 'mongo_mapper/rails_compatibility/document'
-require 'mongo_mapper/rails_compatibility/embedded_document'
-require 'mongo_mapper/embedded_document'
-require 'mongo_mapper/document'
-require 'mongo_mapper/associations'
-require 'mongo_mapper/associations/base'
-require 'mongo_mapper/associations/proxy'
-require 'mongo_mapper/associations/collection'
-require 'mongo_mapper/associations/many_documents_proxy'
-require 'mongo_mapper/associations/belongs_to_proxy'
-require 'mongo_mapper/associations/belongs_to_polymorphic_proxy'
-require 'mongo_mapper/associations/many_polymorphic_proxy'
-require 'mongo_mapper/associations/many_embedded_proxy'
-require 'mongo_mapper/associations/many_embedded_polymorphic_proxy'
-require 'mongo_mapper/associations/many_documents_as_proxy'
-require 'mongo_mapper/associations/one_proxy'
-require 'mongo_mapper/associations/in_array_proxy'
+require 'mongo_mapper/plugins'
\ No newline at end of file