dragonfly 0.9.15 → 1.0

data/lib/dragonfly/image_magick/encoder.rb

@@ -1,57 +0,0 @@
-module Dragonfly
-  module ImageMagick
-    class Encoder
-
-      include Configurable
-      include Utils
-
-      configurable_attr :supported_formats, [
-        :ai,
-        :bmp,
-        :eps,
-        :gif,
-        :gif87,
-        :ico,
-        :j2c,
-        :jp2,
-        :jpeg,
-        :jpg,
-        :pbm,
-        :pcd,
-        :pct,
-        :pcx,
-        :pdf,
-        :pict,
-        :pjpeg,
-        :png,
-        :png24,
-        :png32,
-        :png8,
-        :pnm,
-        :ppm,
-        :ps,
-        :psd,
-        :ras,
-        :tga,
-        :tiff,
-        :wbmp,
-        :xbm,
-        :xpm,
-        :xwd
-      ]
-
-      def encode(temp_object, format, args='')
-        format = format.to_s.downcase
-        throw :unable_to_handle unless supported_formats.include?(format.to_sym)
-        details = identify(temp_object)
-
-        if details[:format] == format.to_sym && args.empty?
-          temp_object
-        else
-          convert(temp_object, args, format)
-        end
-      end
-
-    end
-  end
-end

data/lib/dragonfly/image_magick/generator.rb

@@ -1,147 +0,0 @@
-module Dragonfly
-  module ImageMagick
-    class Generator
-
-      FONT_STYLES = {
-        'normal'  => 'normal',
-        'italic'  => 'italic',
-        'oblique' => 'oblique'
-      }
-
-      FONT_STRETCHES = {
-        'normal'          => 'normal',
-        'semi-condensed'  => 'semi-condensed',
-        'condensed'       => 'condensed',
-        'extra-condensed' => 'extra-condensed',
-        'ultra-condensed' => 'ultra-condensed',
-        'semi-expanded'   => 'semi-expanded',
-        'expanded'        => 'expanded',
-        'extra-expanded'  => 'extra-expanded',
-        'ultra-expanded'  => 'ultra-expanded'
-      }
-
-      FONT_WEIGHTS = {
-        'normal'  => 'normal',
-        'bold'    => 'bold',
-        'bolder'  => 'bolder',
-        'lighter' => 'lighter',
-        '100'     => 100,
-        '200'     => 200,
-        '300'     => 300,
-        '400'     => 400,
-        '500'     => 500,
-        '600'     => 600,
-        '700'     => 700,
-        '800'     => 800,
-        '900'     => 900
-      }
-
-      include Configurable
-      include Utils
-
-      def plain(width, height, colour, opts={})
-        opts = Dragonfly::Utils.symbolize_keys(opts)
-
-        format = opts[:format] || 'png'
-        [
-          convert(nil, "-size #{width}x#{height} xc:#{colour}", format),
-          {:format => format.to_sym, :name => "plain.#{format}"}
-        ]
-      end
-
-      def plasma(width, height, format='png')
-        [
-          convert(nil, "-size #{width}x#{height} plasma:fractal", format),
-          {:format => format.to_sym, :name => "plasma.#{format}"}
-        ]
-      end
-
-      def text(string, opts={})
-        opts = HashWithCssStyleKeys[opts]
-        args = []
-        format = (opts[:format] || :png)
-        background = opts[:background_color] || 'none'
-        font_size = (opts[:font_size] || 12).to_i
-        escaped_string = "\"#{string.gsub(/"/, '\"')}\""
-
-        # Settings
-        args.push("-gravity NorthWest")
-        args.push("-antialias")
-        args.push("-pointsize #{font_size}")
-        args.push("-font \"#{opts[:font]}\"") if opts[:font]
-        args.push("-family '#{opts[:font_family]}'") if opts[:font_family]
-        args.push("-fill #{opts[:color]}") if opts[:color]
-        args.push("-stroke #{opts[:stroke_color]}") if opts[:stroke_color]
-        args.push("-style #{FONT_STYLES[opts[:font_style]]}") if opts[:font_style]
-        args.push("-stretch #{FONT_STRETCHES[opts[:font_stretch]]}") if opts[:font_stretch]
-        args.push("-weight #{FONT_WEIGHTS[opts[:font_weight]]}") if opts[:font_weight]
-        args.push("-background #{background}")
-        args.push("label:#{escaped_string}")
-
-        # Padding
-        pt, pr, pb, pl = parse_padding_string(opts[:padding]) if opts[:padding]
-        padding_top    = (opts[:padding_top]    || pt || 0)
-        padding_right  = (opts[:padding_right]  || pr || 0)
-        padding_bottom = (opts[:padding_bottom] || pb || 0)
-        padding_left   = (opts[:padding_left]   || pl || 0)
-
-        tempfile = convert(nil, args.join(' '), format)
-
-        if (padding_top || padding_right || padding_bottom || padding_left)
-          attrs  = identify(tempfile)
-          text_width  = attrs[:width].to_i
-          text_height = attrs[:height].to_i
-          width  = padding_left + text_width  + padding_right
-          height = padding_top  + text_height + padding_bottom
-
-          args = args.slice(0, args.length - 2)
-          args.push("-size #{width}x#{height}")
-          args.push("xc:#{background}")
-          args.push("-annotate 0x0+#{padding_left}+#{padding_top} #{escaped_string}")
-          run convert_command,  "#{args.join(' ')} #{quote tempfile.path}"
-        end
-
-        [
-          tempfile,
-          {:format => format, :name => "text.#{format}"}
-        ]
-      end
-
-      private
-
-      # Use css-style padding declaration, i.e.
-      # 10        (all sides)
-      # 10 5      (top/bottom, left/right)
-      # 10 5 10   (top, left/right, bottom)
-      # 10 5 10 5 (top, right, bottom, left)
-      def parse_padding_string(str)
-        padding_parts = str.gsub('px','').split(/\s+/).map{|px| px.to_i}
-        case padding_parts.size
-        when 1
-          p = padding_parts.first
-          [p,p,p,p]
-        when 2
-          p,q = padding_parts
-          [p,q,p,q]
-        when 3
-          p,q,r = padding_parts
-          [p,q,r,q]
-        when 4
-          padding_parts
-        else raise ArgumentError, "Couldn't parse padding string '#{str}' - should be a css-style string"
-        end
-      end
-
-      def scale_factor_for(font_size)
-        # Scale approximately to 64 if below
-        min_size = 64
-        if font_size < min_size
-          (min_size.to_f / font_size).ceil
-        else
-          1
-        end.to_f
-      end
-
-    end
-  end
-end

data/lib/dragonfly/image_magick/processor.rb

@@ -1,114 +0,0 @@
-module Dragonfly
-  module ImageMagick
-    class Processor
-
-      GRAVITIES = {
-        'nw' => 'NorthWest',
-        'n'  => 'North',
-        'ne' => 'NorthEast',
-        'w'  => 'West',
-        'c'  => 'Center',
-        'e'  => 'East',
-        'sw' => 'SouthWest',
-        's'  => 'South',
-        'se' => 'SouthEast'
-      }
-
-      # Geometry string patterns
-      RESIZE_GEOMETRY         = /^\d*x\d*[><%^!]?$|^\d+@$/ # e.g. '300x200!'
-      CROPPED_RESIZE_GEOMETRY = /^(\d+)x(\d+)#(\w{1,2})?$/ # e.g. '20x50#ne'
-      CROP_GEOMETRY           = /^(\d+)x(\d+)([+-]\d+)?([+-]\d+)?(\w{1,2})?$/ # e.g. '30x30+10+10'
-      THUMB_GEOMETRY = Regexp.union RESIZE_GEOMETRY, CROPPED_RESIZE_GEOMETRY, CROP_GEOMETRY
-
-      include Configurable
-      include Utils
-
-      def resize(temp_object, geometry)
-        convert(temp_object, "-resize #{geometry}")
-      end
-
-      def auto_orient(temp_object)
-        convert(temp_object, "-auto-orient")
-      end
-
-      def crop(temp_object, opts={})
-        opts = Dragonfly::Utils.symbolize_keys(opts)
-
-        width   = opts[:width]
-        height  = opts[:height]
-        gravity = GRAVITIES[opts[:gravity]]
-        x       = "#{opts[:x] || 0}"
-        x = '+' + x unless x[/^[+-]/]
-        y       = "#{opts[:y] || 0}"
-        y = '+' + y unless y[/^[+-]/]
-        repage  = opts[:repage] == false ? '' : '+repage'
-        resize  = opts[:resize]
-
-        convert(temp_object, "#{"-resize #{resize} " if resize}#{"-gravity #{gravity} " if gravity}-crop #{width}x#{height}#{x}#{y} #{repage}")
-      end
-
-      def flip(temp_object)
-        convert(temp_object, "-flip")
-      end
-
-      def flop(temp_object)
-        convert(temp_object, "-flop")
-      end
-
-      def greyscale(temp_object)
-        convert(temp_object, "-colorspace Gray")
-      end
-      alias grayscale greyscale
-
-      def resize_and_crop(temp_object, opts={})
-        opts = Dragonfly::Utils.symbolize_keys(opts)
-
-        if !opts[:width] && !opts[:height]
-          return temp_object
-        elsif !opts[:width] || !opts[:height]
-          attrs          = identify(temp_object)
-          opts[:width]   ||= attrs[:width]
-          opts[:height]  ||= attrs[:height]
-        end
-
-        opts[:gravity] ||= 'c'
-
-        opts[:resize]  = "#{opts[:width]}x#{opts[:height]}^^"
-        crop(temp_object, opts)
-      end
-
-      def rotate(temp_object, amount, opts={})
-        opts = Dragonfly::Utils.symbolize_keys(opts)
-
-        convert(temp_object, "-rotate #{amount}#{opts[:qualifier]}")
-      end
-
-      def strip(temp_object)
-        convert(temp_object, "-strip")
-      end
-
-      def thumb(temp_object, geometry)
-        case geometry
-        when RESIZE_GEOMETRY
-          resize(temp_object, geometry)
-        when CROPPED_RESIZE_GEOMETRY
-          resize_and_crop(temp_object, 'width' => $1, 'height' => $2, 'gravity' => $3)
-        when CROP_GEOMETRY
-          crop(temp_object,
-            'width' => $1,
-            'height' => $2,
-            'x' => $3,
-            'y' => $4,
-            'gravity' => $5
-          )
-        else raise ArgumentError, "Didn't recognise the geometry string #{geometry}"
-        end
-      end
-
-      def convert(temp_object, args='', format=nil)
-        format ? [super, {:format => format.to_sym}] : super
-      end
-
-    end
-  end
-end

data/lib/dragonfly/image_magick/utils.rb

@@ -1,46 +0,0 @@
-require 'tempfile'
-
-module Dragonfly
-  module ImageMagick
-    module Utils
-
-      include Shell
-      include Loggable
-      include Configurable
-      configurable_attr :convert_command, "convert"
-      configurable_attr :identify_command, "identify"
-    
-      private
-
-      def convert(temp_object=nil, args='', format=nil)
-        tempfile = new_tempfile(format)
-        run convert_command, %(#{quote(temp_object.path) if temp_object} #{args} #{quote(tempfile.path)})
-        tempfile
-      end
-
-      def identify(temp_object)
-        # example of details string:
-        # myimage.png PNG 200x100 200x100+0+0 8-bit DirectClass 31.2kb
-        format, width, height, depth = raw_identify(temp_object).scan(/([A-Z0-9]+) (\d+)x(\d+) .+ (\d+)-bit/)[0]
-        {
-          :format => format.downcase.to_sym,
-          :width => width.to_i,
-          :height => height.to_i,
-          :depth => depth.to_i
-        }
-      end
-    
-      def raw_identify(temp_object, args='')
-        run identify_command, "#{args} #{quote(temp_object.path)}"
-      end
-    
-      def new_tempfile(ext=nil)
-        tempfile = ext ? Tempfile.new(['dragonfly', ".#{ext}"]) : Tempfile.new('dragonfly')
-        tempfile.binmode
-        tempfile.close
-        tempfile
-      end
-
-    end
-  end
-end

data/lib/dragonfly/image_magick_utils.rb

@@ -1,4 +0,0 @@
-module Dragonfly
-  puts "WARNING: Dragonfly::ImageMagickUtils is DEPRECATED and will soon be removed. Please use Dragonfly::ImageMagick::Utils instead."
-  ImageMagickUtils = ImageMagick::Utils
-end

data/lib/dragonfly/job_builder.rb

@@ -1,39 +0,0 @@
-module Dragonfly
-  class JobBuilder
-
-    def initialize(&block)
-      @block = block
-    end
-
-    def build(job, *args)
-      evaluate_block(job, false, *args)
-    end
-
-    def build!(job, *args)
-      evaluate_block(job, true, *args)
-    end
-
-    Job.step_names.each do |step|
-      
-      # fetch, process, etc.
-      define_method step do |*args|
-        if @perform_with_bangs
-          @job.send("#{step}!", *args)
-        else
-          @job = @job.send(step, *args)
-        end
-      end
-      
-    end
-    
-    private
-    
-    def evaluate_block(job, perform_with_bangs, *args)
-      @job = job
-      @perform_with_bangs = perform_with_bangs
-      instance_exec(*args, &@block)
-      @job
-    end
-
-  end
-end

data/lib/dragonfly/job_definitions.rb

@@ -1,30 +0,0 @@
-module Dragonfly
-  class JobDefinitions < Module
-
-    def initialize
-      @job_definitions = {}
-    end
-
-    def add(name, &definition_proc)
-      job_definitions[name] = JobBuilder.new(&definition_proc)
-      jd = job_definitions # Needed because we're about to change 'self'
-      
-      define_method name do |*args|
-        jd[name].build(self, *args)
-      end
-      
-      define_method "#{name}!" do |*args|
-        jd[name].build!(self, *args)
-      end
-    end
-    
-    def definition_names
-      job_definitions.keys
-    end
-
-    private
-
-    attr_reader :job_definitions
-
-  end
-end

data/lib/dragonfly/loggable.rb

@@ -1,28 +0,0 @@
-require 'logger'
-
-module Dragonfly
-  module Loggable
-
-    def log
-      case @log_object
-      when nil
-        @log_object = Logger.new($stdout)
-      when Proc
-        @log_object[]
-      when Logger
-        @log_object
-      end
-    end
-
-    def log=(object)
-      @log_object = object
-    end
-    
-    attr_reader :log_object
-
-    def use_same_log_as(object)
-      self.log = proc{ object.log }
-    end
-
-  end
-end