con_air 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmUwZjFjMGVlYjI5NDA4MGE4OTI3Yjc2NDM1MTFlNzg1NzU4NGZmYQ==
+    Y2VmYmRmY2ZjOGQwMjdiZjRkMDI5ZmVlYzE3ZjlmYzEwMzMzNTMyOQ==
   data.tar.gz: !binary |-
-    ZDY3MGQzZTY5ZDc5MzRkMDhhYjNiMGFlODgwNDI1MWQ0MjU3YTM5Ng==
+    ZGIzOThjOTQ2MmIyNWI2MDQ1MTA5OTUzODhkMDFlMTg0NTI2Nzg0OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTI0YmFlOGY0NzRjYWViZDhjZDJlYTU2ZjY4MWIwZDYxYTZkZDQxZGM2M2Vm
-    MzQ5YzMxOTI5Y2UyYzUyZTJlNzc3Zjk4ZDA4NDE3ODBhYmE2ZTMwMDllMjBl
-    MWM5YzVhYWUwOGNmZWVjNzMzZjYxNmE5ODU1MWIyMjUxMDg3NTQ=
+    OGYyYjdkZTA1OWI2NTI4ZmY5MmY1NDEwYTQzZWVjODJlNzA3OTNiOTRiZDMy
+    MDRiMDgxYzVhYjZmM2VhOTc2ZjRhODZkYWM5MTY0OGEzNmFjMmY0YzNjMmMz
+    ODY5YmU0Yzc3YTc4Y2QyMmQwZTMyNDM4NTIyMjFlZThhNDE0Yzc=
   data.tar.gz: !binary |-
-    NTBmZmFlZjZhOGU2ZmQzOGVlYTExZjBjN2ZlODFmMGQ2NjlmZmMxZmM0Mjk2
-    ZGNjNWE2ZTY3ZmU4OTUzM2M5YmU0MDZiN2IwYWY0NmNlNWQzODk0OTc2MzAz
-    MjRiNDJkZmJmNTUxZmZiYjBiNzBiMTk2NzJmNWVhMDJiZGRiNmU=
+    ODNhNjU5NDMxZjEyMjhmMzgwZTY0NWJjOGU0OTZiNmRjNjM2MTcwNmE2YzYz
+    Mzc3OGMzZjg1MzJlMzZkOGM4ODNjM2Y5NWZkYjEwN2VlNzNmOGIxNGU2ZWYz
+    ZDQwMDZkY2I2NGQ5NjVjMjc5NDFiODQxOWZkYjAxZWMzODFiZjE=

data/lib/con_air/connection_handler.rb

@@ -9,11 +9,19 @@ module ConAir
 
       @hijacked_spec = hijacked_spec
       @swap_class = swap_class
+      @active = true
 
       # Init connections after switching handler
       ActiveRecord::Base.establish_connection
-      @connection_pools[@hijacked_spec] ||= ActiveRecord::ConnectionAdapters::ConnectionPool.new(@hijacked_spec)
-      @class_to_pool[@swap_class.name] = @connection_pools[@hijacked_spec]
+    end
+
+    def establish_connection(name, spec)
+      if name == swap_class.name
+        @connection_pools[@hijacked_spec] ||= ActiveRecord::ConnectionAdapters::ConnectionPool.new(@hijacked_spec)
+        @class_to_pool[name] = @connection_pools[@hijacked_spec]
+      else
+        super
+      end
     end
 
     def exist?(config, klass)

data/lib/con_air/version.rb

@@ -1,3 +1,3 @@
 module ConAir
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/con_air/connection_handler_spec.rb

@@ -5,29 +5,41 @@ describe ConAir::ConnectionHandler do
     @swap_class = double(name: "Swap")
     @config = double.as_null_object
     @spec = double(config: @config)
+    allow(ActiveRecord::Base).to receive(:establish_connection)
+    @handler = ConAir::ConnectionHandler.new(@swap_class, @spec)
   end
 
   context "#new" do
-    it "creates pool using passed-in spec" do
-      handler = ConAir::ConnectionHandler.new(@swap_class, @spec)
-      pool = handler.connection_pools[@spec]
-
-      expect(pool).to be_instance_of(ActiveRecord::ConnectionAdapters::ConnectionPool)
-      expect(pool.spec).to eq(@spec)
-    end
-
     it "establishes activerecords connection" do
       expect(ActiveRecord::Base).to receive(:establish_connection)
 
       ConAir::ConnectionHandler.new(@swap_class, @spec)
     end
+
+    it "is active" do
+      expect(@handler.active).to be(true)
+    end
   end
 
-  context "#exist?" do
-    before do
-      @handler = ConAir::ConnectionHandler.new(@swap_class, @spec)
+  context "#establish_connection" do
+    context "when class matches the one we want to swap" do
+      it "creates pool using passing in spec" do
+        expect(ActiveRecord::ConnectionAdapters::ConnectionPool).to receive(:new).with(@spec)
+
+        @handler.establish_connection(@swap_class.name, @original_spec)
+      end
     end
 
+    context "when class does not match the one we want to swap" do
+      it "creates pool using original in spec" do
+        expect(ActiveRecord::ConnectionAdapters::ConnectionPool).to receive(:new).with(@original_spec)
+
+        @handler.establish_connection("SomeClass", @original_spec)
+      end
+    end
+  end
+
+  context "#exist?" do
     context "when has same config and class to swap" do
       it "returns true" do
         expect(@handler.exist?(@config, @swap_class)).to be(true)

data/spec/dummy/log/test.log

@@ -71,3 +71,39 @@ Connecting to database specified by database.yml
    (14.0ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
    (0.1ms)  SELECT version FROM "schema_migrations"
    (5.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223113501')
+Connecting to database specified by database.yml
+   (2.2ms)  select sqlite_version(*)
+   (13.9ms)  DROP TABLE "users"
+   (4.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (10.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223122635')
+Connecting to database specified by database.yml
+   (23.8ms)  select sqlite_version(*)
+   (9.4ms)  DROP TABLE "users"
+   (4.6ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (7.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223122730')
+Connecting to database specified by database.yml
+   (24.8ms)  select sqlite_version(*)
+   (11.9ms)  DROP TABLE "users"
+   (4.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (5.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223122744')
+Connecting to database specified by database.yml
+   (28.3ms)  select sqlite_version(*)
+   (8.6ms)  DROP TABLE "users"
+   (5.1ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (5.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223122824')
+Connecting to database specified by database.yml
+   (19.4ms)  select sqlite_version(*)
+   (21.3ms)  DROP TABLE "users"
+   (17.4ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (6.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223122957')
+Connecting to database specified by database.yml
+   (26.4ms)  select sqlite_version(*)
+   (15.6ms)  DROP TABLE "users"
+   (4.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (5.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223123037')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: con_air
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ngan Pham