db-charmer 1.5.1 → 1.5.2

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2010-03-06}
+  s.date = %q{2010-03-10}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [

data/lib/db_charmer/abstract_adapter_extensions.rb

@@ -6,15 +6,13 @@ module DbCharmer
       end
 
       def connection_name
-        @connection_name
-      end
-
-      def connection_name=(name)
-        @connection_name = name
+        raise "Can't find connection configuration!" unless @config
+        @config[:connection_name]
       end
 
       def format_log_entry_with_connection_name(message, dump = nil)
         msg = connection_name ? "[#{connection_name}] " : ''
+        msg = "  \e[0;34;1m#{msg}\e[0m" if connection_name && ActiveRecord::Base.colorize_logging
         msg << format_log_entry_without_connection_name(message, dump)
       end
     end

data/lib/db_charmer/active_record_extensions.rb

@@ -7,8 +7,11 @@ module DbCharmer
         if should_exist && !config
           raise ArgumentError, "Invalid connection name (does not exist in database.yml): #{RAILS_ENV}/#{name}"
         end
-        establish_connection(config) if config
-        connection.connection_name = name.to_s
+        # If there is no config, use default one
+        config ||= configurations[RAILS_ENV].clone
+        # Pass connection name with config
+        config[:connection_name] = name.to_s
+        establish_connection(config)
       end
 
       #-----------------------------------------------------------------------------

data/lib/db_charmer/connection_factory.rb

@@ -1,38 +1,46 @@
+#
+# This class is used to automatically generate small abstract ActiveRecord classes
+# that would then be used as a source of database connections for DbCharmer magic.
+# This way we do not need to re-implement all the connection establishing code
+# that ActiveRecord already has and we make our code less dependant on Rails versions.
+#
 module DbCharmer
-  class ConnectionFactory
+  module ConnectionFactory
     @@connection_classes = {}
 
     def self.reset!
       @@connection_classes = {}
     end
 
+    # Establishes connection or return an existing one from cache
     def self.connect(db_name, should_exist = false)
-      @@connection_classes[db_name.to_s] ||= establish_connection(db_name.to_s, should_exist)
-#      DbCharmer.logger.warn("ConnectionFactory.connect(#{db_name}) = #{@@connection_classes[db_name.to_s]}")
-#      return @@connection_classes[db_name.to_s]
+      db_name = db_name.to_s
+      @@connection_classes[db_name] ||= establish_connection(db_name, should_exist)
     end
 
+    # Establish connection with a specified name
     def self.establish_connection(db_name, should_exist = false)
-#      DbCharmer.logger.debug("Creating a connection proxy for #{db_name}")
       abstract_class = generate_abstract_class(db_name, should_exist)
       DbCharmer::ConnectionProxy.new(abstract_class)
     end
 
+    # Generate an abstract AR class with specified connection established
     def self.generate_abstract_class(db_name, should_exist = false)
-#      DbCharmer.logger.info("Generating abstract connection class for #{db_name}: #{abstract_connection_class_name db_name}")
-
+      klass = abstract_connection_class_name(db_name)
+      # Generate class
       module_eval <<-EOF, __FILE__, __LINE__ + 1
-        class #{abstract_connection_class_name db_name} < ActiveRecord::Base
+        class #{klass} < ActiveRecord::Base
           self.abstract_class = true
           establish_real_connection_if_exists(:#{db_name}, #{!!should_exist})
         end
       EOF
-
-      abstract_connection_class_name(db_name).constantize
+      # Return class
+      klass.constantize
     end
 
+    # Generates unique names for our abstract AR classes
     def self.abstract_connection_class_name(db_name)
-      "::AutoGeneratedAbstractConnectionClass#{db_name.camelize}"
+      "::AutoGeneratedAbstractConnectionClass#{db_name.to_s.camelize}"
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -05:00
+date: 2010-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency