read_from_slave 0.5.1 → 0.5.2

data/lib/read_from_slave.rb

@@ -128,9 +128,9 @@ module ReadFromSlave
 
     @@slave_models = {}
 
-    def find_by_sql_with_read_from_slave(sql)
+    def find_by_sql_with_read_from_slave(*find_args)
       Thread.current[:read_from_slave] = (Thread.current[:read_from_slave] != :reload)
-      find_by_sql_without_read_from_slave(sql)
+      find_by_sql_without_read_from_slave(*find_args)
     ensure
       Thread.current[:read_from_slave] = false
     end
@@ -149,7 +149,7 @@ module ReadFromSlave
       if Thread.current[:read_from_slave] && normal_connection.open_transactions == 0
         slaves.each do |slave_name, slave_config|
           if Thread.current[:"with_#{slave_name}_count"].to_i > 0
-            Thread.current[:read_from_slave_uses] = slave_name  # for testing use
+            Thread.current[:read_from_slave_uses] = slave_name.to_sym  # for testing use
             return slave_connection(slave_config)
           end
         end
@@ -204,7 +204,7 @@ module ReadFromSlave
 
     # Returns the first slave defined in database.yml which will be used by default for reads
     def primary_slave_config
-      slaves[primary_slave_name]
+      slaves.symbolize_keys[primary_slave_name]
     end
 
     # Returns the first slave defined in database.yml which will be used by default for reads

data/test/helper.rb

@@ -37,7 +37,7 @@ module ReadFromSlave
                 :database => 'test_db',
                 :timeout => 5000,
                 :slaves =>
-                    {:primary_slave => 'primary_slave',
+                    {'primary_slave' => 'primary_slave',
                      :slave_2 => 'slave_2'
                     }
             },

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: read_from_slave
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.1
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Stephen Sykes
@@ -10,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 Z
+date: 2011-11-27 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
 description: Read_from_slave for Rails enables database reads from a slave database, while writes continue to go to the master
@@ -36,6 +42,7 @@ files:
 - test/schema/schema.rb
 - test/setup.rb
 - test/test.rb
+has_rdoc: true
 homepage: http://github.com/sdsykes/read_from_slave
 licenses: []
 
@@ -49,17 +56,23 @@ 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.8.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Read_from_slave - Utilise your slave databases with rails