paperdragon 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2af4cc674da4c766be355baeb541aea52b73a2c0
-  data.tar.gz: 0fda345ec014359c597b6d090ab4efd23c952021
+  metadata.gz: b0e47f031023232bacb633493965d1fcf66bd574
+  data.tar.gz: 6b29ce47ff2532945759f39b5d8b4a6e49040425
 SHA512:
-  metadata.gz: f4e6cced395393045795cf8674f56b4e8dd8372bf8fa7b995d0cc720681818d295860a63e8c434a29f90ca6399ee5066bf6b60306e4233c1e211d8c61fcc047b
-  data.tar.gz: 3a3e9e574ad94bdf10ac8ddb06ce4088f2a4a773f57763fd5c70605afffbc1737bcc3eae2cf128201d50ae58b71d026bbb8b96252bca256c1921688f22aeb261
+  metadata.gz: d28dc094cd5af5931b7cdad1abd9e87102592bba73fe7f1ce41ce96dd86ab13adbf1d00fcd6d816b3a1e275e1316836fbfb86fe863b1e3566e6f823fed0d180d
+  data.tar.gz: 7f6357827527520ebe2557e752712ecd2baa477f68e11b4fb72eb2ae2bb42ebe8399bb58462d0d4c6494f721dff51edbd24db61a8c6afbcaf3fdfddc14a88773

data/lib/paperdragon/CHANGES.md

@@ -1,3 +1,16 @@
+# 0.0.11
+
+* You can now have any name for attachments in `Model`. This also allows having multiple uploads per model. E.g. the following now works.
+
+    ```ruby
+    processable :avatar, Attachment
+    processable :image, Attachment
+    ```
+
+    You will need `avatar_meta_data` and `image_meta_data` fields, now.
+
+Many thanks to @mrbongiolo for implementing this.
+
 # 0.0.10
 
 * Require Dragonfly 1.0.12 or above and change internal API accordingly. Thanks @acaron for fixing that!

data/lib/paperdragon/model.rb

@@ -15,12 +15,13 @@ module Paperdragon
       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, options={}, &block|
-            attachment = attachment_class.new(image_meta_data, options.merge(model: self))
+            attachment = attachment_class.new(public_send("#{name}_meta_data"),
+                                              options.merge(model: self))
 
             return attachment unless file or block
 
             # run the task block and save the returned new metadata in the model.
-            self.image_meta_data = attachment.task(*[file], &block)
+            self.public_send("#{name}_meta_data=", attachment.task(*[file], &block))
           end
         end
       end
@@ -36,10 +37,11 @@ module Paperdragon
       def processable_writer(name, attachment_class=Attachment)
         mod = Module.new do # TODO: abstract that into Uber, we use it everywhere.
           define_method "#{name}!" do |file=nil, options={}, &block|
-            attachment = attachment_class.new(image_meta_data, options.merge(model: self))
+            attachment = attachment_class.new(public_send("#{name}_meta_data"),
+                                              options.merge(model: self))
 
             # run the task block and save the returned new metadata in the model.
-            self.image_meta_data = attachment.task(*[file], &block)
+            self.public_send("#{name}_meta_data=", attachment.task(*[file], &block))
           end
         end
         include mod
@@ -55,7 +57,7 @@ module Paperdragon
     module Reader
       def processable_reader(name, attachment_class=Attachment)
         define_method name do
-          attachment_class.new(image_meta_data, model: self)
+          attachment_class.new(public_send("#{name}_meta_data"), model: self)
         end
       end
     end

data/lib/paperdragon/paperclip/model.rb

@@ -13,7 +13,7 @@ module Paperdragon
           # `image(:thumb).url`.
           mod = Module.new do # TODO: merge with attachment_accessor_for.
             define_method name do # e.g. Avatar#image
-              Proxy.new(self, attachment_class)  # provide paperclip DSL.
+              Proxy.new(name, self, attachment_class)  # provide paperclip DSL.
             end
           end
           include mod
@@ -23,8 +23,8 @@ module Paperdragon
 
       # Needed to expose Paperclip's DSL, like avatar.image.url(:thumb).
       class Proxy
-        def initialize(model, attachment_class)
-          @attachment = attachment_class.new(model.image_meta_data, {:model => model})
+        def initialize(name, model, attachment_class)
+          @attachment = attachment_class.new(model.public_send("#{name}_meta_data"), {:model => model})
         end
 
         def url(style)

data/lib/paperdragon/version.rb

@@ -1,3 +1,3 @@
 module Paperdragon
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/test/model_test.rb

@@ -11,32 +11,41 @@ class PaperdragonModelTest < MiniTest::Spec
 
     include Paperdragon::Model
     processable :image, Attachment
+    processable :picture, Attachment
 
 
     def image_meta_data
       {:thumb => {:uid => "Avatar-thumb"}}
     end
+
+    def picture_meta_data
+      {:thumb => {:uid => "Picture-thumb"}}
+    end
   end
 
   # model has image_meta_data hash.
   it { Avatar.new.image[:thumb].url.must_equal "/paperdragon/Avatar-thumb" }
+  it { Avatar.new.picture[:thumb].url.must_equal "/paperdragon/Picture-thumb" }
   # model doesn't have upload, yet. returns empty attachment.
   it { Image.new.image.metadata.must_equal({}) }
+  it { Image.new.picture.metadata.must_equal({}) }
 
 
   # minimum setup
   class Image < OpenStruct
     include Paperdragon::Model
     processable :image
+    processable :picture
   end
 
   it { Image.new(:image_meta_data => {:thumb => {:uid => "Avatar-thumb"}}).image[:thumb].url.must_equal "/paperdragon/Avatar-thumb" }
+  it { Image.new(:picture_meta_data => {:thumb => {:uid => "Picture-thumb"}}).picture[:thumb].url.must_equal "/paperdragon/Picture-thumb" }
 
 
   # process with #image{}
   let (:logo) { Pathname("test/fixtures/apotomo.png") }
 
-  it do
+  it "image" do
     model = Image.new
     model.image(logo) do |v|
       v.process!(:original)
@@ -60,6 +69,30 @@ class PaperdragonModelTest < MiniTest::Spec
     model.image_meta_data.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}})
   end
 
+  it "picture" do
+    model = Image.new
+    model.picture(logo) do |v|
+      v.process!(:original)
+      v.process!(:thumb) { |j| j.thumb!("16x16") }
+    end
+
+    model.picture_meta_data.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :thumb=>{:width=>16, :height=>5, :uid=>"thumb-apotomo.png"}})
+
+
+    model.picture do |v|
+      v.reprocess!(:thumb, "1") { |j| j.thumb!("8x8") }
+    end
+
+    model.picture_meta_data.class.must_equal Hash
+    model.picture_meta_data.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :thumb=>{:width=>8, :height=>2, :uid=>"thumb-apotomo-1.png"}})
+
+    model.picture do |v|
+      v.delete!(:thumb)
+    end
+
+    model.picture_meta_data.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}})
+  end
+
   # passing options from image(file, {..}) to the Attachment.
   class ImageWithAttachment < OpenStruct
     include Paperdragon::Model
@@ -75,9 +108,10 @@ class PaperdragonModelTest < MiniTest::Spec
     end
 
     processable :image, Attachment
+    processable :picture, Attachment
   end
 
-  it do
+  it "image" do
     model = ImageWithAttachment.new
     model.image(logo, :path => "/") do |v|
       v.process!(:original)
@@ -92,6 +126,22 @@ class PaperdragonModelTest < MiniTest::Spec
 
     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
+
+  it "picture" do
+    model = ImageWithAttachment.new
+    model.picture(logo, :path => "/") do |v|
+      v.process!(:original)
+    end
+
+    # this assures that both :model and :path (see above) are passed through.
+    model.picture_meta_data.must_equal({:original=>{:width=>216, :height=>63, :uid=>"{:path=>\"/\", :model=>_<PaperdragonModelTest::ImageWithAttachment>}"}})
+
+    model.picture(nil, :new => true) do |v|
+      v.reprocess!(:original, "1") { |j| j.thumb!("8x8") }
+    end
+
+    model.picture_meta_data.must_equal({:original=>{:width=>8, :height=>2, :uid=>"{:new=>true, :model=>#<PaperdragonModelTest::ImageWithAttachment picture_meta_data={:original=>{:width=>216, :height=>63, :uid=>\"{:path=>\\\"/\\\", :model=>_<PaperdragonModelTest::ImageWithAttachment>}\"}}>}"}})
+  end
 end
 
 
@@ -122,8 +172,33 @@ class ModelWriterTest < MiniTest::Spec
     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
 
-end
+  # Using another name
+  class Picture < OpenStruct
+    extend Paperdragon::Model::Writer
+    processable_writer :picture
+  end
 
+  # process with #image{}
+  let (:logo) { Pathname("test/fixtures/apotomo.png") }
+
+  it do
+    model = Picture.new
+    model.picture!(logo) do |v|
+      v.process!(:original)
+      v.process!(:thumb) { |j| j.thumb!("16x16") }
+    end
+
+    model.picture_meta_data.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :thumb=>{:width=>16, :height=>5, :uid=>"thumb-apotomo.png"}})
+
+
+    model.picture! do |v|
+      v.reprocess!(:thumb, "1") { |j| j.thumb!("8x8") }
+    end
+
+    model.picture_meta_data.class.must_equal Hash
+    model.picture_meta_data.must_equal({:original=>{:width=>216, :height=>63, :uid=>"original-apotomo.png"}, :thumb=>{:width=>8, :height=>2, :uid=>"thumb-apotomo-1.png"}})
+  end
+end
 
 class ModelReaderTest < MiniTest::Spec
   class Image < OpenStruct
@@ -132,4 +207,12 @@ class ModelReaderTest < MiniTest::Spec
   end
 
   it { Image.new(:image_meta_data => {:thumb => {:uid => "Avatar-thumb"}}).image[:thumb].url.must_equal "/paperdragon/Avatar-thumb" }
+
+  # Using another name
+  class Image < OpenStruct
+    extend Paperdragon::Model::Reader
+    processable_reader :picture
+  end
+
+  it { Image.new(:picture_meta_data => {:thumb => {:uid => "Avatar-thumb"}}).picture[:thumb].url.must_equal "/paperdragon/Avatar-thumb" }
 end

data/test/paperclip_uid_test.rb

@@ -37,21 +37,47 @@ class PaperclipModelTest < MiniTest::Spec
       end
     end
 
+    class PictureAttachment < Paperdragon::Attachment
+      self.file_class = Photo
+
+      def exists?
+        "Of course it's a Picture!"
+      end
+    end
+
     include Paperdragon::Paperclip::Model
     processable :image, Attachment
+    processable :picture, PictureAttachment
 
 
     def image_meta_data
       {:thumb => {:uid => "Avatar-thumb"}}
     end
+
+    def picture_meta_data
+      {:thumb => {:uid => "Picture-thumb"}}
+    end
+  end
+
+  describe "image" do
+    # old paperclip style
+    it { Avatar.new.image.url(:thumb).must_equal "/paperdragon/Avatar-thumb" }
+
+    # paperdragon style
+    it { Avatar.new.image[:thumb].url.must_equal "/paperdragon/Avatar-thumb" }
+
+    # delegates all unknown methods back to Attachment.
+    it { Avatar.new.image.exists?.must_equal "Of course!" }
   end
 
-  # old paperclip style
-  it { Avatar.new.image.url(:thumb).must_equal "/paperdragon/Avatar-thumb" }
+  describe "picture" do
+    # old paperclip style
+    it { Avatar.new.picture.url(:thumb).must_equal "/paperdragon/Picture-thumb" }
 
-  # paperdragon style
-  it { Avatar.new.image[:thumb].url.must_equal "/paperdragon/Avatar-thumb" }
+    # paperdragon style
+    it { Avatar.new.picture[:thumb].url.must_equal "/paperdragon/Picture-thumb" }
 
-  # delegates all unknown methods back to Attachment.
-  it { Avatar.new.image.exists?.must_equal "Of course!" }
+    # delegates all unknown methods back to Attachment.
+    it { Avatar.new.picture.exists?.must_equal "Of course it's a Picture!" }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperdragon
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly