paperdragon 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af7c068f42c32dc239fc8cf84be2c3bfda25d11
-  data.tar.gz: b1825d0e36536161bca66c9dd35f0ab035ed6260
+  metadata.gz: 36e7122d614e09b22cecbf83c3698e9d6e9343cb
+  data.tar.gz: cede5637f600b6c1121c4c7239af3a7367ed5c35
 SHA512:
-  metadata.gz: 8ac3fa592390c0dafe14c82697985f4b086ae9fc03c2ca1df219d24ec7ce7b4845a03278fb5f77999bc767d54b86b9767540505140a14aa6e116469e465785ce
-  data.tar.gz: e1bac84bb7d1e9e7f8404425980b723733fa3baf2ef09b0af681b6bce4de007a2d324e7713792ab680c6175ef9b347978481a660d9e12a3edf69af0e5103ea33
+  metadata.gz: 5a60d0ed2a91ae998f46fa602d389fb881c384fd43735a5727c26a07539f3db76fc93cca01c3872c335b7a917054e5ef868e1f44a1596acafa0ef709918cd4b9
+  data.tar.gz: fd032e73607fb56b7e11c90b968c84f502858a465c6f6e1ea018b4901757fef14c557e4144d64a896bfa1b517c7722c86e1d9ecc7329c5f4c8e497ce2d0dcd18

data/lib/paperdragon/task.rb

@@ -25,11 +25,11 @@ module Paperdragon
     # fingerprint optional => filename is gonna remain the same
     # original nil => use [:original]
     def reprocess!(style, fingerprint=nil, original=nil, &block)
-      original ||= file(:original)
-      version    = file(style)
-      new_uid    = @attachment.rebuild_uid(version, fingerprint)
+      @original ||= file(:original) # this is cached per task instance.
+      version     = file(style)
+      new_uid     = @attachment.rebuild_uid(version, fingerprint)
 
-      @metadata.merge!(style => version.reprocess!(new_uid, original, &block))
+      @metadata.merge!(style => version.reprocess!(new_uid, @original, &block))
     end
 
     def rename!(style, fingerprint, &block)

data/lib/paperdragon/version.rb

@@ -1,3 +1,3 @@
 module Paperdragon
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/task_test.rb

@@ -48,7 +48,7 @@ class TaskSpec < MiniTest::Spec
     end
 
     subject { Attachment.new({
-      :original=>{:uid=>"original/pic.jpg"}, :thumb=>{:uid=>"original/thumb.jpg"}}).task
+      :original=>{:uid=>"original/pic.jpg"}, :thumb=>{:uid=>"original/thumb.jpg"}, :bigger=>{:uid=>"original/bigger.jpg"}}).task
     }
 
     it do
@@ -56,7 +56,7 @@ class TaskSpec < MiniTest::Spec
       subject.reprocess!(:thumb,    "1",    original) { |j| j.thumb!("16x16") }
 
       # FIXME: fingerprint should be added before .png suffix.
-      subject.metadata_hash.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original/pic-1.jpg"}, :thumb=>{:width=>16, :height=>5, :uid=>"original/thumb-1.jpg"}})
+      subject.metadata_hash.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original/pic-1.jpg"}, :thumb=>{:width=>16, :height=>5, :uid=>"original/thumb-1.jpg"}, :bigger=>{:uid=>"original/bigger.jpg"}})
 
       # exists?(original.uri).must_equal false # deleted
       # exists?(new_uid).must_equal true
@@ -65,13 +65,25 @@ class TaskSpec < MiniTest::Spec
     # don't pass in fingerprint+original.
     it do
       subject.reprocess!(:thumb) { |j| j.thumb!("24x24") }
-      subject.metadata_hash.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-.jpg"}})
+      subject.reprocess!(:bigger) { |j| j.thumb!("48x48") }
+
+      subject.metadata_hash.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-.jpg"}, :bigger=>{:uid=>"original/bigger-.jpg", :width=>48, :height=>14}})
+    end
+
+    # don't pass in original, this must NOT reload the original file more than once!
+    it do
+      subject.reprocess!(:thumb, 1) { |j| j.thumb!("24x24") }
+      File.unlink("public/paperdragon/#{original.uid}") # removing means the original MUST be cached for next step.
+      subject.reprocess!(:bigger, 1) { |j| j.thumb!("48x48") }
+
+      subject.metadata_hash.must_equal(
+        {:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-1.jpg"}, :bigger=>{:uid=>"original/bigger-1.jpg", :width=>48, :height=>14}})
     end
 
     # only process one, should return entire metadata hash
     it do
       subject.reprocess!(:thumb, "new") { |j| j.thumb!("24x24") }
-      subject.metadata_hash.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-new.jpg"}})
+      subject.metadata_hash.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-new.jpg"}, :bigger=>{:uid=>"original/bigger.jpg"}})
 
       # original must be unchanged
       exists?(Attachment.new(subject.metadata_hash)[:original].uid).must_equal true
@@ -81,16 +93,16 @@ class TaskSpec < MiniTest::Spec
     it do
       subject.reprocess!(:thumb, "1234567890") { |j| j.thumb!("24x24") }
       metadata = subject.metadata_hash
-      metadata.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-1234567890.jpg"}})
+      metadata.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-1234567890.jpg"}, :bigger=>{:uid=>"original/bigger.jpg"}})
 
       # this might happen in the next request.
       subject = Attachment.new(metadata).task
       subject.reprocess!(:thumb, "0987654321") { |j| j.thumb!("24x24") }
-      subject.metadata_hash.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-0987654321.jpg"}})
+      subject.metadata_hash.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-0987654321.jpg"}, :bigger=>{:uid=>"original/bigger.jpg"}})
     end
 
     # #rebuild_uid eats integers.
-    it { subject.reprocess!(:thumb, 1234081599) { |j| j.thumb!("24x24") }.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-1234081599.jpg"}}) }
+    it { subject.reprocess!(:thumb, 1234081599) { |j| j.thumb!("24x24") }.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-1234081599.jpg"}, :bigger=>{:uid=>"original/bigger.jpg"}}) }
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperdragon
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly