workless 1.1.2 → 1.1.3

data/README.md

@@ -9,6 +9,7 @@ By adding the gem to your project and configuring our Heroku app with some confi
 
 ## Updates
 
+* Version 1.1.3 includes changes by @radanskoric to reduce number of heroku api calls
 * Version 1.1.2 includes a change by @davidakachaos to scale workers using after_commit
 * Version 1.1.1 includes a fix from @filiptepper and @fixr to correctly scale workers
 * Version 1.1.0 has been released, this adds support for scaling using multiple workers thanks to @jaimeiniesta and @davidakachaos.
@@ -32,21 +33,21 @@ Add the workless gem and the delayed_job gem to your project Gemfile and update
 
 <pre>
 gem "delayed_job", "2.0.7"
-gem "workless", "~> 1.1.1"
+gem "workless", "~> 1.1.3"
 </pre>
 
 ### For rails 3.x with delayed_job 2.1.x
 
 <pre>
 gem "delayed_job", "~> 2.1.4"
-gem "workless", "~> 1.1.1"
+gem "workless", "~> 1.1.3"
 </pre>
 
 ### For rails 3.x with latest delayed_job 3.x using active record
 
 <pre>
 gem "delayed_job_active_record"
-gem "workless", "~> 1.1.1"
+gem "workless", "~> 1.1.3"
 </pre>
 
 If you don't specify delayed_job in your Gemfile workless will bring it in, most likly the latest version (3.0.1)

data/lib/workless/initialize.rb

@@ -1,3 +1,4 @@
 Delayed::Worker.max_attempts = 3
 Delayed::Backend::ActiveRecord::Job.send(:include, Delayed::Workless::Scaler) if defined?(Delayed::Backend::ActiveRecord::Job)
 Delayed::Backend::Mongoid::Job.send(:include, Delayed::Workless::Scaler) if defined?(Delayed::Backend::Mongoid::Job)
+Delayed::Backend::MongoMapper::Job.send(:include, Delayed::Workless::Scaler) if defined?(Delayed::Backend::MongoMapper::Job)

data/lib/workless/scaler.rb

@@ -9,10 +9,18 @@ module Delayed
 
       def self.included(base)
         base.send :extend, ClassMethods
-        base.class_eval do
-          after_commit "self.class.scaler.down", :on => :destroy
-          after_commit "self.class.scaler.up", :on => :create
-          after_commit "self.class.scaler.down", :on => :update, :unless => Proc.new {|r| r.failed_at.nil? }
+        unless base.to_s =~ /ActiveRecord/
+          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? }
+          end
+        else
+          base.class_eval do
+            after_commit "self.class.scaler.down", :on => :destroy
+            after_commit "self.class.scaler.up", :on => :create
+            after_commit "self.class.scaler.down", :on => :update, :unless => Proc.new {|r| r.failed_at.nil? }
+          end
         end
 
       end

data/lib/workless/scalers/heroku.rb

@@ -13,7 +13,7 @@ module Delayed
         end
 
         def self.down
-          client.put_workers(ENV['APP_NAME'], 0) unless self.workers == 0 or self.jobs.count > 0
+          client.put_workers(ENV['APP_NAME'], 0) unless self.jobs.count > 0 or self.workers == 0
         end
 
         def self.workers

data/lib/workless/scalers/heroku_cedar.rb

@@ -7,11 +7,11 @@ module Delayed
         extend Delayed::Workless::Scaler::HerokuClient
 
         def self.up
-          client.post_ps_scale(ENV['APP_NAME'], 'worker', self.workers_needed) if self.workers < self.workers_needed
+          client.post_ps_scale(ENV['APP_NAME'], 'worker', self.workers_needed) if self.workers_needed > self.min_workers and self.workers < self.workers_needed
         end
 
         def self.down
-          client.post_ps_scale(ENV['APP_NAME'], 'worker', self.min_workers) unless self.workers == self.min_workers or self.jobs.count > 0
+          client.post_ps_scale(ENV['APP_NAME'], 'worker', self.min_workers) unless self.jobs.count > 0 or self.workers == self.min_workers
         end
 
         def self.workers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workless
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors: