delayed_job_on_steroids 1.7.3 → 1.7.4

data/VERSION

@@ -1 +1 @@
-1.7.3
+1.7.4

data/delayed_job_on_steroids.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job_on_steroids}
-  s.version = "1.7.3"
+  s.version = "1.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias L\303\274tke", "Aleksey Palazhchenko"]

data/lib/delayed/job.rb

@@ -253,7 +253,13 @@ module Delayed
     # Note: This does not ping the DB to get the time, so all your clients
     # must have syncronized clocks.
     def self.db_time_now
-      (ActiveRecord::Base.default_timezone == :utc) ? Time.now.utc : Time.zone.now
+      if Time.zone
+        Time.zone.now
+      elsif ActiveRecord::Base.default_timezone == :utc
+        Time.now.utc
+      else
+        Time.now
+      end
     end
 
   protected

data/spec/database.rb

@@ -11,7 +11,6 @@ require 'spec'
 ActiveRecord::Base.logger = Logger.new('/tmp/dj.log')
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => '/tmp/jobs.sqlite')
 ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.default_timezone = :utc if Time.zone.nil?
 
 ActiveRecord::Schema.define do
 

data/spec/job_spec.rb

@@ -378,5 +378,24 @@ describe Delayed::Job do
     end
 
   end
+
+  context "db_time_now" do
+    it "should return time in current time zone if set" do
+      Time.zone = 'Eastern Time (US & Canada)'
+      Delayed::Job.db_time_now.zone.should == 'EST'
+    end
+    
+    it "should return UTC time if that is the AR default" do
+      Time.zone = nil
+      ActiveRecord::Base.default_timezone = :utc
+      Delayed::Job.db_time_now.zone.should == 'UTC'
+    end
+
+    it "should return local time if that is the AR default" do
+      Time.zone = nil
+      ActiveRecord::Base.default_timezone = :local
+      Delayed::Job.db_time_now.zone.should_not == 'UTC'
+    end
+  end
   
 end

data/tasks/tasks.rb

@@ -8,7 +8,7 @@ namespace :jobs do
     Delayed::Job.delete_all
   end
 
-  desc "Start a delayed_job worker. Options: MIN_PRIORITY, MAX_PRIORITY, JOB_TYPES."
+  desc "Start a delayed_job worker (options: MIN_PRIORITY, MAX_PRIORITY, JOB_TYPES)."
   task :work => [:merb_env, :environment] do
     Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY'],
       :job_types => ENV['JOB_TYPES']).start

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 7
-  - 3
-  version: 1.7.3
+  - 4
+  version: 1.7.4
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"