imaginizer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b57552f3d3613d48fbe96a2d8271158d4c2e938
-  data.tar.gz: 8addcc75730714e0c81e484fb1925177d1e311a3
+  metadata.gz: 82ba111cb40bc4ffde4bb54212a371ce849b7876
+  data.tar.gz: ec933dd1678bf6ee211d9989fb5fac39e4c8ad16
 SHA512:
-  metadata.gz: 02d32e79e10a528aef27923c23bed3dfcb034a5faff8f0828e3241e6eb6a2bbed90bbe328b1ae1e000b7e44f2050c59a6373d8c9f21585d9f5cbb78e041bff9b
-  data.tar.gz: 92340345dffea0b3bbaabba3dc067361954a1a731ee60d010949bf5acba3a3847002c58676584c408e1b4b69bbbd8afff4a4d011bbc899e812fa8e49e4d13ce5
+  metadata.gz: 286af7a8402b9a6b55737b36bc39be6ddf5b371bb02741f65660bdc10f371e85af9e44921b5d5dc5dfa40abec54ecd0f660733f8bacde92414aa9ab93e25295e
+  data.tar.gz: 378ccaf62c45a887f1f1cf7d8ab9c8855d46dd546caf6fce19429ee42ed0275044827a4f70d2b3ca4bd82715dd778d68bbb9f626700d63550a561c68624a863e

data/README.md

