paperdragon 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f827f261f58ce5b096178c2b90010e90a99b8e27
-  data.tar.gz: f6731a32d9779faab6b1f83da6df1006acab51a4
+  metadata.gz: 9af7c068f42c32dc239fc8cf84be2c3bfda25d11
+  data.tar.gz: b1825d0e36536161bca66c9dd35f0ab035ed6260
 SHA512:
-  metadata.gz: 4481129325b2fa60b3034ae07e1cb4a9e636996f68fc4697c03356863e1e25136f272ae925c12e37ac09b7bff94ebd509d548fa07783df38c957a54e587234ee
-  data.tar.gz: a39824b4503ef45240a09a80845457194504b954cfe66ee4a865207589f5000be7d57dccbceddded4b328b6c2fb0cfaa387e62974999d2c3e8b7f465155a3866
+  metadata.gz: 8ac3fa592390c0dafe14c82697985f4b086ae9fc03c2ca1df219d24ec7ce7b4845a03278fb5f77999bc767d54b86b9767540505140a14aa6e116469e465785ce
+  data.tar.gz: e1bac84bb7d1e9e7f8404425980b723733fa3baf2ef09b0af681b6bce4de007a2d324e7713792ab680c6175ef9b347978481a660d9e12a3edf69af0e5103ea33

data/lib/paperdragon/attachment.rb

@@ -36,10 +36,17 @@ module Paperdragon
         task.metadata_hash
       end
 
+      # Per default, paperdragon tries to increment the fingerprint in the file name, identified by
+      # the pattern <tt>/-\d{10}/</tt> just before the filename extension (.png).
       def rebuild_uid(file, fingerprint=nil) # the signature of this method is to be considered semi-private.
         ext  = ::File.extname(file.uid)
         name = ::File.basename(file.uid, ext)
-        file.uid.sub(name, "#{name}#{fingerprint}")
+
+        if fingerprint and matches = name.match(/-(\d{10})$/)
+          return file.uid.sub(matches[1], fingerprint.to_s)
+        end
+
+        file.uid.sub(name, "#{name}-#{fingerprint}")
       end
 
       def exists? # should be #uploaded? or #stored?

data/lib/paperdragon/paperclip/model.rb

@@ -31,8 +31,8 @@ module Paperdragon
           @attachment[style].url # Avatar::Photo.new(avatar, :thumb).url
         end
 
-        def method_missing(name, *args)
-          @attachment.send(name, *args)
+        def method_missing(name, *args, &block)
+          @attachment.send(name, *args, &block)
         end
       end
     end

data/lib/paperdragon/version.rb

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

data/test/task_test.rb

@@ -51,14 +51,13 @@ class TaskSpec < MiniTest::Spec
       :original=>{:uid=>"original/pic.jpg"}, :thumb=>{:uid=>"original/thumb.jpg"}}).task
     }
 
-    # FIXME: fingerprint should be added before .png suffix, idiot!
     it do
-      subject.reprocess!(:original, "-1", original)
-      subject.reprocess!(:thumb,    "-1",    original) { |j| j.thumb!("16x16") }
+      subject.reprocess!(:original, "1", original)
+      subject.reprocess!(:thumb,    "1",    original) { |j| j.thumb!("16x16") }
 
-      # it
+      # 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"}})
-      # it
+
       # exists?(original.uri).must_equal false # deleted
       # exists?(new_uid).must_equal true
     end
@@ -66,17 +65,32 @@ 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.metadata_hash.must_equal({:original=>{:uid=>"original/pic.jpg"}, :thumb=>{:width=>24, :height=>7, :uid=>"original/thumb-.jpg"}})
     end
 
     # only process one, should return entire metadata hash
     it do
-      subject.reprocess!(:thumb, "-new") { |j| j.thumb!("24x24") }
+      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"}})
 
       # original must be unchanged
       exists?(Attachment.new(subject.metadata_hash)[:original].uid).must_equal true
     end
+
+    # #rebuild_uid tries to replace existing fingerprint (default behaviour).
+    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"}})
+
+      # 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"}})
+    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"}}) }
   end
 
 
@@ -97,7 +111,7 @@ class TaskSpec < MiniTest::Spec
     it do
       attachment = Paperdragon::Attachment.new(metadata) # {:original=>{:width=>216, :height=>63, :uid=>"uid/original", :size=>9632}}
       task = attachment.task
-      task.rename!(:original, "-new") { |uid, new_uid|
+      task.rename!(:original, "new") { |uid, new_uid|
         File.rename("public/paperdragon/"+uid, "public/paperdragon/"+new_uid)
       }.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo-new.png"}})
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperdragon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nick Sutterer