rest-assured 0.1.3 → 0.1.4

data/lib/active_record/leak_connection_patch.rb

@@ -0,0 +1,55 @@
+# fix leaking db connections https://github.com/rails/rails/commit/ea341b8e043160a7ddaba9e6b2bb6044f73c31a8
+# TODO remove with the next ActiveRecord update as this patch will be there
+module ActiveRecord
+  class ConnectionAdapters::ConnectionPool
+    def current_connection_id #:nodoc:
+      ActiveRecord::Base.connection_id ||= Thread.current.object_id
+    end
+  end
+
+  class Base::ConnectionSpecification
+    class << self
+      def connection_id
+        Thread.current['ActiveRecord::Base.connection_id']
+      end
+
+      def connection_id=(connection_id)
+        Thread.current['ActiveRecord::Base.connection_id'] = connection_id
+      end
+    end
+  end
+
+  class QueryCache
+    class BodyProxy
+      def initialize(original_cache_value, target, connection_id)
+        @original_cache_value = original_cache_value
+        @target               = target
+        @connection_id        = connection_id
+      end
+
+      def close
+        @target.close if @target.respond_to?(:close)
+      ensure
+        ActiveRecord::Base.connection_id = @connection_id
+        ActiveRecord::Base.connection.clear_query_cache
+        unless @original_cache_value
+          ActiveRecord::Base.connection.disable_query_cache!
+        end
+      end
+    end
+
+    def call(env)
+      old = ActiveRecord::Base.connection.query_cache_enabled
+      ActiveRecord::Base.connection.enable_query_cache!
+
+      status, headers, body = @app.call(env)
+      [status, headers, BodyProxy.new(old, body, ActiveRecord::Base.connection_id)]
+    rescue Exception => e
+      ActiveRecord::Base.connection.clear_query_cache
+      unless old
+        ActiveRecord::Base.connection.disable_query_cache!
+      end
+      raise e
+    end
+  end
+end

data/lib/rest-assured/init.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'active_record/leak_connection_patch'
 require 'rest-assured/config'
 require 'logger'
 

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest-assured
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Artem Avetisyan
@@ -151,6 +151,7 @@ files:
 - features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
 - features/support/selenium-fix.rb
+- lib/active_record/leak_connection_patch.rb
 - lib/rest-assured.rb
 - lib/rest-assured/config.rb
 - lib/rest-assured/init.rb