Merge branch 'dropping-rails2-support'

.gitignore

@@ -4,3 +4,4 @@ pkg/
 public/
 Gemfile.lock
 *.gem
+./gemfiles/rails*.lock

.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p194

.travis.yml

@@ -15,6 +15,5 @@ notifications:
 
 
 gemfile:
-  - gemfiles/rails2.gemfile
   - gemfiles/rails3.gemfile
   - gemfiles/rails3_1.gemfile

Appraisals

@@ -1,7 +1,3 @@
-appraise "rails2" do
-  gem "rails", "~> 2.3.14"
-end
-
 appraise "rails3" do
   gem "rails", "~> 3.0.10"
 end

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

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=>"../"

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

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=>"../"