delayed_paperclip 2.4.5.1 → 2.4.5.2

data/README.textile

@@ -1,4 +1,4 @@
-h1. Delayed::Paperclip !https://secure.travis-ci.org/jstorimer/delayed_paperclip.png!
+h1. Delayed::Paperclip !https://secure.travis-ci.org/jrgifford/delayed_paperclip.png!
 
 Delayed_paperclip lets you process your "Paperclip":http://github.com/thoughtbot/paperclip attachments in a background task with "delayed_job":http://github.com/tobi/delayed_job or "Resque":http://github.com/defunkt/resque.
 
@@ -76,7 +76,7 @@ To have the missing image url be outputted by paperclip while the image is being
   @user = User.new(:avatar => File.new(...))
   @user.save
   @user.avatar.url #=> "/images/original/missing.png"
-  Delayed::Job.work_off
+  Delayed::Worker.new.work_off
 
   @user.reload
   @user.avatar.url #=> "/system/images/3/original/IMG_2772.JPG?1267562148"

data/lib/delayed_paperclip.rb

@@ -1,5 +1,6 @@
 require 'delayed_paperclip/jobs'
 require 'delayed_paperclip/attachment'
+require 'delayed_paperclip/url_generator'
 require 'delayed_paperclip/railtie'
 
 module DelayedPaperclip

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 :most_appropriate_url, :processed
       base.alias_method_chain :post_process_styles, :processing
     end
 
@@ -45,14 +44,14 @@ module DelayedPaperclip
 
       def post_process_styles_with_processing(*args)
         post_process_styles_without_processing(*args)
-        instance.update_attribute("#{name}_processing", false) if instance.respond_to?(:"#{name}_processing?")
 
-        # 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.update_all({ "#{name}_processing" => false }, instance.class.primary_key => instance.id)
-        # end
+        # 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.update_all({ "#{name}_processing" => false }, instance.class.primary_key => instance.id)
+        end
       end
 
       def save_with_prepare_enqueueing
@@ -64,18 +63,6 @@ module DelayedPaperclip
         end
       end
 
-      def most_appropriate_url_with_processed
-        if original_filename.nil? || delayed_default_url?
-          default_url
-        else
-          @options.url
-        end
-      end
-
-      def delayed_default_url?
-        !(job_is_processing || dirty? || !delayed_options.try(:[], :url_with_processing) || !(@instance.respond_to?(:"#{name}_processing?") && processing?))
-      end
-
     end
   end
 end

data/lib/delayed_paperclip/railtie.rb

@@ -17,6 +17,7 @@ module DelayedPaperclip
     def self.insert
       ActiveRecord::Base.send(:include, DelayedPaperclip::Glue)
       Paperclip::Attachment.send(:include, DelayedPaperclip::Attachment)
+      Paperclip::UrlGenerator.send(:include, DelayedPaperclip::UrlGenerator)
     end
   end
 end

data/lib/delayed_paperclip/url_generator.rb

@@ -0,0 +1,22 @@
+require 'uri'
+module DelayedPaperclip
+  module UrlGenerator
+    def self.included(base)
+      base.send :include, InstanceMethods
+      base.alias_method_chain :most_appropriate_url, :processed
+    end
+
+    def most_appropriate_url_with_processed
+      if @attachment.original_filename.nil? || delayed_default_url?
+        default_url
+      else
+         @attachment_options[:url]
+      end
+    end
+
+    def delayed_default_url?
+      !(@attachment.job_is_processing || @attachment.dirty? || !@attachment.delayed_options.try(:[], :url_with_processing) || !(@attachment.instance.respond_to?(:"#{@attachment.name}_processing?") && @attachment.processing?))
+    end
+  end
+
+end

data/test/base_delayed_paperclip_test.rb

@@ -137,4 +137,14 @@ module BaseDelayedPaperclipTest
     dummy.save!
     process_jobs
   end
+
+  def test_delayed_paperclip_functioning_with_after_update_callback
+    reset_class "Dummy", :with_processed => true, :with_after_update_callback => true
+    Dummy.any_instance.expects(:reprocess)
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    process_jobs
+    dummy.update_attributes(:name => "hi")
+  end
+
 end

data/test/test_helper.rb

@@ -41,6 +41,7 @@ end
 
 def build_dummy_table(with_processed)
   ActiveRecord::Base.connection.create_table :dummies, :force => true do |t|
+    t.string   :name
     t.string   :image_file_name
     t.string   :image_content_type
     t.integer  :image_file_size
@@ -57,6 +58,11 @@ def reset_class(class_name, options)
     include Paperclip::Glue
     has_attached_file     :image
     process_in_background :image, options if options[:with_processed]
+    after_update :reprocess if options[:with_after_update_callback]
+
+    def reprocess
+      image.reprocess!
+    end
   end
   klass.reset_column_information
   klass

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.4.5.1
+  version: 2.4.5.2
   prerelease: 
 platform: ruby
 authors:
 - Jesse Storimer
 - Bert Goethals
+- James Gifford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2152939580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +23,15 @@ dependencies:
         version: 2.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152939580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.5
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152939180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +39,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152939180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152938660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +55,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152938660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &2152938180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +71,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152938180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2152937700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +87,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152937700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Process your Paperclip attachments in the background with delayed_job,
   Resque or your own processor.
-email: jesse@jstorimer.com
+email: james@jamesrgifford.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -78,20 +104,21 @@ files:
 - LICENSE
 - Rakefile
 - init.rb
-- lib/delayed_paperclip/attachment.rb
+- lib/delayed_paperclip/jobs.rb
+- lib/delayed_paperclip/url_generator.rb
 - lib/delayed_paperclip/jobs/delayed_job.rb
 - lib/delayed_paperclip/jobs/resque.rb
-- lib/delayed_paperclip/jobs.rb
+- lib/delayed_paperclip/attachment.rb
 - lib/delayed_paperclip/railtie.rb
 - lib/delayed_paperclip.rb
-- test/base_delayed_paperclip_test.rb
 - test/database.yml
-- test/delayed_paperclip_test.rb
-- test/fixtures/12k.png
+- test/base_delayed_paperclip_test.rb
 - test/resque_paperclip_test.rb
 - test/test_helper.rb
+- test/fixtures/12k.png
+- test/delayed_paperclip_test.rb
 - rails/init.rb
-homepage: http://github.com/jstorimer/delayed_paperclip
+homepage: http://github.com/jrgifford/delayed_paperclip
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -111,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Process your Paperclip attachments in the background.