delayed_paperclip 2.9.2 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cd279c1d4024765a17e736762beaf90e355ae5c
-  data.tar.gz: abc9e943e6dbfd164e749edda10ae93847b80bd0
+  metadata.gz: a5ac9bcd09517a634af35fb347bdc11cf538bb20
+  data.tar.gz: f11ca1ba331c50817bd6a9bcd3b6197948a4ae23
 SHA512:
-  metadata.gz: d8a46607f55622cc639ba1b94af952afa5d69bff67add0634789f681708ddd3b92b93a6f2b9b7fe8561dd7dbd9fb8d8838ff6cd239085bc7311026bfb92ea601
-  data.tar.gz: d9fcbafdcda62b4ebdf627f8a3a43ffda2397bf8e1e7fe09ff383ba0dde7b34a4499658f24d31ee90b475845670de522bb2a2623633b582dd30218c4a7c79382
+  metadata.gz: 3d297de920ba09991941b8a0d3c172c0a36cdc3a89542797eb9341ef757da42cf11a7f2176e985f74d13d93ae8aa2ce8b38ce3749833d789a8784e7c5a64a30f
+  data.tar.gz: f8eb0f2c138883e8a948b6523d29ed18fb7c045b9d0e81020fc004e5e6b9c9b7fb4958e925abfd672c210a1fbd9a7309a49239856165657e25e311e88363255b

data/.travis.yml

@@ -3,9 +3,9 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 2.3.0
-  - 2.2
-  - 2.1
+  - 2.3.1
+  - 2.2.5
+  - 2.1.10
   - 2.0
 
 gemfile:
@@ -13,6 +13,15 @@ gemfile:
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
+  - gemfiles/5.0.gemfile
+
+# Rails 5.0 requires Ruby >= 2.2
+matrix:
+  exclude:
+    - rvm: 2.1.10
+      gemfile: gemfiles/5.0.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/5.0.gemfile
 
 script: "bundle exec rake clean spec"
 

data/Appraisals

@@ -13,3 +13,7 @@ end
 appraise "4.2" do
   gem "rails", "~> 4.2.0"
 end
+
+appraise "5.0" do
+  gem "rails", "~> 5.0.0.beta3"
+end

data/README.md

@@ -83,6 +83,8 @@ end
 
 ### Resque
 
+Resque adapter is deprecated. Please use ActiveJob one.
+
 Make sure that you have [Resque](https://github.com/resque/resque) up and running. The jobs will be
 dispatched to the <code>:paperclip</code> queue, so you can correctly
 dispatch your worker. Configure resque and your workers exactly as you
@@ -90,10 +92,14 @@ would otherwise.
 
 ### DJ
 
+DelayedJob adapter is deprecated. Please use ActiveJob one.
+
 Just make sure that you have DJ up and running.
 
 ### Sidekiq
 
+Sidekiq adapter is deprecated. Please use ActiveJob one.
+
 Make sure that [Sidekiq](http://github.com/mperham/sidekiq) is running and listening to the
 `paperclip` queue, either by adding it to your
 `sidekiq.yml` config file under `- queues:` or by
@@ -255,7 +261,7 @@ end
 You can set queue name for background job. By default it's called "paperclip".
 You can set it by changing global default options or by:
 
-```
+```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar
 
@@ -291,6 +297,43 @@ What if I’m not using images?
 This library works no matter what kind of post-processing you are doing
 with Paperclip.
 
+Paperclip Post-processors are not working
+-----------------------------------------
+
+If you are using custom [post-processing processors](https://github.com/thoughtbot/paperclip#post-processing)
+like this: 
+
+```ruby
+# ...
+
+has_attached_file :avatar, styles: { thumb: '100x100>' },  processors: [:rotator]
+process_in_background :avatar
+
+def rotate!
+  # ...
+  avatar.reprocess! 
+  # ...
+end
+
+# ...
+```
+
+...you may encounter an issue where your post-processors are ignored 
+([more info](https://github.com/jrgifford/delayed_paperclip/issues/171)).
+In order to avoid this use `reprocess_without_delay!`
+
+```ruby
+# ...
+
+def rotate!
+  # ...
+  avatar.reprocess_without_delay! 
+  # ...
+end
+
+# ...
+```
+
 Does it work with s3?
 ---------------------
 
@@ -299,9 +342,16 @@ Yes.
 Contributing
 ------------
 
-Checkout out CONTRIBUTING. Run all tests with
+Checkout out [CONTRIBUTING](https://github.com/jrgifford/delayed_paperclip/blob/master/CONTRIBUTING). Run specs with:
 
 ````
 # Rspec on all versions
-rake appraisal spec
+bundle exec appraisal install
+bundle exec appraisal rake
+
+# Rspec on latest stable gems
+bundle exec rake
+
+# Rspec on specific rails version
+bundle exec appraisal 5.0 rake
 ````

data/Rakefile

@@ -1,28 +1,19 @@
 require 'bundler/setup'
-
-require 'appraisal'
-
 require 'rake'
-require 'rake/testtask'
-
-desc 'Default: run unit tests.'
-task default: [:clean, 'appraisal:install', :all]
+require 'rspec/core/rake_task'
 
-desc 'Test the delayed paperclip plugin under all supported Rails versions.'
-task :all do |t|
-  exec('rake appraisal test spec')
-end
+desc 'Default: run specs'
+task default: [:clean, :spec]
 
-desc 'Clean up files.'
+desc 'Clean up files'
 task :clean do |t|
   FileUtils.rm_rf "doc"
   FileUtils.rm_rf "tmp"
   FileUtils.rm_rf "pkg"
   FileUtils.rm_rf "public"
-  Dir.glob("paperclip-*.gem").each{|f| FileUtils.rm f }
+  Dir.glob("paperclip-*.gem").each { |f| FileUtils.rm f }
 end
 
-require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end

data/gemfiles/5.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.0.0.beta3"
+
+gemspec :path => "../"

data/lib/delayed_paperclip/jobs/delayed_job.rb

@@ -1,4 +1,5 @@
 require 'delayed_job'
+require 'active_support/deprecation'
 
 module DelayedPaperclip
   module Jobs
@@ -8,6 +9,11 @@ module DelayedPaperclip
       if Gem.loaded_specs['delayed_job'].version >= Gem::Version.new("2.1.0")
 
         def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+          ActiveSupport::Deprecation.warn(<<-MESSAGE)
+Using DelayedJob adapter for delayed_paperclip is deprecated and will be removed in version 3.0.0.
+Please use ActiveJob adapter.
+          MESSAGE
+
           ::Delayed::Job.enqueue(
             :payload_object => new(instance_klass, instance_id, attachment_name),
             :priority => instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:priority].to_i,
@@ -18,6 +24,11 @@ module DelayedPaperclip
       else
 
         def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+          ActiveSupport::Deprecation.warn(<<-MESSAGE)
+Using DelayedJob adapter for delayed_paperclip is deprecated and will be removed in version 3.0.0.
+Please use ActiveJob adapter.
+          MESSAGE
+
           ::Delayed::Job.enqueue(
             new(instance_klass, instance_id, attachment_name),
             instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:priority].to_i,

data/lib/delayed_paperclip/jobs/resque.rb

@@ -1,4 +1,5 @@
 require 'resque'
+require 'active_support/deprecation'
 
 module DelayedPaperclip
   module Jobs
@@ -6,6 +7,11 @@ module DelayedPaperclip
       def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
         @queue = instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
         ::Resque.enqueue(self, instance_klass, instance_id, attachment_name)
+
+        ActiveSupport::Deprecation.warn(<<-MESSAGE)
+Using Resque adapter for delayed_paperclip is deprecated and will be removed in version 3.0.0.
+Please use ActiveJob adapter.
+        MESSAGE
       end
 
       def self.perform(instance_klass, instance_id, attachment_name)

data/lib/delayed_paperclip/jobs/sidekiq.rb

@@ -1,4 +1,5 @@
 require 'sidekiq/worker'
+require 'active_support/deprecation'
 
 module DelayedPaperclip
   module Jobs
@@ -6,6 +7,11 @@ module DelayedPaperclip
       include ::Sidekiq::Worker
 
       def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+        ActiveSupport::Deprecation.warn(<<-MESSAGE)
+Using Sidekiq adapter for delayed_paperclip is deprecated and will be removed in version 3.0.0.
+Please use ActiveJob adapter.
+        MESSAGE
+
         queue_name = instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
         # Sidekiq >= 4.1.0
         if respond_to?(:set)

data/lib/delayed_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DelayedPaperclip
-  VERSION = "2.9.2"
+  VERSION = "2.10.0"
 end

data/spec/integration/active_job_inline_spec.rb

@@ -8,7 +8,7 @@ describe "ActiveJob inline" do
       ActiveJob::Base.logger = nil
     end
 
-    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
+    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
 
     describe "perform job" do
       before :each do
@@ -17,7 +17,7 @@ describe "ActiveJob inline" do
       end
 
       it "performs a job" do
-        dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
+        dummy.image = File.open("#{ROOT}/fixtures/12k.png")
         Paperclip::Attachment.any_instance.expects(:reprocess!)
         dummy.save!
       end

data/spec/integration/active_job_resque_spec.rb

@@ -10,7 +10,7 @@ if defined? ActiveJob
       Resque.remove_queue(:paperclip)
     end
 
-    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
+    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
 
     describe "integration tests" do
       include_examples "base usage"

data/spec/integration/active_job_sidekiq_spec.rb

@@ -10,7 +10,7 @@ describe "ActiveJob with Sidekiq backend" do
       Sidekiq::Queues["paperclip"].clear
     end
 
-    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
+    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
 
     describe "integration tests" do
       include_examples "base usage"

data/spec/integration/base_delayed_paperclip_spec.rb

@@ -15,7 +15,7 @@ describe "Base Delayed Paperclip Integration" do
   describe "double save" do
     before :each do
       dummy.image_processing.should be_falsey
-      dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
+      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
       dummy.save!
     end
 

data/spec/integration/delayed_job_spec.rb

@@ -9,7 +9,7 @@ describe "Delayed Job" do
     build_delayed_jobs
   end
 
-  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
+  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
 
   describe "integration tests" do
     include_examples "base usage"
@@ -22,7 +22,16 @@ describe "Delayed Job" do
     end
 
     it "performs a job" do
-      dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
+      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
+      Paperclip::Attachment.any_instance.expects(:reprocess!)
+      dummy.save!
+      Delayed::Job.last.payload_object.perform
+    end
+
+    it "is deprecated" do
+      ActiveSupport::Deprecation.expects(:warn)
+
+      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
       Paperclip::Attachment.any_instance.expects(:reprocess!)
       dummy.save!
       Delayed::Job.last.payload_object.perform

data/spec/integration/examples/base.rb

@@ -162,7 +162,7 @@ shared_examples "base usage" do
     context "same url if same file assigned" do
       it "falls to missing while processing" do
         dummy.save!
-        dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
+        dummy.image = File.open("#{ROOT}/fixtures/12k.png")
         dummy.save!
         dummy.image.url.should start_with("/images/original/missing.png")
         process_jobs

data/spec/integration/resque_spec.rb

@@ -7,7 +7,7 @@ describe "Resque" do
     Resque.remove_queue(:paperclip)
   end
 
-  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
+  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
 
   describe "integration tests" do
     include_examples "base usage"
@@ -20,7 +20,16 @@ describe "Resque" do
     end
 
     it "performs a job" do
-      dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
+      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
+      Paperclip::Attachment.any_instance.expects(:reprocess!)
+      dummy.save!
+      DelayedPaperclip::Jobs::Resque.perform(dummy.class.name, dummy.id, :image)
+    end
+
+    it "is deprecated" do
+      ActiveSupport::Deprecation.expects(:warn)
+
+      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
       Paperclip::Attachment.any_instance.expects(:reprocess!)
       dummy.save!
       DelayedPaperclip::Jobs::Resque.perform(dummy.class.name, dummy.id, :image)

data/spec/integration/sidekiq_spec.rb

@@ -8,7 +8,7 @@ describe "Sidekiq" do
     Sidekiq::Queues["paperclip"].clear
   end
 
-  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
+  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
 
   describe "integration tests" do
     include_examples "base usage"
@@ -21,7 +21,16 @@ describe "Sidekiq" do
     end
 
     it "performs a job" do
-      dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
+      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
+      Paperclip::Attachment.any_instance.expects(:reprocess!)
+      dummy.save!
+      DelayedPaperclip::Jobs::Sidekiq.new.perform(dummy.class.name, dummy.id, :image)
+    end
+
+    it "is deprecated" do
+      ActiveSupport::Deprecation.expects(:warn)
+
+      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
       Paperclip::Attachment.any_instance.expects(:reprocess!)
       dummy.save!
       DelayedPaperclip::Jobs::Sidekiq.new.perform(dummy.class.name, dummy.id, :image)

data/spec/spec_helper.rb

@@ -2,9 +2,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require 'active_record'
-require 'active_record/version'
-require 'active_support'
-require 'active_support/core_ext'
 require 'rspec'
 require 'fakeredis/rspec'
 require 'mocha/api'
@@ -25,13 +22,15 @@ Paperclip::Railtie.insert
 require 'delayed_paperclip/railtie'
 DelayedPaperclip::Railtie.insert
 
-
-
 # silence deprecation warnings in rails 4.2
-if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=)
+# in Rails 5 this setting is deprecated and has no effect
+if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=) && Rails::VERSION::MAJOR < 5
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 
+require "active_support/deprecation"
+ActiveSupport::Deprecation.silenced = true
+
 # Connect to sqlite
 ActiveRecord::Base.establish_connection(
   "adapter" => "sqlite3",
@@ -39,10 +38,8 @@ ActiveRecord::Base.establish_connection(
 )
 
 # Path for filesystem writing
-ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
-
-FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ROOT = Pathname.new(File.expand_path("../.", __FILE__))
+ActiveRecord::Base.logger = Logger.new(ROOT.join("tmp/debug.log"))
 Paperclip.logger = ActiveRecord::Base.logger
 
 RSpec.configure do |config|
@@ -70,7 +67,7 @@ end
 # We're requiring the MockInterpolator object to be used
 require Gem.find_files("../spec/support/mock_interpolator").first
 
-Dir["./spec/integration/examples/*.rb"].sort.each {|f| require f}
+Dir["./spec/integration/examples/*.rb"].sort.each { |f| require f }
 
 # Reset table and class with image_processing column or not
 def reset_dummy(options = {})
@@ -118,10 +115,9 @@ def reset_class(class_name, options)
     def reprocess
       image.reprocess!
     end
-
   end
 
-  Rails.stubs(:root).returns(Pathname.new(ROOT).join('spec', 'tmp'))
+  Rails.stubs(:root).returns(ROOT.join("tmp"))
   klass.reset_column_information
   klass
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.10.0
 platform: ruby
 authors:
 - Jesse Storimer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -218,6 +218,7 @@ files:
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - init.rb
 - lib/delayed_paperclip.rb
 - lib/delayed_paperclip/attachment.rb
@@ -246,6 +247,7 @@ files:
 - spec/integration/resque_spec.rb
 - spec/integration/sidekiq_spec.rb
 - spec/spec_helper.rb
+- spec/tmp/.keep
 homepage: http://github.com/jrgifford/delayed_paperclip
 licenses: []
 metadata: {}
@@ -265,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Process your Paperclip attachments in the background.
@@ -286,3 +288,4 @@ test_files:
 - spec/integration/resque_spec.rb
 - spec/integration/sidekiq_spec.rb
 - spec/spec_helper.rb
+- spec/tmp/.keep