jobler 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc6575214ca69340a22f08224606c5054ede5a4b
-  data.tar.gz: 259b5d8e7f71b30eb3d5af07e22bc6f6e6ff47f8
+  metadata.gz: 1def2ed60486bd0da4f736ea8109cb33fd70842c
+  data.tar.gz: d4fcbab53d884c89d8e952b9e0deb799bdc6c0d7
 SHA512:
-  metadata.gz: cc6428a298bf822a8964ca74ab5bf05d36dca9b289e8108841abf8b319263da810aa4d520c09eed02bc7345801c1fd7a9a741caa18dee61c238e676b5470177d
-  data.tar.gz: 4c23cfe4bf54bd0102cc543dd3ed27ae4651175bc71e11deed63e8a406c23090db6956972c928fb56912e650a4bbfa2896e6de672d00b8c64b55759d884e45a0
+  metadata.gz: 93390acce23a95427e8a44f777bb87c40d30a26fea8a90cd7e7ab2e2363ab3f6136e6fa3c7bfa0870face2b6a0c138c08ad338335281f94e224194da2435082b
+  data.tar.gz: bb38dc88126b4c798ea38cc8de221dd22e5696e188e426761926e76d2b19e6a98e515c2bc980b2ac7470ee424c23ac1df6819b251c0fbfe3a8e2ef1e2b7753a4

data/README.md

@@ -97,11 +97,37 @@ class TestRenderJobler < Jobler::BaseJobler
       content: render(:show)
     )
   end
+
+  def result
+    Jobler::RedirectTo.new(url: "/jobler_jobs/jobs/#{job.to_param}")
+  end
 end
 ```
 
 This will render the view located at "app/joblers/test_render_jobler/show.*"
 
+You should then create a controller something like this:
+
+```ruby
+class JoblerJobsController < ApplicationController
+  def show
+    @job = Jobler::Job.find_by!(slug: param[:id])
+    @result = @job.results.find_by!(name: "render")
+  end
+end
+```
+
+And a view in "app/views/jobler_jobs/show.html.erb":
+```erb
+<%= @result.result.force_encoding("utf-8").html_safe
+```
+
+You should also add a route like this:
+```ruby
+Rails.application.routes.draw do
+  resources :jobler_jobs, only: :show
+end
+```
 
 ## License
 

data/app/controllers/jobler/jobs_controller.rb

@@ -13,7 +13,12 @@ class Jobler::JobsController < Jobler::ApplicationController
           }
         }
       end
-      format.html
+
+      if @result.is_a?(Jobler::RedirectTo)
+        format.html { redirect_to @result.url }
+      else
+        format.html
+      end
     end
   end
 end

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

@@ -5,6 +5,8 @@
 <% if @job.completed? %>
   <% if @result.is_a?(Jobler::FileDownload) %>
     <%= link_to "Download", download_path(@job) %>
+  <% elsif @result.is_a?(Jobler::PageRender) %>
+    <%= @result.body.html_safe %>
   <% end %>
 <% elsif @job.error? %>
   <div class="well">

data/db/migrate/20170217082955_add_host_protocol_and_port_to_jobler_jobs.rb

@@ -0,0 +1,7 @@
+class AddHostProtocolAndPortToJoblerJobs < ActiveRecord::Migration
+  def change
+    add_column :jobler_jobs, :host, :string
+    add_column :jobler_jobs, :protocol, :string
+    add_column :jobler_jobs, :port, :integer
+  end
+end

data/lib/jobler.rb

@@ -5,7 +5,8 @@ module Jobler
   autoload :FileDownload, "#{path}/file_download"
   autoload :JobScheduler, "#{path}/job_scheduler"
   autoload :JobRunner, "#{path}/job_runner"
-  autoload :TemplateRenderer, "#{path}/template_renderer"
+  autoload :PageRender, "#{path}/page_render"
+  autoload :RedirectTo, "#{path}/redirect_to"
 end
 
 require "jobler/engine"

data/lib/jobler/base_jobler.rb

@@ -60,8 +60,14 @@ class Jobler::BaseJobler
       template_path = "joblers/#{jobler_name}/#{template_path}"
     end
 
+    request = ActionDispatch::Request.new(
+      "HTTP_HOST" => "#{job.host}:#{job.port}",
+      "HTTP_X_FORWARDED_PROTO" => job.protocol
+    )
+
     controller = ::ApplicationJoblerController.new
     controller.instance_variable_set(:@jobler, self)
+    controller.request = request
     controller.response = ActionDispatch::Response.new
 
     render_result = controller.render(template_path, formats: Mime::EXTENSION_LOOKUP.keys, layout: false, locals: {jobler: self}.merge(locals))

data/lib/jobler/job_scheduler.rb

@@ -9,17 +9,28 @@ class Jobler::JobScheduler
   end
 
   def initialize(args)
+    @controller = args[:controller]
     @jobler_type = args.fetch(:jobler_type)
     @job_args = args[:job_args]
     @locale = args[:locale]
   end
 
   def create_job
-    @job = Jobler::Job.create!(
+    @job = Jobler::Job.new(
       jobler_type: @jobler_type,
       locale: @locale.presence || I18n.locale,
       parameters: YAML.dump(@job_args)
     )
+
+    if @controller
+      @job.assign_attributes(
+        host: @controller.request.host,
+        port: @controller.request.port,
+        protocol: @controller.request.protocol
+      )
+    end
+
+    @job.save!
   end
 
   def perform_job_later

data/lib/jobler/page_render.rb

@@ -0,0 +1,10 @@
+class Jobler::PageRender
+  def initialize(args)
+    @job = args.fetch(:job)
+    @name = args.fetch(:name)
+  end
+
+  def body
+    @job.results.find_by!(name: @name).result
+  end
+end

data/lib/jobler/redirect_to.rb

@@ -0,0 +1,7 @@
+class Jobler::RedirectTo
+  attr_reader :url
+
+  def initialize(args)
+    @url = args.fetch(:url)
+  end
+end

data/lib/jobler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobler
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,13 +53,15 @@ files:
 - 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
+- db/migrate/20170217082955_add_host_protocol_and_port_to_jobler_jobs.rb
 - lib/jobler.rb
 - lib/jobler/base_jobler.rb
 - lib/jobler/engine.rb
 - lib/jobler/file_download.rb
 - lib/jobler/job_runner.rb
 - lib/jobler/job_scheduler.rb
-- lib/jobler/template_renderer.rb
+- lib/jobler/page_render.rb
+- lib/jobler/redirect_to.rb
 - lib/jobler/version.rb
 - lib/tasks/jobler_tasks.rake
 homepage: https://www.github.com/kaspernj/jobler

data/lib/jobler/template_renderer.rb

@@ -1,3 +0,0 @@
-class TemplateRenderer
-  include RenderAnywhere
-end