paperdragon 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae7a952a0d1b965849bfd22d565fe9e8a839935
-  data.tar.gz: 9b4f84cd5d10ecc7cc66ad4e407c0f0e2396956f
+  metadata.gz: 00a917cff82896af01efe02f6217157cea6eb144
+  data.tar.gz: cd5588ff1dcb1dc713086d57b37b2ce5a12ffe8b
 SHA512:
-  metadata.gz: 0e2550a838b86707593ba45bc64d71748bc1828099439e39cc81fd0b298f29d04460fe854619554bdd47c39a5167dbd8ec39a9835acc42a2e244bc99f803bade
-  data.tar.gz: c1278828b15d425f0237667ec2643cdc358796f19a5e571c584b3b07dc1f87970ca51fb972b5f3f3b99240d24ac44fd29540f5929f9abbbd1249b48784b42030
+  metadata.gz: e2944453772c81e767aa30ead6e175ca76beb8febf43c985d6446a1ab5ae4672d1647a0e1dde5c6c020fd7857b2dccbb0a1d2ceae9bef02177726937d7a30596
+  data.tar.gz: a5b2009a183835567b9d5e9217416287d9659ad86f02912a5592b0b073bd53c651ef09a993236fa5d6f85d9294d93152eaa7faa85046957bdfc749921d2d774f

data/README.md

@@ -77,7 +77,7 @@ For a better understanding and to see how simple it is, go and check out the `im
 
 ```ruby
  user.image_meta_data #=> {original: {uid: "original-logo.jpg", width: 240, height: 800},
-                      #    thumb:    {uid: "thumb-logo.jpg", width: 48, height: 48},
+                      #    thumb:    {uid: "thumb-logo.jpg", width: 140, height: 140},
                       #   ..and so on..
                       #   }
  ```
@@ -91,7 +91,7 @@ After processing, you may want to render those image versions in your app.
 user.image[:thumb].url
 ```
 
-This is all you need to retrieve the URL/path for a stored image. Use this for your image tags
+This is all you need to retrieve the URL/path for a stored image. Use this for your image tags.
 
 ```haml
 = img_tag user.image[:thumb].url
@@ -174,6 +174,29 @@ end
 This will also remove the associated metadata from the model.
 
 
+## Replacing Images
+
+It's ok to run `#process!` again on a model with an existing attachment.
+
+```ruby
+user.image_meta_data  #=> {original: {uid: "original-logo-1234567890.jpg", ..},
+```
+
+Processing here will overwrite the existing attachment.
+
+```ruby
+user.image(new_file) do |v|
+  v.process!(:original) # overwrites the existing, deletes old.
+end
+```
+
+```ruby
+user.image_meta_data  #=> {original: {uid: "original-new-file01.jpg", ..},
+```
+
+While replacing the old with the new upload, the old file also gets deleted.
+
+
 ## Fingerprints
 
 Paperdragon comes with a very simple built-in file naming.
@@ -223,7 +246,7 @@ class Attachment < Paperdragon::Attachment
   # def build_uid and the other code from above..
 
   def rebuild_uid(file, fingerprint)
-    file.uid.sub("logo.png", "logo-#{fingerprint".png)
+    file.uid.sub("logo.png", "logo-#{fingerprint}.png")
   end
 end
 ```
@@ -311,4 +334,4 @@ class User < ActiveRecord::Base
   include Paperdragon::Paperclip::Model
 ```
 
-This will allow both APIs for a smooth transition.
+This will allow both APIs for a smooth transition.

data/lib/paperdragon/CHANGES.md

@@ -0,0 +1,3 @@
+# 0.0.7
+
+* `Task#process!` (and the delegated `File#process!`) now delete the original version of an attachment if `process!` is used to replace the latter.

data/lib/paperdragon/attachment.rb

@@ -36,6 +36,11 @@ module Paperdragon
         task.metadata_hash
       end
 
+      # Computes UID when File doesn't have one, yet. Called in #initialize.
+      def uid_from(*args)
+        build_uid(*args)
+      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.
@@ -57,11 +62,6 @@ module Paperdragon
     private
       attr_reader :options
 
-      # Computes UID when File doesn't have one, yet. Called in #initialize.
-      def uid_from(*args)
-        build_uid(*args)
-      end
-
       def build_uid(style, file)
         # can we use Dragonfly's API here?
         "#{style}-#{Dragonfly::TempObject.new(file).original_filename}"

data/lib/paperdragon/file/operations.rb

@@ -2,14 +2,28 @@ module Paperdragon
   class File
     # DISCUSS: allow the metadata passing here or not?
     module Process
-      def process!(file, metadata={})
+      def process!(file, new_uid=nil, metadata={})
         job = Dragonfly.app.new_job(file)
 
         yield job if block_given?
 
+        old_uid = uid
+        uid!(new_uid) if new_uid # set new uid if this is a replace.
+
+        upload!(job, old_uid, new_uid, metadata)
+      end
+
+    private
+      # Upload file, delete old file if there is one.
+      def upload!(job, old_uid, new_uid, metadata)
         puts "........................STORE  (process): #{uid}"
         job.store(path: uid, :headers => {'x-amz-acl' => 'public-read', "Content-Type" => "image/jpeg"})
 
+        if new_uid # new uid means delete old one.
+          puts "........................DELETE (reprocess): #{old_uid}"
+          Dragonfly.app.destroy(old_uid)
+        end
+
         @data = nil
         metadata_for(job, metadata)
       end
@@ -25,22 +39,15 @@ module Paperdragon
 
 
     module Reprocess
