diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..af96e20 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,4 @@ +2.6.1 +* Wrote Unit tests +* Rewrote Integration tests in rspec +* Paperclip 3.5 compatibility \ No newline at end of file diff --git a/delayed_paperclip.gemspec b/delayed_paperclip.gemspec index 1a1df44..be6ebac 100644 --- a/delayed_paperclip.gemspec +++ b/delayed_paperclip.gemspec @@ -1,25 +1,16 @@ +$:.push File.expand_path("../lib", __FILE__) +require "delayed_paperclip/version" -include_files = ["README*", "LICENSE", "Rakefile", "init.rb", "{lib,tasks,test,rails,generators,shoulda_macros}/**/*"].map do |glob| - Dir[glob] -end.flatten -exclude_files = ["**/*.rbc", "test/s3.yml", "test/debug.log", "test/paperclip.db", "test/doc", "test/doc/*", "test/pkg", "test/pkg/*", "test/tmp", "test/tmp/*"].map do |glob| - Dir[glob] -end.flatten - -spec = Gem::Specification.new do |s| +Gem::Specification.new do |s| s.name = %q{delayed_paperclip} - s.version = "2.6.0.0" + s.version = DelayedPaperclip::VERSION - s.authors = ["Jesse Storimer", "Bert Goethals", "James Gifford"] + s.authors = ["Jesse Storimer", "Bert Goethals", "James Gifford", "Scott Carleton"] s.summary = %q{Process your Paperclip attachments in the background.} s.description = %q{Process your Paperclip attachments in the background with delayed_job, Resque or your own processor.} s.email = %q{james@jamesrgifford.com} s.homepage = %q{http://github.com/jrgifford/delayed_paperclip} - s.files = include_files - exclude_files - - s.test_files = Dir["test/**/*,rb"] + Dir['test/features/*'] - s.add_dependency 'paperclip', [">= 3.3.0"] s.add_development_dependency 'mocha' @@ -28,5 +19,8 @@ spec = Gem::Specification.new do |s| s.add_development_dependency 'delayed_job' s.add_development_dependency 'resque' s.add_development_dependency 'sidekiq' + + s.files = `git ls-files`.split("\n") + s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") end diff --git a/gemfiles/paperclip3_5.gemfile b/gemfiles/paperclip3_5.gemfile new file mode 100644 index 0000000..9c0ae44 --- /dev/null +++ b/gemfiles/paperclip3_5.gemfile @@ -0,0 +1,11 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "appraisal" +gem "json", :platforms=>:ruby_18 +gem "delayed_job_active_record", :require=>false +gem "rails" +gem "paperclip", "~> 3.5" + +gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/paperclip3_5.gemfile.lock b/gemfiles/paperclip3_5.gemfile.lock new file mode 100644 index 0000000..69f9e49 --- /dev/null +++ b/gemfiles/paperclip3_5.gemfile.lock @@ -0,0 +1,160 @@ +PATH + remote: .. + specs: + delayed_paperclip (2.6.1) + paperclip (>= 3.3.0) + +GEM + remote: http://rubygems.org/ + specs: + actionmailer (3.2.14) + actionpack (= 3.2.14) + mail (~> 2.5.4) + actionpack (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.14) + activesupport (= 3.2.14) + builder (~> 3.0.0) + activerecord (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + activesupport (3.2.14) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + appraisal (0.5.2) + bundler + rake + arel (3.0.2) + builder (3.0.4) + celluloid (0.14.1) + timers (>= 1.0.0) + climate_control (0.0.3) + activesupport (>= 3.0) + cocaine (0.5.1) + climate_control (>= 0.0.3, < 1.0) + connection_pool (1.0.0) + delayed_job (3.0.5) + activesupport (~> 3.0) + delayed_job_active_record (0.4.4) + activerecord (>= 2.1.0, < 4) + delayed_job (~> 3.0) + diff-lcs (1.2.4) + erubis (2.7.0) + hike (1.2.3) + i18n (0.6.4) + journey (1.0.4) + json (1.8.0) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + metaclass (0.0.1) + mime-types (1.23) + mocha (0.14.0) + metaclass (~> 0.0.1) + mono_logger (1.1.0) + multi_json (1.7.7) + paperclip (3.5.0) + activemodel (>= 3.0.0) + activesupport (>= 3.0.0) + cocaine (~> 0.5.0) + mime-types + polyglot (0.3.3) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-protection (1.5.0) + rack + rack-ssl (1.3.3) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (3.2.14) + actionmailer (= 3.2.14) + actionpack (= 3.2.14) + activerecord (= 3.2.14) + activeresource (= 3.2.14) + activesupport (= 3.2.14) + bundler (~> 1.0) + railties (= 3.2.14) + railties (3.2.14) + actionpack (= 3.2.14) + activesupport (= 3.2.14) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.0.4) + rdoc (3.12.2) + json (~> 1.4) + redis (3.0.4) + redis-namespace (1.3.0) + 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) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.4) + rspec-expectations (2.14.0) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.1) + sidekiq (2.12.1) + celluloid (>= 0.14.1) + connection_pool (>= 1.0.0) + json + redis (>= 3.0) + redis-namespace + sinatra (1.3.6) + rack (~> 1.4) + rack-protection (~> 1.3) + tilt (~> 1.3, >= 1.3.3) + sprockets (2.2.2) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.7) + thor (0.18.1) + tilt (1.4.1) + timers (1.1.0) + treetop (1.4.14) + polyglot + polyglot (>= 0.3.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 (~> 3.5) + rails + resque + rspec + sidekiq + sqlite3 diff --git a/gemfiles/rails3.gemfile.lock b/gemfiles/rails3.gemfile.lock index adc6630..73233ac 100644 --- a/gemfiles/rails3.gemfile.lock +++ b/gemfiles/rails3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - delayed_paperclip (2.6.0.0) + delayed_paperclip (2.6.1) paperclip (>= 3.3.0) GEM @@ -68,9 +68,8 @@ GEM metaclass (~> 0.0.1) mono_logger (1.1.0) multi_json (1.7.5) - paperclip (3.4.2) + paperclip (3.5.0) activemodel (>= 3.0.0) - activerecord (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.0) mime-types diff --git a/gemfiles/rails3_1.gemfile.lock b/gemfiles/rails3_1.gemfile.lock index 6b6fb23..2733845 100644 --- a/gemfiles/rails3_1.gemfile.lock +++ b/gemfiles/rails3_1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - delayed_paperclip (2.6.0.0) + delayed_paperclip (2.6.1) paperclip (>= 3.3.0) GEM @@ -67,9 +67,8 @@ GEM metaclass (~> 0.0.1) mono_logger (1.1.0) multi_json (1.2.0) - paperclip (3.4.2) + paperclip (3.5.0) activemodel (>= 3.0.0) - activerecord (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.0) mime-types diff --git a/gemfiles/rails3_2.gemfile.lock b/gemfiles/rails3_2.gemfile.lock index bc0bb42..a5ec275 100644 --- a/gemfiles/rails3_2.gemfile.lock +++ b/gemfiles/rails3_2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - delayed_paperclip (2.6.0.0) + delayed_paperclip (2.6.1) paperclip (>= 3.3.0) GEM @@ -66,9 +66,8 @@ GEM metaclass (~> 0.0.1) mono_logger (1.1.0) multi_json (1.7.5) - paperclip (3.4.2) + paperclip (3.5.0) activemodel (>= 3.0.0) - activerecord (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.0) mime-types diff --git a/lib/delayed_paperclip/version.rb b/lib/delayed_paperclip/version.rb new file mode 100644 index 0000000..fc06a26 --- /dev/null +++ b/lib/delayed_paperclip/version.rb @@ -0,0 +1,3 @@ +module DelayedPaperclip + VERSION = "2.6.1" +end