barbeque 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cdb95733c48465dc1ded4986b0bbe415b84df84
-  data.tar.gz: ff6688e7c2b6afabd31a7df9a4d0fd9fe70fd573
+  metadata.gz: c6b2851abd5afe48390d9cc74057bb8364b354fa
+  data.tar.gz: abd05db89ddd0ca3cdb0561741c9d480c667543c
 SHA512:
-  metadata.gz: f7e3e84c1bc9a946d0906150c605835d3a9d42a2608a81859cb735275cd4a6b8586d233c05e3bef692b79589a97949c152fa6996ce5de0c545230b9f81bc8465
-  data.tar.gz: 4e36ad0423d6713a879b875e72e24a0b8f3a8bd6bcdc230cfdc42bd7758bd62f611d9c96846e3e4de501079bffbb241a8988e6cb94130b25bf6a3b19bb7e98f4
+  metadata.gz: 353ff01f793a236c9bdaccdfdcf989b294fed731dfe753c81a4e0526cd83e28fda01fff881858dbb0725156cb71e8ee6886942936d13edadc28cf290fe7095cd
+  data.tar.gz: 03d100039d9f126275fd3bf7325d72a0d1a3d68f2bf4511dcd4c230e6c110f1280331f89ac8a3a8d8f74d682b0463e7c05baa7df10bd659d70ffb8718ce4135a

data/app/controllers/barbeque/job_executions_controller.rb

@@ -1,12 +1,21 @@
 class Barbeque::JobExecutionsController < Barbeque::ApplicationController
+  ID_REGEXP = /\A[0-9]+\z/
+
   def show
-    @job_execution = Barbeque::JobExecution.find(params[:id])
+    if ID_REGEXP === params[:message_id]
+      job_execution = Barbeque::JobExecution.find_by(id: params[:message_id])
+      if job_execution
+        redirect_to(job_execution)
+        return
+      end
+    end
+    @job_execution = Barbeque::JobExecution.find_by!(message_id: params[:message_id])
     @log = @job_execution.execution_log
     @job_retries = @job_execution.job_retries.order(id: :desc)
   end
 
   def retry
-    @job_execution = Barbeque::JobExecution.find(params[:job_execution_id])
+    @job_execution = Barbeque::JobExecution.find_by!(message_id: params[:job_execution_message_id])
     raise ActionController::BadRequest unless @job_execution.retryable?
 
     result = Barbeque::MessageRetryingService.new(message_id: @job_execution.message_id).run

data/app/controllers/barbeque/job_retries_controller.rb

@@ -1,9 +1,13 @@
 class Barbeque::JobRetriesController < Barbeque::ApplicationController
   def show
-    @job_execution = Barbeque::JobExecution.find(params[:job_execution_id])
-    @execution_log = @job_execution.execution_log
-
     @job_retry = Barbeque::JobRetry.find(params[:id])
+    @job_execution = @job_retry.job_execution
+
+    if params[:job_execution_message_id] != @job_execution.message_id
+      redirect_to([@job_execution, @job_retry])
+    end
+
+    @execution_log = @job_execution.execution_log
     @retry_log = @job_retry.execution_log
   end
 end

data/app/models/barbeque/job_execution.rb

@@ -24,4 +24,8 @@ class Barbeque::JobExecution < Barbeque::ApplicationRecord
   def retryable?
     failed? || error?
   end
+
+  def to_param
+    message_id
+  end
 end

data/app/views/barbeque/job_executions/show.html.haml

@@ -5,7 +5,7 @@
     %li= link_to('Home', root_path)
     %li= link_to(job_definition.app.name, app_path(job_definition.app.id))
     %li= link_to(job_definition.job, job_definition_path(job_definition.id))
-    %li.active ##{@job_execution.id}
+    %li.active #{@job_execution.message_id}
 
 .row
   .col-sm-7

data/app/views/barbeque/job_retries/show.html.haml

@@ -6,7 +6,7 @@
     %li= link_to('Home', root_path)
     %li= link_to(job_definition.app.name, app_path(job_definition.app.id))
     %li= link_to(job_definition.job, job_definition_path(job_definition.id))
-    %li= link_to("##{job_execution.id}", job_execution_path(job_execution.id))
+    %li= link_to(job_execution.message_id, job_execution_path(job_execution))
     %li.active ##{@job_retry.id}
 
 .row

data/config/routes.rb

@@ -8,7 +8,7 @@ Barbeque::Engine.routes.draw do
     get :execution_stats
   end
 
-  resources :job_executions, only: :show do
+  resources :job_executions, only: :show, param: :message_id do
     post :retry
 
     resources :job_retries, only: :show

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '1.4.1'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails