dragonfly 1.1.4 → 1.4.0

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

@@ -1,19 +0,0 @@
-module Dragonfly
-  module ImageMagick
-    module Generators
-      class Convert
-
-        def call(content, args, format)
-          format = format.to_s
-          convert_command = content.env[:convert_command] || 'convert'
-          content.shell_generate :ext => format do |path|
-            "#{convert_command} #{args} #{path}"
-          end
-          content.add_meta('format' => format)
-        end
-
-      end
-    end
-  end
-end
-

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

@@ -1,33 +0,0 @@
-module Dragonfly
-  module ImageMagick
-    module Processors
-      class Convert
-
-        def call(content, args='', opts={})
-          convert_command = content.env[:convert_command] || 'convert'
-          format = opts['format']
-
-          input_args = opts['input_args'] if opts['input_args']
-          delegate_string = "#{opts['delegate']}:" if opts['delegate']
-          frame_string = "[#{opts['frame']}]" if opts['frame']
-
-          content.shell_update :ext => format do |old_path, new_path|
-            "#{convert_command} #{input_args} #{delegate_string}#{old_path}#{frame_string} #{args} #{new_path}"
-          end
-
-          if format
-            content.meta['format'] = format.to_s
-            content.ext = format
-            content.meta['mime_type'] = nil # don't need it as we have ext now
-          end
-        end
-
-        def update_url(attrs, args='', opts={})
-          format = opts['format']
-          attrs.ext = format if format
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe Dragonfly::ImageMagick::Generators::Convert do
-  let (:generator) { Dragonfly::ImageMagick::Generators::Convert.new }
-  let (:app) { test_app }
-  let (:image) { Dragonfly::Content.new(app) }
-
-  describe "calling convert" do
-    before(:each) do
-      generator.call(image, "-size 1x1 xc:white", 'png')
-    end
-    it {image.should have_width(1)}
-    it {image.should have_height(1)}
-    it {image.should have_format('png')}
-    it {image.meta.should == {'format' => 'png'}}
-  end
-
-end
-

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

@@ -1,88 +0,0 @@
-require 'spec_helper'
-
-describe Dragonfly::ImageMagick::Processors::Convert do
-
-  def sample_content(name)
-    Dragonfly::Content.new(app, SAMPLES_DIR.join(name))
-  end
-
-  let(:app){ test_app }
-  let(:image){ sample_content('beach.png') } # 280x355
-  let(:processor){ Dragonfly::ImageMagick::Processors::Convert.new }
-
-  it "should allow for general convert commands" do
-    processor.call(image, '-scale 56x71')
-    image.should have_width(56)
-    image.should have_height(71)
-  end
-
-  it "should allow for general convert commands with added format" do
-    processor.call(image, '-scale 56x71', 'format' => 'gif')
-    image.should have_width(56)
-    image.should have_height(71)
-    image.should have_format('gif')
-    image.meta['format'].should == 'gif'
-  end
-
-  it "should work for commands with parenthesis" do
-    processor.call(image, "\\( +clone -sparse-color Barycentric '0,0 black 0,%[fx:h-1] white' -function polynomial 2,-2,0.5 \\) -compose Blur -set option:compose:args 15 -composite")
-    image.should have_width(280)
-  end
-
-  it "should work for files with spaces in the name" do
-    image = Dragonfly::Content.new(app, SAMPLES_DIR.join('white pixel.png'))
-    processor.call(image, "-resize 2x2!")
-    image.should have_width(2)
-  end
-
-  it "updates the url with format if given" do
-    url_attributes = Dragonfly::UrlAttributes.new
-    processor.update_url(url_attributes, '-scale 56x71', 'format' => 'gif')
-    url_attributes.ext.should == 'gif'
-  end
-
-  it "allows converting specific frames" do
-    gif = sample_content('gif.gif')
-    processor.call(gif, '-resize 50x50')
-    all_frames_size = gif.size
-
-    gif = sample_content('gif.gif')
-    processor.call(gif, '-resize 50x50', 'frame' => 0)
-    one_frame_size = gif.size
-
-    one_frame_size.should < all_frames_size
-  end
-
-  it "accepts input arguments for convert commands" do
-    image2 = image.clone
-    processor.call(image, '')
-    processor.call(image2, '', 'input_args' => '-extract 50x50+10+10')
-
-    image.should_not equal_image(image2)
-    image2.should have_width(50)
-  end
-
-  it "allows converting using specific delegates" do
-    expect {
-      processor.call(image, '', 'format' => 'jpg', 'delegate' => 'png')
-    }.to call_command(app.shell, %r{'convert' 'png:/[^']+?/beach\.png' '/[^']+?\.jpg'})
-  end
-
-  it "maintains the mime_type meta if it exists already" do
-    processor.call(image, '-resize 10x')
-    image.meta['mime_type'].should be_nil
-
-    image.add_meta('mime_type' => 'image/png')
-    processor.call(image, '-resize 5x')
-    image.meta['mime_type'].should == 'image/png'
-    image.mime_type.should == 'image/png' # sanity check
-  end
-
-  it "doesn't maintain the mime_type meta on format change" do
-    image.add_meta('mime_type' => 'image/png')
-    processor.call(image, '', 'format' => 'gif')
-    image.meta['mime_type'].should be_nil
-    image.mime_type.should == 'image/gif' # sanity check
-  end
-
-end