mojo_magick 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d7e7a6d4e6182e2f6dfe239a5ea6479e18c23d
-  data.tar.gz: a29fb27bbd8ffaef8acccd892abbf3245368b6c6
+  metadata.gz: 0cbc5f7e905a8bebd095f21a82f35e689139726e
+  data.tar.gz: 299c155a1930b3fe85fded5371cf8020c9220d31
 SHA512:
-  metadata.gz: 48608b32f529b88428d4f4d65d88af56a8d26f3e89c7e90d6a957d02ede0ca23d2fc2d05299fdd50a2234457316e7559d431b42ff4e0ba982ba1daeca5708b94
-  data.tar.gz: 187989b5dec6e00b1e43d17b64c9cfa7321ff43c36996aca7030775dd58fa664538f0016159c140762e1f9d3047931dc384423f150945b2b4e7044930b215995
+  metadata.gz: f882f66230b6266875239d5907a9ce1baa3ba3c7700bbcc92683b152d01bdd1e71667c3d6878fd773667cd8fa827160426c5a657c4a836b9d61578888fbaf1d4
+  data.tar.gz: 49df40b4ef661d3f21750dd76c8f1e21147c3b10699b7ff8ada38d94b5a7f1069cd972e18b63d25d390c49e40a3ed1c60b683c2e9a7170c38fbc1fd435b20d5f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mojo_magick (0.4.4)
+    mojo_magick (0.4.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -122,6 +122,14 @@ complex commands.
       c.file 'output.jpg'
     end
 
+### Get a list of available fonts
+
+    fonts = MojoMagick::get_fonts
+
+    fonts.first
+    => #<MojoMagick::Font:0x000001015a8b90 @name="AvantGarde-Book", @family="AvantGarde", @style="Normal", @stretch="Normal", @weight="400", @glyphs="/usr/local/share/ghostscript/fonts/a010013l.pfb">
+
+
 ### Create a new image with text
 
 Note: Use with care.  If you don't have fonts installed ImageMagick can spin off wildly leaving MojoMagick not knowing what to do.  For Unix/MacOSX, you should install freetype and ghostscript.

data/init.rb

@@ -1 +1,3 @@
 require File::expand_path(File::join(File::dirname(__FILE__), 'lib', 'mojo_magick'))
+
+

data/lib/image_magick/fonts.rb

@@ -0,0 +1,9 @@
+module ImageMagick
+  module Fonts
+    def get_fonts
+      @parser ||= MojoMagick::Util::Parser.new
+      fonts = self.raw_command('identify', '-list font')
+      @parser.parse_fonts(fonts)
+    end
+  end
+end

data/lib/image_magick/resource_limits.rb

@@ -0,0 +1,93 @@
+# This module provides some mix-in methods to permit resource limitation commands in MojoMagick
+module ImageMagick
+  module ResourceLimits
+    @@resource_limits = {}
+
+    # controls limits on memory and other resources for imagemagick.
+    # possible values for type can include:
+    #    Area, Disk, File, Map, or Memory
+    # value is byte size for everything but Disk, where it's number of files
+    # type can be string or symbol.
+    # Just limiting Memory will not solve problems with imagemagick going out of
+    # control with resource consumption on certain bad files. You have to set disk,
+    # area and map limits too. Read up on imagemagick website for more.
+    # Different options have different units
+    #   DISK: N GB
+    #   AREA, MAP, MEMORY: N MB
+    #   FILE: N num file handles
+    # Examples:
+    #   # set disk to 5 gigabytes limit
+    #   MiniMagick::Image::set_limit(:disk => 5)
+    #   # set memory to 32mb, map to 64mb and disk to 0
+    #   MiniMagick::Image::set_limit(:memory => 32, 'map' => 64, 'disk' => 0)
+      def set_limits(options)
+        mem_fix = 1
+        options.each do |resource, value|
+          @@resource_limits[resource.to_s.downcase.to_sym] = value.to_s
+        end
+      end
+
+      # remove a limit
+      def remove_limits(*options)
+        mem_fix = 1
+        @@resource_limits.delete_if do |resource, value|
+          resource == options.values_at(options.index(resource))[0].to_s.downcase.to_sym
+        end
+      end
+
+      # remove limits from resources
+      def unset_limits(options = {})
+        mem_fix = 1
+        @@resource_limits = {}
+        if options[:unset_env]
+          ENV["MAGICK_AREA_LIMIT"]=nil
+          ENV["MAGICK_MAP_LIMIT"]=nil
+          ENV["MAGICK_MEMORY_LIMIT"]=nil
+          ENV["MAGICK_DISK_LIMIT"]=nil
+        end
+      end
+
+      # returns the default limits that imagemagick is using, when run with no "-limit" parameters
+    # options:
+    #   :show_actual_values => true (default false) - will return integers instead of readable values
+      def get_default_limits(options = {})
+        mem_fix = 1
+        parse_limits(options.merge(:get_current_limits => false))
+      end
+
+      # returns the limits that imagemagick is running based on any "set_limits" calls
+      def get_current_limits(options = {})
+        mem_fix = 1
+        parse_limits(options.merge(:get_current_limits => true))
+      end
+
+      alias :get_limits :get_current_limits
+
+      def parse_limits(options)
+        show_actual_values = options[:show_actual_values]
+        if options[:get_current_limits]
+          raw_limits = self.raw_command('identify', '-list resource')
+        else
+          # we run a raw shell command here to obtain limits without applying command line limit params
+          raw_limits = `identify -list resource`
+        end
+        actual_values, readable_values = parser.parse_limits(raw_limits)
+        show_actual_values ? actual_values : readable_values
+      end # parse_limits
+
+      # returns a string suitable for passing as a set of imagemagick params
+    # that contains all the limit constraints
+    def get_limits_as_params
+      retval = ''
+      # we upcase the value here for newer versions of ImageMagick (>=6.8.x)
+      @@resource_limits.each do |type, value|
+        retval += " -limit #{type.to_s} #{value.upcase} "
+      end
+      retval
+    end
+
+    def parser
+      @parser ||= MojoMagick::Util::Parser.new
+    end
+  end
+end

data/lib/image_resources.rb

@@ -1,125 +0,0 @@
-# This module provides some mix-in methods to permit resource limitation commands in MojoMagick
-# They're stored here simply to make MojoMagick more readable
-module ImageMagickResources
-  module ResourceLimits
-    @@resource_limits = {}
-
-    # controls limits on memory and other resources for imagemagick.
-    # possible values for type can include:
-    #    Area, Disk, File, Map, or Memory
-    # value is byte size for everything but Disk, where it's number of files
-    # type can be string or symbol.
-    # Just limiting Memory will not solve problems with imagemagick going out of
-    # control with resource consumption on certain bad files. You have to set disk,
-    # area and map limits too. Read up on imagemagick website for more.
-    # Different options have different units
-    #   DISK: N GB
-    #   AREA, MAP, MEMORY: N MB
-    #   FILE: N num file handles
-    # Examples:
-    #   # set disk to 5 gigabytes limit
-    #   MiniMagick::Image::set_limit(:disk => 5)
-    #   # set memory to 32mb, map to 64mb and disk to 0
-    #   MiniMagick::Image::set_limit(:memory => 32, 'map' => 64, 'disk' => 0)
-      def set_limits(options)
-        mem_fix = 1
-        options.each do |resource, value|
-          @@resource_limits[resource.to_s.downcase.to_sym] = value.to_s
-        end
-      end
-
-      # remove a limit
-      def remove_limits(*options)
-        mem_fix = 1
-        @@resource_limits.delete_if do |resource, value|
-          resource == options.values_at(options.index(resource))[0].to_s.downcase.to_sym
-        end
-      end
-
-      # remove limits from resources
-      def unset_limits(options = {})
-        mem_fix = 1
-        @@resource_limits = {}
-        if options[:unset_env]
-          ENV["MAGICK_AREA_LIMIT"]=nil
-          ENV["MAGICK_MAP_LIMIT"]=nil
-          ENV["MAGICK_MEMORY_LIMIT"]=nil
-          ENV["MAGICK_DISK_LIMIT"]=nil
-        end
-      end
-
-      # returns the default limits that imagemagick is using, when run with no "-limit" parameters
-    # options:
-    #   :show_actual_values => true (default false) - will return integers instead of readable values
-      def get_default_limits(options = {})
-        mem_fix = 1
-        parse_limits(options.merge(:get_current_limits => false))
-      end
-
-      # returns the limits that imagemagick is running based on any "set_limits" calls
-      def get_current_limits(options = {})
-        mem_fix = 1
-        parse_limits(options.merge(:get_current_limits => true))
-      end
-
-      alias :get_limits :get_current_limits
-
-      def parse_limits(options)
-        show_actual_values = options[:show_actual_values]
-        if options[:get_current_limits]
-          raw_limits = self.raw_command('identify', '-list resource')
-        else
-          # we run a raw shell command here to obtain limits without applying command line limit params
-          raw_limits = `identify -list resource`
-        end
-        row_limits = raw_limits.split("\n")
-        header = row_limits[0].chomp
-        data = row_limits[2].chomp
-        resources = header.strip.split
-        limits = data.strip.split
-        #resources = header.scan(/^ *([A-Z][a-z]+) +([A-Z][a-z]+) +([A-Z][a-z]+) +([A-Z][a-z]+) +([A-Z][a-z]+)/)[0]
-        #limits = data.scan(/^ *([0-9]+[.0-9a-z]+) +([0-9]+[.0-9a-z]+) +([0-9]+[.0-9a-z]+) +([0-9]+[.0-9a-z]+) +([0-9]+[.0-9a-z]+)/)[0]
-        actual_values = {}
-        readable_values = {}
-        resources.each_index do |i|
-          resource = resources[i].downcase.to_sym
-          scale = limits[i].match(%r{[a-z]+$}) || []
-          value = limits[i].match(%r{^[0-9]+})
-          unscaled_value = value ? value[0].to_i : -1
-          case scale[0]
-            when 'eb'
-              scaled_value = unscaled_value * (2 ** 60)
-            when 'pb'
-              scaled_value = unscaled_value * (2 ** 50)
-            when 'tb'
-              scaled_value = unscaled_value * (2 ** 40)
-            when 'gb'
-              scaled_value = unscaled_value * (2 ** 30)
-            when 'mb'
-              scaled_value = unscaled_value * (2 ** 20)
-            when 'kb'
-              scaled_value = unscaled_value * (2 ** 10)
-            when 'b'
-              scaled_value = unscaled_value
-            else
-              scaled_value = unscaled_value
-          end
-          actual_values[resource] = scaled_value
-          readable_values[resource] = limits[i]
-        end
-        # return actual values if requested in options, otherwise readable values
-        show_actual_values ? actual_values : readable_values
-      end # parse_limits
-
-      # returns a string suitable for passing as a set of imagemagick params
-    # that contains all the limit constraints
-    def get_limits_as_params
-      retval = ''
-      # we upcase the value here for newer versions of ImageMagick (>=6.8.x)
-      @@resource_limits.each do |type, value|
-        retval += " -limit #{type.to_s} #{value.upcase} "
-      end
-      retval
-    end
-  end
-end

data/lib/initializers/hash.rb

@@ -0,0 +1,8 @@
+class Hash
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
+  end
+end

data/lib/mojo_magick.rb

@@ -1,6 +1,11 @@
 cwd = File::dirname(__FILE__)
-require File::join(cwd, 'image_resources')
+initializers_dir = File::expand_path(File::join(cwd, 'initializers'))
+Dir.glob(File::join(initializers_dir, '*.rb')).each { |f| require f }
+require File::join(cwd, 'mojo_magick/util/parser')
+require File::join(cwd, 'image_magick/resource_limits')
+require File::join(cwd, 'image_magick/fonts')
 require File::join(cwd, 'mojo_magick/opt_builder')
+require File::join(cwd, 'mojo_magick/font')
 require 'tempfile'
 
 
@@ -60,7 +65,8 @@ module MojoMagick
   class MojoFailed < MojoMagickException; end
 
   # enable resource limiting functionality
-  extend ImageMagickResources::ResourceLimits
+  extend ImageMagick::ResourceLimits
+  extend ImageMagick::Fonts
 
   def MojoMagick::windows?
     mem_fix = 1
@@ -126,6 +132,11 @@ module MojoMagick
     dest_file
   end
 
+  def MojoMagick::available_fonts
+    # returns width, height of image if available, nil if not
+    Font.all
+  end
+
   # returns an empty hash or a hash with :width and :height set (e.g. {:width => INT, :height => INT})
   # raises MojoFailed when results are indeterminate (width and height could not be determined)
   def MojoMagick::get_image_size(source_file)

data/lib/mojo_magick/font.rb

@@ -0,0 +1,23 @@
+module MojoMagick
+
+  class Font
+
+    attr_accessor :name, :family, :style, :stretch, :weight, :glyphs
+
+    def valid?
+      !(name.nil?)
+    end
+
+    def initialize(property_hash = {})
+      property_hash.symbolize_keys!
+      [:name, :family, :style, :stretch, :weight, :glyphs].each do |f|
+        setter = "#{f}="
+        self.send(setter, property_hash[f])
+      end
+    end
+
+    def self.all
+      ImageMagick::Font.all.map{|font_info| Font.new(font_info)}
+    end
+  end
+end

data/lib/mojo_magick/util/parser.rb

@@ -0,0 +1,69 @@
+module MojoMagick
+  module Util
+    class Parser
+      # handle parsing outputs from ImageMagick commands
+
+      def parse_fonts(raw_fonts)
+        font = nil
+        fonts = {}
+        enumerator = raw_fonts.split(/\n/).each
+        name = nil
+        while (begin; line = enumerator.next; rescue StopIteration; line=nil; end) do
+          line.chomp!
+          line = enumerator.next if line.nil? || line.empty? || (/^\s+$/ =~ line)
+          if m = /^\s*Font:\s+(.*)$/.match(line)
+            name = m[1].strip
+            fonts[name] = {:name => name}
+          else
+            key_val = line.split(/:/).map(&:strip)
+            k = key_val[0].downcase.to_sym
+            v = key_val[1]
+            if k && name
+              fonts[name][k] = key_val[1]
+            end
+          end
+        end
+        fonts.values.map{|f| MojoMagick::Font.new f}
+      end
+
+      def parse_limits(raw_limits)
+
+        row_limits = raw_limits.split("\n")
+        header = row_limits[0].chomp
+        data = row_limits[2].chomp
+        resources = header.strip.split
+        limits = data.strip.split
+
+        actual_values = {}
+        readable_values = {}
+        resources.each_index do |i|
+          resource = resources[i].downcase.to_sym
+          scale = limits[i].match(%r{[a-z]+$}) || []
+          value = limits[i].match(%r{^[0-9]+})
+          unscaled_value = value ? value[0].to_i : -1
+          case scale[0]
+          when 'eb'
+            scaled_value = unscaled_value * (2 ** 60)
+          when 'pb'
+            scaled_value = unscaled_value * (2 ** 50)
+          when 'tb'
+            scaled_value = unscaled_value * (2 ** 40)
+          when 'gb'
+            scaled_value = unscaled_value * (2 ** 30)
+          when 'mb'
+            scaled_value = unscaled_value * (2 ** 20)
+          when 'kb'
+            scaled_value = unscaled_value * (2 ** 10)
+          when 'b'
+            scaled_value = unscaled_value
+          else
+            scaled_value = unscaled_value
+          end
+          actual_values[resource] = scaled_value
+          readable_values[resource] = limits[i]
+        end
+        [actual_values, readable_values]
+      end
+    end
+  end
+end

data/lib/mojo_magick/version.rb

@@ -1,3 +1,3 @@
 module MojoMagick
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/test/font_test.rb

@@ -0,0 +1,35 @@
+
+require File::join(File::dirname(__FILE__), 'test_helper')
+
+IDENTIFY_FONT_RESPONSE =<<EOF
+Font: Zapf-Dingbats
+    family: Zapf Dingbats
+    style: Normal
+    stretch: Normal
+    weight: 400
+    glyphs: /System/Library/Fonts/ZapfDingbats.ttf
+  Font: Zapfino
+    family: Zapfino
+    style: Italic
+    stretch: Normal
+    weight: 400
+    glyphs: /Library/Fonts/Zapfino.ttf
+EOF
+
+class FontTest < Test::Unit::TestCase
+
+  def test_font
+    f = MojoMagick::Font.new
+    assert_equal f.name, nil
+    assert_equal f.valid?, false
+
+    f = MojoMagick::Font.new(:name => "Zapfino", :weight => 400)
+    assert_equal f.name, 'Zapfino'
+    assert_equal f.valid?, true
+    assert_equal f.weight,  400
+
+  end
+
+end
+
+

data/test/fonts_test.rb

@@ -0,0 +1,12 @@
+require File::join(File::dirname(__FILE__), 'test_helper')
+
+class FontsTest < Test::Unit::TestCase
+
+  def test_get_fonts
+    fonts = MojoMagick::get_fonts
+    assert fonts.is_a? Array
+    assert fonts.length > 1
+    assert fonts.first.name
+    assert (fonts.first.name.is_a? String)
+  end
+end

data/test/mojo_magick_test.rb

@@ -131,38 +131,6 @@ class MojoMagickTest < Test::Unit::TestCase
     assert_equal 120, dim[:height]
   end
 
-  def test_resource_limits
-    orig_limits = MojoMagick::get_default_limits
-    assert_equal 7, orig_limits.size
-    orig_limits_test = orig_limits.dup
-    orig_limits_test.delete_if do |resource, value|
-      assert [:area, :map, :disk, :memory, :file, :thread, :time].include?(resource), "Found unexpected resource #{resource}"
-      true
-    end
-    assert_equal 0, orig_limits_test.size
-
-    # set area to 32mb limit
-    MojoMagick::set_limits(:area => '32mb')
-    new_limits = MojoMagick::get_current_limits
-    assert_equal '32mb', new_limits[:area].downcase
-
-    # remove limits on area
-    MojoMagick::remove_limits(:area)
-    new_limits = MojoMagick::get_current_limits
-    assert_equal orig_limits[:area], new_limits[:area]
-
-    # set memory to 64 mb, disk to 0 and
-    MojoMagick::set_limits(:memory => '64mb', :disk => '0b')
-    new_limits = MojoMagick::get_current_limits(:show_actual_values => true)
-    assert_equal 61, new_limits[:memory]
-    assert_equal 0, new_limits[:disk]
-
-    # return to original/default limit values
-    MojoMagick::unset_limits
-    new_limits = MojoMagick::get_current_limits
-    assert_equal orig_limits, new_limits
-  end
-
   def test_tempfile
     # Create a tempfile and return the path
     filename = MojoMagick::tempfile('binary data')

data/test/parser_test.rb

@@ -0,0 +1,30 @@
+require File::join(File::dirname(__FILE__), 'test_helper')
+
+IDENTIFY_FONT_RESPONSE =<<EOF
+
+Font: Zapf-Dingbats
+    family: Zapf Dingbats
+    style: Normal
+    stretch: Normal
+    weight: 400
+    glyphs: /System/Library/Fonts/ZapfDingbats.ttf
+
+  Font: Zapfino
+    family: Zapfino
+    style: Italic
+    stretch: Normal
+    weight: 400
+    glyphs: /Library/Fonts/Zapfino.ttf
+
+
+EOF
+
+class ParserTest < Test::Unit::TestCase
+
+  def test_parse_fonts
+    parser = MojoMagick::Util::Parser.new
+    parsed_fonts = parser.parse_fonts(IDENTIFY_FONT_RESPONSE)
+    assert_equal parsed_fonts.length, 2
+    assert_equal parsed_fonts[1].style, 'Italic'
+  end
+end

data/test/resource_limits_test.rb

@@ -0,0 +1,37 @@
+require File::join(File::dirname(__FILE__), 'test_helper')
+
+class ResourceLimitsTest < Test::Unit::TestCase
+
+  def test_resource_limits
+    orig_limits = MojoMagick::get_default_limits
+    assert_equal 7, orig_limits.size
+    orig_limits_test = orig_limits.dup
+    orig_limits_test.delete_if do |resource, value|
+      assert [:area, :map, :disk, :memory, :file, :thread, :time].include?(resource), "Found unexpected resource #{resource}"
+      true
+    end
+    assert_equal 0, orig_limits_test.size
+
+    # set area to 32mb limit
+    MojoMagick::set_limits(:area => '32mb')
+    new_limits = MojoMagick::get_current_limits
+    assert_equal '32mb', new_limits[:area].downcase
+
+    # remove limits on area
+    MojoMagick::remove_limits(:area)
+    new_limits = MojoMagick::get_current_limits
+    assert_equal orig_limits[:area], new_limits[:area]
+
+    # set memory to 64 mb, disk to 0 and
+    MojoMagick::set_limits(:memory => '64mb', :disk => '0b')
+    new_limits = MojoMagick::get_current_limits(:show_actual_values => true)
+    assert_equal 61, new_limits[:memory]
+    assert_equal 0, new_limits[:disk]
+
+    # return to original/default limit values
+    MojoMagick::unset_limits
+    new_limits = MojoMagick::get_current_limits
+    assert_equal orig_limits, new_limits
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojo_magick
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Steve Midgley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,16 +69,25 @@ files:
 - README.md
 - Rakefile
 - init.rb
+- lib/image_magick/fonts.rb
+- lib/image_magick/resource_limits.rb
 - lib/image_resources.rb
+- lib/initializers/hash.rb
 - lib/mojo_magick.rb
+- lib/mojo_magick/font.rb
 - lib/mojo_magick/opt_builder.rb
+- lib/mojo_magick/util/parser.rb
 - lib/mojo_magick/version.rb
 - mojo_magick.gemspec
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg
 - test/fixtures/zero_byte_image.jpg
+- test/font_test.rb
+- test/fonts_test.rb
 - test/mojo_magick_test.rb
 - test/opt_builder_test.rb
+- test/parser_test.rb
+- test/resource_limits_test.rb
 - test/test_helper.rb
 homepage: http://github.com/bunnymatic/mojo_magick
 licenses: []
@@ -110,11 +119,15 @@ rubyforge_project: mojo_magick
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: mojo_magick-0.4.4
+summary: mojo_magick-0.4.5
 test_files:
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg
 - test/fixtures/zero_byte_image.jpg
+- test/font_test.rb
+- test/fonts_test.rb
 - test/mojo_magick_test.rb
 - test/opt_builder_test.rb
+- test/parser_test.rb
+- test/resource_limits_test.rb
 - test/test_helper.rb