db-charmer 1.7.1 → 1.8.0.pre1

data/CHANGES

@@ -1,3 +1,14 @@
+1.8.0 (2012-11-12):
+
+Added support for Rails versions up to 3.2.9. Please note, that Rails 3.2.4 is not officially
+supported. Your code may work on that version, but no bug reports will be accepted about this
+version.
+
+Tests for DbCharmer have been moved to the gem repository to make Travis-CI integration more
+stable. We do not put test files into the gem inself so it should not be a problem for most
+of the users. If you still use db-charmer as a plugin, please switch to gem mode.
+
+----------------------------------------------------------------------------------------
 1.7.1 (2012-04-22):
 
 Beta feature: Rails 3.1 and 3.2 support

data/README.rdoc

@@ -16,7 +16,7 @@ For more information on the project, you can check out our web site at http://ko
 == Installation
 
 There are two options when approaching +DbCharmer+ installation:
-* using the gem (recommended and the only way of using it with Rails 3.0+)
+* using the gem (recommended and the only way of using it with Rails 3.2+)
 * install as a Rails plugin (works in Rails 2.x only)
 
 To install as a gem, add this to your Gemfile:
@@ -276,7 +276,7 @@ This option could be used to disable automated slave reads on your models so tha
 call <tt>on_slave</tt> or use other methods to enable slave reads when you need it. Example:
 
   class User < ActiveRecord::Base
-    db_magic :slave => slave01, :forced_slave_reads => false
+    db_magic :slave => slave01, :force_slave_reads => false
   end
 
 2) <tt>force_slave_reads</tt> +ActionController+ class method. This method could be used to
@@ -582,17 +582,30 @@ the DbCharmer Users Group mailing list:
 
 == What Ruby and Rails implementations does it work for?
 
-We have a continuous integration setup for this gem on with Rails 2.2, 2.3 and 3.0 using a few
-different versions of Ruby. For more information about the build matrix please visit
-http://github.com/kovyrin/db-charmer-sandbox web site.
+We have a continuous integration setup for this gem on with Rails 2.3, 3.0, 3.1 and 3.2 using a few
+different versions of Ruby.
 
