switch_point 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1f2d543d57d381bd1f30ada661a2bd0af01de56
-  data.tar.gz: 18b2322fdead64b792dbc5bde8ea8b4a08c38ffe
+  metadata.gz: 77687087fa3661aba6aace55de51de3f92de2e93
+  data.tar.gz: ec806bac134278e915188fa93d988d640b8e50ac
 SHA512:
-  metadata.gz: 276be82faa7bdb01ab7c15959c6ef226433c5296ebfc4cf3e3b081ef3e162bf3b342c1ced86ed72985589a5d447a049bf04f4a44595ab1cd63e6be605d129a1a
-  data.tar.gz: 5affb3b76703ee30e84714e388a9c742c5444c66e5ffd71be91e48b2dcb206831172c520bea7ffae9b833c62725f1091877b4dd0a036fc5df254549aefd15b0f
+  metadata.gz: e5d6a8c24fa34a4cdefd0e87786c62bc9e861beb2d848478445cb9329362b9457bfdfe06f64ad27c451a21731feddd2a7a7d70b9d4b6a361c9177701640a6a9c
+  data.tar.gz: 90bcacff53ac17022d2494584c564daa56942f978e30fd7c0322a93063f7a193b057d241a2837767b043bae06a6f79dd96c43fc95cfa0d3cd7232333d4d9efd4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.2 (2014-06-19)
+- Establish connection lazily
+    - Just like ActiveRecord::Base, real connection isn't created until `.connection` is called
+
 ## 0.4.1 (2014-06-19)
 - Support :writable only configuration
 

data/lib/switch_point/connection.rb

@@ -8,7 +8,7 @@ module SwitchPoint
     DESTRUCTIVE_METHODS.each do |method_name|
       define_method(:"#{method_name}_with_switch_point") do |*args, &block|
         parent_method = :"#{method_name}_without_switch_point"
-        if self.pool.equal?(ActiveRecord::Base.connection.pool)
+        if self.pool.equal?(ActiveRecord::Base.connection_pool)
           Connection.handle_base_connection(self, parent_method, *args, &block)
         else
           Connection.handle_generated_connection(self, parent_method, method_name, *args, &block)

data/lib/switch_point/proxy.rb

@@ -10,7 +10,7 @@ module SwitchPoint
       @current_name = name
       AVAILABLE_MODES.each do |mode|
         model = define_model(name, mode)
-        memorize_switch_point(name, mode, model.connection)
+        memorize_switch_point(name, mode, model.connection_pool)
       end
       @global_mode = DEFAULT_MODE
     end
@@ -30,10 +30,9 @@ module SwitchPoint
       end
     end
 
-    def memorize_switch_point(name, mode, connection)
+    def memorize_switch_point(name, mode, pool)
       switch_point = { name: name, mode: mode }
-      pool = connection.pool
-      if pool.equal?(ActiveRecord::Base.connection.pool)
+      if pool.equal?(ActiveRecord::Base.connection_pool)
         if mode != :writable
           raise RuntimeError.new("ActiveRecord::Base's switch_points must be writable, but #{name} is #{mode}")
         end

data/lib/switch_point/version.rb

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

data/spec/models.rb

@@ -73,3 +73,12 @@ ActiveRecord::Base.configurations = {
   'default' => base.merge(database: 'default.sqlite3')
 }
 ActiveRecord::Base.establish_connection(:default)
+
+# XXX: Check connection laziness
+[Book, User, Note, Nanika1, ActiveRecord::Base].each do |model|
+  model.with_writable do
+    if model.connected?
+      raise "#{model.name} didn't establish connection lazily!"
+    end
+  end
+end

metadata

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