switch_point 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80333b18b169594e3d1439b08df9cff562f85eff
-  data.tar.gz: 9d701fc245dc24a8f1736d4d0adad9bf920de04b
+  metadata.gz: 7214878a8ac1b215808ee7fb386f02643ca94961
+  data.tar.gz: 05cad4a43106ab868ed8bcc47be9ed881a202f7e
 SHA512:
-  metadata.gz: d4ab8f26f462b8bdb96c97c7f39e3bd20befc4c0d94445b7c9bf3f349c06d0218bc6b314ed2ecd6435c5055cff9aaaced2d2e688a7a8d7a6c5299baf1533cb82
-  data.tar.gz: 5eaf795923f263f0caa615baec1f6687e8c834c80842925cb4a50fca10eb568977dc795d9704edefe7da145f5c8712ad53cb3ec4398e9eee4728025058464c38
+  metadata.gz: 6344f088708f67f8bb5bf8d55ed908356469cffda84c7ae65e96e82fa72394f002c26857e576410ee6c3c72b9bfc5e5700e72d07a01e6eab6191a87cd60d1e98
+  data.tar.gz: 0cebcc98ac866bddc15bd8bc5b1a85669cf09aaadbadeaca24c0fa0b531a4d9e65986ac4dca65f40e90911f319c7e704b51ffc17ba5a28c4755ab2dac248482c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.3 (2014-06-02)
+- Support specifying the same database name within different switch_point
+- Add Proxy#readonly? and Proxy#writable? predicate
+
 ## 0.2.2 (2014-05-30)
 - Fix nil error on with_{readonly,writable} from non-switch_point model
 

data/lib/switch_point/config.rb

@@ -14,7 +14,7 @@ module SwitchPoint
     end
 
     def model_name(name, mode)
-      "#{mode}_#{database_name(name, mode)}".camelize
+      "#{name}_#{mode}".camelize
     end
 
     def fetch(name)

data/lib/switch_point/proxy.rb

@@ -28,10 +28,18 @@ module SwitchPoint
       @mode = :readonly
     end
 
+    def readonly?
+      @mode == :readonly
+    end
+
     def writable!
       @mode = :writable
     end
 
+    def writable?
+      @mode == :writable
+    end
+
     def with_readonly(&block)
       with_connection(:readonly, &block)
     end

data/lib/switch_point/version.rb

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

data/spec/models.rb

@@ -8,6 +8,9 @@ SwitchPoint.configure do |config|
   config.define_switch_point :comment,
     readonly: :comment_readonly,
     writable: :comment_writable
+  config.define_switch_point :special,
+    readonly: :main_readonly_special,
+    writable: :main_writable
 end
 
 class Book < ActiveRecord::Base
@@ -26,6 +29,10 @@ class User < ActiveRecord::Base
   use_switch_point :user
 end
 
+class BigData < ActiveRecord::Base
+  use_switch_point :special
+end
+
 class Note < ActiveRecord::Base
 end
 
@@ -33,6 +40,7 @@ base = { adapter: 'sqlite3' }
 ActiveRecord::Base.configurations = {
   'main_readonly' => base.merge(database: 'main_readonly.sqlite3'),
   'main_writable' => base.merge(database: 'main_writable.sqlite3'),
+  'main_readonly_special' => base.merge(database: 'main_readonly_special.sqlite3'),
   'user' => base.merge(database: 'user.sqlite3'),
   'comment_readonly' => base.merge(database: 'comment_readonly.sqlite3'),
   'comment_writable' => base.merge(database: 'comment_writable.sqlite3'),

data/spec/switch_point/model_spec.rb

@@ -28,6 +28,7 @@ RSpec.describe SwitchPoint::Model do
       expect(User).to connect_to('user.sqlite3')
       expect(Comment).to connect_to('comment_readonly.sqlite3')
       expect(Note).to connect_to('default.sqlite3')
+      expect(Book.switch_point_proxy).to be_readonly
     end
 
     it 'sends destructive queries to writable' do
@@ -56,14 +57,27 @@ RSpec.describe SwitchPoint::Model do
         expect(Book.connection).to equal(Publisher.connection)
       end
     end
+
+    context 'with the same database name' do
+      it 'does NOT shares a connection' do
+        expect(Book.connection).to_not equal(BigData.connection)
+        Book.with_writable do
+          BigData.with_writable do
+            expect(Book.connection).to_not equal(BigData.connection)
+          end
+        end
+      end
+    end
   end
 
   describe '.with_writable' do
     it 'changes connection locally' do
       Book.with_writable do
         expect(Book).to connect_to('main_writable.sqlite3')
+        expect(Book.switch_point_proxy).to be_writable
       end
       expect(Book).to connect_to('main_readonly.sqlite3')
+      expect(Book.switch_point_proxy).to be_readonly
     end
 
     it 'affects to other models with the same switch point' do

metadata

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