-In addition to CI testing, we use this gem in production on Scribd.com (one of the largest RoR
+CI is running on TravisCI.org: https://travis-ci.org/kovyrin/db-charmer
+
+At the moment we have the following build matrix:
+
+* Rails versions:
+  - 2.x {<img src="https://secure.travis-ci.org/kovyrin/db-charmer-sandbox.png?branch=rails23" alt="Build Status: Rails 2.x" />}[https://travis-ci.org/kovyrin/db-charmer-sandbox]
+  - 3.x {<img src="https://secure.travis-ci.org/kovyrin/db-charmer.png?branch=master" alt="Build Status: Rails 3.x" />}[https://travis-ci.org/kovyrin/db-charmer]
+* Ruby versions:
+  - 1.8.7
+  - Ruby Enterprise Edition (1.8.7)
+  - 1.9.3 (Rails 3 only since older versions do not support new ruby releases)
+* Databases:
+  - MySQL
+
+In addition to CI testing, this gem is used in production on Scribd.com (one of the largest RoR
 sites in the world) with Ruby Enterprise Edition and Rails 2.2, Rails 2.3, Sinatra and plain
 Rack applications.
 
-Starting with version 1.7.0 we support Rails 3.0, but until further notice we consider it a
-beta-quality feature since we do not run any production software on this version of Rails. If you
-run your application on Rails 3.0, please contact the author.
+Starting with version 1.8.0 we support Rails versions up to 3.2.8. Please note, that Rails 3.2.4
+is not officially supported. Your code may work on that version, but no bug reports will be
+accepted about this version.
 
 
 == Who are the authors?
@@ -605,8 +618,12 @@ Other contributors who have helped with the development of this library are (alp
 * Allen Madsen
 * Andrew Geweke
 * Ashley Martens
+* Cauê Guerra
+* David Dai
 * Dmytro Shteflyuk
 * Eric Lindvall
+* Eugene Pimenov
+* Jonathan Viney
 * Gregory Man
 * Michael Birk
 * Tyler McMullen

data/lib/db_charmer.rb

@@ -24,6 +24,11 @@ module DbCharmer
     ::ActiveRecord::VERSION::MAJOR == 2
   end
 
+  # Used in all Rails2-specific places
+  def self.rails324?
+    ActiveRecord::VERSION::STRING == '3.2.4'
+  end
+
   # Accessors
   @@connections_should_exist = true
   mattr_accessor :connections_should_exist
@@ -91,6 +96,9 @@ 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?
+
 # Add useful methods to global object
 require 'db_charmer/core_extensions'
 

data/lib/db_charmer/action_controller/force_slave_reads.rb

@@ -4,7 +4,7 @@ module DbCharmer
 
       module ClassMethods
         @@db_charmer_force_slave_reads_actions = {}
-        def force_slave_reads(params)
+        def force_slave_reads(params = {})
           @@db_charmer_force_slave_reads_actions[self.name] = {
             :except => params[:except] ? [*params[:except]].map(&:to_s) : [],
             :only => params[:only] ? [*params[:only]].map(&:to_s) : []

data/lib/db_charmer/core_extensions.rb

@@ -17,7 +17,7 @@ class Object
 end
 
 class NilClass
-  def try(method, *options, &block)
+  def try(*args)
     nil
   end
 end

data/lib/db_charmer/version.rb

@@ -1,9 +1,9 @@
 module DbCharmer
   module Version
     MAJOR = 1
-    MINOR = 7
-    PATCH = 1
-    BUILD = nil
+    MINOR = 8
+    PATCH = 0
+    BUILD = "pre1"
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 1690807325
+  prerelease: 6
   segments: 
   - 1
-  - 7
+  - 8
+  - 0
+  - pre
   - 1
-  version: 1.7.1
+  version: 1.8.0.pre1
 platform: ruby
 authors: 
 - Oleksiy Kovyrin
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-22 00:00:00 Z
+date: 2012-11-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,12 +27,12 @@ dependencies:
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 29
         segments: 
         - 3
         - 2
-        - 3
-        version: 3.2.3
+        - 9
+        version: 3.2.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +43,12 @@ dependencies:
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 29
         segments: 
         - 3
         - 2
-        - 3
-        version: 3.2.3
+        - 9
+        version: 3.2.9
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -101,15 +103,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
-- CHANGES
-- LICENSE
-- Makefile
-- README.rdoc
-- Rakefile
-- db-charmer.gemspec
-- init.rb
-- lib/db_charmer.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
@@ -133,16 +126,21 @@ files:
 - lib/db_charmer/rails31/active_record/migration/command_recorder.rb
 - lib/db_charmer/rails31/active_record/preloader/association.rb
 - lib/db_charmer/rails31/active_record/preloader/has_and_belongs_to_many.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/method.rb
 - lib/db_charmer/sharding/stub_connection.rb
+- lib/db_charmer/sharding.rb
 - lib/db_charmer/version.rb
+- lib/db_charmer.rb
 - lib/tasks/databases.rake
+- init.rb
+- README.rdoc
+- LICENSE
+- CHANGES
 homepage: http://kovyrin.github.com/db-charmer
 licenses: []
 
@@ -163,16 +161,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord Connections Magic (slaves, multiple connections, etc)

data/.gitignore

@@ -1,4 +0,0 @@
-/doc
-/pkg
-.DS_Store
-/_site

data/Makefile

@@ -1,2 +0,0 @@
-doc/files/README_rdoc.html:	README.rdoc
-	rdoc README.rdoc

data/Rakefile

@@ -1,4 +0,0 @@
-require 'rake'
-require 'bundler'
-
-Bundler::GemHelper.install_tasks

data/db-charmer.gemspec

@@ -1,29 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'db_charmer/version'
-
-Gem::Specification.new do |s|
-  s.name          = 'db-charmer'
-  s.version       = DbCharmer::Version::STRING
-  s.platform      = Gem::Platform::RUBY
-
-  s.authors       = [ 'Oleksiy Kovyrin' ]
-  s.email         = 'alexey@kovyrin.net'
-  s.homepage      = 'http://kovyrin.github.com/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.'
-
-  s.rdoc_options = [ '--charset=UTF-8' ]
-
-  s.files            = `git ls-files`.split("\n")
-  s.require_paths    = [ 'lib' ]
-  s.extra_rdoc_files = [ 'LICENSE', 'README.rdoc' ]
-
-  # Dependencies
-  s.add_dependency 'activesupport', '<= 3.2.3'
-  s.add_dependency 'activerecord', '<= 3.2.3'
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'actionpack'
-end