jobler 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48611c7dac3539e71c56fd8b94861495e6d42bfd
-  data.tar.gz: 90ace36fd054d1eb70b55947ace2d5c83a5be55d
+  metadata.gz: bc6575214ca69340a22f08224606c5054ede5a4b
+  data.tar.gz: 259b5d8e7f71b30eb3d5af07e22bc6f6e6ff47f8
 SHA512:
-  metadata.gz: 9d5a976300160f6a0144fd7c5225c0d187023d5b1f259db31bdd385419547fcf7c38fc7e0ed212af39fd41086c05f9eb628aaffb97e76aa7fa05257d2644227c
-  data.tar.gz: 5620d5fede8a100fa849d98c32df9001573b9aa1c2fb9c5dfc85f481640a6e02cafbf12034aab837f992adaf2ae41e1c2101b1901c3bbc523eeda6eab5ff0acd
+  metadata.gz: cc6428a298bf822a8964ca74ab5bf05d36dca9b289e8108841abf8b319263da810aa4d520c09eed02bc7345801c1fd7a9a741caa18dee61c238e676b5470177d
+  data.tar.gz: 4c23cfe4bf54bd0102cc543dd3ed27ae4651175bc71e11deed63e8a406c23090db6956972c928fb56912e650a4bbfa2896e6de672d00b8c64b55759d884e45a0

data/app/assets/javascripts/jobler/application.js

@@ -1,2 +1,3 @@
 //= require jquery
+//= require jobler/timeago
 //= require jobler/jobs

data/app/assets/javascripts/jobler/jobs.js

