read_from_slave 0.3.0 → 0.4.0

data/README

@@ -2,17 +2,17 @@ Read_from_slave
 
 Read_from_slave for Rails enables database reads from a slave database, while writes continue to go to the master
 
-Read_from_slave will work with Rails 2.2 and above.
+Read_from_slave will work with Rails 2.2 and above, including Rails 3 versions.
 
 Installation
 
-sudo gem install sdsykes-read_from_slave
+gem install read_from_slave
 
 Configuration
 
 In config/environments/production.rb (for instance)
 
-  config.gem "sdsykes-read_from_slave", :lib=>"read_from_slave"
+  config.gem "read_from_slave"
 
 In config/database.yml
 

data/README.textile

@@ -2,13 +2,13 @@ h1. Read_from_slave
 
 h4. Read_from_slave for Rails enables database reads from a slave database, while writes continue to go to the master
 
-Read_from_slave will work with Rails 2.2 and above.
+Read_from_slave will work with Rails 2.2 and above, including Rails 3 versions.
 
 h2. Installation
 
 <pre>
 <code>
-sudo gem install sdsykes-read_from_slave
+gem install read_from_slave
 </code>
 </pre>
 
@@ -18,7 +18,7 @@ In config/environments/production.rb (for instance)
 
 <pre>
 <code>
-config.gem "sdsykes-read_from_slave", :lib=>"read_from_slave"
+config.gem "read_from_slave"
 </code>
 </pre>
 

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:minor: 3
-:patch: 0
+:minor: 4
+:build: 
 :major: 0
+:patch: 0

data/lib/read_from_slave.rb

@@ -3,10 +3,14 @@
 # To use read_from_slave you must install the gem, configure the gem in your environment file,
 # and setup your database.yml file with an entry for your slave database.
 #
+#   gem install read_from_slave
+#
+# Read_from_slave is compatible with Rails 2.2.x and Rails 3
+#
 # === Configuration
 # In config/environments/production.rb (for instance)
 #
-#   config.gem "sdsykes-read_from_slave", :lib=>"read_from_slave"
+#   config.gem "read_from_slave"
 #
 # In config/database.yml  
 #
@@ -47,13 +51,26 @@ module ReadFromSlave
       base = ActiveRecord::Base
       base.send(:include, InstanceMethods)
       base.alias_method_chain :reload, :read_from_slave
-      base.extend(SingletonMethods)
+      base.extend(ClassMethods)
       base.class_eval do
         class << self
           alias_method_chain :find_by_sql, :read_from_slave
           alias_method_chain :connection, :read_from_slave
         end
       end
+      
+      begin
+        calculation_base = ActiveRecord::Relation  # rails 3
+        calculation_base.send(:include, CalculationMethod)
+        calculation_base.alias_method_chain :calculate, :read_from_slave
+      rescue NameError  # rails 2
+        base.extend(CalculationMethod)
+        base.class_eval do
+          class << self
+            alias_method_chain :calculate, :read_from_slave
+          end
+        end
+      end
     end
   end
 
@@ -64,7 +81,7 @@ module ReadFromSlave
     end
   end
 
-  module SingletonMethods
+  module ClassMethods
 
     @@slave_models = {}
 
@@ -146,6 +163,15 @@ module ReadFromSlave
       end
     end
   end
+  
+  module CalculationMethod
+    def calculate_with_read_from_slave(*args)
+      Thread.current[:read_from_slave] = true
+      calculate_without_read_from_slave(*args)
+    ensure
+      Thread.current[:read_from_slave] = false      
+    end
+  end
 end
 
 ReadFromSlave.install!

data/test/read_from_slave_test.rb

@@ -42,4 +42,10 @@ class ReadFromSlaveTest < ActiveSupport::TestCase
     ActiveRecord::Base.establish_slave_connections
     assert_equal conn, Course.connection_without_read_from_slave
   end
+  
+  test "count should use the slave" do
+    Course.create(:name=>"Saw playing")
+    assert_equal 1, Course.count
+    assert_equal :slave, Thread.current[:read_from_slave_uses]
+  end
 end

data/test/setup.rb

@@ -1,3 +1,7 @@
 require 'rubygems'
-require 'activerecord'
+
+# specify rails version to test with here
+#gem 'activerecord', '= 2.3.8'
+
+require 'active_record'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'read_from_slave')

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: read_from_slave
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Stephen Sykes
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +03:00
+date: 2010-08-14 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -45,21 +51,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Read_from_slave - Utilise your slave databases with rails