jobler 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b799fadf62229d053e33b4f073fecc0962e944d9e2dee1dc8ae9f213c4a425ba
-  data.tar.gz: d7a89ad05effc901eb99b11b944450091f63b4ed7aca467f58f1203118e19e56
+  metadata.gz: 549a9f294ff023f7c67091e91120706db134cd9639d9f8b2d60d9860c5562788
+  data.tar.gz: '097746283982a71eeffdd1a006e2e8a6d178c5b847e6854ddae0696075da4490'
 SHA512:
-  metadata.gz: 0ae5ea9a10281c55fcb793679dcd0b46a879938a333b9839b285013521021077ee6eeb510f2c5cd6a475151083e3a703230c71dd8bb91843e0f49e422b66cb35
-  data.tar.gz: dea066d7849a36caf18f2a6755481efb06159ca805326fef94e20d09c9fa047bab121c692f652cfb4c15b16ab43eded86e827b6e318f516d1909e3dd373501ef
+  metadata.gz: 3204ebaef1538454ea89a42066fc498d554317f14a9dd72e03356c1c1cb58ef5aac58909246c750b17c785b4610b33cef3a7b19ab93cc3877297ae0b659025e6
+  data.tar.gz: e7ffb22951a39418e2ffd48c7f58b69b7465dbf41419583c5b49ed8ae71fbcbd15ca5dd7f58491df70ec7769c2e1dadb2416bb7ceac974910d50ef8af7617a23

data/app/controllers/jobler/downloads_controller.rb

@@ -4,7 +4,11 @@ class Jobler::DownloadsController < Jobler::ApplicationController
     @result = @job.jobler.result
 
     if @result.is_a?(Jobler::FileDownload)
-      send_file @result.temp_file.path, disposition: "attachment", filename: @result.file_name
+      if @result.url.present?
+        redirect_to @result.url
+      else
+        send_file @result.temp_file.path, disposition: "attachment", filename: @result.file_name
+      end
     else
       flash[:error] = "The result wasn't a file download"
       redirect_to :back

data/app/models/jobler/result.rb

@@ -1,5 +1,7 @@
 class Jobler::Result < ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord
   belongs_to :job, class_name: "Jobler::Job", inverse_of: :results
 
+  has_one_attached :file
+
   validates :job, :name, presence: true
 end

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

@@ -4,7 +4,11 @@
 
 <% if @job.completed? %>
   <% if @result.is_a?(Jobler::FileDownload) %>
-    <%= link_to "Download", download_path(@job) %>
+    <% if @result.url.present? %>
+      <%= link_to "Download", @result.url %>
+    <% else %>
+      <%= link_to "Download", download_path(@job) %>
+    <% end %>
   <% elsif @result.is_a?(Jobler::PageRender) %>
     <%= @result.body.html_safe %>
   <% end %>

data/lib/jobler/base_controller.rb

@@ -1,2 +1,2 @@
-class Jobler::BaseController < ActionController::Base
+class Jobler::BaseController < ActionController::Base # rubocop:disable Rails/ApplicationController
 end

data/lib/jobler/base_jobler.rb

@@ -2,24 +2,52 @@ class Jobler::BaseJobler
   attr_accessor :controller, :format
   attr_reader :args, :job
 
-  def initialize(args = {})
-    @args = args[:args]
-    @job = args[:job]
+  def self.before_jobling(&blk)
+    @@before_jobling ||= [] # rubocop:disable Style/ClassVars
+    @@before_jobling << blk
   end
 
-  def create_result!(args)
-    if args[:temp_file]
-      temp_file = args.fetch(:temp_file)
-      temp_file.close unless temp_file.closed?
-      content = File.read(temp_file.path)
+  def self.after_jobling(&blk)
+    @@after_jobling ||= [] # rubocop:disable Style/ClassVars
+    @@after_jobling << blk
+  end
+
+  def initialize(args:, job:)
+    @args = args
+    @job = job
+  end
+
+  def call_before_callbacks
+    @@before_jobling&.each do |before_callback|
+      instance_eval(&before_callback)
+    end
+  end
+
+  def call_after_callbacks
+    @@after_jobling&.each do |after_callback|
+      instance_eval(&after_callback)
+    end
+  end
+
+  def create_result!(content: nil, name:, result: nil, temp_file: nil, save_in_database: false)
+    jobler_result = job.results.new(name: name)
+
+    if content && !temp_file
+      temp_file = Tempfile.new(name)
+      temp_file.write(content)
+      temp_file.close
+    end
+
+    if result
+      jobler_result.result = result
     else
-      content = args.fetch(:content)
+      raise "No tempfile could be found" unless temp_file
+
+      handle_file(jobler_result: jobler_result, save_in_database: save_in_database, temp_file: temp_file)
     end
 
-    job.results.create!(
-      name: args.fetch(:name),
-      result: content
-    )
+    jobler_result.save!
+    jobler_result
   end
 
   def execute!
@@ -89,10 +117,9 @@ class Jobler::BaseJobler
     raise NoMethodError, "You should define the 'result' method on #{self.class.name}"
   end
 
-  def temp_file_for_result(args)
-    job_result = job.results.where(name: args.fetch(:name)).first
-
-    raise "No result by that name: #{args.fetch(:name)}" unless job_result
+  def temp_file_for_result(name:)
+    job_result = job.results.where(name: name).first
+    raise "No result by that name: #{name}" unless job_result
 
     temp_file = ::Tempfile.new("jobler_tempfile")
     temp_file.binmode
@@ -100,4 +127,27 @@ class Jobler::BaseJobler
     temp_file.close
     temp_file
   end
+
+  def url_for_result(name:)
+    job_result = job.results.where(name: name).first
+    raise "No result by that name: #{name}" unless job_result
+
+    Rails.application.routes.url_helpers.rails_blob_path(job_result.file.attachment, only_path: true)
+  end
+
+private
+
+  def handle_file(jobler_result:, save_in_database:, temp_file:)
+    if save_in_database
+      temp_file = temp_file
+      temp_file.close unless temp_file.closed?
+      content = File.read(temp_file.path)
+      jobler_result.result = content
+    else
+      jobler_result.file.attach(
+        filename: File.basename(temp_file.path),
+        io: File.open(temp_file.path)
+      )
+    end
+  end
 end

data/lib/jobler/file_download.rb

@@ -1,8 +1,12 @@
 class Jobler::FileDownload
-  attr_reader :file_name, :temp_file
+  attr_reader :file_name, :temp_file, :url
 
-  def initialize(args)
-    @file_name = args.fetch(:file_name)
-    @temp_file = args.fetch(:temp_file)
+  def initialize(file_name: nil, temp_file: nil, url: nil)
+    raise "Temp file or URL should be given" if !temp_file && !url
+    raise "No filename given with temp-file" if temp_file && file_name.blank?
+
+    @file_name = file_name
+    @temp_file = temp_file
+    @url = url
   end
 end

data/lib/jobler/job_runner.rb

@@ -7,7 +7,13 @@ class Jobler::JobRunner < ActiveJob::Base # rubocop:disable Rails/ApplicationJob
 
     begin
       with_locale do
-        @job.jobler.execute!
+        @job.jobler.call_before_callbacks
+
+        begin
+          @job.jobler.execute!
+        ensure
+          @job.jobler.call_after_callbacks
+        end
       end
 
       @job.update!(ended_at: Time.zone.now, progress: 1.0, state: "completed")

data/lib/jobler/version.rb

@@ -1,3 +1,3 @@
 module Jobler
-  VERSION = "0.0.12".freeze
+  VERSION = "0.0.13".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobler
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails