workless_revived 1.2.4.2 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b5a1a47d9231df47d7e91665f9df9ed5ed0da09
-  data.tar.gz: adbf672dd8df88f312bd2dffab188e7d142a2369
+  metadata.gz: 98e47054154aee4abcc5275e895a0ce1695370b4
+  data.tar.gz: 3d1aacf639ccafff4f39b05932cdd2a57fd3121e
 SHA512:
-  metadata.gz: 6566f63ba82935ed5d9ffb20dea3e76f8da9705f031fd8c4f219d91e0705dd6b0fbcc5970cdaaba54af22ce36e7ca6d145bb4122928e9c4f06ccc92835b4cf89
-  data.tar.gz: 648a225d01433fe5cdef45639a68c93930621dbb909458903136a70a626329c52d88accca930ab7243cb0641767d95baed650cfbe7bc142134b273b74b6d9ce8
+  metadata.gz: 23bf9f4b9e0d9cdebf6f731d87f19d574ebdb99f59dc5130875b7a6719a853958dd5336ad3fe09ad480e44717da504fb38b224d13025917ac3b87d4dd72a67b4
+  data.tar.gz: c27916acaa6088249f0d264be8f3ea78c38100c90eedcccfd61191be47eaead40147d32dee2bf2b2c593bce91bc0464f87aef894aefde780616d63b57665fb3b

data/README.md

@@ -13,6 +13,7 @@ By adding the gem to your project and configuring our Heroku app with some confi
 
 ## Updates
 
+* Version 1.2.5 Added middleware to check on delayed jobs, fixed Rails 5 support
 * Version 1.2.4 drops support for older versions!
 * Version 1.2.3 replaces multiple commit callback with two callbacks for compatibility by @lostboy
 * Version 1.2.2 includes after_commit fix by @collectiveip

data/lib/workless/middleware/workless_checker.rb

@@ -14,7 +14,7 @@ class WorklessChecker
       headers['Content-Length'] = response_body.bytesize.to_s
     end
 
-    return [status, headers, response_body ? [response_body] : response]
+    [status, headers, response_body ? [response_body] : response]
   end
 
   # fix issue if response's body is a Proc
@@ -28,10 +28,10 @@ class WorklessChecker
 
   # if send file?
   def file?(headers)
-    headers["Content-Transfer-Encoding"] == "binary"
+    headers['Content-Transfer-Encoding'] == 'binary'
   end
 
   def html_request?(headers, response)
-    headers['Content-Type'] && headers['Content-Type'].include?('text/html') && response.body.include?("<html")
+    headers['Content-Type'] && headers['Content-Type'].include?('text/html') && response.body.include?('<html')
   end
 end

data/lib/workless/railtie.rb

@@ -5,7 +5,7 @@ module Delayed
   class Railtie < Rails::Railtie
     initializer :after_initialize do |config|
       require 'workless/initialize'
-      config.middleware.use "WorklessChecker"
+      config.middleware.use 'WorklessChecker'
     end
   end
 end

data/lib/workless/scaler.rb

@@ -1,20 +1,19 @@
 module Delayed
   module Workless
     module Scaler
-
-      autoload :Heroku,      "workless/scalers/heroku"
-      autoload :HerokuCedar, "workless/scalers/heroku_cedar"
-      autoload :Local,       "workless/scalers/local"
-      autoload :Null,        "workless/scalers/null"
+      autoload :Heroku,      'workless/scalers/heroku'
+      autoload :HerokuCedar, 'workless/scalers/heroku_cedar'
+      autoload :Local,       'workless/scalers/local'
+      autoload :Null,        'workless/scalers/null'
 
       def self.included(base)
         base.send :extend, ClassMethods
         if base.to_s =~ /ActiveRecord/
           base.class_eval do
-            after_commit "self.class.scaler.down", :on => :update, :if => Proc.new {|r| !r.failed_at.nil? }
-            after_commit "self.class.scaler.down", :on => :destroy, :if => Proc.new {|r| r.destroyed? or !r.failed_at.nil? }
-            after_commit "self.class.scaler.up", :on => :create
-          end          
+            after_commit 'self.class.scaler.down'.to_sym, on: :update, if: proc { |r| !r.failed_at.nil? }
+            after_commit 'self.class.scaler.down'.to_sym, on: :destroy, if: proc { |r| r.destroyed? || !r.failed_at.nil? }
+            after_commit 'self.class.scaler.up'.to_sym, on: :create
+          end
         elsif base.to_s =~ /Sequel/
           base.send(:define_method, 'after_destroy') do
             super
@@ -30,19 +29,19 @@ module Delayed
           end
         else
           base.class_eval do
-            after_destroy "self.class.scaler.down"
-            after_create "self.class.scaler.up"
-            after_update "self.class.scaler.down", :unless => Proc.new {|r| r.failed_at.nil? }
+            after_destroy 'self.class.scaler.down'
+            after_create 'self.class.scaler.up'
+            after_update 'self.class.scaler.down', unless: proc { |r| r.failed_at.nil? }
           end
         end
       end
 
       module ClassMethods
         def scaler
-          @scaler ||= if ENV.include?("HEROKU_API_KEY")
-            Scaler::HerokuCedar
-          else
-            Scaler::Local
+          @scaler ||= if ENV.include?('HEROKU_API_KEY')
+                        Scaler::HerokuCedar
+                      else
+                        Scaler::Local
           end
         end
 
@@ -50,8 +49,6 @@ module Delayed
           @scaler = "Delayed::Workless::Scaler::#{scaler.to_s.camelize}".constantize
         end
       end
-
     end
-
   end
 end

data/lib/workless/scalers/base.rb

@@ -3,25 +3,21 @@ require 'delayed_job'
 module Delayed
   module Workless
     module Scaler
-
       class Base
         def self.jobs
-          if Rails.version >= "3.0.0"
-            Delayed::Job.where(:failed_at => nil)
+          if Rails.version >= '3.0.0'
+            Delayed::Job.where(failed_at: nil)
           else
-            Delayed::Job.all(:conditions => { :failed_at => nil })
+            Delayed::Job.all(conditions: { failed_at: nil })
           end
         end
       end
 
       module HerokuClient
-
         def client
-          @client ||= ::Heroku::API.new(:api_key => ENV['HEROKU_API_KEY'])
+          @client ||= ::Heroku::API.new(api_key: ENV['HEROKU_API_KEY'])
         end
-
       end
-
     end
   end
 end

data/lib/workless/scalers/heroku.rb

@@ -3,25 +3,21 @@ require 'heroku-api'
 module Delayed
   module Workless
     module Scaler
-
       class Heroku < Base
-
         extend Delayed::Workless::Scaler::HerokuClient
 
         def self.up
-          client.put_workers(ENV['APP_NAME'], 1) if self.workers == 0
+          client.put_workers(ENV['APP_NAME'], 1) if workers == 0
         end
 
         def self.down
-          client.put_workers(ENV['APP_NAME'], 0) unless self.jobs.count > 0 or self.workers == 0
+          client.put_workers(ENV['APP_NAME'], 0) unless jobs.count > 0 || workers == 0
         end
 
         def self.workers
-          client.get_ps(ENV['APP_NAME']).body.count { |p| p["process"] =~ /worker\.\d?/ }
+          client.get_ps(ENV['APP_NAME']).body.count { |p| p['process'] =~ /worker\.\d?/ }
         end
-
       end
-
     end
   end
 end

data/lib/workless/scalers/heroku_cedar.rb

@@ -7,15 +7,15 @@ module Delayed
         extend Delayed::Workless::Scaler::HerokuClient
 
         def self.up
-          client.post_ps_scale(ENV['APP_NAME'], 'worker', self.workers_needed) if self.workers_needed > self.min_workers and self.workers < self.workers_needed
+          client.post_ps_scale(ENV['APP_NAME'], 'worker', workers_needed) if workers_needed > min_workers && workers < workers_needed
         end
 
         def self.down
-          client.post_ps_scale(ENV['APP_NAME'], 'worker', self.workers_needed) unless self.workers == self.workers_needed
+          client.post_ps_scale(ENV['APP_NAME'], 'worker', workers_needed) unless workers == workers_needed
         end
 
         def self.workers
