switch_point 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7214878a8ac1b215808ee7fb386f02643ca94961
-  data.tar.gz: 05cad4a43106ab868ed8bcc47be9ed881a202f7e
+  metadata.gz: 4b8ceb04a21d6850779c5fcc61d2b0552bec494f
+  data.tar.gz: 0d6cc9ce87e7f320b1b7e14ff7dd3be22578dbde
 SHA512:
-  metadata.gz: 6344f088708f67f8bb5bf8d55ed908356469cffda84c7ae65e96e82fa72394f002c26857e576410ee6c3c72b9bfc5e5700e72d07a01e6eab6191a87cd60d1e98
-  data.tar.gz: 0cebcc98ac866bddc15bd8bc5b1a85669cf09aaadbadeaca24c0fa0b531a4d9e65986ac4dca65f40e90911f319c7e704b51ffc17ba5a28c4755ab2dac248482c
+  metadata.gz: cfff954c906a2c517ea9a9fb70780bf3504d076ad25db2db6f37dcbd6eadf34017b5649465a6addc8cdbf477abb79559a8c680385f024a7b5d70a179734bf094
+  data.tar.gz: 17a845a358c5ce19a13d8b42d0bef169ffb6c756efc36cc19176bdc4780776e5071982bacac0eb82ebe0ebf33ea8e59de96b23827b03bd6d159c3c74215fc254

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0 (2014-06-04)
+- Improve thread safety
+- Raise appropriate error if unknown mode is given to with_connection
+
 ## 0.2.3 (2014-06-02)
 - Support specifying the same database name within different switch_point
 - Add Proxy#readonly? and Proxy#writable? predicate

data/README.md

@@ -21,9 +21,6 @@ Or install it yourself as:
 
 See [spec/models](spec/models.rb).
 
-## TODO
-- Thread safety
-
 ## Contributing
 
 1. Fork it ( https://github.com/eagletmt/switch_point/fork )

data/lib/switch_point/proxy.rb

@@ -2,15 +2,18 @@ module SwitchPoint
   class Proxy
     attr_reader :initial_name
 
+    AVAILABLE_MODES = [:readonly, :writable]
+    DEFAULT_MODE = :readonly
+
     def initialize(name)
       @initial_name = name
       @current_name = name
-      [:readonly, :writable].each do |mode|
+      AVAILABLE_MODES.each do |mode|
         model = define_model(SwitchPoint.config.model_name(name, mode))
         model.establish_connection(SwitchPoint.config.database_name(name, mode))
         memorize_switch_point(name, mode, model.connection)
       end
-      @mode = :readonly
+      @global_mode = DEFAULT_MODE
     end
 
     def define_model(model_name)
@@ -24,20 +27,41 @@ module SwitchPoint
       connection.pool.instance_variable_set(:@switch_point, switch_point)
     end
 
+    def thread_local_mode
+      Thread.current[:"switch_point_#{@current_name}_mode"]
+    end
+
+    def thread_local_mode=(mode)
+      Thread.current[:"switch_point_#{@current_name}_mode"] = mode
+    end
+    private :thread_local_mode=
+
+    def mode
+      thread_local_mode || @global_mode
+    end
+
     def readonly!
-      @mode = :readonly
+      if thread_local_mode
+        self.thread_local_mode = :readonly
+      else
+        @global_mode = :readonly
+      end
     end
 
     def readonly?
-      @mode == :readonly
+      mode == :readonly
     end
 
     def writable!
-      @mode = :writable
+      if thread_local_mode
+        self.thread_local_mode = :writable
+      else
+        @global_mode = :writable
+      end
     end
 
     def writable?
-      @mode == :writable
+      mode == :writable
     end
 
     def with_readonly(&block)
@@ -48,12 +72,15 @@ module SwitchPoint
       with_connection(:writable, &block)
     end
 
-    def with_connection(mode, &block)
-      saved_mode = @mode
-      @mode = mode
+    def with_connection(new_mode, &block)
+      unless AVAILABLE_MODES.include?(new_mode)
+        raise ArgumentError.new("Unknown mode: #{new_mode}")
+      end
+      saved_mode = self.thread_local_mode
+      self.thread_local_mode = new_mode
       block.call
     ensure
-      @mode = saved_mode
+      self.thread_local_mode = saved_mode
     end
 
     def switch_name(new_name, &block)
@@ -76,7 +103,7 @@ module SwitchPoint
 
     def connection
       ProxyRepository.checkout(@current_name) # Ensure the target proxy is created
-      Proxy.const_get(SwitchPoint.config.model_name(@current_name, @mode)).connection
+      Proxy.const_get(SwitchPoint.config.model_name(@current_name, mode)).connection
     end
   end
 end

data/lib/switch_point/version.rb

@@ -1,3 +1,3 @@
 module SwitchPoint
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/switch_point/model_spec.rb

@@ -142,6 +142,15 @@ RSpec.describe SwitchPoint::Model do
         expect(Note.with_writable { :bypass }).to eq(:bypass)
       end
     end
+
+    it 'affects thread-locally' do
+      Book.with_writable do
+        expect(Book).to connect_to('main_writable.sqlite3')
+        Thread.start do
+          expect(Book).to connect_to('main_readonly.sqlite3')
+        end.join
+      end
+    end
   end
 
   describe '.with_readonly' do
@@ -163,6 +172,12 @@ RSpec.describe SwitchPoint::Model do
     end
   end
 
+  describe '#with_connection' do
+    it 'raises error if unknown mode is given' do
+      expect { SwitchPoint::ProxyRepository.checkout(:main).with_connection(:typo) }.to raise_error
+    end
+  end
+
   describe '.switch_name' do
     after do
       Book.switch_point_proxy.reset_name!

data/spec/switch_point_spec.rb

@@ -11,5 +11,25 @@ RSpec.describe SwitchPoint do
       expect(Book).to connect_to('main_writable.sqlite3')
       expect(Publisher).to connect_to('main_writable.sqlite3')
     end
+
+    it 'affects thread-globally' do
+      SwitchPoint.writable!(:main)
+      Thread.start do
+        expect(Book).to connect_to('main_writable.sqlite3')
+      end.join
+    end
+
+    context 'within with block' do
+      it 'changes the current mode' do
+        Book.with_writable do
+          SwitchPoint.readonly!(:main)
+          expect(Book).to connect_to('main_readonly.sqlite3')
+        end
+        expect(Book).to connect_to('main_readonly.sqlite3')
+        Book.with_writable do
+          expect(Book).to connect_to('main_writable.sqlite3')
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switch_point
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal