db-charmer 1.7.0.pre5 → 1.7.0.pre6

data/.gitignore

@@ -0,0 +1,3 @@
+/doc
+/pkg
+.DS_Store

data/README.rdoc

@@ -292,8 +292,8 @@ send their reads to slaves. Example:
 
 3) <tt>force_slave_reads!</tt> +ActionController+ instance method, that could be used within
 your actions or in controller filters to temporarily switch your models to forced slave reads
-mode. This could be useful for cases when the same actions could be called by logged-in and
-anonymous users. Then you could authorize users in <tt>before_filter</tt> and call
+mode. This method could be useful for cases when the same actions could be called by logged-in 
+and anonymous users. Then you could authorize users in <tt>before_filter</tt> and call
 <tt>force_slave_reads!</tt> method for anonymous page views.
 
   class ProfilesController < Application
@@ -303,6 +303,10 @@ anonymous users. Then you could authorize users in <tt>before_filter</tt> and ca
     ...
   end
 
+Notice: Before using this method you need to enable +ActionController+ support in +DbCharmer+.
+You need to call <tt>DbCharmer.enable_controller_magic!</tt> method from your project
+initialization code.
+
 4) <tt>DbCharmer.force_slave_reads</tt> method that could be used with a block of ruby code
 and would enable forced slave reads mode until the end of the block execution. This is really
 powerful feature allowing high granularity in your control of forced slave reads mode. Example:

data/Rakefile

@@ -1,22 +1,4 @@
-begin
-  require 'jeweler'
-  require './lib/db_charmer/version.rb'
+require 'rake'
+require 'bundler'
 
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = 'db-charmer'
-    gemspec.summary = 'ActiveRecord Connections Magic'
-    gemspec.description = 'ActiveRecord Connections Magic (slaves, multiple connections, etc)'
-    gemspec.email = 'alexey@kovyrin.net'
-    gemspec.homepage = 'http://github.com/kovyrin/db-charmer'
-    gemspec.authors = ['Alexey Kovyrin']
-
-    gemspec.version = DbCharmer::Version::STRING
-
-    gemspec.add_dependency('activesupport', '~> 2.2')
-    gemspec.add_dependency('activerecord', '~> 2.2')
-    gemspec.add_dependency('actionpack', '~> 2.2')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler not available. Install it with: sudo gem install jeweler'
-end
+Bundler::GemHelper.install_tasks

data/db-charmer.gemspec

@@ -1,77 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'db_charmer/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{db-charmer}
-  s.version = "1.7.0.pre5"
+  s.name          = 'db-charmer'
+  s.version       = DbCharmer::Version::STRING
+  s.platform      = Gem::Platform::RUBY
 
-  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-06-21}
-  s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
-  s.email = %q{alexey@kovyrin.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    "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.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{ActiveRecord Connections Magic}
+  s.authors       = [ 'Alexey Kovyrin' ]
+  s.email         = 'alexey@kovyrin.net'
+  s.homepage      = 'http://github.com/kovyrin/db-charmer'
+  s.summary       = 'ActiveRecord Connections Magic (slaves, multiple connections, etc)'
+  s.description   = 'DbCharmer is a Rails plugin (and gem) that could be used to manage AR model connections, implement master/slave query schemes, sharding and other magic features many high-scale applications need.'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.rdoc_options = [ '--charset=UTF-8' ]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 2.2"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.2"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 2.2"])
-    else
-      s.add_dependency(%q<activesupport>, ["~> 2.2"])
-      s.add_dependency(%q<activerecord>, ["~> 2.2"])
-      s.add_dependency(%q<actionpack>, ["~> 2.2"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, ["~> 2.2"])
-    s.add_dependency(%q<activerecord>, ["~> 2.2"])
-    s.add_dependency(%q<actionpack>, ["~> 2.2"])
-  end
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'actionpack'
+
+  s.files            = `git ls-files`.split("\n")
+  s.require_paths    = [ 'lib' ]
+  s.extra_rdoc_files = [ 'LICENSE', 'README.rdoc' ]
+
+  # Dependencies
+  s.add_dependency 'activesupport', '~> 2.2'
+  s.add_dependency 'activerecord', '~> 2.2'
 end
 

data/lib/db_charmer.rb

@@ -2,6 +2,9 @@ module DbCharmer
   # Configure autoload
   autoload :Sharding, 'db_charmer/sharding'
   autoload :Version,  'db_charmer/version'
+  module ActionController
+    autoload :ForceSlaveReads, 'db_charmer/action_controller/force_slave_reads'
+  end
 
   # Accessors
   @@connections_should_exist = true
@@ -23,6 +26,12 @@ module DbCharmer
     !! connections_should_exist
   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)
@@ -145,9 +154,3 @@ class ::ActiveRecord::Base
     alias_method_chain :inherited, :hijacking
   end
 end
-
-#-----------------------------------------------------------------------------------------------------------------------
-# Extend ActionController to support forcing slave reads
-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/version.rb

@@ -3,7 +3,7 @@ module DbCharmer
     MAJOR = 1
     MINOR = 7
     PATCH = 0
-    BUILD = 'pre5'
+    BUILD = 'pre6'
 
     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: 1923832051
+  hash: 1923832053
   prerelease: 6
   segments: 
   - 1
   - 7
   - 0
   - pre
-  - 5
-  version: 1.7.0.pre5
+  - 6
+  version: 1.7.0.pre6
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -17,28 +17,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 -04:00
+date: 2011-06-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 2
-        - 2
-        version: "2.2"
-  type: :runtime
+        - 0
+        version: "0"
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: yard
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +76,11 @@ dependencies:
         - 2
         version: "2.2"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,8 +91,8 @@ dependencies:
         - 2
         version: "2.2"
   type: :runtime
-  version_requirements: *id003
-description: ActiveRecord Connections Magic (slaves, multiple connections, etc)
+  version_requirements: *id005
+description: DbCharmer is a Rails plugin (and gem) that could be used to manage AR model connections, implement master/slave query schemes, sharding and other magic features many high-scale applications need.
 email: alexey@kovyrin.net
 executables: []
 
@@ -75,6 +102,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - CHANGES
 - LICENSE
 - Makefile
@@ -113,8 +141,8 @@ homepage: http://github.com/kovyrin/db-charmer
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -143,6 +171,6 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: ActiveRecord Connections Magic
+summary: ActiveRecord Connections Magic (slaves, multiple connections, etc)
 test_files: []