-          client.get_ps(ENV['APP_NAME']).body.count { |p| p["process"] =~ /worker\.\d?/ }
+          client.get_ps(ENV['APP_NAME']).body.count { |p| p['process'] =~ /worker\.\d?/ }
         end
 
         # Returns the number of workers needed based on the current number of pending jobs and the settings defined by:
@@ -25,7 +25,7 @@ module Delayed
         # ENV['WORKLESS_MIN_WORKERS']
         #
         def self.workers_needed
-          [[(self.jobs.count.to_f / self.workers_ratio).ceil, self.max_workers].min, self.min_workers].max
+          [[(jobs.count.to_f / workers_ratio).ceil, max_workers].min, min_workers].max
         end
 
         def self.workers_ratio
@@ -46,4 +46,4 @@ module Delayed
       end
     end
   end
-end
+end

data/lib/workless/scalers/local.rb

@@ -4,7 +4,6 @@ module Delayed
   module Workless
     module Scaler
       class Local < Base
-
         def self.executable_prefix
           if defined? Delayed::Compatibility.executable_prefix
             Delayed::Compatibility.executable_prefix
@@ -14,22 +13,22 @@ module Delayed
         end
 
         def self.up
-          if self.workers == 0
-            Rush::Box.new[Rails.root].bash("#{executable_prefix}/delayed_job start -i workless", :background => true)
+          if workers == 0
+            Rush::Box.new[Rails.root].bash("#{executable_prefix}/delayed_job start -i workless", background: true)
             sleep 1
           end
           true
         end
 
         def self.down
-          if self.workers > 0 and jobs.count == 0
-            Rush::Box.new[Rails.root].bash("#{executable_prefix}/delayed_job stop -i workless", :background => true)
+          if workers > 0 && jobs.count == 0
+            Rush::Box.new[Rails.root].bash("#{executable_prefix}/delayed_job stop -i workless", background: true)
           end
           true
         end
 
         def self.workers
-          Rush::Box.new.processes.filter(:cmdline => /delayed_job start -i workless|delayed_job.workless/).size
+          Rush::Box.new.processes.filter(cmdline: /delayed_job start -i workless|delayed_job.workless/).size
         end
       end
     end

data/lib/workless/scalers/null.rb

@@ -1,17 +1,13 @@
 module Delayed
   module Workless
     module Scaler
-
       class Null < Base
-      
         def self.up
         end
 
         def self.down
         end
-
       end
-      
     end
   end
 end

data/lib/workless_revived.rb

@@ -0,0 +1,5 @@
+require 'heroku-api'
+require File.dirname(__FILE__) + '/workless/scalers/base'
+require File.dirname(__FILE__) + '/workless/scaler'
+require File.dirname(__FILE__) + '/workless/middleware/workless_checker' if defined?(Rails::Railtie)
+require File.dirname(__FILE__) + '/workless/railtie' if defined?(Rails::Railtie)

data/rails/init.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + "/../lib/workless/initialize"
+require File.dirname(__FILE__) + '/../lib/workless/initialize'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workless_revived
 version: !ruby/object:Gem::Version
-  version: 1.2.4.2
+  version: 1.2.5
 platform: ruby
 authors:
 - davidakachaos
@@ -14,16 +14,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/workless.rb
 - lib/workless/initialize.rb
 - lib/workless/middleware/workless_checker.rb
 - lib/workless/railtie.rb
@@ -98,6 +97,7 @@ files:
 - lib/workless/scalers/heroku_cedar.rb
 - lib/workless/scalers/local.rb
 - lib/workless/scalers/null.rb
+- lib/workless_revived.rb
 - rails/init.rb
 homepage: http://github.com/davidakachaos/workless_revived
 licenses: []

data/lib/workless.rb

@@ -1,5 +0,0 @@
-require "heroku-api"
-require File.dirname(__FILE__) + "/workless/scalers/base"
-require File.dirname(__FILE__) + "/workless/scaler"
-require File.dirname(__FILE__) + "/workless/middleware/workless_checker" if defined?(Rails::Railtie)
-require File.dirname(__FILE__) + "/workless/railtie" if defined?(Rails::Railtie)