read_from_slave 0.5.0 → 0.5.1

data/README

@@ -114,7 +114,7 @@ The safest thing to do is to have something like this in your production.rb or e
 
 Documentation
 
-http://rdoc.info/projects/sdsykes/read_from_slave
+http://rdoc.info/github/sdsykes/read_from_slave/master/frames
 
 Tests
 

data/README.textile

@@ -142,7 +142,7 @@ end
 
 h2. Documentation
 
-"http://rdoc.info/projects/sdsykes/read_from_slave":http://rdoc.info/projects/sdsykes/read_from_slave
+"http://rdoc.info/github/sdsykes/read_from_slave/master/frames":http://rdoc.info/github/sdsykes/read_from_slave/master/frames
 
 h2. Tests
 

data/VERSION.yml

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

data/lib/read_from_slave/railtie.rb

@@ -0,0 +1,10 @@
+require 'read_from_slave'
+require 'rails'
+
+module ReadFromSlave
+  class Railtie < Rails::Railtie
+    initializer 'read_from_slave.install_with_methods', :after=>"active_record.initialize_database" do |app|
+      ReadFromSlave.install_with_methods!
+    end
+  end
+end

data/lib/read_from_slave.rb

@@ -82,6 +82,20 @@ module ReadFromSlave
       end
     end
 
+    def install_with_methods!
+      ActiveRecord::Base.connection.instance_variable_get(:@config)[:slaves].each_key do |slave_name|
+        ActiveRecord::Base.class_eval <<-EOM
+          def self.with_#{slave_name}(&block)
+            Thread.current[:with_#{slave_name}_count] ||= 0
+            Thread.current[:with_#{slave_name}_count] += 1
+            yield
+          ensure
+            Thread.current[:with_#{slave_name}_count] -= 1
+          end
+        EOM
+      end if ActiveRecord::Base.connection.instance_variable_get(:@config)[:slaves]
+    end
+
     def default_to_master!
       base = ActiveRecord::Base
       base.class_eval do
@@ -121,18 +135,6 @@ module ReadFromSlave
       Thread.current[:read_from_slave] = false
     end
 
-    ActiveRecord::Base.connection.instance_variable_get(:@config)[:slaves].each_key do |slave_name|
-      eval <<-EOM
-        def with_#{slave_name}(&block)
-          Thread.current[:with_#{slave_name}_count] ||= 0
-          Thread.current[:with_#{slave_name}_count] += 1
-          yield
-        ensure
-          Thread.current[:with_#{slave_name}_count] -= 1
-        end
-      EOM
-    end if ActiveRecord::Base.connection.instance_variable_get(:@config)[:slaves]
-
     def connection_with_slave_db_scope
       slaves.each_key do |slave_name|
         if Thread.current[:"with_#{slave_name}_count"].to_i > 0
@@ -247,3 +249,8 @@ module ReadFromSlave
 end
 
 ReadFromSlave.install!
+if defined? ::Rails::Railtie
+  require 'read_from_slave/railtie'
+else
+  ReadFromSlave.install_with_methods!
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: read_from_slave
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors: 
 - Stephen Sykes
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 +03:00
-default_executable: 
+date: 2011-06-01 00:00:00 Z
 dependencies: []
 
 description: Read_from_slave for Rails enables database reads from a slave database, while writes continue to go to the master
@@ -34,6 +28,7 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/read_from_slave.rb
+- lib/read_from_slave/railtie.rb
 - test/active_record_setup.rb
 - test/helper.rb
 - test/models/course.rb
@@ -41,7 +36,6 @@ files:
 - test/schema/schema.rb
 - test/setup.rb
 - test/test.rb
-has_rdoc: true
 homepage: http://github.com/sdsykes/read_from_slave
 licenses: []
 
@@ -55,23 +49,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Read_from_slave - Utilise your slave databases with rails