dragonfly 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02f20eccc1d86bf996f08161608ad73638233923
-  data.tar.gz: 6e7a890b717ae596ebe78563b7f560c40fcd61a0
+  metadata.gz: 13de1169904aec53779af0935d6a07ecd59fe6a5
+  data.tar.gz: c5f99e7f5de7a1a7b93cbd93246e9737651f2c45
 SHA512:
-  metadata.gz: a0ac983a943033572f7bdcf6d4e00676d1af95c77202ca433e4cccb7d912ba97b751ec608ea624f088150a5d6ba9ea7de2dcedaa63c6f4ba6bf6170fe886b0dc
-  data.tar.gz: 7ad341424eaf01b4656694dbad4313b2f245e93b328462b703668d7a56987b235c8e02ad4718ab28afb7bc7e4acda1c37ca284a99897862d70d81abadea30bf7
+  metadata.gz: 4852dbed8e8ef2cf0fbfab4c6eb93f9036315ce8e83d581cd00c12fefefdf7fc4b7b0e87107391e8c2b8ddad26503b64ecd63d1267a0eacc3d50033abde29859
+  data.tar.gz: e4f00871e4aca9c56e424dec1ef41d77183b0d305eaae765ba199cd39ec04516b084ce421171c1aa91f546c59dbd1c5549d02456d6246925afc39fea537c8d12

data/History.md

@@ -1,3 +1,13 @@
+1.0.10 (2015-05-14)
+===================
+Features
+--------
+- Allow method signified by symbol in storage_options to take an attachment object
+- Allow passing in "input_args" to convert processor
+Fixes
+-----
+- correct Rack version
+
 1.0.9 (2015-04-29)
 ===================
 Fixes

data/README.md

@@ -44,7 +44,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.0.9'
+gem 'dragonfly', '~> 1.0.10'
 ```
 
 Require with
@@ -57,6 +57,12 @@ See [the Articles wiki](http://github.com/markevans/dragonfly/wiki/Articles) for
 
 Please feel free to contribute!!
 
+Examples
+========
+See [the Wiki](http://github.com/markevans/dragonfly/wiki) and see the pages list for examples.
+
+Please feel free to contribute!!
+
 Plugins / add-ons
 =================
 See [the Add-ons wiki](http://github.com/markevans/dragonfly/wiki/Dragonfly-add-ons).

data/dragonfly.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
     "README.md"
   ]
 
-  spec.add_runtime_dependency("rack", [">= 0"])
+  spec.add_runtime_dependency("rack", [">= 1.3.0"])
   spec.add_runtime_dependency("multi_json", ["~> 1.0"])
   spec.add_runtime_dependency("addressable", ["~> 2.3"])
 

data/lib/dragonfly/image_magick/processors/convert.rb

@@ -7,9 +7,11 @@ module Dragonfly
           convert_command = content.env[:convert_command] || 'convert'
           format = opts['format']
 
+          input_args = opts['input_args'] if opts['input_args']
           frame_string = "[#{opts['frame']}]" if opts['frame']
+
           content.shell_update :ext => format do |old_path, new_path|
-            "#{convert_command} #{old_path}#{frame_string} #{args} #{new_path}"
+            "#{convert_command} #{input_args} #{old_path}#{frame_string} #{args} #{new_path}"
           end
 
           if format

data/lib/dragonfly/model/attachment_class_methods.rb

@@ -126,7 +126,9 @@ module Dragonfly
           storage_options_specs.inject({}) do |opts, spec|
             options = case spec
             when Proc then model.instance_exec(attachment, &spec)
-            when Symbol then model.send(spec)
+            when Symbol
+              meth = model.method(spec)
+              (1 === meth.arity) ? meth.call(attachment) : meth.call
             else spec
             end
             opts.merge!(options)

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

data/spec/dragonfly/image_magick/processors/convert_spec.rb

@@ -8,6 +8,7 @@ describe Dragonfly::ImageMagick::Processors::Convert do
 
   let(:app){ test_app }
   let(:image){ sample_content('beach.png') } # 280x355
+  let(:pdf){ sample_content('memo.pdf') }
   let(:processor){ Dragonfly::ImageMagick::Processors::Convert.new }
 
   it "should allow for general convert commands" do
@@ -53,4 +54,12 @@ describe Dragonfly::ImageMagick::Processors::Convert do
     one_frame_size.should < all_frames_size
   end
 
+  it "accepts input arguments for convert commands" do
+    pdf2 = pdf.clone
+    processor.call(pdf, '-scale 85x110', 'format' => 'png')
+    processor.call(pdf2, '-scale 85x110', 'format' => 'png', 'input_args' => '-density 150')
+
+    pdf.should_not equal_image(pdf2)
+  end
+
 end

data/spec/dragonfly/model/model_spec.rb

@@ -881,6 +881,14 @@ describe "models" do
       item.save!
     end
 
+    it 'should pass the attachment object if the method allows' do
+      set_storage_options :special_ops
+      item = @item_class.new :title => 'lump', :preview_image => 'hello'
+      def item.special_ops(a); {:egg => (a.data + title)}; end
+      @app.datastore.should_receive(:write).with(anything, hash_including(:egg => 'hellolump'))
+      item.save!
+    end
+
     it "should allow setting more than once" do
       @item_class.class_eval do
         dragonfly_accessor :preview_image do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +179,7 @@ files:
 - samples/beach.png
 - samples/egg.png
 - samples/gif.gif
+- samples/memo.pdf
 - samples/round.gif
 - samples/sample.docx
 - samples/taj.jpg
@@ -267,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.