jobler 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1def2ed60486bd0da4f736ea8109cb33fd70842c
-  data.tar.gz: d4fcbab53d884c89d8e952b9e0deb799bdc6c0d7
+  metadata.gz: ee45867f29fec3487a83847580edb529f31efa93
+  data.tar.gz: 43af4c9d76332230923f66008fe76a269a893478
 SHA512:
-  metadata.gz: 93390acce23a95427e8a44f777bb87c40d30a26fea8a90cd7e7ab2e2363ab3f6136e6fa3c7bfa0870face2b6a0c138c08ad338335281f94e224194da2435082b
-  data.tar.gz: bb38dc88126b4c798ea38cc8de221dd22e5696e188e426761926e76d2b19e6a98e515c2bc980b2ac7470ee424c23ac1df6819b251c0fbfe3a8e2ef1e2b7753a4
+  metadata.gz: 60c88b3ca44fb1d387bde74cabe19806d2880e5d62dd3cc9e4d2b065fb5663c15bf8e4e2abf98cfe302b3dea5b6e824133386c5e3393b15d2148e380c2bcc362
+  data.tar.gz: 286709c6802b2d2fe30e85f349fb94b18f3a6a98941cc1a265b2ff2a952a8d4bffca1df5a71e4e6f68b744cb0a214b20b071f8b4417a7339a417dab1ee2fa2ac

data/README.md

@@ -64,7 +64,7 @@ end
 
 You can do something like this in your controller:
 ```ruby
-class MyController < ApplicationController
+class MyController < Jobler::BaseController
   def some_action
     scheduler = Jobler::JobScheduler.create! jobler_type: "MyJobler", job_args: {
       current_user_id: current_user.id,

data/lib/jobler.rb

@@ -1,6 +1,7 @@
 module Jobler
   path = "#{File.dirname(__FILE__)}/jobler"
 
+  autoload :BaseController, "#{path}/base_controller"
   autoload :BaseJobler, "#{path}/base_jobler"
   autoload :FileDownload, "#{path}/file_download"
   autoload :JobScheduler, "#{path}/job_scheduler"

data/lib/jobler/base_controller.rb

@@ -0,0 +1,2 @@
+class Jobler::BaseController < ActionController::Base
+end

data/lib/jobler/base_jobler.rb

@@ -71,7 +71,14 @@ class Jobler::BaseJobler
     controller.response = ActionDispatch::Response.new
 
     render_result = controller.render(template_path, formats: Mime::EXTENSION_LOOKUP.keys, layout: false, locals: {jobler: self}.merge(locals))
-    render_result.join
+
+    if render_result.is_a?(String)
+      # Rails 5 behaviour
+      render_result
+    else
+      # Rails 4 behaviour
+      render_result.join
+    end
   end
 
   def result

data/lib/jobler/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jobler
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7.1
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7.1
+        version: '4'
 description: Generate pages or files in the background
 email:
 - kaspernj@gmail.com
@@ -55,6 +55,7 @@ files:
 - 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_controller.rb
 - lib/jobler/base_jobler.rb
 - lib/jobler/engine.rb
 - lib/jobler/file_download.rb