switch_point 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c52a7c39b406241e2df69b1d0dfae3a6c45d15d3
-  data.tar.gz: 606dd78b88ad59873c9d7e187c110163899f1ffb
+  metadata.gz: caaba1e17cb79206eb52931dadba051e12aa10a4
+  data.tar.gz: a5ad7388ad8989ddd5c6a9ad9dd3a33474d4b6a3
 SHA512:
-  metadata.gz: 1e9097c7f4e5696728fc57a0f190ccd6a4c65d665f1fbb7cfbc89e67cd77658f288d8a4f16a7360e3e34c103a1fdbb050b132eafc13e077901f1af25f1d8cf75
-  data.tar.gz: 02bcf5bc10f0c2c4a3b7ee04f3d33b1a94edcfc0f1b91ef1ff2251963052983c3d24cdb67f8a80b6e73daae802d1448352eb573a364d41559d228752efe89337
+  metadata.gz: 18ccaf6142ea40e8e9974cf7fb85f7b8d0bf8fe0737128f5745b66c896b39a8af5d32e5c3b238a5c1a0486a09686f5d69aa409f774f74c394182dc0e330d075d
+  data.tar.gz: 3d4eb2f58f0e548348250567bae0e01cc873f3a4a703dd9727565cadeaad83fad295cb016e0f4d5fddd2d8fe26cec1b42de84f6d75e4f4faaf974d2280244a77

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1 (2014-05-29)
+- Add Proxy#switch_name to switch proxy configuration
+- Fix weird nil error when Config#define_switch_point isn't called yet
+
 ## 0.2.0 (2014-05-29)
 - Always send destructive operations to writable connection
 - Fix bug on pooled connections

data/lib/switch_point/config.rb

@@ -2,12 +2,15 @@ module SwitchPoint
   class Config
     def define_switch_point(name, config)
       assert_valid_config!(config)
+      switch_points[name] = config
+    end
+
+    def switch_points
       @switch_points ||= {}
-      @switch_points[name] = config
     end
 
     def database_name(name, mode)
-      @switch_points[name][mode]
+      switch_points[name][mode]
     end
 
     def model_name(name, mode)
@@ -15,11 +18,11 @@ module SwitchPoint
     end
 
     def fetch(name)
-      @switch_points.fetch(name)
+      switch_points.fetch(name)
     end
 
     def keys
-      @switch_points.keys
+      switch_points.keys
     end
 
     private

data/lib/switch_point/model.rb

@@ -31,15 +31,15 @@ module SwitchPoint
         @switch_point_name = name
       end
 
+      def switch_point_proxy
+        ProxyRepository.checkout(@switch_point_name)
+      end
+
       private
 
       def assert_existing_switch_point!(name)
         SwitchPoint.config.fetch(name)
       end
-
-      def switch_point_proxy
-        ProxyRepository.checkout(@switch_point_name)
-      end
     end
   end
 end

data/lib/switch_point/proxy.rb

@@ -1,10 +1,12 @@
 module SwitchPoint
   class Proxy
+    attr_reader :initial_name
+
     def initialize(name)
-      @models = {}
+      @initial_name = name
+      @current_name = name
       [:readonly, :writable].each do |mode|
         model = define_model(SwitchPoint.config.model_name(name, mode))
-        @models[mode] = model
         model.establish_connection(SwitchPoint.config.database_name(name, mode))
         memorize_switch_point(name, mode, model.connection)
       end
@@ -46,8 +48,27 @@ module SwitchPoint
       @mode = saved_mode
     end
 
+    def switch_name(new_name, &block)
+      if block
+        begin
+          old_name = @current_name
+          @current_name = new_name
+          block.call
+        ensure
+          @current_name = old_name
+        end
+      else
+        @current_name = new_name
+      end
+    end
+
+    def reset_name!
+      @current_name = @initial_name
+    end
+
     def connection
-      @models[@mode].connection
+      ProxyRepository.checkout(@current_name) # Ensure the target proxy is created
+      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.0"
+  VERSION = "0.2.1"
 end

data/spec/switch_point/model_spec.rb

@@ -142,4 +142,27 @@ RSpec.describe SwitchPoint::Model do
       end
     end
   end
+
+  describe '.switch_name' do
+    after do
+      Book.switch_point_proxy.reset_name!
+    end
+
+    it 'switches proxy configuration' do
+      Book.switch_point_proxy.switch_name(:comment)
+      expect(Book).to connect_to('comment_readonly.sqlite3')
+      expect(Publisher).to connect_to('comment_readonly.sqlite3')
+    end
+
+    context 'with block' do
+      it 'switches proxy configuration locally' do
+        Book.switch_point_proxy.switch_name(:comment) do
+          expect(Book).to connect_to('comment_readonly.sqlite3')
+          expect(Publisher).to connect_to('comment_readonly.sqlite3')
+        end
+        expect(Book).to connect_to('main_readonly.sqlite3')
+        expect(Publisher).to connect_to('main_readonly.sqlite3')
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switch_point
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kohei Suzuki