paperdragon 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c124aecf9f335b22baf9214604df964e1a965dd
-  data.tar.gz: 6328ab40a1eead17adc5b399678383cc88761a48
+  metadata.gz: 7ae7a952a0d1b965849bfd22d565fe9e8a839935
+  data.tar.gz: 9b4f84cd5d10ecc7cc66ad4e407c0f0e2396956f
 SHA512:
-  metadata.gz: 0fc0da95f318aeab85656c5d76cc06e008e0fb2cddfac3da524501f1633f5cd04ef9fedc14ce11badc2e1a91ea3259482d9f1b95d5609523eca446163e0880ac
-  data.tar.gz: e6b9f994f29266b394c5d8c5999b40425a2808002419dea331bf628985d746a4f2bf7e331c495204441de4bbcf84c0fae753be2e021f7b74b8a77dabbc9221cc
+  metadata.gz: 0e2550a838b86707593ba45bc64d71748bc1828099439e39cc81fd0b298f29d04460fe854619554bdd47c39a5167dbd8ec39a9835acc42a2e244bc99f803bade
+  data.tar.gz: c1278828b15d425f0237667ec2643cdc358796f19a5e571c584b3b07dc1f87970ca51fb972b5f3f3b99240d24ac44fd29540f5929f9abbbd1249b48784b42030

data/README.md

@@ -4,7 +4,7 @@ _Explicit image processing._
 
 ## Summary
 
-Paperdragon gives you image processing as known from [Paperclip](https://github.com/thoughtbot/paperclip, [CarrierWave](https://github.com/carrierwaveuploader/carrierwave) or [Dragonfly](https://github.com/markevans/dragonfly). It allows uploading, cropping, resizing, watermarking, maintaining different versions of an image, and so on.
+Paperdragon gives you image processing as known from [Paperclip](https://github.com/thoughtbot/paperclip), [CarrierWave](https://github.com/carrierwaveuploader/carrierwave) or [Dragonfly](https://github.com/markevans/dragonfly). It allows uploading, cropping, resizing, watermarking, maintaining different versions of an image, and so on.
 
 It provides a very explicit DSL: **No magic is happening behind the scenes, paperdragon makes _you_ implement the processing steps.**
 

data/lib/paperdragon/attachment.rb

@@ -15,7 +15,7 @@ module Paperdragon
 
     module InstanceMethods
       def initialize(metadata, options={})
-        @metadata = Metadata.new(metadata)
+        @metadata = Metadata[metadata]
         @options  = options # to be used in #(re)build_uid for your convenience. # DISCUSS: we pass in the model here - is that what we want?
       end
       attr_reader :metadata # TODO: test me.

data/lib/paperdragon/metadata.rb

@@ -3,29 +3,22 @@ module Paperdragon
   # Metadata.new(nil)[:original][:width] => ""
   # Holds metadata for an attachment. This is a hash keyed by versions, e.g. +:original+,
   # +:thumb+, and so on.
-  class Metadata
-    def initialize(hash)
-      @hash = hash || {}
+  class Metadata < Hash
+    def self.[](hash) # allow Metadata[nil]
+      super hash || {}
     end
 
     def [](name)
-      @hash[name] || {}
+      super || {}
     end
 
     def populated?
-      @hash.size > 0
-    end
-
-    def merge!(hash)
-      @hash.merge!(hash)
-    end
-
-    def dup
-      self.class.new(@hash.dup)
+      size > 0
     end
 
+    # Consider this semi-public. This is used the make the metadata hash serialisable (as a plain hash).
     def to_hash
-      @hash
+      Hash[self]
     end
   end
 end

data/lib/paperdragon/model.rb

@@ -13,8 +13,8 @@ module Paperdragon
       # Creates Avatar#image that returns a Paperdragon::File instance.
       def attachment_accessor_for(name, attachment_class)
         mod = Module.new do # TODO: abstract that into Uber, we use it everywhere.
-          define_method name do |file=nil, &block|
-            attachment = attachment_class.new(self.image_meta_data, {:model => self})
+          define_method name do |file=nil, options={}, &block|
+            attachment = attachment_class.new(self.image_meta_data, options.merge({:model => self}))
 
             return attachment unless file or block
 

data/lib/paperdragon/version.rb

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

data/test/attachment_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class AttachmentSpec < MiniTest::Spec
   class Attachment < Paperdragon::Attachment
   private
-    def uid_from(style)
+    def uid_from(style, file)
       "/uid/#{style}"
     end
   end

data/test/metadata_test.rb

@@ -9,7 +9,7 @@ class MetadataTest < MiniTest::Spec
       }
     }
 
-    subject { Paperdragon::Metadata.new(valid) }
+    subject { Paperdragon::Metadata[valid] }
 
     it { subject.populated?.must_equal true }
     it { subject[:original][:width].must_equal 960 }
@@ -22,7 +22,7 @@ class MetadataTest < MiniTest::Spec
 
 
   describe "nil" do
-    subject { Paperdragon::Metadata.new(nil) }
+    subject { Paperdragon::Metadata[nil] }
 
     it { subject.populated?.must_equal false }
     it { subject[:page].must_equal({}) }
@@ -30,7 +30,7 @@ class MetadataTest < MiniTest::Spec
   end
 
   describe "empty hash" do
-    subject { Paperdragon::Metadata.new({}) }
+    subject { Paperdragon::Metadata[{}] }
 
     it { subject.populated?.must_equal false }
     it { subject[:page].must_equal({}) }
@@ -42,13 +42,11 @@ class MetadataTest < MiniTest::Spec
   # #dup
   # don't change original hash.
   it do
-    Paperdragon::Metadata.new(original).dup.merge!(:additional => {})
+    Paperdragon::Metadata[original].dup.merge!(:additional => {})
     original[:additional].must_equal nil
   end
 
-  # #merge!
-  it { Paperdragon::Metadata.new(original).merge!(:additional => {}).to_hash.must_equal({:original=>{}, :additional=>{}}) }
-
   # #to_hash
-  it { Paperdragon::Metadata.new(original).to_hash.must_equal({:original=>{}}) }
+  it { Paperdragon::Metadata[original].to_hash.must_equal({:original=>{}}) }
+  it { Paperdragon::Metadata[original].to_hash.class.must_equal(Hash) }
 end

data/test/model_test.rb

@@ -47,6 +47,41 @@ class PaperdragonModelTest < MiniTest::Spec
       v.reprocess!(:thumb, "1") { |j| j.thumb!("8x8") }
     end
 
+    model.image_meta_data.class.must_equal Hash
     model.image_meta_data.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :thumb=>{:width=>8, :height=>2, :uid=>"thumb-apotomo-1.png"}})
   end
+
+
+  # passing options from image(file, {..}) to the Attachment.
+  class ImageWithAttachment < OpenStruct
+    include Paperdragon::Model
+
+    class Attachment < Paperdragon::Attachment
+      def build_uid(style, file)
+        @options.inspect # we use options here!
+      end
+
+      def rebuild_uid(style, file)
+        @options.inspect
+      end
+    end
+
+    processable :image, Attachment
+  end
+
+  it do
+    model = ImageWithAttachment.new
+    model.image(logo, :path => "/") do |v|
+      v.process!(:original)
+    end
+
+    # this assures that both :model and :path (see above) are passed through.
+    model.image_meta_data.must_equal({:original=>{:width=>216, :height=>63, :uid=>"{:path=>\"/\", :model=>_<PaperdragonModelTest::ImageWithAttachment>}"}})
+
+    model.image(nil, :new => true) do |v|
+      v.reprocess!(:original, "1") { |j| j.thumb!("8x8") }
+    end
+
+    model.image_meta_data.must_equal({:original=>{:width=>8, :height=>2, :uid=>"{:new=>true, :model=>#<PaperdragonModelTest::ImageWithAttachment image_meta_data={:original=>{:width=>216, :height=>63, :uid=>\"{:path=>\\\"/\\\", :model=>_<PaperdragonModelTest::ImageWithAttachment>}\"}}>}"}})
+  end
 end

data/test/task_test.rb

@@ -18,6 +18,15 @@ class TaskSpec < MiniTest::Spec
         t.process!(:thumb) { |j| j.thumb!("16x16") }
       end.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :thumb=>{:width=>16, :height=>5, :uid=>"thumb-apotomo.png"}})
     end
+
+    # modify metadata in task
+    it do
+      Attachment.new({:processing => true, :approved => true}).task(logo) do |t|
+        t.process!(:original)
+        t.metadata.delete(:processing)
+      end.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :approved => true})
+    end
+
   end
 
   # task without block

data/test/test_helper.rb

@@ -9,4 +9,9 @@ MiniTest::Spec.class_eval do
   def generate_uid
     Dragonfly.app.datastore.send(:relative_path_for, "aptomo.png")
   end
+
+  def self.it(name=nil, *args)
+    name ||= Random.rand
+    super
+  end
 end

metadata

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