Enable code reloading in development mode with Rails 5

.travis.yml

@@ -7,12 +7,6 @@ before_install:
   - gem install bundler
   - gem update bundler
 rvm:
-  - 2.0.0
-  - 2.1.8
   - 2.2.4
   - 2.3.0
   - jruby-head
-  - rbx-2
-matrix:
-  allow_failures:
-    - rvm: rbx-2

Gemfile

@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'rails', '~> 4.2'
+gem 'rails', '5.0.0.beta2'
+gem 'rack', '2.0.0.alpha'
+gem 'sinatra', github: 'sinatra/sinatra'
 gem 'simplecov'
 gem 'minitest'
 gem 'minitest-utils'
@@ -22,7 +24,7 @@ platforms :mri do
   gem 'ruby-prof'
 end
 
-platforms :jruby do
-  gem 'jruby-openssl'
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
+#platforms :jruby do
+  #gem 'jruby-openssl'
+  #gem 'activerecord-jdbcsqlite3-adapter'
+#end

lib/sidekiq.rb

@@ -29,7 +29,8 @@ module Sidekiq
       shutdown: [],
     },
     dead_max_jobs: 10_000,
-    dead_timeout_in_seconds: 180 * 24 * 60 * 60 # 6 months
+    dead_timeout_in_seconds: 180 * 24 * 60 * 60, # 6 months
+    reloader: proc { |&block| block.call },
   }
 
   DEFAULT_WORKER_OPTIONS = {

lib/sidekiq/cli.rb

@@ -231,6 +231,10 @@ def boot_system
           end
           require 'sidekiq/rails'
           require File.expand_path("#{options[:require]}/config/environment.rb")
+
+          if ::Rails::VERSION::MAJOR > 4 && ::Rails.env.development?
+            Sidekiq.options[:reloader] = Sidekiq::Rails::Reloader.new
+          end
         end
         options[:tag] ||= default_tag
       else

lib/sidekiq/processor.rb

@@ -35,6 +35,7 @@ def initialize(mgr)
       @job = nil
       @thread = nil
       @strategy = (mgr.options[:fetch] || Sidekiq::BasicFetch).new(mgr.options)
+      @reloader = Sidekiq.options[:reloader]
     end
 
     def terminate(wait=false)
@@ -117,33 +118,35 @@ def process(work)
       jobstr = work.job
       queue = work.queue_name
 
-      ack = false
-      begin
-        job = Sidekiq.load_json(jobstr)
-        klass  = job['class'.freeze].constantize
-        worker = klass.new
-        worker.jid = job['jid'.freeze]
-
-        stats(worker, job, queue) do
-          Sidekiq.server_middleware.invoke(worker, job, queue) do
-            # Only ack if we either attempted to start this job or
-            # successfully completed it. This prevents us from
-            # losing jobs if a middleware raises an exception before yielding
-            ack = true
-            execute_job(worker, cloned(job['args'.freeze]))
+      @reloader.call do
+        ack = false
+        begin
+          job = Sidekiq.load_json(jobstr)
+          klass  = job['class'.freeze].constantize
+          worker = klass.new
+          worker.jid = job['jid'.freeze]
+
+          stats(worker, job, queue) do
+            Sidekiq.server_middleware.invoke(worker, job, queue) do
+              # Only ack if we either attempted to start this job or
+              # successfully completed it. This prevents us from
+              # losing jobs if a middleware raises an exception before yielding
+              ack = true
+              execute_job(worker, cloned(job['args'.freeze]))
+            end
           end
+          ack = true
+        rescue Sidekiq::Shutdown
+          # Had to force kill this job because it didn't finish
+          # within the timeout.  Don't acknowledge the work since
+          # we didn't properly finish it.
+          ack = false
+        rescue Exception => ex
+          handle_exception(ex, job || { :job => jobstr })
+          raise
+        ensure
+          work.acknowledge if ack
         end
-        ack = true
-      rescue Sidekiq::Shutdown
-        # Had to force kill this job because it didn't finish
-        # within the timeout.  Don't acknowledge the work since
-        # we didn't properly finish it.
-        ack = false
-      rescue Exception => ex
-        handle_exception(ex, job || { :job => jobstr })
-        raise
-      ensure
-        work.acknowledge if ack
       end
     end
 

lib/sidekiq/rails.rb

@@ -34,5 +34,22 @@ class Rails < ::Rails::Engine
     initializer 'sidekiq' do
       Sidekiq.hook_rails!
     end
+
+    class Reloader
+      def initialize(app = ::Rails.application)
+        Sidekiq.logger.debug "Enabling Rails 5+ development code reloading, so hot!"
+        @app = app
+      end
+
+      def call
+        @app.reloader.wrap do
+          yield
+        end
+      end
+
+      def inspect
+        "#<Sidekiq::Rails::Reloader @app=#{@app.class.name}>"
+      end
+    end
   end if defined?(::Rails)
 end

myapp/Gemfile

@@ -1,21 +1,22 @@
 source 'https://rubygems.org'
 
+gem 'pry'
+gem 'sidekiq', :path => '..'
+gem 'rails', '5.0.0.beta4'
+gem 'rack', '2.0.0.alpha'
+gem 'sinatra', github: 'sinatra/sinatra'
+
 platforms :ruby do
   gem 'sqlite3'
   gem 'redis-namespace'
 end
 
-platforms :jruby do
-  gem 'jruby-openssl'
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
+#platforms :jruby do
+  #gem 'jruby-openssl'
+  #gem 'activerecord-jdbcsqlite3-adapter'
+#end
 
-gem 'rails'
-gem 'sidekiq', :path => '..'
 #gem 'ruby-prof'
 
 #de Does not work with jruby or rbx:
 #de gem 'pry-byebug'
-
-# sidekiq-web dependencies
-gem 'sinatra'

sidekiq.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'connection_pool', '~> 2.2', '>= 2.2.0'
   gem.add_dependency                  'concurrent-ruby', '~> 1.0'
   gem.add_development_dependency      'redis-namespace', '~> 1.5', '>= 1.5.2'
-  gem.add_development_dependency      'sinatra', '~> 1.4', '>= 1.4.6'
+  gem.add_development_dependency      'sinatra', '>= 1.4.6'
   gem.add_development_dependency      'minitest', '~> 5.7', '>= 5.7.0'
   gem.add_development_dependency      'rake', '~> 10.0'
-  gem.add_development_dependency      'rails', '~> 4', '>= 3.2.0'
+  gem.add_development_dependency      'rails', '>= 3.2.0'
 end