lib/sidekiq/cron/web_extension.rb in sidekiq-cron-2.0.0.rc1 vs lib/sidekiq/cron/web_extension.rb in sidekiq-cron-2.0.0.rc2

@@ -2,10 +2,17 @@
   module Cron
     module WebExtension
       def self.registered(app)
         app.settings.locales << File.join(File.expand_path("..", __FILE__), "locales")
 
+        app.helpers do
+          # This method constructs the URL for the cron jobs page within the specified namespace.
+          def namespace_redirect_path
+            "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+          end
+        end
+
         # Index page of cron jobs.
         app.get '/cron' do
           view_path = File.join(File.expand_path("..", __FILE__), "views")
 
           @current_namespace = 'default'
@@ -42,67 +49,67 @@
           @job = Sidekiq::Cron::Job.find(@job_name, @current_namespace)
 
           if @job
             render(:erb, File.read(File.join(view_path, "cron_show.erb")))
           else
-            redirect "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+            redirect namespace_redirect_path
           end
         end
 
-        # Enque all cron jobs.
+        # Enqueue all cron jobs.
         app.post '/cron/namespaces/:namespace/all/enque' do
-          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enque!)
-          redirect params['redirect'] || "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enqueue!)
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Enqueue cron job.
         app.post '/cron/namespaces/:namespace/jobs/:name/enque' do
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
-            job.enque!
+            job.enqueue!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Delete all schedules.
         app.post '/cron/namespaces/:namespace/all/delete' do
           Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:destroy)
-          redirect "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Delete schedule.
         app.post '/cron/namespaces/:namespace/jobs/:name/delete' do
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.destroy
           end
-          redirect "#{root_path}cron"
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Enable all jobs.
         app.post '/cron/namespaces/:namespace/all/enable' do
           Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enable!)
-          redirect params['redirect'] || "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Enable job.
         app.post '/cron/namespaces/:namespace/jobs/:name/enable' do
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.enable!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Disable all jobs.
         app.post '/cron/namespaces/:namespace/all/disable' do
           Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:disable!)
-          redirect params['redirect'] || "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Disable job.
         app.post '/cron/namespaces/:namespace/jobs/:name/disable' do
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.disable!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+          redirect params['redirect'] || namespace_redirect_path
         end
       end
     end
   end
 end