db-charmer 1.7.0.pre2 → 1.7.0.pre3

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.7.0.pre2"
+  s.version = "1.7.0.pre3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2011-05-23}
+  s.date = %q{2011-06-20}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [

data/lib/db_charmer.rb

@@ -66,25 +66,25 @@ require 'db_charmer/connection_proxy'
 require 'db_charmer/force_slave_reads'
 
 # Add our custom class-level attributes to AR models
-ActiveRecord::Base.extend(DbCharmer::ActiveRecord::ClassAttributes)
+::ActiveRecord::Base.extend(DbCharmer::ActiveRecord::ClassAttributes)
 
 # Enable connections switching in AR
-ActiveRecord::Base.extend(DbCharmer::ActiveRecord::ConnectionSwitching)
+::ActiveRecord::Base.extend(DbCharmer::ActiveRecord::ConnectionSwitching)
 
 # Enable misc AR extensions
-ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, DbCharmer::AbstractAdapter::LogFormatting)
+::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, DbCharmer::AbstractAdapter::LogFormatting)
 
 # Enable connection proxy in AR
-ActiveRecord::Base.extend(DbCharmer::ActiveRecord::MultiDbProxy::ClassMethods)
-ActiveRecord::Base.extend(DbCharmer::ActiveRecord::MultiDbProxy::MasterSlaveClassMethods)
-ActiveRecord::Base.send(:include, DbCharmer::ActiveRecord::MultiDbProxy::InstanceMethods)
+::ActiveRecord::Base.extend(DbCharmer::ActiveRecord::MultiDbProxy::ClassMethods)
+::ActiveRecord::Base.extend(DbCharmer::ActiveRecord::MultiDbProxy::MasterSlaveClassMethods)
+::ActiveRecord::Base.send(:include, DbCharmer::ActiveRecord::MultiDbProxy::InstanceMethods)
 
 # Enable connection proxy for scopes
-ActiveRecord::NamedScope::Scope.send(:include, DbCharmer::ActiveRecord::NamedScope::ScopeProxy)
+::ActiveRecord::NamedScope::Scope.send(:include, DbCharmer::ActiveRecord::NamedScope::ScopeProxy)
 
 # Enable connection proxy for associations
 # WARNING: Inject methods to association class right here (they proxy include calls somewhere else, so include does not work)
-module ActiveRecord
+module ::ActiveRecord
   module Associations
     class AssociationProxy
       def proxy?
@@ -108,18 +108,18 @@ module ActiveRecord
 end
 
 # Enable multi-db migrations
-ActiveRecord::Migration.extend(DbCharmer::ActiveRecord::Migration::MultiDbMigrations)
+::ActiveRecord::Migration.extend(DbCharmer::ActiveRecord::Migration::MultiDbMigrations)
 
 # Enable the magic
-ActiveRecord::Base.extend(DbCharmer::ActiveRecord::DbMagic)
+::ActiveRecord::Base.extend(DbCharmer::ActiveRecord::DbMagic)
 
 # Setup association preload magic
-ActiveRecord::Base.extend(DbCharmer::ActiveRecord::AssociationPreload)
+::ActiveRecord::Base.extend(DbCharmer::ActiveRecord::AssociationPreload)
 
 # Open up really useful API method
-ActiveRecord::AssociationPreload::ClassMethods.send(:public, :preload_associations)
+::ActiveRecord::AssociationPreload::ClassMethods.send(:public, :preload_associations)
 
-class ActiveRecord::Base
+class ::ActiveRecord::Base
   class << self
     def inherited_with_hijacking(subclass)
       out = inherited_without_hijacking(subclass)
@@ -133,5 +133,5 @@ end
 
 #-----------------------------------------------------------------------------------------------------------------------
 # Extend ActionController to support forcing slave reads
-ActionController::Base.extend(DbCharmer::ActionController::ForceSlaveReads::ClassMethods)
-ActionController::Base.send(:include, DbCharmer::ActionController::ForceSlaveReads::InstanceMethods)
+::ActionController::Base.extend(DbCharmer::ActionController::ForceSlaveReads::ClassMethods)
+::ActionController::Base.send(:include, DbCharmer::ActionController::ForceSlaveReads::InstanceMethods)

data/lib/db_charmer/version.rb

@@ -3,7 +3,7 @@ module DbCharmer
     MAJOR = 1
     MINOR = 7
     PATCH = 0
-    BUILD = 'pre2'
+    BUILD = 'pre3'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  hash: 1923832061
+  hash: 1923832063
   prerelease: 6
   segments: 
   - 1
   - 7
   - 0
   - pre
-  - 2
-  version: 1.7.0.pre2
+  - 3
+  version: 1.7.0.pre3
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -04:00
+date: 2011-06-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency