db-charmer 1.7.0.pre3 → 1.7.0.pre4

data/db-charmer.gemspec

@@ -1,11 +1,11 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.7.0.pre3"
+  s.version = "1.7.0.pre4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
@@ -14,45 +14,44 @@ Gem::Specification.new do |s|
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGES",
-     "LICENSE",
-     "Makefile",
-     "README.rdoc",
-     "Rakefile",
-     "db-charmer.gemspec",
-     "init.rb",
-     "lib/db_charmer.rb",
-     "lib/db_charmer/abstract_adapter/log_formatting.rb",
-     "lib/db_charmer/action_controller/force_slave_reads.rb",
-     "lib/db_charmer/active_record/association_preload.rb",
-     "lib/db_charmer/active_record/class_attributes.rb",
-     "lib/db_charmer/active_record/connection_switching.rb",
-     "lib/db_charmer/active_record/db_magic.rb",
-     "lib/db_charmer/active_record/finder_overrides.rb",
-     "lib/db_charmer/active_record/migration/multi_db_migrations.rb",
-     "lib/db_charmer/active_record/multi_db_proxy.rb",
-     "lib/db_charmer/active_record/named_scope/scope_proxy.rb",
-     "lib/db_charmer/active_record/sharding.rb",
-     "lib/db_charmer/connection_factory.rb",
-     "lib/db_charmer/connection_proxy.rb",
-     "lib/db_charmer/core_extensions.rb",
-     "lib/db_charmer/force_slave_reads.rb",
-     "lib/db_charmer/sharding.rb",
-     "lib/db_charmer/sharding/connection.rb",
-     "lib/db_charmer/sharding/method/db_block_group_map.rb",
-     "lib/db_charmer/sharding/method/db_block_map.rb",
-     "lib/db_charmer/sharding/method/hash_map.rb",
-     "lib/db_charmer/sharding/method/range.rb",
-     "lib/db_charmer/sharding/stub_connection.rb",
-     "lib/db_charmer/version.rb",
-     "lib/tasks/databases.rake"
+    "CHANGES",
+    "LICENSE",
+    "Makefile",
+    "README.rdoc",
+    "Rakefile",
+    "db-charmer.gemspec",
+    "init.rb",
+    "lib/db_charmer.rb",
+    "lib/db_charmer/abstract_adapter/log_formatting.rb",
+    "lib/db_charmer/action_controller/force_slave_reads.rb",
+    "lib/db_charmer/active_record/association_preload.rb",
+    "lib/db_charmer/active_record/class_attributes.rb",
+    "lib/db_charmer/active_record/connection_switching.rb",
+    "lib/db_charmer/active_record/db_magic.rb",
+    "lib/db_charmer/active_record/finder_overrides.rb",
+    "lib/db_charmer/active_record/migration/multi_db_migrations.rb",
+    "lib/db_charmer/active_record/multi_db_proxy.rb",
+    "lib/db_charmer/active_record/named_scope/scope_proxy.rb",
+    "lib/db_charmer/active_record/sharding.rb",
+    "lib/db_charmer/connection_factory.rb",
+    "lib/db_charmer/connection_proxy.rb",
+    "lib/db_charmer/core_extensions.rb",
+    "lib/db_charmer/force_slave_reads.rb",
+    "lib/db_charmer/sharding.rb",
+    "lib/db_charmer/sharding/connection.rb",
+    "lib/db_charmer/sharding/method.rb",
+    "lib/db_charmer/sharding/method/db_block_group_map.rb",
+    "lib/db_charmer/sharding/method/db_block_map.rb",
+    "lib/db_charmer/sharding/method/hash_map.rb",
+    "lib/db_charmer/sharding/method/range.rb",
+    "lib/db_charmer/sharding/stub_connection.rb",
+    "lib/db_charmer/version.rb",
+    "lib/tasks/databases.rake"
   ]
   s.homepage = %q{http://github.com/kovyrin/db-charmer}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{ActiveRecord Connections Magic}

data/lib/db_charmer.rb

@@ -1,4 +1,5 @@
 module DbCharmer
+  # Accessors
   @@connections_should_exist = true
   mattr_accessor :connections_should_exist
 
@@ -66,25 +67,30 @@ 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)
+require 'db_charmer/active_record/class_attributes'
+ActiveRecord::Base.extend(DbCharmer::ActiveRecord::ClassAttributes)
 
 # Enable connections switching in AR
-::ActiveRecord::Base.extend(DbCharmer::ActiveRecord::ConnectionSwitching)
+require 'db_charmer/active_record/connection_switching'
+ActiveRecord::Base.extend(DbCharmer::ActiveRecord::ConnectionSwitching)
 
 # Enable misc AR extensions
-::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, DbCharmer::AbstractAdapter::LogFormatting)
+require 'db_charmer/abstract_adapter/log_formatting'
+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)
+require 'db_charmer/active_record/multi_db_proxy'
+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)
+require 'db_charmer/active_record/named_scope/scope_proxy'
+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,16 +114,21 @@ module ::ActiveRecord
 end
 
 # Enable multi-db migrations
-::ActiveRecord::Migration.extend(DbCharmer::ActiveRecord::Migration::MultiDbMigrations)
+require 'db_charmer/active_record/migration/multi_db_migrations'
+ActiveRecord::Migration.extend(DbCharmer::ActiveRecord::Migration::MultiDbMigrations)
 
 # Enable the magic
-::ActiveRecord::Base.extend(DbCharmer::ActiveRecord::DbMagic)
+require 'db_charmer/active_record/finder_overrides'
+require 'db_charmer/active_record/sharding'
+require 'db_charmer/active_record/db_magic'
+ActiveRecord::Base.extend(DbCharmer::ActiveRecord::DbMagic)
 
 # Setup association preload magic
-::ActiveRecord::Base.extend(DbCharmer::ActiveRecord::AssociationPreload)
+require 'db_charmer/active_record/association_preload'
+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 << self
@@ -133,5 +144,6 @@ end
 
 #-----------------------------------------------------------------------------------------------------------------------
 # Extend ActionController to support forcing slave reads
-::ActionController::Base.extend(DbCharmer::ActionController::ForceSlaveReads::ClassMethods)
-::ActionController::Base.send(:include, DbCharmer::ActionController::ForceSlaveReads::InstanceMethods)
+require 'db_charmer/action_controller/force_slave_reads'
+ActionController::Base.extend(DbCharmer::ActionController::ForceSlaveReads::ClassMethods)
+ActionController::Base.send(:include, DbCharmer::ActionController::ForceSlaveReads::InstanceMethods)

data/lib/db_charmer/sharding.rb

@@ -1,5 +1,9 @@
 module DbCharmer
   module Sharding
+    autoload :Connection, 'db_charmer/sharding/connection'
+    autoload :StubConnection, 'db_charmer/sharding/stub_connection'
+    autoload :Method, 'db_charmer/sharding/method'
+
     @@sharded_connections = {}
 
     def self.register_connection(config)
@@ -12,4 +16,3 @@ module DbCharmer
     end
   end
 end
-

data/lib/db_charmer/sharding/method.rb

@@ -0,0 +1,10 @@
+module DbCharmer
+  module Sharding
+    module Method
+      autoload :Range, 'db_charmer/sharding/method/range'
+      autoload :HashMap, 'db_charmer/sharding/method/hash_map'
+      autoload :DbBlockMap, 'db_charmer/sharding/method/db_block_map'
+      autoload :DbBlockGroupMap, 'db_charmer/sharding/method/db_block_group_map'
+    end
+  end
+end

data/lib/db_charmer/version.rb

@@ -3,7 +3,7 @@ module DbCharmer
     MAJOR = 1
     MINOR = 7
     PATCH = 0
-    BUILD = 'pre3'
+    BUILD = 'pre4'
 
     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: 1923832063
+  hash: 1923832049
   prerelease: 6
   segments: 
   - 1
   - 7
   - 0
   - pre
-  - 3
-  version: 1.7.0.pre3
+  - 4
+  version: 1.7.0.pre4
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -75,7 +75,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - CHANGES
 - LICENSE
 - Makefile
@@ -101,6 +100,7 @@ files:
 - lib/db_charmer/force_slave_reads.rb
 - lib/db_charmer/sharding.rb
 - lib/db_charmer/sharding/connection.rb
+- lib/db_charmer/sharding/method.rb
 - lib/db_charmer/sharding/method/db_block_group_map.rb
 - lib/db_charmer/sharding/method/db_block_map.rb
 - lib/db_charmer/sharding/method/hash_map.rb
@@ -113,8 +113,8 @@ homepage: http://github.com/kovyrin/db-charmer
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,2 +0,0 @@
-/doc
-/pkg