-      def reprocess!(fingerprint, original, metadata={})
+      def reprocess!(new_uid, original, metadata={})
         job = Dragonfly.app.new_job(original.data) # inheritance here somehow?
 
         yield job if block_given?
 
         old_uid = uid
-        uid!(fingerprint) # new UID is computed and set.
+        uid!(new_uid) # new UID is already computed and set.
 
-        puts "........................STORE  (reprocess): #{uid}"
-        job.store(path: uid, headers: {'x-amz-acl' => 'public-read', "Content-Type" => "image/jpeg"}) # store with thumb url.
-
-        puts "........................DELETE (reprocess): #{old_uid}"
-        Dragonfly.app.destroy(old_uid)
-
-        @data = nil
-        metadata_for(job, metadata)
+        upload!(job, old_uid, new_uid, metadata)
       end
     end
 

data/lib/paperdragon/task.rb

@@ -19,7 +19,10 @@ module Paperdragon
     #   metadata = version.process!(upload, &block)
     #   merge! {style => metadata}
     def process!(style, &block)
-      @metadata.merge!(style => file(style, upload).process!(upload, &block))
+      version = file(style, upload)
+      new_uid = new_uid_for(style, version) # new uid when overwriting existing attachment.
+
+      @metadata.merge!(style => version.process!(upload, new_uid, &block))
     end
 
     # fingerprint optional => filename is gonna remain the same
@@ -47,5 +50,11 @@ module Paperdragon
     def upload
       @upload or raise MissingUploadError.new("You called #process! but didn't pass an uploaded file to Attachment#task.")
     end
+
+    # Returns new UID for new file when overriding an existing attachment with #process!.
+    def new_uid_for(style, version)
+      # check if UID is present in existing metadata.
+      @attachment.metadata[style][:uid] ? @attachment.uid_from(style, upload) : nil # DISCUSS: move to Attachment?
+    end
   end
 end

data/lib/paperdragon/version.rb

@@ -1,3 +1,3 @@
 module Paperdragon
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/file_test.rb

@@ -56,7 +56,7 @@ class PaperdragonFileTest < MiniTest::Spec
 
     # additional metadata
     it do
-      file.process!(logo, :cropping => "16x16") do |job|
+      file.process!(logo, nil, :cropping => "16x16") do |job|
         job.thumb!("16x16")
       end.must_equal({:width=>16, :height=>5, :uid=>uid, :cropping=>"16x16"})
     end

data/test/task_test.rb

@@ -37,7 +37,24 @@ class TaskSpec < MiniTest::Spec
       subject.process!(:original)
       subject.process!(:thumb) { |j| j.thumb!("16x16") }
 
-      subject.metadata_hash.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :thumb=>{:width=>16, :height=>5, :uid=>"thumb-apotomo.png"}})
+      original_metadata = subject.metadata_hash
+      original_metadata.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :thumb=>{:width=>16, :height=>5, :uid=>"thumb-apotomo.png"}})
+      # processed files must exist.
+      exists?(original_metadata[:original][:uid]).must_equal true
+      exists?(original_metadata[:thumb][:uid]).must_equal true
+
+      # calling #process! again, with existing metadata, means OVERWRITING the existing image.
+      task = Attachment.new(subject.metadata_hash).task(Pathname("test/fixtures/trb.png"))
+      task.process!(:thumb) { |j| j.thumb!("48x48") }
+
+      overwritten_metadata = task.metadata_hash
+      overwritten_metadata.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :thumb=>{:width=>48, :height=>48, :uid=>"thumb-trb.png"}})
+      # original must still exist.
+      exists?(overwritten_metadata[:original][:uid]).must_equal true
+      # old thumb must be deleted.
+      exists?(original_metadata[:thumb][:uid]).must_equal false
+      # new thumb must be existing
+      exists?(overwritten_metadata[:thumb][:uid]).must_equal true
     end
 
     it do
@@ -45,6 +62,14 @@ class TaskSpec < MiniTest::Spec
         Attachment.new(nil).task.process!(:original)
       end
     end
+
+    it do
+      # after uploading "new", only delete when uid was in metadata.
+      existing_metadata = {processing: true}
+      metadata = Attachment.new(existing_metadata).task(logo).process!(:thumb)
+      metadata.must_equal({:processing=>true, :thumb=>{:width=>216, :height=>63, :uid=>"thumb-apotomo.png"}})
+      exists?("thumb-apotomo.png").must_equal true
+    end
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperdragon
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -93,6 +93,7 @@ files:
 - README.md
 - Rakefile
 - lib/paperdragon.rb
+- lib/paperdragon/CHANGES.md
 - lib/paperdragon/attachment.rb
 - lib/paperdragon/file.rb
 - lib/paperdragon/file/operations.rb
@@ -106,6 +107,7 @@ files:
 - test/attachment_test.rb
 - test/file_test.rb
 - test/fixtures/apotomo.png
+- test/fixtures/trb.png
 - test/metadata_test.rb
 - test/model_test.rb
 - test/paperclip_uid_test.rb
@@ -131,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Explicit image processing based on Dragonfly with Paperclip compatibility.
@@ -139,9 +141,9 @@ test_files:
 - test/attachment_test.rb
 - test/file_test.rb
 - test/fixtures/apotomo.png
+- test/fixtures/trb.png
 - test/metadata_test.rb
 - test/model_test.rb
 - test/paperclip_uid_test.rb
 - test/task_test.rb
 - test/test_helper.rb
-has_rdoc: