delayed_paperclip 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9d8e927d5a6ecdf619755a0593874e1d6aa9125
-  data.tar.gz: e3408926c0a1b18b5f850dd2396ffcb767edd893
+  metadata.gz: 41fd7daaa3126fd153f1448405465ab92d983833
+  data.tar.gz: 5953ed040cea15002ca58e269dd9b12eace3ed9c
 SHA512:
-  metadata.gz: 4e2c42c5a2babfc35dc485b990a587d6eb77081c6e26d23c163926c2152a981a3a1a08c11a5f463b351e115db20436cf43c2771d20d96fc9a1ef7633ce468dfc
-  data.tar.gz: e4168634498e359e1b6969feecf5c164be9858b521172a6f8ef79977cf17ef7add5d105586af5d3bddeca85734bbfae0d03f466737f29c6cfba859f280d53a6e
+  metadata.gz: 0558c10976a587d713e68e4b22f3bbfe0d5cbeaf84abad212d510b282bc0e33918dd3e3a98c60b5d05c56efd2e0a5a6255b35346214c0a9acb4d310a8e4bea3f
+  data.tar.gz: c0db6281bbf54e20ef7489ae2ae094809471ad2d8fccc5578d8a52f00b507d49f6d37dbf148adfc82887a6a15a602a30f8b8d9062480ed56891cac0450d0c40b

data/ChangeLog

@@ -1,4 +1 @@
-2.6.1
-* Wrote Unit tests
-* Rewrote Integration tests in rspec
-* Paperclip 3.5 compatibility
+-> https://github.com/jrgifford/delayed_paperclip/releases

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    delayed_paperclip (2.8.0)
+    delayed_paperclip (2.9.1)
       paperclip (>= 3.3)
 
 GEM

data/gemfiles/4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    delayed_paperclip (2.8.0)
+    delayed_paperclip (2.9.1)
       paperclip (>= 3.3)
 
 GEM

data/gemfiles/4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    delayed_paperclip (2.8.0)
+    delayed_paperclip (2.9.1)
       paperclip (>= 3.3)
 
 GEM

data/gemfiles/4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    delayed_paperclip (2.8.0)
+    delayed_paperclip (2.9.1)
       paperclip (>= 3.3)
 
 GEM

data/lib/delayed_paperclip/attachment.rb

@@ -12,7 +12,7 @@ module DelayedPaperclip
     module InstanceMethods
 
       def delayed_options
-        @options[:delayed]
+        options[:delayed]
       end
 
       # Attr accessor in Paperclip
@@ -35,9 +35,8 @@ module DelayedPaperclip
       end
 
       def split_processing?
-        options[:only_process] &&
-          options[:only_process] !=
-            options[:delayed][:only_process]
+        options[:only_process] && delayed_options &&
+          options[:only_process] != delayed_options[:only_process]
       end
 
       def processing?

data/lib/delayed_paperclip/url_generator.rb

@@ -11,11 +11,12 @@ module DelayedPaperclip
     def for_with_processed(style_name, options)
       most_appropriate_url = @attachment.processing_style?(style_name) ? most_appropriate_url(style_name) : most_appropriate_url_without_processed
 
-      escape_url_as_needed(
-        timestamp_as_needed(
+      timestamp_as_needed(
+        escape_url_as_needed(
           @attachment_options[:interpolator].interpolate(most_appropriate_url, @attachment, style_name),
           options
-      ), options)
+        ),
+      options)
     end
 
     # This method is a mess

data/lib/delayed_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DelayedPaperclip
-  VERSION = "2.9.0"
+  VERSION = "2.9.1"
 end

data/spec/delayed_paperclip/attachment_spec.rb

@@ -33,9 +33,18 @@ describe DelayedPaperclip::Attachment do
       dummy.image.stubs(:delay_processing?).returns true
       dummy.image.post_processing_with_delay.should be_false
     end
+
+    context "on a non-delayed image" do
+      let(:dummy_options) { { with_processed: false } }
+
+      it "is false if delay_processing? is true" do
+        dummy.image.stubs(:delay_processing?).returns true
+        dummy.image.post_processing_with_delay.should be_false
+      end
+    end
   end
 
-  describe "delay_processing?" do
+  describe "#delay_processing?" do
     it "returns delayed_options existence if post_processing_with_delay is nil" do
       dummy.image.post_processing_with_delay = nil
       dummy.image.delay_processing?.should be_true
@@ -47,7 +56,7 @@ describe DelayedPaperclip::Attachment do
     end
   end
 
-  describe "processing?" do
+  describe "#processing?" do
     it "delegates to the dummy instance" do
       dummy.expects(:image_processing?)
       dummy.image.processing?
@@ -62,7 +71,7 @@ describe DelayedPaperclip::Attachment do
     end
   end
 
-  describe "processing_stye?" do
+  describe "#processing_style?" do
     let(:style) { :background }
     let(:processing_style?) { dummy.image.processing_style?(style) }
 
@@ -107,7 +116,7 @@ describe DelayedPaperclip::Attachment do
     end
   end
 
-  describe "delayed_only_process" do
+  describe "#delayed_only_process" do
     context "without only_process options" do
       it "returns []" do
         expect(dummy.image.delayed_only_process).to eq []
@@ -135,7 +144,7 @@ describe DelayedPaperclip::Attachment do
     end
   end
 
-  describe "process_delayed!" do
+  describe "#process_delayed!" do
     it "sets job_is_processing to true" do
       dummy.image.expects(:job_is_processing=).with(true).once
       dummy.image.expects(:job_is_processing=).with(false).once

data/spec/delayed_paperclip/url_generator_spec.rb

@@ -57,6 +57,32 @@ describe DelayedPaperclip::UrlGenerator do
           expect(attachment.url(:online)).to eql "/system/dummies/images/000/000/001/online/12k.png"
         end
       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)
+          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[]")
+        end
+
+        it "does not interpolate timestamp" do
+          expected = "the(expected)result[]"
+          updated_at = 1231231234
+
+          expect(
+            "the%28expected%29result%5B%5D?#{updated_at}"
+          ).to be == generate(expected, updated_at)
+        end
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -24,6 +24,8 @@ 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=)
   ActiveRecord::Base.raise_in_transactional_callbacks = true
@@ -49,6 +51,10 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 end
 
+# In order to not duplicate code directly from Paperclip's spec support
+# 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}
 
 # Reset table and class with image_processing column or not

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Jesse Storimer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip