fresh_connection 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb171789539cc2eaf31793f904e53f4c0a9f1114
-  data.tar.gz: be8ef001eec63ca7a879d3950fb460b7f300bdb6
+  metadata.gz: 3707472745859247112e68f0b348876811dcea97
+  data.tar.gz: 032461a6457f8ff4b5f566ef54e4ace7160aeebd
 SHA512:
-  metadata.gz: becd1aed70d40cecaa8155630609e7ec13d9fd62c4f4ce6fb92e4f6e54bdeb025915aa55dc9deb226da2a89f6c0bfb491353dea84b68595bf015599108c8e238
-  data.tar.gz: 4aa63bc28708181c47df8dfd211e6fceb2df57dc2a45d1e053a0594db9d1b82b6d366c0186c77f17f1b8faa80a5fccd26f4d9aa8fe51a88b9a9b0451aee32fcf
+  metadata.gz: 504d3589083726b6403c1e828dbe5d4b692e6b0bd695c21422a23daad8f6427dc8151fb9f00dd1dd18c4929189dbbf621d736e7fc176b52fa9fe8f7d17e87649
+  data.tar.gz: ead47efa46d780b2a1e0586c2a5be2347c1f4e8bf7a47323d38cd8b90d9f33af344d874642792a8c59ba01b3444627f24bca04ad33825b7a1c67a708c359076f

data/fresh_connection.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '~> 3.2.0'
+  spec.add_dependency 'activerecord', '>= 3.2.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/fresh_connection/active_record/abstract_adapter.rb

@@ -13,11 +13,11 @@ module ActiveRecord
       private
 
       def change_connection
-        master_con, @connection =
-          @connection, FreshConnection::SlaveConnection.connection.raw_connection
+        master_connection, @connection =
+          @connection, FreshConnection::SlaveConnection.raw_connection
         yield
       ensure
-        @connection = master_con
+        @connection = master_connection
       end
     end
   end

data/lib/fresh_connection/active_record/relation.rb

@@ -5,18 +5,20 @@ module ActiveRecord
     def exec_queries_with_slave_connection
       return @records if loaded?
 
-      if FreshConnection::SlaveConnection.ignore_model?(@klass.name)
-        FreshConnection::SlaveConnection.force_master_access { exec_queries_without_slave_connection }
-      elsif go_slave?
-        FreshConnection::SlaveConnection.slave_access { exec_queries_without_slave_connection }
-      else
-        FreshConnection::SlaveConnection.master_access { exec_queries_without_slave_connection }
+      FreshConnection::SlaveConnection.manage_access(@klass.name, go_slave?) do
+        exec_queries_without_slave_connection
       end
     end
     alias_method_chain :exec_queries, :slave_connection
 
-    def go_slave?
-      connection.open_transactions == 0 && (@readonly_value.nil? || @readonly_value)
+    if Rails.version.to_f > 3
+      def go_slave?
+        connection.open_transactions == 0 && (readonly_value.nil? || readonly_value)
+      end
+    else
+      def go_slave?
+        connection.open_transactions == 0 && (@readonly_value.nil? || @readonly_value)
+      end
     end
   end
 end

data/lib/fresh_connection/slave_connection.rb

@@ -6,8 +6,8 @@ module FreshConnection
     class << self
       attr_writer :ignore_models, :ignore_configure_connection, :master_clear_connection
 
-      def connection
-        slave_connection
+      def raw_connection
+        slave_connection.raw_connection
       end
 
       def clear_all_connections!
@@ -17,26 +17,18 @@ module FreshConnection
         @slave_connections = {}
       end
 
-      def slave_access
-        access_in(:slave)
-        yield
-      ensure
-        access_out
-      end
-
-      def master_access
-        access_in(:master)
-        yield
-      ensure
-        access_out
-      end
-
-      def force_master_access
-        now_target = Thread.current[TARGET]
-        Thread.current[TARGET] = :master
-        yield
-      ensure
-        Thread.current[TARGET] = now_target
+      def manage_access(model_name, go_slave, &block)
+        if ignore_model?(model_name)
+          force_master_access(&block)
+        else
+          target = go_slave ? :slave : :master
+          begin
+            access_in(target)
+            block.call
+          ensure
+            access_out
+          end
+        end
       end
 
       def slave_access?
@@ -57,6 +49,14 @@ module FreshConnection
 
       private
 
+      def force_master_access
+        now_target = Thread.current[TARGET]
+        Thread.current[TARGET] = :master
+        yield
+      ensure
+        Thread.current[TARGET] = now_target
+      end
+
       def access_in(target)
         Thread.current[COUNT] = (Thread.current[COUNT] || 0) + 1
         Thread.current[TARGET] ||= target
@@ -70,7 +70,6 @@ module FreshConnection
         end
       end
 
-
       def slave_connection
         @slave_connections ||= {}
         @slave_connections[current_thread_id] ||= new_connection

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency