switch_point 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d745412c8403805b7d7221bd0873e96156fbf117
-  data.tar.gz: a3ebbfe8088491a63e86525f6e10e045c4c7b90e
+  metadata.gz: b1f2d543d57d381bd1f30ada661a2bd0af01de56
+  data.tar.gz: 18b2322fdead64b792dbc5bde8ea8b4a08c38ffe
 SHA512:
-  metadata.gz: 0288d5f1aee3e3a1bbe3e7816f728628f795f0903fa0ce32b1b96bfe54284b4fcd20260f3dbdd2b8fbdb93fee24779b6921f0fce30d13a5b5232b7e92402fb12
-  data.tar.gz: d58730ca9ec1cae341942d644600d87b523cadf64b3ce3d78ee65791ebb3c4c9f487843b524f9ec194b18a857ca7220a53dd05a72a18b6d193268eec36052dff
+  metadata.gz: 276be82faa7bdb01ab7c15959c6ef226433c5296ebfc4cf3e3b081ef3e162bf3b342c1ced86ed72985589a5d447a049bf04f4a44595ab1cd63e6be605d129a1a
+  data.tar.gz: 5affb3b76703ee30e84714e388a9c742c5444c66e5ffd71be91e48b2dcb206831172c520bea7ffae9b833c62725f1091877b4dd0a036fc5df254549aefd15b0f

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.4.1 (2014-06-19)
+- Support :writable only configuration
+
 ## 0.4.0 (2014-06-17)
 - auto_writable is disabled by default
     - To restore the previous behavior, set `config.auto_writable = true`.

data/README.md

@@ -34,7 +34,7 @@ Suppose `after_save` callback is set to User model. When `User.create` is called
 
 1. BEGIN TRANSACTION is sent to READONLY connection.
 2. switch_point switches the connection to WRITABLE.
-3. CREATE statement is sent to WRITABLE connection.
+3. INSERT statement is sent to WRITABLE connection.
 4. switch_point reset the connection to READONLY.
 5. after_save callback is called.
     - At this point, the connection is READONLY and in a transaction.

data/lib/switch_point/config.rb

@@ -44,11 +44,13 @@ module SwitchPoint
     private
 
     def assert_valid_config!(config)
-      unless config.has_key?(:readonly)
-        raise ArgumentError.new(":readonly key is required")
+      unless config.has_key?(:readonly) || config.has_key?(:writable)
+        raise ArgumentError.new(':readonly or :writable must be specified')
       end
-      unless config[:readonly].is_a?(Symbol)
-        raise TypeError.new(":readonly's value must be Symbol")
+      if config.has_key?(:readonly)
+        unless config[:readonly].is_a?(Symbol)
+          raise TypeError.new(":readonly's value must be Symbol")
+        end
       end
       if config.has_key?(:writable)
         unless config[:writable].is_a?(Symbol)

data/lib/switch_point/proxy.rb

@@ -2,7 +2,7 @@ module SwitchPoint
   class Proxy
     attr_reader :initial_name
 
-    AVAILABLE_MODES = [:readonly, :writable]
+    AVAILABLE_MODES = [:writable, :readonly]
     DEFAULT_MODE = :readonly
 
     def initialize(name)
@@ -16,13 +16,18 @@ module SwitchPoint
     end
 
     def define_model(name, mode)
-      model = Class.new(ActiveRecord::Base)
       model_name = SwitchPoint.config.model_name(name, mode)
       if model_name
+        model = Class.new(ActiveRecord::Base)
         Proxy.const_set(model_name, model)
         model.establish_connection(SwitchPoint.config.database_name(name, mode))
+        model
+      elsif mode == :readonly
+        # Re-use writable connection
+        Proxy.const_get(SwitchPoint.config.model_name(name, :writable))
+      else
+        Class.new(ActiveRecord::Base)
       end
-      model
     end
 
     def memorize_switch_point(name, mode, connection)
@@ -35,6 +40,8 @@ module SwitchPoint
         switch_points = pool.instance_variable_get(:@switch_points) || []
         switch_points << switch_point
         pool.instance_variable_set(:@switch_points, switch_points)
+      elsif pool.instance_variable_defined?(:@switch_point)
+        # Only :writable is specified
       else
         pool.instance_variable_set(:@switch_point, switch_point)
       end
@@ -119,6 +126,11 @@ module SwitchPoint
       model_name = SwitchPoint.config.model_name(@current_name, mode)
       if model_name
         Proxy.const_get(model_name).connection
+      elsif mode == :readonly
+        # When only writable is specified, re-use writable connection.
+        with_writable do
+          connection
+        end
       else
         ActiveRecord::Base.connection
       end

data/lib/switch_point/version.rb

@@ -1,3 +1,3 @@
 module SwitchPoint
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/models.rb

@@ -15,6 +15,8 @@ SwitchPoint.configure do |config|
     readonly: :main_readonly
   config.define_switch_point :nanika2,
     readonly: :main_readonly
+  config.define_switch_point :nanika3,
+    writable: :comment_writable
 end
 
 require 'active_record'
@@ -56,6 +58,10 @@ class Nanika2 < ActiveRecord::Base
   use_switch_point :nanika2
 end
 
+class Nanika3 < ActiveRecord::Base
+  use_switch_point :nanika3
+end
+
 base = { adapter: 'sqlite3' }
 ActiveRecord::Base.configurations = {
   'main_readonly' => base.merge(database: 'main_readonly.sqlite3'),

data/spec/spec_helper.rb

@@ -41,6 +41,8 @@ RSpec.configure do |config|
     FileUtils.cp('main_writable.sqlite3', 'main_readonly.sqlite3')
 
     Note.connection.execute('CREATE TABLE notes (id integer primary key autoincrement)')
+
+    Nanika3.connection.execute('CREATE TABLE nanika3s (id integer primary key)')
   end
 
   config.after(:suite) do
@@ -54,6 +56,8 @@ RSpec.configure do |config|
       Book.delete_all
     end
     FileUtils.cp('main_writable.sqlite3', 'main_readonly.sqlite3')
+
+    Nanika3.delete_all
   end
 end
 

data/spec/switch_point/model_spec.rb

@@ -117,6 +117,18 @@ RSpec.describe SwitchPoint::Model do
         Note.create
       end
     end
+
+    context 'without :readonly' do
+      it 'sends all queries to :writable' do
+        expect(Nanika3).to connect_to('comment_writable.sqlite3')
+        Nanika3.with_writable do
+          expect(Nanika3).to connect_to('comment_writable.sqlite3')
+          Nanika3.create
+        end
+        expect(Nanika3.count).to eq(1)
+        expect(Nanika3.with_readonly { Nanika3.connection }).to equal(Nanika3.with_writable { Nanika3.connection })
+      end
+    end
   end
 
   describe '.with_writable' do

metadata

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