diff --git a/.gitignore b/.gitignore
index aaf50f4..49487c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pkg/
public/
Gemfile.lock
*.gem
+./gemfiles/rails*.lock
diff --git a/.rbenv-version b/.rbenv-version
new file mode 100644
index 0000000..f3a9c9a
--- /dev/null
+++ b/.rbenv-version
@@ -0,0 +1 @@
+1.9.3-p194
diff --git a/.travis.yml b/.travis.yml
index 285855c..6b8069a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,5 @@ notifications:
gemfile:
- - gemfiles/rails2.gemfile
- gemfiles/rails3.gemfile
- gemfiles/rails3_1.gemfile
diff --git a/Appraisals b/Appraisals
index bb94087..d9cc126 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,7 +1,3 @@
-appraise "rails2" do
- gem "rails", "~> 2.3.14"
-end
-
appraise "rails3" do
gem "rails", "~> 3.0.10"
end
diff --git a/README.textile b/README.textile
index 7581a6f..e93d71b 100644
--- a/README.textile
+++ b/README.textile
@@ -12,21 +12,14 @@ h2. Installation
Install the gem:
-<pre><code>sudo gem install delayed_paperclip</code></pre>
+<pre><code>gem install delayed_paperclip</code></pre>
-Add it to your environment.rb:
+Or even better, add it to your Gemfile.
-<pre><code>config.gem 'delayed_paperclip'</code></pre>
-
-Or, even better, to your Gemfile:
-
-<pre><code>source "http://gemcutter.org"
+<pre><code>source "https://rubygems.org"
gem 'delayed_paperclip'
</code></pre>
-Or install as a rails plugin:
-
-<pre><code>script/plugin install git://github.com/jstorimer/delayed_paperclip.git</code></pre>
Dependencies:
* Paperclip
diff --git a/gemfiles/rails2.gemfile b/gemfiles/rails2.gemfile
deleted file mode 100644
index 8ad3506..0000000
--- a/gemfiles/rails2.gemfile
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "paperclip", "2.5"
-gem "appraisal"
-gem "mocha"
-gem "sqlite3"
-gem "delayed_job", :require=>false
-gem "resque", :require=>false
-gem "json", :platforms=>:ruby_18
-gem "rails", "~> 2.3.14"
-
-gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/rails2.gemfile.lock b/gemfiles/rails2.gemfile.lock
deleted file mode 100644
index 62b41b2..0000000
--- a/gemfiles/rails2.gemfile.lock
+++ /dev/null
@@ -1,76 +0,0 @@
-PATH
- remote: /Users/maguilar/code/data-engineering/vendor/plugins/delayed_paperclip
- specs:
- delayed_paperclip (2.4.5.1)
- paperclip (>= 2.4.5)
-
-GEM
- remote: http://rubygems.org/
- specs:
- actionmailer (2.3.14)
- actionpack (= 2.3.14)
- actionpack (2.3.14)
- activesupport (= 2.3.14)
- rack (~> 1.1.0)
- activerecord (2.3.14)
- activesupport (= 2.3.14)
- activeresource (2.3.14)
- activesupport (= 2.3.14)
- activesupport (2.3.14)
- appraisal (0.3.8)
- bundler
- rake
- cocaine (0.2.1)
- daemons (1.0.10)
- delayed_job (2.0.7)
- activesupport (~> 2.0)
- daemons (= 1.0.10)
- json (1.6.1)
- metaclass (0.0.1)
- mime-types (1.17.2)
- mocha (0.10.0)
- metaclass (~> 0.0.1)
- multi_json (1.0.3)
- paperclip (2.5.0)
- activerecord (>= 2.3.0)
- activesupport (>= 2.3.2)
- cocaine (>= 0.0.2)
- mime-types
- rack (1.1.2)
- rails (2.3.14)
- actionmailer (= 2.3.14)
- actionpack (= 2.3.14)
- activerecord (= 2.3.14)
- activeresource (= 2.3.14)
- activesupport (= 2.3.14)
- rake (>= 0.8.3)
- rake (0.9.2.2)
- redis (2.2.2)
- redis-namespace (1.0.3)
- redis (< 3.0.0)
- resque (1.19.0)
- multi_json (~> 1.0)
- redis-namespace (~> 1.0.2)
- sinatra (>= 0.9.2)
- vegas (~> 0.1.2)
- sinatra (1.2.7)
- rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
- sqlite3 (1.3.4)
- tilt (1.3.3)
- vegas (0.1.8)
- rack (>= 1.0.0)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- appraisal
- delayed_job
- delayed_paperclip!
- json
- mocha
- paperclip (= 2.5)
- rails (~> 2.3.14)
- resque
- sqlite3
diff --git a/gemfiles/rails3.gemfile b/gemfiles/rails3.gemfile
index 9ddb0fb..5458e57 100644
--- a/gemfiles/rails3.gemfile
+++ b/gemfiles/rails3.gemfile
@@ -2,13 +2,14 @@
source "http://rubygems.org"
-gem "paperclip", "2.5"
+gem "paperclip", "~>2.7"
gem "appraisal"
gem "mocha"
gem "sqlite3"
+gem "json", :platforms=>:ruby_18
gem "delayed_job", :require=>false
+gem "delayed_job_active_record", :require=>false
gem "resque", :require=>false
-gem "json", :platforms=>:ruby_18
gem "rails", "~> 3.0.10"
gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/rails3.gemfile.lock b/gemfiles/rails3.gemfile.lock
index 63c6b68..6c37169 100644
--- a/gemfiles/rails3.gemfile.lock
+++ b/gemfiles/rails3.gemfile.lock
@@ -1,5 +1,5 @@
PATH
- remote: /Users/maguilar/code/data-engineering/vendor/plugins/delayed_paperclip
+ remote: /home/jrg/code/delayed_paperclip
specs:
delayed_paperclip (2.4.5.1)
paperclip (>= 2.4.5)
@@ -8,103 +8,104 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.10)
- actionpack (= 3.0.10)
+ actionmailer (3.0.17)
+ actionpack (= 3.0.17)
mail (~> 2.2.19)
- actionpack (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
+ actionpack (3.0.17)
+ activemodel (= 3.0.17)
+ activesupport (= 3.0.17)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
- rack (~> 1.2.1)
+ rack (~> 1.2.5)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.10)
- activesupport (= 3.0.10)
+ activemodel (3.0.17)
+ activesupport (= 3.0.17)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
+ activerecord (3.0.17)
+ activemodel (= 3.0.17)
+ activesupport (= 3.0.17)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
- activeresource (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- activesupport (3.0.10)
- appraisal (0.3.8)
+ activeresource (3.0.17)
+ activemodel (= 3.0.17)
+ activesupport (= 3.0.17)
+ activesupport (3.0.17)
+ appraisal (0.4.1)
bundler
rake
arel (2.0.10)
builder (2.1.2)
- cocaine (0.2.1)
- daemons (1.1.4)
- delayed_job (2.1.4)
+ cocaine (0.4.0)
+ delayed_job (3.0.3)
activesupport (~> 3.0)
- daemons
+ delayed_job_active_record (0.3.3)
+ activerecord (>= 2.1.0, < 4)
+ delayed_job (~> 3.0)
erubis (2.6.6)
abstract (>= 1.0.0)
i18n (0.5.0)
- json (1.6.1)
+ json (1.7.5)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.17.2)
- mocha (0.10.0)
+ mime-types (1.19)
+ mocha (0.12.6)
metaclass (~> 0.0.1)
- multi_json (1.0.3)
- paperclip (2.5.0)
+ multi_json (1.3.6)
+ paperclip (2.7.1)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
cocaine (>= 0.0.2)
mime-types
polyglot (0.3.3)
- rack (1.2.4)
+ rack (1.2.5)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.10)
- actionmailer (= 3.0.10)
- actionpack (= 3.0.10)
- activerecord (= 3.0.10)
- activeresource (= 3.0.10)
- activesupport (= 3.0.10)
+ rails (3.0.17)
+ actionmailer (= 3.0.17)
+ actionpack (= 3.0.17)
+ activerecord (= 3.0.17)
+ activeresource (= 3.0.17)
+ activesupport (= 3.0.17)
bundler (~> 1.0)
- railties (= 3.0.10)
- railties (3.0.10)
- actionpack (= 3.0.10)
- activesupport (= 3.0.10)
+ railties (= 3.0.17)
+ railties (3.0.17)
+ actionpack (= 3.0.17)
+ activesupport (= 3.0.17)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2.2)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
- redis (2.2.2)
- redis-namespace (1.0.3)
- redis (< 3.0.0)
- resque (1.19.0)
+ redis (3.0.2)
+ redis-namespace (1.2.1)
+ redis (~> 3.0.0)
+ resque (1.23.0)
multi_json (~> 1.0)
- redis-namespace (~> 1.0.2)
+ redis-namespace (~> 1.0)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
- sinatra (1.2.7)
+ sinatra (1.2.8)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
- sqlite3 (1.3.4)
+ sqlite3 (1.3.6)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
- vegas (0.1.8)
+ tzinfo (0.3.33)
+ vegas (0.1.11)
rack (>= 1.0.0)
PLATFORMS
@@ -113,10 +114,11 @@ PLATFORMS
DEPENDENCIES
appraisal
delayed_job
+ delayed_job_active_record
delayed_paperclip!
json
mocha
- paperclip (= 2.5)
+ paperclip (~> 2.7)
rails (~> 3.0.10)
resque
sqlite3
diff --git a/gemfiles/rails3_1.gemfile b/gemfiles/rails3_1.gemfile
index 17abc2d..623d54f 100644
--- a/gemfiles/rails3_1.gemfile
+++ b/gemfiles/rails3_1.gemfile
@@ -2,13 +2,14 @@
source "http://rubygems.org"
-gem "paperclip", "2.5"
+gem "paperclip", "~>2.7"
gem "appraisal"
gem "mocha"
gem "sqlite3"
+gem "json", :platforms=>:ruby_18
gem "delayed_job", :require=>false
+gem "delayed_job_active_record", :require=>false
gem "resque", :require=>false
-gem "json", :platforms=>:ruby_18
gem "rails", "~> 3.1.0"
gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/rails3_1.gemfile.lock b/gemfiles/rails3_1.gemfile.lock
index cc3502f..ecf44d6 100644
--- a/gemfiles/rails3_1.gemfile.lock
+++ b/gemfiles/rails3_1.gemfile.lock
@@ -7,116 +7,117 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.1)
- actionpack (= 3.1.1)
- mail (~> 2.3.0)
- actionpack (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
+ actionmailer (3.1.8)
+ actionpack (= 3.1.8)
+ mail (~> 2.3.3)
+ actionpack (3.1.8)
+ activemodel (= 3.1.8)
+ activesupport (= 3.1.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.1)
+ rack (~> 1.3.6)
+ rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.2)
- activemodel (3.1.1)
- activesupport (= 3.1.1)
+ sprockets (~> 2.0.4)
+ activemodel (3.1.8)
+ activesupport (= 3.1.8)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
- arel (~> 2.2.1)
+ activerecord (3.1.8)
+ activemodel (= 3.1.8)
+ activesupport (= 3.1.8)
+ arel (~> 2.2.3)
tzinfo (~> 0.3.29)
- activeresource (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
- activesupport (3.1.1)
- multi_json (~> 1.0)
- appraisal (0.3.8)
+ activeresource (3.1.8)
+ activemodel (= 3.1.8)
+ activesupport (= 3.1.8)
+ activesupport (3.1.8)
+ multi_json (>= 1.0, < 1.3)
+ appraisal (0.4.1)
bundler
rake
- arel (2.2.1)
- builder (3.0.0)
- cocaine (0.2.1)
- daemons (1.1.4)
- delayed_job (2.1.4)
+ arel (2.2.3)
+ builder (3.0.3)
+ cocaine (0.4.0)
+ delayed_job (3.0.3)
activesupport (~> 3.0)
- daemons
+ delayed_job_active_record (0.3.3)
+ activerecord (>= 2.1.0, < 4)
+ delayed_job (~> 3.0)
erubis (2.7.0)
hike (1.2.1)
- i18n (0.6.0)
- json (1.6.1)
- mail (2.3.0)
+ i18n (0.6.1)
+ json (1.7.5)
+ mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.17.2)
- mocha (0.10.0)
+ mime-types (1.19)
+ mocha (0.12.6)
metaclass (~> 0.0.1)
- multi_json (1.0.3)
- paperclip (2.5.0)
+ multi_json (1.2.0)
+ paperclip (2.7.1)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
cocaine (>= 0.0.2)
mime-types
polyglot (0.3.3)
- rack (1.3.5)
- rack-cache (1.1)
+ rack (1.3.6)
+ rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-protection (1.1.4)
+ rack-protection (1.2.0)
rack
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.1.1)
- actionmailer (= 3.1.1)
- actionpack (= 3.1.1)
- activerecord (= 3.1.1)
- activeresource (= 3.1.1)
- activesupport (= 3.1.1)
+ rails (3.1.8)
+ actionmailer (= 3.1.8)
+ actionpack (= 3.1.8)
+ activerecord (= 3.1.8)
+ activeresource (= 3.1.8)
+ activesupport (= 3.1.8)
bundler (~> 1.0)
- railties (= 3.1.1)
- railties (3.1.1)
- actionpack (= 3.1.1)
- activesupport (= 3.1.1)
+ railties (= 3.1.8)
+ railties (3.1.8)
+ actionpack (= 3.1.8)
+ activesupport (= 3.1.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
- redis (2.2.2)
- redis-namespace (1.0.3)
- redis (< 3.0.0)
- resque (1.19.0)
+ redis (3.0.2)
+ redis-namespace (1.2.1)
+ redis (~> 3.0.0)
+ resque (1.23.0)
multi_json (~> 1.0)
- redis-namespace (~> 1.0.2)
+ redis-namespace (~> 1.0)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
- sinatra (1.3.1)
- rack (~> 1.3, >= 1.3.4)
- rack-protection (~> 1.1, >= 1.1.2)
+ sinatra (1.3.3)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
- sprockets (2.0.3)
+ sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.4)
+ sqlite3 (1.3.6)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
- vegas (0.1.8)
+ tzinfo (0.3.33)
+ vegas (0.1.11)
rack (>= 1.0.0)
PLATFORMS
@@ -125,10 +126,11 @@ PLATFORMS
DEPENDENCIES
appraisal
delayed_job
+ delayed_job_active_record
delayed_paperclip!
json
mocha
- paperclip (= 2.5)
+ paperclip (~> 2.7)
rails (~> 3.1.0)
resque
sqlite3