fresh_connection 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5020cb29611bf24a7ee6063ce70c1df0c58fc241
-  data.tar.gz: 2c4e322e659d9cb8cc96c71a670c8cfff55bcbc7
+  metadata.gz: f83d1ba0780db658b9d3e9879476a4992b3f43ba
+  data.tar.gz: f25542e364f014b4fae17820715f91bb24ce4e1c
 SHA512:
-  metadata.gz: a9e952072b5549d5b36fb2702f9ddee6a0299b9e8360c9efb668afd7b5684d5d214d79f17d82fc619185de642668a03cdd74d046a119afebe4f3c75c274d7afe
-  data.tar.gz: 886a5c6650c1fc07cdce4191b0b3d00b808dc3219cb1169f62b0a2027d4c72b529b7779241e64085d0122d283b5bc4d85597067501429d8e5f3ffa1c05714ccb
+  metadata.gz: 7351305422d63add314a3a3a2aea341557d9338fae72af84c252e311cb7f5f3a0b2c669ec79d2230889e373acf094f8a3670006c2093a6c17027abd4af5acc34
+  data.tar.gz: 8a19c6258fcff2798143c6a807e538980f9dc3afa73b689f9b028dc2cdb126acdab0f6deb2b7af72e701bf24933664a725944c807a2f5fa2bcb78fcbd291687c

data/lib/fresh_connection/active_record/relation.rb

@@ -5,7 +5,7 @@ module ActiveRecord
     def exec_queries_with_slave_connection
       return @records if loaded?
 
-      FreshConnection::SlaveConnection.manage_access(@klass.name, go_slave?) do
+      FreshConnection::SlaveConnection.manage_access(@klass, go_slave?) do
         exec_queries_without_slave_connection
       end
     end

data/lib/fresh_connection/connection_manager.rb

@@ -1,15 +1,23 @@
 module FreshConnection
   class ConnectionManager
+    def initialize
+      @mutex = Mutex.new
+    end
+
     def slave_connection
-      @slave_connections ||= {}
-      @slave_connections[current_thread_id] ||= new_connection
+      @mutex.synchronize do
+        @slave_connections ||= {}
+        @slave_connections[current_thread_id] ||= new_connection
+      end
     end
 
     def put_aside!
-      if @slave_connections.present?
-        @slave_connections.each_value{|c| c && c.disconnect! rescue nil}
+      @mutex.synchronize do
+        if @slave_connections.present?
+          @slave_connections.each_value{|c| c && c.disconnect! rescue nil}
+        end
+        @slave_connections = {}
       end
-      @slave_connections = {}
     end
 
     private

data/lib/fresh_connection/slave_connection.rb

@@ -18,8 +18,8 @@ module FreshConnection
         connection_manager.put_aside!
       end
 
-      def manage_access(model_name, go_slave, &block)
-        if ignore_model?(model_name)
+      def manage_access(model_klass, go_slave, &block)
+        if ignore_model?(model_klass)
           force_master_access(&block)
         else
           target = go_slave ? :slave : :master
@@ -36,8 +36,17 @@ module FreshConnection
         Thread.current[TARGET] == :slave
       end
 
-      def ignore_model?(model_name)
-        (@ignore_models || []).include?(model_name)
+      def ignore_model?(model_klass)
+        (@ignore_models || []).one? do |ignore_model|
+          case ignore_model
+          when String
+            ignore_model == model_klass.name
+          when ActiveRecord::Base
+            model_klass.ancestors.include?(ignore_model)
+          else
+            false
+          end
+        end
       end
 
       def ignore_configure_connection?

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord