db-charmer 1.8.3 → 1.8.4

data/CHANGES

@@ -1,3 +1,8 @@
+1.8.4 (2013-03-18):
+
+Bumped up rails dependencies up to 3.2.13.
+
+----------------------------------------------------------------------------------------
 1.8.3 (2013-02-11):
 
 Bumped up rails dependencies up to 3.2.12.

data/README.rdoc

@@ -10,7 +10,7 @@ multiple databases and/or database servers. The major features we add to ActiveR
 5. Multiple database migrations with very flexible query routing controls.
 6. Simple database sharding functionality with multiple sharding methods (value, range, mapping table).
 
-For more information on the project, you can check out our web site at http://kovyrin.github.com/db-charmer.
+For more information on the project, you can check out our web site at http://dbcharmer.net.
 
 
 == Installation
@@ -567,7 +567,7 @@ sharding connection names or connection configurations to be used to establish c
 
 == Documentation/Questions
 
-For more information about the library, please visit our site at http://kovyrin.github.com/db-charmer.
+For more information about the library, please visit our site at http://dbcharmer.net.
 If you need more defails on DbCharmer internals, please check out the source code. All the plugin's
 code is ~100% covered with tests. The project located in <tt>test-project</tt> directory has unit
 tests for all or, at least, the most actively used code paths.

data/lib/db_charmer.rb

@@ -10,6 +10,7 @@ module DbCharmer
     autoload :ForceSlaveReads, 'db_charmer/action_controller/force_slave_reads'
   end
 
+  #-------------------------------------------------------------------------------------------------
   # Used in all Rails3-specific places
   def self.rails3?
     ::ActiveRecord::VERSION::MAJOR > 2
@@ -25,42 +26,50 @@ module DbCharmer
     ::ActiveRecord::VERSION::MAJOR == 2
   end
 
-  # Used in all Rails2-specific places
+  # Detect broken Rails version
   def self.rails324?
     ActiveRecord::VERSION::STRING == '3.2.4'
   end
 
-  # Accessors
-  @@connections_should_exist = true
-  mattr_accessor :connections_should_exist
+  #-------------------------------------------------------------------------------------------------
+  # Returns true if we're running within a Rails project
+  def self.running_with_rails?
+    defined?(Rails) && Rails.respond_to?(:env)
+  end
 
-  # Try to detect current environment or use development by default
-  if defined?(Rails)
-    @@env = Rails.env
-  elsif ENV['RAILS_ENV']
-    @@env = ENV['RAILS_ENV']
-  elsif ENV['RACK_ENV']
-    @@env = ENV['RACK_ENV']
-  else
-    @@env = 'development'
+  # Returns current environment name based on Rails or Rack environment variables
+  def self.detect_environment
+    return Rails.env if running_with_rails?
+    ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'default'
   end
+
+  # Try to detect current environment or use development by default
+  @@env = DbCharmer.detect_environment
   mattr_accessor :env
 
+  #-------------------------------------------------------------------------------------------------
+  # Accessors
+  @@connections_should_exist = true
+  mattr_accessor :connections_should_exist
+
   def self.connections_should_exist?
     !! connections_should_exist
   end
 
+  #-------------------------------------------------------------------------------------------------
+  def self.logger
+    return Rails.logger if running_with_rails?
+    @@logger ||= Logger.new(STDERR)
+  end
+
+  #-------------------------------------------------------------------------------------------------
   # Extend ActionController to support forcing slave reads
   def self.enable_controller_magic!
     ::ActionController::Base.extend(DbCharmer::ActionController::ForceSlaveReads::ClassMethods)
     ::ActionController::Base.send(:include, DbCharmer::ActionController::ForceSlaveReads::InstanceMethods)
   end
 
-  def self.logger
-    return Rails.logger if defined?(Rails)
-    @logger ||= Logger.new(STDERR)
-  end
-
+  #-------------------------------------------------------------------------------------------------
   def self.with_remapped_databases(mappings, &proc)
     old_mappings = ::ActiveRecord::Base.db_charmer_database_remappings
     begin
@@ -97,6 +106,7 @@ private
   end
 end
 
+#---------------------------------------------------------------------------------------------------
 # Print warning about the broken Rails 2.3.4
 puts "WARNING: Rails 3.2.4 is not officially supported by DbCharmer. Please upgrade." if DbCharmer.rails324?
 
@@ -218,8 +228,9 @@ else
   ActiveRecord::AssociationPreload::ClassMethods.send(:public, :preload_associations)
 end
 
-
-class ::ActiveRecord::Base
+#---------------------------------------------------------------------------------------------------
+# Hijack connection on all new AR classes when we're in a block with main AR connection remapped
+class ActiveRecord::Base
   class << self
     def inherited_with_hijacking(subclass)
       out = inherited_without_hijacking(subclass)

data/lib/db_charmer/version.rb

@@ -2,7 +2,7 @@ module DbCharmer
   module Version
     MAJOR = 1
     MINOR = 8
-    PATCH = 3
+    PATCH = 4
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db-charmer
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - <=
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - <=
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - <=
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - <=
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ files:
 - README.rdoc
 - LICENSE
 - CHANGES
-homepage: http://kovyrin.github.com/db-charmer
+homepage: http://dbcharmer.net
 licenses: []
 post_install_message: 
 rdoc_options: