barbeque 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43082ae404cbe883e4ba07cbd59e6704c928ab3
-  data.tar.gz: a2f5fabeb566ac7c2345c5b77f7e4093d43243f9
+  metadata.gz: c235c801a5847d1f7ee491ead2247b9e3c08845a
+  data.tar.gz: f2157e1f492cba1a78fc8e64d528abb850e144e7
 SHA512:
-  metadata.gz: cb8b997431c6661bd6c5fd03dfcc17a1c86146b8e88db452aa43b1d668ea1473375c6dd42ce6c54057c965cc6a6fab7181818e01a9aab337f6acf1cee2149e5d
-  data.tar.gz: 833426bd91b0901351f491b4962ebc7f15460cb181b66f2d9242358279e9ae288a49a13563c96a4d705ffffe512c26d7bfa5268072717b977fc7af90053f62f6
+  metadata.gz: '08626acefc490c6da1fe8abf979216974743335448aae55404551ae9d9cc43038729b928cef678b51f8f24f7703095b74071863d0f16fb1851432c96da0095e3'
+  data.tar.gz: 299a6c177bf233a04d9bf9fbf6907014cf4663d7cb894459657592e0441030b6af760f90ec8ba89b0d3976cb800f8266d7198b23523723be32cedf29f379f54c

data/app/controllers/barbeque/api/job_executions_controller.rb

@@ -15,12 +15,14 @@ class Barbeque::Api::JobExecutionsController < Barbeque::Api::ApplicationControl
   end
 
   def require_resource
-    @resource = Barbeque::JobExecution.find_or_initialize_by(message_id: params[:message_id])
+    model = Barbeque::JobExecution.find_or_initialize_by(message_id: params[:message_id])
+    @resource = Barbeque::Api::JobExecutionResource.new(model, url_options)
   end
 
   def create_resource
     message_id = enqueue_message
-    Barbeque::JobExecution.new(message_id: message_id).to_resource
+    model = Barbeque::JobExecution.new(message_id: message_id)
+    @resource = Barbeque::Api::JobExecutionResource.new(model, url_options)
   end
 
   # @return [String] id of a message queued to SQS.
@@ -32,4 +34,13 @@ class Barbeque::Api::JobExecutionsController < Barbeque::Api::ApplicationControl
       message:     params[:message],
     ).run
   end
+
+  # Link to job_execution isn't available if it isn't dequeued yet
+  def location
+    if @resource.id
+      super
+    else
+      nil
+    end
+  end
 end

data/app/models/barbeque/api/job_execution_resource.rb

@@ -3,5 +3,22 @@ class Barbeque::Api::JobExecutionResource < Barbeque::Api::ApplicationResource
 
   property :status
 
-  delegate :message_id, :status, to: :model
+  property :id
+
+  property :html_url, selectable: true
+
+  delegate :message_id, :status, :id, to: :model
+
+  def initialize(model, url_options)
+    super(model)
+    @url_options = url_options
+  end
+
+  def html_url
+    if model.id
+      Barbeque::Engine.routes.url_helpers.job_execution_url(model, @url_options)
+    else
+      nil
+    end
+  end
 end

data/app/models/barbeque/job_execution.rb

@@ -18,8 +18,4 @@ class Barbeque::JobExecution < Barbeque::ApplicationRecord
   def execution_log
     @execution_log ||= Barbeque::ExecutionLog.load(execution: self)
   end
-
-  def to_resource
-    Barbeque::Api::JobExecutionResource.new(self)
-  end
 end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -387,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Job queue system to run job with Docker