con_air 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWEyZDcxNTBlZTVhOTE3N2I0MzNlZTkwM2NlZWQ4MjljY2UxMGI1Zg==
+    MmUwZjFjMGVlYjI5NDA4MGE4OTI3Yjc2NDM1MTFlNzg1NzU4NGZmYQ==
   data.tar.gz: !binary |-
-    ZGZjNmUxZjc1OTE5ZTk2ODkyOTE3MTQxYWU0OTY0YTkxMjRlYzM0OQ==
+    ZDY3MGQzZTY5ZDc5MzRkMDhhYjNiMGFlODgwNDI1MWQ0MjU3YTM5Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTc5MDYzMGVmNjJmYmRkYWZmMDY0MjU0ZTBjYjBhN2Q1YjhiY2FlMjQ0N2Qy
-    MzU0MDM3NmFlNzljOWYxMjQyZDdkZDdhNzk1OTVkMDVmZTc3NmViMTkwYWY5
-    MDQxM2Y1YWUzYjEzMmVjM2Y2MmY1NmUyMDFiMmY3ZGMzOTE2ZTY=
+    NTI0YmFlOGY0NzRjYWViZDhjZDJlYTU2ZjY4MWIwZDYxYTZkZDQxZGM2M2Vm
+    MzQ5YzMxOTI5Y2UyYzUyZTJlNzc3Zjk4ZDA4NDE3ODBhYmE2ZTMwMDllMjBl
+    MWM5YzVhYWUwOGNmZWVjNzMzZjYxNmE5ODU1MWIyMjUxMDg3NTQ=
   data.tar.gz: !binary |-
-    ZTA2OWRlZjQ0ZDY0NmVjY2ZhYzBiNmRiNDJjMGIzMDJkOWIwYThkNzUyNDc3
-    ODY2ZTUyNTEwZDJiMWZkZDM1MWJhNTdlOTA3Mjg2MDI3MTFhZTk1YjBiOGNk
-    OWM4ZGY5NzE2OTBiYmE2NDQ0MzQ3N2FkYzAwNjZjYjk0ZGIxZWE=
+    NTBmZmFlZjZhOGU2ZmQzOGVlYTExZjBjN2ZlODFmMGQ2NjlmZmMxZmM0Mjk2
+    ZGNjNWE2ZTY3ZmU4OTUzM2M5YmU0MDZiN2IwYWY0NmNlNWQzODk0OTc2MzAz
+    MjRiNDJkZmJmNTUxZmZiYjBiNzBiMTk2NzJmNWVhMDJiZGRiNmU=

data/lib/con_air/connection_handler.rb

@@ -11,18 +11,9 @@ module ConAir
       @swap_class = swap_class
 
       # Init connections after switching handler
-
       ActiveRecord::Base.establish_connection
-      establish_connection(hijacked_spec, swap_class)
-    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
+      @connection_pools[@hijacked_spec] ||= ActiveRecord::ConnectionAdapters::ConnectionPool.new(@hijacked_spec)
+      @class_to_pool[@swap_class.name] = @connection_pools[@hijacked_spec]
     end
 
     def exist?(config, klass)

data/lib/con_air/version.rb

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

data/spec/con_air/connection_handler_spec.rb

@@ -3,31 +3,31 @@ require "spec_helper"
 describe ConAir::ConnectionHandler do
   before do
     @swap_class = double(name: "Swap")
-    @config = double
+    @config = double.as_null_object
     @spec = double(config: @config)
-    @original_spec = double
-    @handler = ConAir::ConnectionHandler.new(@swap_class, @spec)
   end
 
-  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)
+  context "#new" do
+    it "creates pool using passed-in spec" do
+      handler = ConAir::ConnectionHandler.new(@swap_class, @spec)
+      pool = handler.connection_pools[@spec]
 
-        @handler.establish_connection(@swap_class.name, @original_spec)
-      end
+      expect(pool).to be_instance_of(ActiveRecord::ConnectionAdapters::ConnectionPool)
+      expect(pool.spec).to eq(@spec)
     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)
+    it "establishes activerecords connection" do
+      expect(ActiveRecord::Base).to receive(:establish_connection)
 
-        @handler.establish_connection("SomeClass", @original_spec)
-      end
+      ConAir::ConnectionHandler.new(@swap_class, @spec)
     end
   end
 
   context "#exist?" do
+    before do
+      @handler = ConAir::ConnectionHandler.new(@swap_class, @spec)
+    end
+
     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/con_air_spec.rb

@@ -43,7 +43,7 @@ describe ConAir do
       end
 
       it "establish connection" do
-        expect(ActiveRecord::Base).to receive(:establish_connection)
+        expect(klass).to receive(:establish_connection)
 
         ConAir.hijack(@config, klass) { }
       end

data/spec/dummy/log/test.log

@@ -5,3 +5,69 @@ Connecting to database specified by database.yml
    (17.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.1ms)  SELECT version FROM "schema_migrations"
    (17.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131220144142')
+Connecting to database specified by database.yml
+   (29.5ms)  select sqlite_version(*)
+   (21.4ms)  DROP TABLE "users"
+   (17.6ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (17.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223111850')
+Connecting to database specified by database.yml
+   (25.0ms)  select sqlite_version(*)
+   (27.5ms)  DROP TABLE "users"
+   (4.4ms)  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 ('20131223112540')
+Connecting to database specified by database.yml
+   (26.1ms)  select sqlite_version(*)
+   (8.7ms)  DROP TABLE "users"
+   (5.2ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (8.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223112642')
+Connecting to database specified by database.yml
+   (24.2ms)  select sqlite_version(*)
+   (12.7ms)  DROP TABLE "users"
+   (14.7ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (17.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223112746')
+Connecting to database specified by database.yml
+   (24.3ms)  select sqlite_version(*)
+   (25.0ms)  DROP TABLE "users"
+   (17.3ms)  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 ('20131223112802')
+Connecting to database specified by database.yml
+   (24.2ms)  select sqlite_version(*)
+   (26.8ms)  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"
+   (17.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223113032')
+Connecting to database specified by database.yml
+   (26.9ms)  select sqlite_version(*)
+   (24.9ms)  DROP TABLE "users"
+   (17.5ms)  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 ('20131223113046')
+Connecting to database specified by database.yml
+   (26.4ms)  select sqlite_version(*)
+   (13.2ms)  DROP TABLE "users"
+   (5.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (4.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223113114')
+Connecting to database specified by database.yml
+   (25.7ms)  select sqlite_version(*)
+   (21.5ms)  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"
+   (17.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223113405')
+Connecting to database specified by database.yml
+   (26.7ms)  select sqlite_version(*)
+   (9.4ms)  DROP TABLE "users"
+   (17.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (17.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131223113450')
+Connecting to database specified by database.yml
+   (19.0ms)  select sqlite_version(*)
+   (21.2ms)  DROP TABLE "users"
+   (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')

metadata

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