sidekiq 4.2.4 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581035f739e6ecf4fdd07d42b7ff78b1012f3ad2
-  data.tar.gz: 26c02597dab733a1fdf7d948a7a274029033ae21
+  metadata.gz: 9a2578c1e0ac05d0f59c8ec89ac300e8c8dab429
+  data.tar.gz: 180b80981a6d6043b6aec7222f16d9ab2d5f93a8
 SHA512:
-  metadata.gz: ace3433e3bc81e986d56177f392a54f24e9a6f5cd1a050107d5273271cc61df5b022dfae32f99fb0cd74b71d5c9470daebca8073a5106bbe605f71d788196500
-  data.tar.gz: abca98c2d32c438dfc4f60e8dabcea79cc0f28c616d62942a02f768bb0353199abd139aacdc12db546ee19e66b95fb0a36644104dd47c663f034f02882bffd24
+  metadata.gz: 60a192e270a1d867cb8c3787aebd46f6ffcb6bd5a6f63fd61519d83ef93ab46b44658d32d671139fb7a33a55dc5641b4e9793ebda1a82f69fa5105d19ac8ce3b
+  data.tar.gz: df14db1cc745182b29b7d8924a51759ff1fe01a1331959af53fde65eeab456dde03f52e85ddacc39a92ce6b27eead378a3ea30c3d5da5e8ea77b13007218f21f

data/Changes.md

@@ -1,5 +1,11 @@
 # Sidekiq Changes
 
+4.2.5
+-----------
+
+- Re-enable eager loading of all code when running non-development Rails 5. [#3203]
+- Better root URL handling for zany web servers [#3207]
+
 4.2.4
 -----------
 

data/Ent-Changes.md

@@ -3,6 +3,11 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+1.4.0
+-------------
+
+- No functional changes, require latest Sidekiq and Sidekiq Pro versions
+
 1.3.2
 -------------
 

data/lib/sidekiq/cli.rb

@@ -229,8 +229,9 @@ module Sidekiq
           require 'sidekiq/rails'
           require File.expand_path("#{options[:require]}/config/environment.rb")
           ::Rails.application.eager_load!
-        elsif ::Rails::VERSION::MAJOR == 4
+        elsif ::Rails::VERSION::MAJOR >= 4 && environment != 'development'
           # Painful contortions, see 1791 for discussion
+          # No autoloading, we want to force eager load for everything.
           require File.expand_path("#{options[:require]}/config/application.rb")
           ::Rails::Application.initializer "sidekiq.eager_load" do
             ::Rails.application.config.eager_load = true
@@ -238,6 +239,7 @@ module Sidekiq
           require 'sidekiq/rails'
           require File.expand_path("#{options[:require]}/config/environment.rb")
         else
+          # Rails 5+ && development mode, use Reloader
           require 'sidekiq/rails'
           require File.expand_path("#{options[:require]}/config/environment.rb")
         end

data/lib/sidekiq/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sidekiq
-  VERSION = "4.2.4"
+  VERSION = "4.2.5"
 end

data/lib/sidekiq/web/application.rb

@@ -28,10 +28,6 @@ module Sidekiq
       # nothing, backwards compatibility
     end
 
-    get "" do
-      redirect(root_path)
-    end
-
     get "/" do
       @redis_info = redis_info.select{ |k, v| REDIS_KEYS.include? k }
       stats_history = Sidekiq::Stats::History.new((params['days'] || 30).to_i)

data/lib/sidekiq/web/router.rb

@@ -45,6 +45,10 @@ module Sidekiq
       request_method = env[REQUEST_METHOD]
       path_info = ::Rack::Utils.unescape env[PATH_INFO]
 
+      # There are servers which send an empty string when requesting the root.
+      # These servers should be ashamed of themselves.
+      path_info = "/" if path_info == ""
+
       @routes[request_method].each do |route|
         if params = route.match(request_method, path_info)
           env[ROUTE_PARAMS] = params

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis