delayed_paperclip 2.6.1 → 2.7.0

data/spec/delayed_paperclip/url_generator_spec.rb

@@ -1,14 +1,36 @@
 require 'spec_helper'
 
 describe DelayedPaperclip::UrlGenerator do
-  before :all do
+  before :each do
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
-    reset_dummy
+    reset_dummy(dummy_options)
   end
 
   let(:dummy) { Dummy.create }
   let(:attachment) { dummy.image }
-
+  let(:dummy_options) { {} }
+
+  describe "for_with_processed" do
+    context "with split pcoessing" do
+      # everything in this hash is passed to delayed_paperclip, expect for the
+      # paperclip stuff
+      let(:dummy_options) { {
+        paperclip: {
+          styles: {
+            online: "400x400x",
+            background: "600x600x"
+          },
+          only_process: [:online]
+        },
+
+        only_process: [:background]
+      }}
+
+      it "returns the default_url when the style is still being processed" do
+        expect(attachment.url(:background)).to eql "/images/background/missing.png"
+      end
+    end
+  end
 
   describe "#most_appropriate_url_with_processed" do
     context "without delayed_default_url" do
@@ -17,7 +39,6 @@ describe DelayedPaperclip::UrlGenerator do
       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"
@@ -121,6 +142,7 @@ describe DelayedPaperclip::UrlGenerator do
       attachment.delayed_options[:url_with_processing] = true
       attachment.instance.stubs(:respond_to?).with(:image_processing?).returns true
       attachment.stubs(:processing?).returns true
+      attachment.stubs(:processing_style?).with(anything).returns true
     end
 
     it "has all false, delayed_default_url returns true" do
@@ -167,5 +189,14 @@ describe DelayedPaperclip::UrlGenerator do
         subject.delayed_default_url?.should be_false
       end
     end
+
+    context "style is provided and is being processed" do
+      let(:style) { :main }
+      before :each do
+        attachment.stubs(:processing_style?).with(style).returns(true)
+      end
+
+      specify { expect(subject.delayed_default_url?(style)).to be }
+    end
   end
-end
+end

data/spec/delayed_paperclip_spec.rb

@@ -31,7 +31,9 @@ describe DelayedPaperclip do
     let(:dummy) { Dummy.create! }
 
     it "finds dummy and calls #process_delayed!" do
-      Dummy.expects(:find).with(dummy.id).returns(dummy)
+      dummy_stub = stub
+      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
@@ -45,9 +47,10 @@ describe DelayedPaperclip do
     it "returns paperclip options regardless of version" do
       Dummy.paperclip_definitions.should ==  {:image =>   { :styles => { :thumbnail => "25x25" },
                                               :delayed => { :priority => 0,
-                                                            :only_process => nil,
+                                                            :only_process => [],
                                                             :url_with_processing => true,
-                                                            :processing_image_url => nil}
+                                                            :processing_image_url => nil,
+                                                            :queue => nil}
                                                           }
                                               }
     end

data/spec/spec_helper.rb

@@ -1,11 +1,19 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
-require 'rails'
 require 'active_record'
+require 'active_record/version'
+require 'active_support'
+require 'active_support/core_ext'
 require 'rspec'
 require 'mocha/api'
 
+begin
+  require 'pry'
+rescue LoadError
+  # Pry is not available, just ignore.
+end
+
 require 'paperclip/railtie'
 Paperclip::Railtie.insert
 
@@ -37,20 +45,21 @@ Dir["./spec/integration/examples/*.rb"].sort.each {|f| require f}
 # Reset table and class with image_processing column or not
 def reset_dummy(options = {})
   options[:with_processed] = true unless options.key?(:with_processed)
-  build_dummy_table(options[: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
 
 # Dummy Table for images
 # with or without image_processing column
-def build_dummy_table(with_processed)
+def build_dummy_table(with_column)
   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
     t.datetime :image_updated_at
-    t.boolean(:image_processing, :default => false) if with_processed
+    t.boolean(:image_processing, :default => false) if with_column
   end
 end
 
@@ -67,9 +76,11 @@ def reset_class(class_name, options)
   klass.class_eval do
     include Paperclip::Glue
 
-    has_attached_file  :image, options[:paperclip]
+    has_attached_file :image, options[:paperclip]
     options.delete(:paperclip)
 
+    validates_attachment :image, :content_type => { :content_type => "image/png" }
+
     process_in_background :image, options if options[:with_processed]
 
     after_update :reprocess if options[:with_after_update_callback]

data/test/base_delayed_paperclip_test.rb

@@ -186,6 +186,20 @@ module BaseDelayedPaperclipTest
     process_jobs
   end
 
+  def test_delayed_paperclip_functioning_with_only_process_and_paperclip_only_process_option
+    reset_class "Dummy", :with_processed => true, :only_process => [:small], :paperclip => { :only_process => [:thumbnail] }
+
+    Paperclip::Attachment.any_instance.expects(:post_process).with(:thumbnail)
+    Paperclip::Attachment.any_instance.expects(:post_process).with(:small).never
+
+    Paperclip::Attachment.any_instance.expects(:reprocess!).with(:small)
+    Paperclip::Attachment.any_instance.expects(:reprocess!).with(:thumbnail).never
+
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    process_jobs
+  end
+
   def test_delayed_paperclip_should_convert_image_formats
     reset_class "Dummy", :with_processed => true, :paperclip => { :styles => {:thumbnail => ['12x12', :jpg]} }
     dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))

data/test/test_helper.rb

@@ -2,10 +2,19 @@ require 'rubygems'
 require 'test/unit'
 require 'mocha/setup'
 require 'active_record'
+require 'active_record/version'
+require 'active_support'
+require 'active_support/core_ext'
 require 'logger'
 require 'sqlite3'
-require 'paperclip/railtie'
 
+begin
+  require 'pry'
+rescue LoadError
+  # Pry is not available, just ignore.
+end
+
+require 'paperclip/railtie'
 Paperclip::Railtie.insert
 
 ROOT       = File.join(File.dirname(__FILE__), '..')
@@ -64,9 +73,11 @@ def reset_class(class_name, options)
   klass.class_eval do
     include Paperclip::Glue
 
-    has_attached_file  :image, options[:paperclip]
+    has_attached_file :image, options[:paperclip]
     options.delete(:paperclip)
 
+    validates_attachment :image, :content_type => { :content_type => "image/png" }
+
     process_in_background :image, options if options[:with_processed]
 
     after_update :reprocess if options[:with_after_update_callback]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Jesse Storimer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: delayed_job_active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -111,9 +125,67 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Process your Paperclip attachments in the background with delayed_job,
-  Resque or your own processor.
-email: james@jamesrgifford.com
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Process your Paperclip attachments in the background with DelayedJob,
+  Resque, Sidekiq or your own processor.
+email:
+- james@jamesrgifford.com
+- scott@artsicle.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -131,14 +203,12 @@ files:
 - README.textile
 - Rakefile
 - delayed_paperclip.gemspec
-- gemfiles/paperclip3_5.gemfile
-- gemfiles/paperclip3_5.gemfile.lock
-- gemfiles/rails3.gemfile
-- gemfiles/rails3.gemfile.lock
 - gemfiles/rails3_1.gemfile
 - gemfiles/rails3_1.gemfile.lock
 - gemfiles/rails3_2.gemfile
 - gemfiles/rails3_2.gemfile.lock
+- gemfiles/rails4.gemfile
+- gemfiles/rails4.gemfile.lock
 - init.rb
 - lib/delayed_paperclip.rb
 - lib/delayed_paperclip/attachment.rb
@@ -187,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Process your Paperclip attachments in the background.

data/gemfiles/paperclip3_5.gemfile

@@ -1,11 +0,0 @@
-# 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=>"../"

data/gemfiles/paperclip3_5.gemfile.lock

@@ -1,160 +0,0 @@
-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