Skip to content
This repository has been archived by the owner on Oct 5, 2018. It is now read-only.

fix for DelayedJob version fix #53 #56

Merged
merged 4 commits into from Sep 10, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -2,5 +2,4 @@
*.log
pkg/
public/
Gemfile.lock
*.gem
91 changes: 91 additions & 0 deletions Gemfile.lock
@@ -0,0 +1,91 @@
PATH
remote: .
specs:
delayed_paperclip (2.4.5.2)
paperclip (>= 2.4.5)

GEM
remote: http://rubygems.org/
specs:
activemodel (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
appraisal (0.5.2)
bundler
rake
arel (4.0.0)
atomic (1.1.13)
builder (3.1.4)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.1)
climate_control (>= 0.0.3, < 1.0)
delayed_job (4.0.0)
activesupport (>= 3.0, < 4.1)
delayed_job_active_record (4.0.0)
activerecord (>= 3.0, < 4.1)
delayed_job (>= 3.0, < 4.1)
i18n (0.6.5)
json (1.8.0)
metaclass (0.0.1)
mime-types (1.24)
minitest (4.7.5)
mocha (0.14.0)
metaclass (~> 0.0.1)
mono_logger (1.1.0)
multi_json (1.7.9)
paperclip (2.8.0)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
cocaine (>= 0.0.2)
mime-types
rack (1.5.2)
rack-protection (1.5.0)
rack
rake (10.1.0)
redis (3.0.4)
redis-namespace (1.3.1)
redis (~> 3.0.0)
resque (1.24.1)
mono_logger (~> 1.0)
multi_json (~> 1.0)
redis-namespace (~> 1.2)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
sinatra (1.4.3)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
sqlite3 (1.3.8)
thread_safe (0.1.2)
atomic
tilt (1.4.1)
tzinfo (0.3.37)
vegas (0.1.11)
rack (>= 1.0.0)

PLATFORMS
ruby

DEPENDENCIES
appraisal
delayed_job
delayed_job_active_record
delayed_paperclip!
json
mocha
paperclip (~> 2.7)
resque
sqlite3
4 changes: 2 additions & 2 deletions gemfiles/rails2.gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: /Users/maguilar/code/data-engineering/vendor/plugins/delayed_paperclip
remote: ..
specs:
delayed_paperclip (2.4.5.1)
delayed_paperclip (2.4.5.2)
paperclip (>= 2.4.5)

GEM
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails3.gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: /Users/maguilar/code/data-engineering/vendor/plugins/delayed_paperclip
remote: ..
specs:
delayed_paperclip (2.4.5.1)
delayed_paperclip (2.4.5.2)
paperclip (>= 2.4.5)

GEM
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails3_1.gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: /home/jrg/code/delayed_paperclip
remote: ..
specs:
delayed_paperclip (2.4.5.1)
delayed_paperclip (2.4.5.2)
paperclip (>= 2.4.5)

GEM
Expand Down
2 changes: 1 addition & 1 deletion lib/delayed_paperclip/jobs/delayed_job.rb
Expand Up @@ -4,7 +4,7 @@ module DelayedPaperclip
module Jobs
class DelayedJob < Struct.new(:instance_klass, :instance_id, :attachment_name)

if defined?(::Delayed::DeserializationError) # this is available in newer versions of DelayedJob. Using the newee Job api thus.
if Gem.loaded_specs['delayed_job'].version >= Gem::Version.new("2.1.0") # this is available in newer versions of DelayedJob. Using the newee Job api thus.

def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
::Delayed::Job.enqueue(
Expand Down