@@ -11,7 +11,7 @@ You need [Imagemagick](http://www.imagemagick.org) with [Freetype](http://freety
 
 To check if you have it installed, run this command:
 
-    check=`cosnvert -list CONFIGURE 2> /dev/null|grep DELEGATES|grep freetype|wc -l`; if [ $check -eq 1 ]; then echo "Imagemagick/Freetype IS installed"; else echo "Imagemagick/Freetype IS NOT installed"; fi
+    check=`convert -list CONFIGURE 2> /dev/null|grep DELEGATES|grep freetype|wc -l`; if [ $check -eq 1 ]; then echo "Imagemagick/Freetype IS installed"; else echo "Imagemagick/Freetype IS NOT installed"; fi
 
 To install:
 

data/bin/imaginizer

@@ -9,9 +9,9 @@ end
 
 require 'imaginizer/parser'
 
-options = ImaginizerParser.parse ARGV
+options = Imaginizer::Parser.parse ARGV
 output = options.delete :output
 puts "Creating images with #{options}:"
 images = Imaginizer.create_images options
 puts "Images created at #{images.map &:image_path}"
-ImaginizerParser.output images, output
+Imaginizer::Parser.output images, output

data/lib/imaginizer.rb

@@ -1,137 +1,24 @@
-require 'mini_magick'
+require 'imaginizer/image'
 
 module Imaginizer
   def self.create_images(options = {})
     sizes = options.delete(:sizes) { [] }
-    sizes.map do |size|
-      width, height = size.split 'x'
-      create_image options.merge(width: width, height: height)
-    end
+    sizes.map {|size| create_image size, options}
   end
 
-  def self.create_image(options = {})
-    Image.create image_path(options) do |image|
+  def self.create_image(size, options = {})
+    Image.create size, image_path(size) do |image|
       image.make_jpeg
-      image.resize options[:width], options[:height]
-      image.set_background options[:bg] if options[:bg]
-      image.overlay_image options[:fg] if options[:fg]
+      image.resize
+      image.set_background options[:background] if options[:background]
+      image.set_foreground options[:foreground] if options[:foreground]
       image.set_title options[:title] if options[:title]
       image.set_subtitle options[:subtitle] if options[:subtitle]
       image.set_footer options[:footer] if options[:footer]
     end
   end
 
-  def self.image_path(options)
-    basename = options.values_at(:width, :height).join('_')
-    "/tmp/#{basename}.jpg"
-  end
-
-  class Image
-    attr_accessor :image_data, :image_path
-
-    def initialize(source_path = nil)
-      @image_data = MiniMagick::Image.open source_path || empty_image_path
-    end
-
-    def self.create(image_path)
-      new.tap do |image|
-        image.image_path = image_path
-        yield image
-        image.image_data.write image_path
-      end
-    end
-
-    [:height, :width, :format].each do |method|
-      define_method method do
-        image_data[method]
-      end
-    end
-
-    def size
-      "#{width}x#{height}"
-    end
-
-    def make_jpeg
-      @image_data.format 'jpg'
-    end
-
-    def resize(w, h)
-      @image_data.resize "#{w}x#{h}!" if w and h
-    end
-
-    def crop(options = {})
-      return if options.none?
-      w = options[:width] || width
-      h = options[:height] || height
-      x_offset = (width - w)/2
-      y_offset = (height- h)/2
-      @image_data.crop "#{w}x#{h}+#{x_offset}+#{y_offset}"
-    end
-
-    def blur(radius_x_sigma)
-      @image_data.combine_options {|c| c.blur radius_x_sigma} if radius_x_sigma
-    end
-
-    def set_background(options = {})
-      overlay_image options.merge(blur: '0x15', fill: true)
-    end
-
-    def set_title(options = {})
-      overlay_text options.merge(uppercase: true)
-    end
-
-    def set_subtitle(options = {})
-      overlay_text options.merge(style: 'italic')
-    end
-
-    def set_footer(options = {})
-      overlay_box options.fetch(:box, {height: options[:size]})
-      overlay_text options.merge(style: 'bold', uppercase: true, gravity: 'south')
-    end
-
-    def overlay_text(options = {})
-      return unless text = options[:text]
-      text.upcase! if options[:uppercase]
-      @image_data.combine_options do |c|
-        c.fill 'white'
-        c.font font_path(options[:style])
-        c.gravity options.fetch(:gravity, 'center')
-        c.pointsize options[:size] if options[:size]
-        c.draw "text 0,0 '#{options[:text]}'"
-      end
-    end
-
-    def overlay_box(options = {})
-      return if options.none?
-      x2 = width
-      y2 = height
-      x1 = x2 - (options[:width] || x2)
-      y1 = y2 - (options[:height] || y2)
-      @image_data.combine_options do |c|
-        c.fill 'graya(0%, 0.5)'
-        c.draw "rectangle #{x1}, #{y1}, #{x2}, #{y2}"
-      end
-    end
-
-    def overlay_image(options = {})
-      return unless options[:img]
-      image = Image.new options[:img]
-      image.blur options[:blur]
-      image.crop height: options[:height]
-      image.resize width, height if options[:fill]
-      @image_data = @image_data.composite image.image_data
-    end
-
-  private
-
-    def empty_image_path
-      File.expand_path '../assets/1x1.jpg', __FILE__
-    end
-
-    def font_path(style)
-      style ||= 'regular'
-      font_file = "../assets/RobotoCondensed-#{style.capitalize}.ttf"
-      File.expand_path font_file, __FILE__
-    end
+  def self.image_path(size)
+    "/tmp/#{size}.jpg"
   end
 end

data/lib/imaginizer/image.rb

@@ -0,0 +1,196 @@
+require 'mini_magick'
+
+class Imaginizer::Image
+  attr_accessor :image_data, :image_path, :image_size
+
+  def initialize(source_path = nil)
+    @image_data = MiniMagick::Image.open source_path || empty_image_path
+  end
+
+  def self.create(size, image_path)
+    new.tap do |image|
+      image.image_size = size
+      image.image_path = image_path
+      yield image
+      image.image_data.write image_path
+    end
+  end
+
+  def make_jpeg
+    @image_data.format 'jpg'
+  end
+
+  def resize
+    @image_data.resize "#{image_width}x#{image_height}!"
+  end
+
+  def set_background(options = {})
+    v = values_for :background
+    overlay_image options.merge(blur: '0x15', fill: true, x: v[:x],
+      y: v[:y], h: v[:h])
+  end
+
+  def set_foreground(options = {})
+    v = values_for :foreground
+    overlay_image options.merge(h: v[:h], w: v[:w]) unless v[:skip]
+  end
+
+  def set_title(options = {})
+    set_text :title, options do |v|
+      {style: 'bold', uppercase: true, x: v[:x], y: v[:y], size: v[:size]}
+    end
+  end
+
+  def set_subtitle(options = {})
+    set_text :subtitle, options do |v|
+      {style: 'italic', size: 14, x: v[:x], y: v[:y]}
+    end
+  end
+
+  def set_footer(options = {})
+    overlay_box values_for(:footer)
+    set_text :footer, options do |v|
+      {style: 'bold', uppercase: true, x: v[:x], y: v[:y], size: v[:size]}
+    end
+  end
+
+protected
+
+  def blur(radius_x_sigma)
+    @image_data.combine_options {|c| c.blur radius_x_sigma} if radius_x_sigma
+  end
+
+  def crop(options = {})
+    return if options.none?
+    w = options[:w] || width
+    h = options[:h] || height
+    x_offset = (width - w)/2
+    y_offset = (height- h)/2
+    @image_data.crop "#{w}x#{h}+#{x_offset}+#{y_offset}"
+  end
+
+private
+
+  def values_for(property)
+    {medium_rectangle: {
+      width: 300,
+      height: 250,
+      background: {y: 125, h: 125},
+      foreground: {h: 125},
+      title: {y: 23, second_line_y: 57, size: 40},
+      subtitle: {y: 84},
+      footer: {h: 30, size: 25, y: 111}
+    },
+    rectangle: {
+      width: 180,
+      height: 150,
+      foreground: {skip: true},
+      title: {y: -39, second_line_y: -12, size: 34},
+      subtitle: {y: 13},
+      footer: {h: 28, size: 16, y: 63}
+    },
+    wide_skyscraper: {
+      width: 160,
+      height: 600,
+      background: {y: 250, h: 125},
+      foreground: {h: 250},
+      title: {y: -23, second_line_y: 0, size: 30},
+      subtitle: {y: 33},
+      footer: {h: 94, size: 26, y: 242, second_line_y: 263}
+    },
+    leaderboard: {
+      width: 728,
+      height: 90,
+      background: {x: 228},
+      foreground: {w: 228},
+      title: {x: 120, y: -24, size: 42},
+      subtitle: {x: 120, y: 5},
+      footer: {w: 500, h: 29, size: 26, x: 120, y: 30}
+    }
+    }[@image_size].fetch property, {}
+  end
+
+  [:height, :width, :format].each do |method|
+    define_method method do
+      image_data[method]
+    end
+  end
+
+  def size
+    "#{width}x#{height}"
+  end
+
+  def image_width
+    values_for :width
+  end
+
+  def image_height
+    values_for :height
+  end
+
+  def set_text(size, options = {})
+    values = values_for size
+    size_options = options.merge yield(values)
+    if values[:second_line_y]
+      line1, line2 = word_wrap options[:text]
+      overlay_text size_options.merge(text: line1)
+      overlay_text size_options.merge(text: line2, y: values[:second_line_y])
+    else
+      overlay_text size_options
+    end
+  end
+
+  def word_wrap(text)
+    text.delete("\n").sub(/(.{1,9})(\s+|$)/, "\\1\n").strip.split("\n")
+  end
+
+  def overlay_text(options = {})
+    return unless text = options[:text]
+    text.upcase! if options[:uppercase]
+    @image_data.combine_options do |c|
+      c.fill 'white'
+      c.font font_path(options[:style])
+      c.gravity 'center'
+      c.pointsize options[:size] if options[:size]
+      c.draw "text #{options[:x] || 0},#{options[:y] || 0} '#{options[:text]}'"
+    end
+  end
+
+  def overlay_box(options = {})
+    return if options.none?
+    x2 = width
+    y2 = height
+    x1 = x2 - (options[:w] || x2)
+    y1 = y2 - (options[:h] || y2)
+    @image_data.combine_options do |c|
+      c.fill 'graya(0%, 0.5)'
+      c.draw "rectangle #{x1}, #{y1}, #{x2}, #{y2}"
+    end
+  end
+
+  def overlay_image(options = {})
+    return unless options[:img]
+    image = self.class.new options[:img]
+    image.blur options[:blur]
+
+    image.crop options
+    image.resize image_size if options[:fill]
+    overlay_x = options[:x] || 0
+    overlay_y = options[:y] || 0
+    @image_data = @image_data.composite image.image_data do |c|
+      c.geometry "#{image.width}x#{image.height}+#{overlay_x}+#{overlay_y}"
+    end
+  end
+
+
+
+  def empty_image_path
+    File.expand_path '../../assets/1x1.jpg', __FILE__
+  end
+
+  def font_path(style)
+    style ||= 'regular'
+    font_file = "../../assets/RobotoCondensed-#{style.capitalize}.ttf"
+    File.expand_path font_file, __FILE__
+  end
+end

data/lib/imaginizer/parser.rb

@@ -1,5 +1,11 @@
+# coding: utf-8
 require 'optparse'
-class ImaginizerParser
+
+class Imaginizer::Parser
+  def self.valid_sizes
+    [:medium_rectangle, :rectangle, :wide_skyscraper, :leaderboard]
+  end
+
   def self.parse(args)
     options = default_values
 
@@ -9,49 +15,38 @@ class ImaginizerParser
       opts.separator ''
       opts.separator 'Specific options:'
 
-      opts.on('-d', '--dimension WxH', String, 'Image width x height') do |d|
+      opts.on('-d', '--dimension [IAB_SIZE]', valid_sizes,
+        %Q(Sizes to create #{valid_sizes} – multiple values accepted)) do |d|
         options[:sizes] << d
       end
-      default_sizes = options.delete(:default_sizes)
-      options[:sizes] = default_sizes if options[:sizes].empty?
 
-      opts.on('-b', '--background path', String, 'Background image') do |path|
-        options[:bg][:img] = path
+      opts.on('-b', '--background path', String,
+        %q(Background image – either a local path or a URL)) do |path|
+        options[:background][:img] = path
       end
 
-      opts.on('-f', '--foreground path', String, 'Foreground image') do |path|
-        options[:fg][:img] = path
+      opts.on('-f', '--foreground path', String,
+        %q(Foreground image – either a local path or a URL)) do |path|
+        options[:foreground][:img] = path
       end
 
-      opts.on('--foreground-height N', String, 'Foreground image height') do |n|
-        options[:fg][:height] = n
-      end
-
-      opts.on('-t', '--title text', String, 'Overlay title') do |text|
+      opts.on('-t', '--title text', String,
+        %q(Title to overlay – maximum 15 characters)) do |text|
         options[:title][:text] = text
       end
 
-      opts.on('--title-size N', Integer, 'Title size') do |size|
-        options[:title][:size] = size
-      end
-
-      opts.on('-s', '--subtitle text', String, 'Overlay subtitle') do |text|
+      opts.on('-s', '--subtitle text', String,
+        %q(Subtitle to overlay – maximum 15 characters)) do |text|
         options[:subtitle][:text] = text
       end
 
-      opts.on('--subtitle-size N', Integer, 'Subtitle size') do |size|
-        options[:subtitle][:size] = size
-      end
-
-      opts.on('-r', '--footer text', String, 'Overlay footer') do |text|
+      opts.on('-r', '--footer text', String,
+        %q(Footer to overlay – maximum 20 characters)) do |text|
         options[:footer][:text] = text
       end
 
-      opts.on('--footer-size N', Integer, 'Footer size') do |size|
-        options[:footer][:size] = size
-      end
-
-      opts.on('-o', '--output [OUTPUT]', [:image, :html], 'What to show') do |o|
+      opts.on('-o', '--output [OUTPUT]', [:image, :html],
+        %q(Output type – either an image or an HTML page)) do |o|
         options[:output] = o
       end
 
@@ -70,6 +65,8 @@ class ImaginizerParser
     end
 
     opt_parser.parse!(args)
+
+    options[:sizes] = self.valid_sizes if options[:sizes].empty?
     options
   end
 
@@ -77,12 +74,11 @@ class ImaginizerParser
     {}.tap do |opts|
       opts[:output] = :html
       opts[:sizes] = []
-      opts[:default_sizes] = ['300x250', '180x150', '160x600', '728x90']
-      opts[:title] = {text: 'Sample title', size: 40}
-      opts[:subtitle] = {text: 'Sample subtitle', size: 14}
-      opts[:footer] = {text: 'Sample footer', size: 25}
-      opts[:bg] = {img: 'http://lorempixel.com/300/300/abstract'}
-      opts[:fg] = {img: 'http://lorempixel.com/300/300/people', height: 100}
+      opts[:title] = {text: 'Title max 18 chars'}
+      opts[:subtitle] = {text: 'This subtitle is 30 characters'}
+      opts[:footer] = {text: 'A footer w/ 20 chars'}
+      opts[:background] = {img: 'http://lorempixel.com/300/300/abstract'}
+      opts[:foreground] = {img: 'http://lorempixel.com/300/300/people'}
     end
   end
 
@@ -98,13 +94,17 @@ class ImaginizerParser
     <html>
     	<head>
     		<meta charset="UTF-8" />
+    		<style>
+    		  body {background-color: #ccc}
+    		  figure {float: left}
+    		</style>
     		<title>Imaginizer output</title>
     	</head>
     	<body>
     	  #{images.map do |image|
     	    '<figure>' +
     	    '<img src="' + image.image_path + '" />' +
-          '<figcaption>Size: ' + image.size + '</figcaption>' +
+          '<figcaption>Size: ' + image.image_size.to_s + '</figcaption>' +
     	    '</figure>'
     	  end.join}
     	</body>

data/lib/imaginizer/version.rb

@@ -1,3 +1,3 @@
 module Imaginizer
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imaginizer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Claudio Baccigalupo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -123,6 +123,7 @@ files:
 - lib/assets/RobotoCondensed-Bold.ttf
 - lib/assets/RobotoCondensed-Italic.ttf
 - lib/assets/RobotoCondensed-Regular.ttf
+- lib/imaginizer/image.rb
 - lib/imaginizer/parser.rb
 - lib/imaginizer/version.rb
 - lib/imaginizer.rb