delayed_paperclip 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39e783ff8099e58b8da9162334e1d129f0103030
-  data.tar.gz: 07f048dfc6d2f630972d05e1884da1877885b3d5
+  metadata.gz: 3da45f87f8ee8a55f4b3c7c6ba763f6a2680f651
+  data.tar.gz: 56d4c5b2724facc8e70682b93a3c2196911e673f
 SHA512:
-  metadata.gz: 0e54b03d471c7f99d997bc61e0dba8b3cb3ad198ade0876d411152c5fe7324ce08fe121b4883da69f5dc29b8a6cbf985009e24c4142966d175bc609d1021a6f5
-  data.tar.gz: a87ba2994e205635505b28859c58147ab7af689b3ec146421b4f6a224e903b689a313cfb443d8ebc188b8279d852dd0aa035b2a6d4bcde8157a6a7e57ccc548d
+  metadata.gz: 9408a28957b8007e2503a93927ad61995bf39c61a40d3e384f774e19494b035633d716f2849c3dd9eab281da2d05565cf300ad877005be16623c53c24b82ee7e
+  data.tar.gz: 5c4ba36bca41329090a6e0ffbc92888c36243768d7a30ced5e5062534e478502bf1cccb40859e7b649e8ad3987c7ed8df1551c9fd5d26a444f5f86016c35122b

data/delayed_paperclip.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'delayed_job'
   s.add_development_dependency 'delayed_job_active_record'
   s.add_development_dependency 'resque'
-  s.add_development_dependency 'sidekiq'
+  s.add_development_dependency 'sidekiq', '< 3.0'
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler'

data/gemfiles/rails3_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    delayed_paperclip (2.7.0)
+    delayed_paperclip (2.7.1)
       paperclip (>= 3.3)
 
 GEM
@@ -44,9 +44,9 @@ GEM
       timers (~> 1.1.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.3)
+    cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
-    connection_pool (1.2.0)
+    connection_pool (2.0.0)
     delayed_job (4.0.0)
       activesupport (>= 3.0, < 4.1)
     delayed_job_active_record (4.0.0)
@@ -61,13 +61,13 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.3)
+    metaclass (0.0.4)
     mime-types (1.25.1)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
     multi_json (1.8.4)
-    paperclip (4.1.0)
+    paperclip (4.1.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
@@ -105,21 +105,21 @@ GEM
     redis (3.0.7)
     redis-namespace (1.4.1)
       redis (~> 3.0.4)
-    resque (1.25.1)
+    resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.2)
+      redis-namespace (~> 1.3)
       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.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    sidekiq (2.17.6)
+    rspec-mocks (2.14.6)
+    sidekiq (2.17.7)
       celluloid (>= 0.15.2)
       connection_pool (>= 1.0.0)
       json
@@ -133,7 +133,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.9)
     thor (0.14.6)
     tilt (1.4.1)
     timers (1.1.0)
@@ -159,5 +159,5 @@ DEPENDENCIES
   rake
   resque
   rspec
-  sidekiq
+  sidekiq (< 3.0)
   sqlite3

data/gemfiles/rails3_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    delayed_paperclip (2.7.0)
+    delayed_paperclip (2.7.1)
       paperclip (>= 3.3)
 
 GEM
@@ -43,9 +43,9 @@ GEM
       timers (~> 1.1.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.3)
+    cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
-    connection_pool (1.2.0)
+    connection_pool (2.0.0)
     delayed_job (4.0.0)
       activesupport (>= 3.0, < 4.1)
     delayed_job_active_record (4.0.0)
@@ -60,13 +60,13 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.3)
+    metaclass (0.0.4)
     mime-types (1.25.1)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
     multi_json (1.8.4)
-    paperclip (4.1.0)
+    paperclip (4.1.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
@@ -102,21 +102,21 @@ GEM
     redis (3.0.7)
     redis-namespace (1.4.1)
       redis (~> 3.0.4)
-    resque (1.25.1)
+    resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.2)
+      redis-namespace (~> 1.3)
       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.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    sidekiq (2.17.6)
+    rspec-mocks (2.14.6)
+    sidekiq (2.17.7)
       celluloid (>= 0.15.2)
       connection_pool (>= 1.0.0)
       json
@@ -131,7 +131,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.9)
     thor (0.18.1)
     tilt (1.4.1)
     timers (1.1.0)
@@ -157,5 +157,5 @@ DEPENDENCIES
   rake
   resque
   rspec
-  sidekiq
+  sidekiq (< 3.0)
   sqlite3

data/gemfiles/rails4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    delayed_paperclip (2.7.0)
+    delayed_paperclip (2.7.1)
       paperclip (>= 3.3)
 
 GEM
@@ -41,9 +41,9 @@ GEM
       timers (~> 1.1.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.3)
+    cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
-    connection_pool (1.2.0)
+    connection_pool (2.0.0)
     delayed_job (4.0.0)
       activesupport (>= 3.0, < 4.1)
     delayed_job_active_record (4.0.0)
@@ -57,14 +57,14 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.3)
+    metaclass (0.0.4)
     mime-types (1.25.1)
     minitest (4.7.5)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
     multi_json (1.8.4)
-    paperclip (4.1.0)
+    paperclip (4.1.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
@@ -92,21 +92,21 @@ GEM
     redis (3.0.7)
     redis-namespace (1.4.1)
       redis (~> 3.0.4)
-    resque (1.25.1)
+    resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.2)
+      redis-namespace (~> 1.3)
       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.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    sidekiq (2.17.6)
+    rspec-mocks (2.14.6)
+    sidekiq (2.17.7)
       celluloid (>= 0.15.2)
       connection_pool (>= 1.0.0)
       json
@@ -125,7 +125,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.9)
     thor (0.18.1)
     thread_safe (0.1.3)
       atomic
@@ -153,5 +153,5 @@ DEPENDENCIES
   rake
   resque
   rspec
-  sidekiq
+  sidekiq (< 3.0)
   sqlite3

data/lib/delayed_paperclip/attachment.rb

@@ -7,7 +7,6 @@ module DelayedPaperclip
       base.alias_method_chain :post_processing, :delay
       base.alias_method_chain :post_processing=, :delay
       base.alias_method_chain :save, :prepare_enqueueing
-      base.alias_method_chain :after_flush_writes, :processing
     end
 
     module InstanceMethods
@@ -57,6 +56,7 @@ module DelayedPaperclip
         self.post_processing = true
         reprocess!(*delayed_options[:only_process])
         self.job_is_processing = false
+        update_processing_column
       end
 
       def processing_image_url
@@ -65,18 +65,6 @@ module DelayedPaperclip
         processing_image_url
       end
 
-      # Updates _processing column to false
-      def after_flush_writes_with_processing(*args)
-        after_flush_writes_without_processing(*args)
-        # update_column is available in rails 3.1 instead we can do this to update the attribute without callbacks
-
-        # instance.update_column("#{name}_processing", false) if instance.respond_to?(:"#{name}_processing?")
-        if instance.respond_to?(:"#{name}_processing?")
-          instance.send("#{name}_processing=", false)
-          instance.class.where(instance.class.primary_key => instance.id).update_all({ "#{name}_processing" => false })
-        end
-      end
-
       def save_with_prepare_enqueueing
         was_dirty = @dirty
 
@@ -92,6 +80,15 @@ module DelayedPaperclip
         reprocess!(*style_args)
       end
 
+      private
+
+      def update_processing_column
+        if instance.respond_to?(:"#{name}_processing?")
+          instance.send("#{name}_processing=", false)
+          instance.class.where(instance.class.primary_key => instance.id).update_all({ "#{name}_processing" => false })
+        end
+      end
+
     end
   end
 end

data/lib/delayed_paperclip/url_generator.rb

@@ -18,9 +18,13 @@ module DelayedPaperclip
       ), options)
     end
 
+    # This method is a mess
     def most_appropriate_url_with_processed(style = nil)
       if @attachment.original_filename.nil? || delayed_default_url?(style)
-        if @attachment.delayed_options.nil? || @attachment.processing_image_url.nil? || !@attachment.processing?
+        if @attachment.delayed_options.nil? ||
+           @attachment.processing_image_url.nil? ||
+           !@attachment.processing?
+
           default_url
         else
           @attachment.processing_image_url
@@ -44,18 +48,10 @@ module DelayedPaperclip
       return false if not @attachment.delayed_options.try(:[], :url_with_processing)
       return false if not processing?(style)
       true
-
-      # OLD CRAZY CONDITIONAL
-      # TODO: Delete
-      # !(
-      #   @attachment.job_is_processing ||
-      #   @attachment.dirty? ||
-      #   !@attachment.delayed_options.try(:[], :url_with_processing) ||
-      #   !(@attachment.instance.respond_to?(:"#{@attachment.name}_processing?") && @attachment.processing?)
-      # )
     end
 
     private
+
     def processing?(style)
       return true if @attachment.processing?
 

data/lib/delayed_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DelayedPaperclip
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 end

data/spec/delayed_paperclip/attachment_spec.rb

@@ -166,21 +166,14 @@ describe DelayedPaperclip::Attachment do
     end
   end
 
-  describe "#after_flush_writes_with_processing" do
+  describe "#update_processing_column" do
     it "updates the column to false" do
       dummy.update_attribute(:image_processing, true)
 
-      dummy.image.after_flush_writes_with_processing
+      dummy.image.send(:update_processing_column)
 
       dummy.image_processing.should be_false
     end
-
-    it "still flushes temp files" do
-      dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
-      paths = dummy.image.queued_for_write.values.map(&:path)
-      dummy.image.after_flush_writes_with_processing
-      paths.none?{ |path| File.exists?(path) }.should be_true
-    end
   end
 
   describe "#save_with_prepare_enqueueing" do

data/spec/delayed_paperclip/instance_methods_spec.rb

@@ -55,12 +55,8 @@ describe DelayedPaperclip::InstanceMethods do
   end
 
   describe "#prepare_enqueueing_for" do
-
     it "updates processing column to true" do
-      pending
-      # TODO: Why would it be writing the attribute here as well as in mark_enqueue_delayed_processing
       dummy.image_processing.should be_false
-      dummy.expects(:write_attribute).with("image_processing", true)
       dummy.prepare_enqueueing_for("image")
       dummy.image_processing.should be_true
     end

data/spec/delayed_paperclip/url_generator_spec.rb

@@ -83,7 +83,7 @@ describe DelayedPaperclip::UrlGenerator do
 
           context "with processing_image_url" do
             before :each do
-              attachment.stubs(:processing_image_url).returns "/processing/image.jpg"\
+              attachment.stubs(:processing_image_url).returns "/processing/image.jpg"
             end
 
             context "and is processing" do

data/spec/integration/base_delayed_paperclip_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe "Base Delayed Paperclip Integration" do
+  before :all do
+    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
+    Resque.remove_queue(:paperclip)
+  end
+
+  let(:dummy) { Dummy.create }
+
+  before :each do
+    reset_dummy(paperclip: { default_url: "/../../fixtures/missing.png" })
+  end
+
+  describe "double save" do
+    before :each do
+      dummy.image_processing.should be_false
+      dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
+      dummy.save!
+    end
+
+    it "processing column remains true" do
+      dummy.image_processing.should be_true
+      dummy.save!
+      dummy.image_processing.should be_true
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -46,6 +46,7 @@ Dir["./spec/integration/examples/*.rb"].sort.each {|f| require f}
 def reset_dummy(options = {})
   options[:with_processed] = true unless options.key?(:with_processed)
   options[:processed_column] = options[:with_processed] unless options.has_key?(:processed_column)
+
   build_dummy_table(options.delete(:processed_column))
   reset_class("Dummy", options)
 end
@@ -76,8 +77,7 @@ def reset_class(class_name, options)
   klass.class_eval do
     include Paperclip::Glue
 
-    has_attached_file :image, options[:paperclip]
-    options.delete(:paperclip)
+    has_attached_file :image, options.delete(:paperclip)
 
     validates_attachment :image, :content_type => { :content_type => "image/png" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Jesse Storimer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -115,16 +115,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +226,8 @@ files:
 - spec/delayed_paperclip/url_generator_spec.rb
 - spec/delayed_paperclip_spec.rb
 - spec/fixtures/12k.png
+- spec/fixtures/missing.png
+- spec/integration/base_delayed_paperclip_spec.rb
 - spec/integration/delayed_job_spec.rb
 - spec/integration/examples/base.rb
 - spec/integration/resque_spec.rb
@@ -257,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Process your Paperclip attachments in the background.
@@ -268,6 +270,8 @@ test_files:
 - spec/delayed_paperclip/url_generator_spec.rb
 - spec/delayed_paperclip_spec.rb
 - spec/fixtures/12k.png
+- spec/fixtures/missing.png
+- spec/integration/base_delayed_paperclip_spec.rb
 - spec/integration/delayed_job_spec.rb
 - spec/integration/examples/base.rb
 - spec/integration/resque_spec.rb