Compatibility with paperclip 2.4.0

Appraisals

@@ -1,26 +1,11 @@
 appraise "rails2" do
-  gem "rails", "~> 2.3.14"
+  gem "rails", "~> 2.3.12"
 end
 
 appraise "rails3" do
-  gem "rails", "~> 3.0.10"
+  gem "rails", "~> 3.0.9"
 end
 
 appraise "rails3_1" do
-  gem "rails", "~> 3.1.0"
+  gem "rails", "~> 3.1.0.rc5"
 end
-
-appraise "rails2_paperclip_2_3" do
-  gem "rails", "~> 2.3.14"
-  gem "paperclip", "~> 2.3.16"
-end
-
-appraise "rails3_paperclip_2_3" do
-  gem "rails", "~> 3.0.10"
-  gem "paperclip", "~> 2.3.16"
-end
-
-appraise "rails3_1_paperclip_2_3" do
-  gem "rails", "~> 3.1.0"
-  gem "paperclip", "~> 2.3.16"
-end

Gemfile

@@ -1,6 +1,9 @@
 source "http://rubygems.org"
 
-gem "paperclip"
+gemspec
+
+gem "paperclip", '2.4.0'
+
 gem "appraisal"
 gem "mocha"
 gem "sqlite3"

delayed_paperclip.gemspec

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
 
   s.test_files        = Dir["test/**/*,rb"] + Dir['test/features/*']
 
-  s.add_dependency 'paperclip', ["~> 2.3.9"]
+  s.add_dependency 'paperclip', [">= 2.4.0"]
 
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'sqlite3'

gemfiles/rails2.gemfile

@@ -2,12 +2,13 @@
 
 source "http://rubygems.org"
 
-gem "paperclip"
+gem "paperclip", "2.4.0"
 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"
+gem "rails", "~> 2.3.12"
 
+gemspec :path=>"../"

gemfiles/rails2.gemfile.lock

@@ -1,3 +1,9 @@
+PATH
+  remote: /Users/bertg/Development/delayed_paperclip
+  specs:
+    delayed_paperclip (0.7.2)
+      paperclip (>= 2.4.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -21,11 +27,11 @@ GEM
       daemons (= 1.0.10)
     json (1.6.1)
     metaclass (0.0.1)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
     multi_json (1.0.3)
-    paperclip (2.4.1)
+    paperclip (2.4.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
@@ -38,7 +44,7 @@ GEM
       activeresource (= 2.3.14)
       activesupport (= 2.3.14)
       rake (>= 0.8.3)
-    rake (0.9.2)
+    rake (0.9.2.2)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
@@ -47,7 +53,7 @@ GEM
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    sinatra (1.2.6)
+    sinatra (1.2.7)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     sqlite3 (1.3.4)
@@ -61,9 +67,10 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   delayed_job
+  delayed_paperclip!
   json
   mocha
-  paperclip
-  rails (~> 2.3.14)
+  paperclip (= 2.4.0)
+  rails (~> 2.3.12)
   resque
   sqlite3

gemfiles/rails3.gemfile

@@ -2,12 +2,13 @@
 
 source "http://rubygems.org"
 
-gem "paperclip"
+gem "paperclip", "2.4.0"
 gem "appraisal"
 gem "mocha"
 gem "sqlite3"
 gem "delayed_job", :require=>false
 gem "resque", :require=>false
 gem "json", :platforms=>:ruby_18
-gem "rails", "~> 3.0.10"
+gem "rails", "~> 3.0.9"
 
+gemspec :path=>"../"

gemfiles/rails3.gemfile.lock

@@ -1,3 +1,9 @@
+PATH
+  remote: /Users/bertg/Development/delayed_paperclip
+  specs:
+    delayed_paperclip (0.7.2)
+      paperclip (>= 2.4.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -48,16 +54,16 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
     multi_json (1.0.3)
-    paperclip (2.4.1)
+    paperclip (2.4.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     rack (1.2.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -77,8 +83,9 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
-    rdoc (3.9.4)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
@@ -87,7 +94,7 @@ GEM
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    sinatra (1.2.6)
+    sinatra (1.2.7)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     sqlite3 (1.3.4)
@@ -96,7 +103,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.31)
     vegas (0.1.8)
       rack (>= 1.0.0)
 
@@ -106,9 +113,10 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   delayed_job
+  delayed_paperclip!
   json
   mocha
-  paperclip
-  rails (~> 3.0.10)
+  paperclip (= 2.4.0)
+  rails (~> 3.0.9)
   resque
   sqlite3

gemfiles/rails3_1.gemfile

@@ -2,12 +2,13 @@
 
 source "http://rubygems.org"
 
-gem "paperclip"
+gem "paperclip", "2.4.0"
 gem "appraisal"
 gem "mocha"
 gem "sqlite3"
 gem "delayed_job", :require=>false
 gem "resque", :require=>false
 gem "json", :platforms=>:ruby_18
-gem "rails", "~> 3.1.0"
+gem "rails", "~> 3.1.0.rc5"
 
+gemspec :path=>"../"