delayed_paperclip 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87f666e3339caae1a67262dc9d7a2e0a4735a4cb
-  data.tar.gz: 17312387a6ca724e835abee1b1aac059c28e24b2
+  metadata.gz: ee7342bcd21ac1c386a6856db5e168f555542b13
+  data.tar.gz: 14abfc99f34f048e8e7db32be2950a2fe3ba097d
 SHA512:
-  metadata.gz: cd54dd5bf121d9d9b1bec0feeb669d8afed6dbf0edecc4088f14c84578d976e2cab2e55e5959f03a3b6aba0ca6a75870285870938f6b156ee8bf8d1e0c0402d2
-  data.tar.gz: 5731d670649b7b293b587192d7f569912caf43c717c100b384e24bbc2377b297f30346edf69c88a7c5320621ee1d5a1c9221abedeb59ee8f40e2c81b9ef83558
+  metadata.gz: 4a2126fd4538776b25d2e4f7e1e14880754807f3b2470fe6fac57d9ce1052adff8bca565333b7f2a12972513e5df2f1304e59de666084eda67fa1614c405e511
+  data.tar.gz: 2ba9ba29b2ef8a5ac1e1df24d412e035b7304e24224495edb751a95e03e42a5d38af1c198636a88a8cd2a4f4f00a60f6223cdb07777b78a3d26523334b290609

data/.travis.yml

@@ -11,6 +11,7 @@ rvm:
 gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
+  - gemfiles/5.0_paperclip_master.gemfile
 
 # Rails 5.0 requires Ruby >= 2.2.2
 matrix:
@@ -19,6 +20,10 @@ matrix:
       gemfile: gemfiles/5.0.gemfile
     - rvm: 2.0
       gemfile: gemfiles/5.0.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/5.0_paperclip_master.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/5.0_paperclip_master.gemfile
     # Paperclip >= 5.0 requires Ruby 2.1
     - rvm: 2.0
       gemfile: gemfiles/4.2.gemfile

data/Appraisals

@@ -5,3 +5,8 @@ end
 appraise "5.0" do
   gem "rails", "~> 5.0.0"
 end
+
+appraise "5.0-paperclip-master" do
+  gem "rails", "~> 5.0.0"
+  gem "paperclip", github: "thoughtbot/paperclip"
+end

data/Gemfile

@@ -1,3 +1,3 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec

data/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rake'
 require 'rspec/core/rake_task'
 

data/gemfiles/.bundle/config

@@ -0,0 +1 @@
+--- {}

data/gemfiles/5.0_paperclip_master.gemfile

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

data/lib/delayed_paperclip.rb

@@ -23,9 +23,9 @@ module DelayedPaperclip
     end
 
     def process_job(instance_klass, instance_id, attachment_name)
-      if instance = instance_klass.constantize.unscoped.where(id: instance_id).first
-        instance.send(attachment_name).process_delayed!
-      end
+      instance_klass.constantize.unscoped.find(instance_id).
+        send(attachment_name).
+        process_delayed!
     end
 
   end

data/lib/delayed_paperclip/attachment.rb

@@ -1,105 +1,89 @@
 module DelayedPaperclip
   module Attachment
+    attr_accessor :job_is_processing
 
-    def self.included(base)
-      base.send :include, InstanceMethods
-      base.send :attr_accessor, :job_is_processing
-
-      base.send :alias_method, :post_processing_without_delay, :post_processing
-      base.send :alias_method, :post_processing, :post_processing_with_delay
-
-      base.send :alias_method, :post_processing_without_delay=, :post_processing=
-      base.send :alias_method, :post_processing=, :post_processing_with_delay=
-
-      base.send :alias_method, :save_without_prepare_enqueueing, :save
-      base.send :alias_method, :save, :save_with_prepare_enqueueing
+    def delayed_options
+      options[:delayed]
     end
 
-    module InstanceMethods
-
-      def delayed_options
-        options[:delayed]
-      end
-
-      # Attr accessor in Paperclip
-      def post_processing_with_delay
-        !delay_processing? || split_processing?
-      end
+    # Attr accessor in Paperclip
+    def post_processing
+      !delay_processing? || split_processing?
+    end
 
-      def post_processing_with_delay=(value)
-        @post_processing_with_delay = value
-      end
+    def post_processing=(value)
+      @post_processing_with_delay = value
+    end
 
-      # if nil, returns whether it has delayed options
-      # if set, then it returns
-      def delay_processing?
-        if @post_processing_with_delay.nil?
-          !!delayed_options
-        else
-          !@post_processing_with_delay
-        end
+    # if nil, returns whether it has delayed options
+    # if set, then it returns
+    def delay_processing?
+      if @post_processing_with_delay.nil?
+        !!delayed_options
+      else
+        !@post_processing_with_delay
       end
+    end
 
-      def split_processing?
-        options[:only_process] && delayed_options &&
-          options[:only_process] != delayed_only_process
-      end
+    def split_processing?
+      options[:only_process] && delayed_options &&
+        options[:only_process] != delayed_only_process
+    end
 
-      def processing?
-        column_name = :"#{@name}_processing?"
-        @instance.respond_to?(column_name) && @instance.send(column_name)
-      end
+    def processing?
+      column_name = :"#{@name}_processing?"
+      @instance.respond_to?(column_name) && @instance.send(column_name)
+    end
 
-      def processing_style?(style)
-        return false if !processing?
+    def processing_style?(style)
+      return false if !processing?
 
-        !split_processing? || delayed_only_process.include?(style)
-      end
+      !split_processing? || delayed_only_process.include?(style)
+    end
 
-      def delayed_only_process
-        only_process = delayed_options.fetch(:only_process, []).dup
-        only_process = only_process.call(self) if only_process.respond_to?(:call)
-        only_process.map(&:to_sym)
-      end
+    def delayed_only_process
+      only_process = delayed_options.fetch(:only_process, []).dup
+      only_process = only_process.call(self) if only_process.respond_to?(:call)
+      only_process.map(&:to_sym)
+    end
 
-      def process_delayed!
-        self.job_is_processing = true
-        self.post_processing = true
-        reprocess!(*delayed_only_process)
-        self.job_is_processing = false
-        update_processing_column
-      end
+    def process_delayed!
+      self.job_is_processing = true
+      self.post_processing = true
+      reprocess!(*delayed_only_process)
+      self.job_is_processing = false
+      update_processing_column
+    end
 
-      def processing_image_url
-        processing_image_url = delayed_options[:processing_image_url]
-        processing_image_url = processing_image_url.call(self) if processing_image_url.respond_to?(:call)
-        processing_image_url
-      end
+    def processing_image_url
+      processing_image_url = delayed_options[:processing_image_url]
+      processing_image_url = processing_image_url.call(self) if processing_image_url.respond_to?(:call)
+      processing_image_url
+    end
 
-      def save_with_prepare_enqueueing
-        was_dirty = @dirty
+    def save
+      was_dirty = @dirty
 
-        save_without_prepare_enqueueing.tap do
-          if delay_processing? && was_dirty
-            instance.prepare_enqueueing_for name
-          end
+      super.tap do
+        if delay_processing? && was_dirty
+          instance.prepare_enqueueing_for name
         end
       end
+    end
 
-      def reprocess_without_delay!(*style_args)
-        @post_processing_with_delay = true
-        reprocess!(*style_args)
-      end
+    def reprocess_without_delay!(*style_args)
+      @post_processing_with_delay = true
+      reprocess!(*style_args)
+    end
 
-      private
+    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
+    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

data/lib/delayed_paperclip/railtie.rb

@@ -20,7 +20,7 @@ module DelayedPaperclip
     # Attachment and URL Generator extends Paperclip
     def self.insert
       ActiveRecord::Base.send(:include, DelayedPaperclip::Glue)
-      Paperclip::Attachment.send(:include, DelayedPaperclip::Attachment)
+      Paperclip::Attachment.prepend(DelayedPaperclip::Attachment)
       Paperclip::Attachment.default_options[:url_generator] = DelayedPaperclip::UrlGenerator
     end
   end

data/lib/delayed_paperclip/url_generator.rb

@@ -3,9 +3,13 @@ require 'paperclip/url_generator'
 
 module DelayedPaperclip
   class UrlGenerator < ::Paperclip::UrlGenerator
+    def initialize(attachment, _compatibility = nil)
+      @attachment = attachment
+      @attachment_options = attachment.options
+    end
+
     def for(style_name, options)
       most_appropriate_url = @attachment.processing_style?(style_name) ? most_appropriate_url(style_name) : most_appropriate_url()
-
       timestamp_as_needed(
         escape_url_as_needed(
           @attachment_options[:interpolator].interpolate(most_appropriate_url, @attachment, style_name),

data/lib/delayed_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DelayedPaperclip
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/spec/delayed_paperclip/attachment_spec.rb

@@ -23,12 +23,12 @@ describe DelayedPaperclip::Attachment do
   describe "#post_processing_with_delay" do
     it "is true if delay_processing? is false" do
       dummy.image.stubs(:delay_processing?).returns false
-      dummy.image.post_processing_with_delay.should be_truthy
+      dummy.image.post_processing.should be_truthy
     end
 
     it "is false if delay_processing? is true" do
       dummy.image.stubs(:delay_processing?).returns true
-      dummy.image.post_processing_with_delay.should be_falsey
+      dummy.image.post_processing.should be_falsey
     end
 
     context "on a non-delayed image" do
@@ -36,19 +36,19 @@ describe DelayedPaperclip::Attachment do
 
       it "is false if delay_processing? is true" do
         dummy.image.stubs(:delay_processing?).returns true
-        dummy.image.post_processing_with_delay.should be_falsey
+        dummy.image.post_processing.should be_falsey
       end
     end
   end
 
   describe "#delay_processing?" do
-    it "returns delayed_options existence if post_processing_with_delay is nil" do
-      dummy.image.post_processing_with_delay = nil
+    it "returns delayed_options existence if post_processing is nil" do
+      dummy.image.post_processing = nil
       dummy.image.delay_processing?.should be_truthy
     end
 
-    it "returns inverse of post_processing_with_delay if it's set" do
-      dummy.image.post_processing_with_delay = true
+    it "returns inverse of post_processing if it's set" do
+      dummy.image.post_processing = true
       dummy.image.delay_processing?.should be_falsey
     end
   end
@@ -151,7 +151,8 @@ describe DelayedPaperclip::Attachment do
         reset_dummy(paperclip: { only_process: lambda { |a| [:small, :large] } } )
       end
 
-      it "returns [:small, :large]" do
+      # Enable when https://github.com/thoughtbot/paperclip/pull/2289 is resolved
+      xit "returns [:small, :large]" do
         expect(dummy.image.delayed_only_process).to eq [:small, :large]
       end
     end
@@ -192,7 +193,8 @@ describe DelayedPaperclip::Attachment do
         reset_dummy(paperclip: { only_process: lambda { |a| [:small, :large] } } )
       end
 
-      it "calls reprocess! with options" do
+      # Enable when https://github.com/thoughtbot/paperclip/pull/2289 is resolved
+      xit "calls reprocess! with options" do
         dummy.image.expects(:reprocess!).with(:small, :large)
         dummy.image.process_delayed!
       end
@@ -237,7 +239,7 @@ describe DelayedPaperclip::Attachment do
     end
   end
 
-  describe "#save_with_prepare_enqueueing" do
+  describe "#save" do
     context "delay processing and it was dirty" do
       before :each do
         dummy.image.stubs(:delay_processing?).returns true
@@ -246,14 +248,14 @@ describe DelayedPaperclip::Attachment do
 
       it "prepares the enqueing" do
         dummy.expects(:prepare_enqueueing_for).with(:image)
-        dummy.image.save_with_prepare_enqueueing
+        dummy.image.save
       end
     end
 
     context "without dirty or delay_processing" do
       it "does not prepare_enqueueing" do
         dummy.expects(:prepare_enqueueing_for).with(:image).never
-        dummy.image.save_with_prepare_enqueueing
+        dummy.image.save
       end
     end
   end

data/spec/delayed_paperclip/url_generator_spec.rb

@@ -2,12 +2,13 @@ require 'spec_helper'
 
 describe DelayedPaperclip::UrlGenerator do
   before :each do
-    reset_dummy(dummy_options)
+    reset_dummy({})
   end
 
-  let(:dummy) { Dummy.create }
-  let(:attachment) { dummy.image }
-  let(:dummy_options) { {} }
+  def make_attachment(options = {})
+    reset_dummy(options)
+    Dummy.create.image
+  end
 
   describe "for" do
     before :each do
@@ -15,19 +16,21 @@ describe DelayedPaperclip::UrlGenerator do
     end
 
     context "with split processing" do
-      # everything in this hash is passed to delayed_paperclip, except for the
-      # paperclip stuff
-      let(:dummy_options) { {
-        paperclip: {
-          styles: {
-            online: "400x400x",
-            background: "600x600x"
-          },
-          only_process: [:online]
-        },
-
-        only_process: [:background]
-      }}
+      let(:attachment) do
+        make_attachment(
+          {
+            paperclip: {
+              styles: {
+                online: "400x400x",
+                background: "600x600x"
+              },
+              only_process: [:online]
+            },
+
+            only_process: [:background]
+          }
+        )
+      end
 
       context "processing" do
         before :each do
@@ -58,19 +61,30 @@ describe DelayedPaperclip::UrlGenerator do
       end
 
       context "should be able to escape (, ), [, and ]." do
-        def generate(expected, updated_at=nil)
-          mock_interpolator = MockInterpolator.new(result: expected)
-          options           = { interpolator: mock_interpolator }
-          url_generator     = Paperclip::UrlGenerator.new(attachment, options)
+        def generate(expected, updated_at = nil)
+          attachment = make_attachment(
+            {
+              paperclip: {
+                styles: {
+                  online: "400x400x",
+                  background: "600x600x"
+                },
+                only_process: [:online],
+                interpolator: MockInterpolator.new(result: expected)
+              },
+
+              only_process: [:background]
+            }
+          )
+          url_generator = DelayedPaperclip::UrlGenerator.new(attachment, {})
           attachment.stubs(:updated_at).returns updated_at
           url_generator.for(:style_name, {escape: true, timestamp: !!updated_at})
         end
 
-
         it "interpolates correctly without timestamp" do
           expect(
             "the%28expected%29result%5B%5D"
-          ).to be == generate("the(expected)result[]")
+          ).to eq(generate("the(expected)result[]"))
         end
 
         it "does not interpolate timestamp" do
@@ -79,7 +93,7 @@ describe DelayedPaperclip::UrlGenerator do
 
           expect(
             "the%28expected%29result%5B%5D?#{updated_at}"
-          ).to be == generate(expected, updated_at)
+          ).to eq(generate(expected, updated_at))
         end
       end
     end
@@ -87,18 +101,20 @@ describe DelayedPaperclip::UrlGenerator do
 
   describe "#most_appropriate_url" do
     context "without delayed_default_url" do
-      subject { DelayedPaperclip::UrlGenerator.new(attachment, {url: "/blah/url.jpg"})}
+      let(:attachment) { make_attachment(paperclip: {url: "/blah/url.jpg"}) }
+
+      subject { DelayedPaperclip::UrlGenerator.new(attachment) }
 
       before :each do
         subject.stubs(:delayed_default_url?).returns false
       end
-      context "with original file name" do
-        before :each do
-          attachment.stubs(:original_filename).returns "blah"
-        end
 
+      context "with original file name" do
         it "returns options url" do
-          subject.most_appropriate_url.should == "/blah/url.jpg"
+          attachment.stubs(:original_filename).returns "blah"
+          subjec = DelayedPaperclip::UrlGenerator.new(attachment)
+          subjec.stubs(:delayed_default_url?).returns false
+          subjec.most_appropriate_url.should == "/blah/url.jpg"
         end
       end
 
@@ -162,7 +178,8 @@ describe DelayedPaperclip::UrlGenerator do
   end
 
   describe "#timestamp_possible?" do
-    subject { DelayedPaperclip::UrlGenerator.new(attachment, {})}
+    let(:attachment) { make_attachment }
+    subject { DelayedPaperclip::UrlGenerator.new(attachment) }
 
     context "with delayed_default_url" do
       before :each do
@@ -187,7 +204,8 @@ describe DelayedPaperclip::UrlGenerator do
   end
 
   describe "#delayed_default_url?" do
-    subject { DelayedPaperclip::UrlGenerator.new(attachment, {})}
+    let(:attachment) { make_attachment }
+    subject { DelayedPaperclip::UrlGenerator.new(attachment) }
 
     before :each do
       attachment.stubs(:job_is_processing).returns false

data/spec/delayed_paperclip_spec.rb

@@ -32,20 +32,11 @@ describe DelayedPaperclip do
 
     it "finds dummy and calls #process_delayed!" do
       dummy_stub = stub
-      dummy_stub.expects(:where).with(id: dummy.id).returns([dummy])
+      dummy_stub.expects(:find).with(dummy.id).returns(dummy)
       Dummy.expects(:unscoped).returns(dummy_stub)
       dummy.image.expects(:process_delayed!)
       DelayedPaperclip.process_job("Dummy", dummy.id, :image)
     end
-
-    it "doesn't find dummy and it doesn't raise any exceptions" do
-      dummy_stub = stub
-      dummy_stub.expects(:where).with(id: dummy.id).returns([])
-      Dummy.expects(:unscoped).returns(dummy_stub)
-      expect do
-        DelayedPaperclip.process_job("Dummy", dummy.id, :image)
-      end.not_to raise_exception
-    end
   end
 
   describe "paperclip definitions" do
@@ -64,4 +55,4 @@ describe DelayedPaperclip do
                                               })
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Jesse Storimer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -171,8 +171,10 @@ files:
 - README.md
 - Rakefile
 - delayed_paperclip.gemspec
+- gemfiles/.bundle/config
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/5.0_paperclip_master.gemfile
 - lib/delayed_paperclip.rb
 - lib/delayed_paperclip/attachment.rb
 - lib/delayed_paperclip/process_job.rb
@@ -210,20 +212,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Process your Paperclip attachments in the background
-test_files:
-- spec/delayed_paperclip/attachment_spec.rb
-- spec/delayed_paperclip/class_methods_spec.rb
-- spec/delayed_paperclip/instance_methods_spec.rb
-- 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/examples/base.rb
-- spec/integration/process_job_spec.rb
-- spec/spec_helper.rb
-- spec/tmp/.keep
+test_files: []