@@ -7,23 +7,25 @@ function updateJobProgress() {
 
     result = $.parseJSON(data.responseText)
 
-    $(".job-progress").text((result.job.progress * 100).toFixed(2) + "%")
+    $(".job-headline").text(result.job.state_humanized)
+    $(".progress-bar").text((result.job.progress * 100).toFixed(0) + "%")
+    $(".progress-bar").css({width: (result.job.progress * 100) + "%"})
 
-    if (result.job.state == "completed") {
+    if (result.job.state == "completed" || result.job.state == "error") {
       console.log("Job is completed - reload!")
       location.reload()
     }
   }})
 
   if (job.data("state") != "completed") {
-    setTimeout("updateJobProgress()", 5000)
+    setTimeout("updateJobProgress()", 2000)
   }
 }
 
 $(document).ready(function() {
   job = $(".job")
 
-  if (job.data("state") != "completed") {
-    updateJobProgress()
+  if (job.data("state") != "completed" && job.data("state") != "error") {
+    setTimeout("updateJobProgress()", 1000)
   }
 })

data/app/assets/javascripts/jobler/timeago.js

@@ -0,0 +1,3 @@
+$(document).ready(function() {
+  jQuery("time.timeago").timeago()
+})

data/app/assets/stylesheets/jobler/application.css

@@ -1,15 +1,3 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */
+body {
+  padding-top: 50px;
+}

data/app/controllers/jobler/downloads_controller.rb

@@ -1,6 +1,6 @@
 class Jobler::DownloadsController < Jobler::ApplicationController
   def show
-    @job = Jobler::Job.find(params[:id])
+    @job = Jobler::Job.find_by!(slug: params[:id])
     @result = @job.jobler.result
 
     if @result.is_a?(Jobler::FileDownload)

data/app/controllers/jobler/jobs_controller.rb

@@ -1,6 +1,6 @@
 class Jobler::JobsController < Jobler::ApplicationController
   def show
-    @job = Jobler::Job.find(params[:id])
+    @job = Jobler::Job.find_by!(slug: params[:id])
     @result = @job.jobler.result if @job.completed?
 
     respond_to do |format|
@@ -8,7 +8,8 @@ class Jobler::JobsController < Jobler::ApplicationController
         render json: {
           job: {
             progress: @job.progress,
-            state: @job.state
+            state: @job.state,
+            state_humanized: @job.state.humanize
           }
         }
       end

data/app/models/jobler/job.rb

@@ -1,7 +1,9 @@
 class Jobler::Job < ActiveRecord::Base
   has_many :results, class_name: "Jobler::Result", dependent: :destroy
 
-  validates :jobler_type, :state, presence: true
+  validates :jobler_type, :slug, :state, presence: true
+
+  before_validation :set_slug
 
   def jobler
     user_jobler = jobler_type.constantize.new
@@ -13,4 +15,20 @@ class Jobler::Job < ActiveRecord::Base
   def completed?
     state == "completed"
   end
+
+  def error?
+    state == "error"
+  end
+
+  def to_param
+    raise "No slug" unless slug?
+    slug
+  end
+
+private
+
+  def set_slug
+    require "securerandom"
+    self.slug ||= SecureRandom.hex
+  end
 end

data/app/views/jobler/jobs/show.html.erb

@@ -1,17 +1,26 @@
 <div class="job" data-id="<%= @job.id %>" data-path="<%= job_path(@job) %>" data-state="<%= @job.state %>"></div>
 
-<% if @job.completed? %>
-  <h1>Completed</h1>
+<h1 class="job-headline"><%= @job.state.humanize %></h1>
 
+<% if @job.completed? %>
   <% if @result.is_a?(Jobler::FileDownload) %>
     <%= link_to "Download", download_path(@job) %>
   <% end %>
+<% elsif @job.error? %>
+  <div class="well">
+    <%= @job.error_type %>: <%= @job.error_message %>
+  </div>
+  <pre><%= @job.error_backtrace %></pre>
 <% else %>
-  <h1>Waiting</h1>
+  Started <time class="timeago" datetime="<%= @job.created_at %>"></time>
 
-  <div class="job-progress">
-    <% if @job.progress? %>
-      <%= number_with_precision @job.progress, precision: 2 %>%
-    <% end %>
+  <div class="row">
+    <div class="col-lg-4 col-md-6 col-sm-8 col-xs-10">
+      <div class="progress">
+        <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: <%= (@job.progress * 100).to_i %>%;">
+          <%= (@job.progress * 100).to_i %>%
+        </div>
+      </div>
+    </div>
   </div>
 <% end %>

data/app/views/layouts/jobler/application.html.erb

@@ -2,13 +2,35 @@
 <html>
 <head>
   <title>Jobler</title>
+
   <%= stylesheet_link_tag "jobler/application", media: "all" %>
+  <%= stylesheet_link_tag "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css", integrity: "sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u", crossorigin: "anonymous" %>
+
   <%= javascript_include_tag "jobler/application" %>
+  <%= javascript_include_tag "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js", integrity: "sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa", crossorigin: "anonymous" %>
+  <%= javascript_include_tag "https://use.fontawesome.com/de02b76735.js" %>
+  <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.5.4/jquery.timeago.min.js" %>
+
   <%= csrf_meta_tags %>
 </head>
 <body class="controller-<%= controller_name %> action-<%= action_name %>">
-
-<%= yield %>
-
+  <nav class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="#">Jobler</a>
+      </div>
+    </div>
+  </nav>
+  <div class="container">
+    <div class="starter-template">
+      <%= yield %>
+    </div>
+  </div>
 </body>
 </html>

data/db/migrate/20170206100737_add_error_message_and_error_backtrace_to_jobs.rb

@@ -0,0 +1,7 @@
+class AddErrorMessageAndErrorBacktraceToJobs < ActiveRecord::Migration
+  def change
+    add_column :jobler_jobs, :error_message, :text
+    add_column :jobler_jobs, :error_type, :string
+    add_column :jobler_jobs, :error_backtrace, :text
+  end
+end

data/db/migrate/20170206104246_add_slug_to_jobs.rb

@@ -0,0 +1,6 @@
+class AddSlugToJobs < ActiveRecord::Migration
+  def change
+    add_column :jobler_jobs, :slug, :string
+    add_index :jobler_jobs, :slug, unique: true
+  end
+end

data/lib/jobler/job_runner.rb

@@ -12,8 +12,13 @@ class Jobler::JobRunner < ActiveJob::Base
 
       @job.update_attributes!(ended_at: Time.zone.now, progress: 1.0, state: "completed")
     rescue Exception => e # rubocop:disable Lint/RescueException
-      @job.update_attributes!(ended_at: Time.zone.now, state: "error")
-      raise e
+      @job.update_attributes!(
+        ended_at: Time.zone.now,
+        error_message: e.message,
+        error_type: e.class.name,
+        error_backtrace: e.backtrace.join("\n"),
+        state: "error"
+      )
     end
   end
 

data/lib/jobler/version.rb

@@ -1,3 +1,3 @@
 module Jobler
-  VERSION = "0.0.4".freeze
+  VERSION = "0.0.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobler
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,6 +37,7 @@ files:
 - app/assets/javascripts/jobler.js
 - app/assets/javascripts/jobler/application.js
 - app/assets/javascripts/jobler/jobs.js
+- app/assets/javascripts/jobler/timeago.js
 - app/assets/stylesheets/jobler/application.css
 - app/controllers/jobler/application_controller.rb
 - app/controllers/jobler/downloads_controller.rb
@@ -50,6 +51,8 @@ files:
 - db/migrate/20170130220604_create_jobs.rb
 - db/migrate/20170130220734_create_jobler_results.rb
 - db/migrate/20170203161045_add_locale_to_jobs.rb
+- db/migrate/20170206100737_add_error_message_and_error_backtrace_to_jobs.rb
+- db/migrate/20170206104246_add_slug_to_jobs.rb
 - lib/jobler.rb
 - lib/jobler/base_jobler.rb
 - lib/jobler/engine.rb