barbeque 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3026b077536df0611a58ba0aa89d874684f9034c770acda9dcb3157bd3eb3038
-  data.tar.gz: 2483622e8a5509fba04ee65cb211f9310499de78c4728f043e020e86dad3d1ee
+  metadata.gz: 66a4d253528f2a554ce38065c2eca4eb57f2281d6d6cbbe9adf285d00211b0b5
+  data.tar.gz: 3df5c3011aa375dce9274fffa75a8be6a77231632bba9fa02196a2c098447aa2
 SHA512:
-  metadata.gz: 0f3ad0c7751118435c9e08f1a7dabc8a9b26244d1658b4a09726234fb1da4b0a8de06e41b7909f378dfed6c1f3fc4d3946eccf2104982376ab517e3cd48b0b33
-  data.tar.gz: 6b0872c02ecea57d88b2512ffb23ffc6bbb65942a25f9240eafa4b251a114aae3d41f19aa0e8e012c5c5035908f9de19904cd1df6a809fc6d04e7bcc129bb729
+  metadata.gz: e54454ba9b12c2dbb3bad474c8511e0b5234fb3296fd80679bcf0802470d46de47a118f7774fc5deb8d79c029d6d52c91b4bf8f2de1f9e25597e95e5dc6a60b1
+  data.tar.gz: f4e929ced516b5e0cec7e8d7e2db717f5b0b49d4ca3dc40bb37c211a57dc96dfbbe62d053afa1dbaa120fcb56a9bf5da288a65c74610f5d36ea6693d09278ecc

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

@@ -1,6 +1,8 @@
 require 'garage'
 
-class Barbeque::Api::ApplicationController < ActionController::Base
+class Barbeque::Api::ApplicationController < ActionController::API
+  before_action :force_json_format
+
   include Garage::ControllerHelper
 
   rescue_from ActiveRecord::RecordNotFound do |exception|
@@ -19,4 +21,9 @@ class Barbeque::Api::ApplicationController < ActionController::Base
   def respond_with_error(status_code, error_code, message)
     render json: { status_code: status_code, error_code: error_code, message: message }, status: status_code
   end
+
+  # This is required to use ActionController::API with Garage
+  def force_json_format
+    request.format = :json
+  end
 end

data/app/models/barbeque/job_definition.rb

@@ -19,7 +19,7 @@ class Barbeque::JobDefinition < Barbeque::ApplicationRecord
     from = from.beginning_of_hour
     to = to.beginning_of_hour
     stats = Hash.new { |h, k| h[k] = { count: 0, avg_time: 0 } }
-    job_executions.where(created_at: from .. to).group(DATE_HOUR_SQL).order(DATE_HOUR_SQL).pluck("#{DATE_HOUR_SQL}, count(1), avg(timestampdiff(second, created_at, finished_at))").each do |date_hour, count, avg_time|
+    job_executions.where(created_at: from .. to).group(DATE_HOUR_SQL).order(Arel.sql(DATE_HOUR_SQL)).pluck(Arel.sql("#{DATE_HOUR_SQL}, count(1), avg(timestampdiff(second, created_at, finished_at))")).each do |date_hour, count, avg_time|
       time = Time.zone.parse("#{date_hour} UTC")
       stats[time] = {
         count: count,

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rinku
   requirement: !ruby/object:Gem::Requirement
@@ -350,8 +350,6 @@ files:
 - app/helpers/barbeque/application_helper.rb
 - app/helpers/barbeque/job_definitions_helper.rb
 - app/helpers/barbeque/job_executions_helper.rb
-- app/jobs/barbeque/application_job.rb
-- app/mailers/barbeque/application_mailer.rb
 - app/models/barbeque/api/application_resource.rb
 - app/models/barbeque/api/job_execution_resource.rb
 - app/models/barbeque/api/job_retry_resource.rb

data/app/jobs/barbeque/application_job.rb

@@ -1,4 +0,0 @@
-module Barbeque
-  class ApplicationJob < ActiveJob::Base
-  end
-end

data/app/mailers/barbeque/application_mailer.rb

@@ -1,6 +0,0 @@
-module Barbeque
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end