slowpoke 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04cee7305d4bc3abf484d847fe5bbfea96b50e07
-  data.tar.gz: d29391739f21509b6d43fae455bc16e7b1f4a466
+  metadata.gz: 91db9bc17aea48ff4c981c379dd667128f2c1902
+  data.tar.gz: ba3a009f49d2ff5c24c855d8351ee42efb2c1a14
 SHA512:
-  metadata.gz: 5ebe972633f91bcbb728083ee16f55e36a2200af9115e81c94c9ab9d6eb7f6c72f75fce62de04f76af18ca1f5a527825bb468999934fc828b36d4d88b03e2437
-  data.tar.gz: 3cfb727f6695098342f5543da8266472937aaaa3a4b6504d967a6f2e1d9f2bc1204e3c78d2055607bf1c867b01a1502990821e7b3115ff1acf6327d9561e8fad
+  metadata.gz: d2e1c852583fa00010cfe4cafbe0c0e4f17ef88318fc1e069fb4e14a5c9dc0e688f393502bc1e7c667784e2daa5dfd92d18232ffca85a857a0ced4a888fb8482
+  data.tar.gz: ebfe28a37bad757c0da1a762dd94e12db58f885301e695c5686684913230ed692a9e885d37a0d3155781a921631294d6b60e8aaf0723d9f5a3b9ebc7cd980f23

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0
+
+- Fixed custom error pages for Rails 5.1
+- Fixed migration statement timeout
+- Don’t kill server in development
+
 ## 0.1.3
 
 - Fixed deprecation warning in Rails 5

data/Gemfile

@@ -2,5 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in slowpoke.gemspec
 gemspec
-
-gem "makara", github: "taskrabbit/makara"

data/lib/slowpoke.rb

@@ -1,6 +1,5 @@
 require "slowpoke/version"
 require "rack/timeout/base"
-require "safely_block"
 require "slowpoke/middleware"
 require "slowpoke/migration"
 require "slowpoke/railtie"
@@ -16,7 +15,11 @@ module Slowpoke
 
   def self.timeout=(timeout)
     timeout = timeout.to_i if timeout.respond_to?(:to_i)
-    @timeout = Rack::Timeout.timeout = timeout
+    @timeout = Rack::Timeout.service_timeout = timeout
+  end
+
+  def self.migration_statement_timeout
+    ENV["MIGRATION_STATEMENT_TIMEOUT"]
   end
 end
 

data/lib/slowpoke/migration.rb

@@ -1,17 +1,12 @@
 module Slowpoke
   module Migration
     def connection
-      if ENV["MIGRATION_STATEMENT_TIMEOUT"]
-        @connection_with_timeout ||= begin
-          config = ActiveRecord::Base.connection_config
-          config["variables"] ||= {}
-          config["variables"]["statement_timeout"] = ENV["MIGRATION_STATEMENT_TIMEOUT"].to_i
-          ActiveRecord::Base.establish_connection(config)
-          ActiveRecord::Base.connection
-        end
-      else
-        super
+      connection = super
+      if Slowpoke.migration_statement_timeout && !@migration_statement_timeout_set
+        connection.execute("SET statement_timeout = #{Slowpoke.migration_statement_timeout.to_i}")
+        @migration_statement_timeout_set = true
       end
+      connection
     end
   end
 end

data/lib/slowpoke/railtie.rb

@@ -2,11 +2,12 @@ module Slowpoke
   class Railtie < Rails::Railtie
     initializer "slowpoke" do |app|
       Rack::Timeout.timeout = Slowpoke.timeout
-
-      app.config.middleware.insert_before ActionDispatch::RemoteIp, Rack::Timeout
-
-      # prevent RequestExpiryError from killing web server
-      app.config.middleware.insert 0, Slowpoke::Middleware
+      if Rails::VERSION::MAJOR >= 5
+        app.config.middleware.insert_after ActionDispatch::DebugExceptions, Rack::Timeout
+      else
+        app.config.middleware.insert_before ActionDispatch::RemoteIp, Rack::Timeout
+      end
+      app.config.middleware.insert(0, Slowpoke::Middleware) unless Rails.env.development?
     end
   end
 end

data/lib/slowpoke/version.rb

@@ -1,3 +1,3 @@
 module Slowpoke
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/slowpoke.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails"
   spec.add_dependency "rack-timeout", ">= 0.3.0"
-  spec.add_dependency "safely_block"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slowpoke
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,47 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: safely_block
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: Rack::Timeout is great. Slowpoke makes it better.
 email:
 - andrew@chartkick.com
@@ -121,9 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rack::Timeout is great. Slowpoke makes it better.
 test_files: []
-has_rdoc: