mojo_magick 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb294af1589ca062245a0197a4a442f25c584fbbcbe7745d07f8976d6282c3d
-  data.tar.gz: ddb865f0d484815352da4c5182d3674e94ec0296c1b8fb5d8579d7c461397cc1
+  metadata.gz: 93f3aa9373877c8a0a09828441a83f62a4f633b0779642dd881460295ec117d1
+  data.tar.gz: '0395757ba6b054c84b1d649333d32b6ce085eaad407a3a80e1b23054cc5a6f32'
 SHA512:
-  metadata.gz: 00fe14025e466113053a171d7866e32cbd9c20a011efc84ca543dba8cf62ef892c9b3c96f5a4cdcf11fd524fec939f11c806687668c57c5e6df0324ff8778e03
-  data.tar.gz: 76c39990bc119753db01f883b5592f179e2c36eb2c3f4a0f401f87ea548bfab39c9de664f6d8de4b19576a83c285a5d42fc62df25972c65d7ce8fd313e1068b4
+  metadata.gz: 2b417825f921e106e47a2a0387cd8dff673d468b40a95387cfbef1be8d3811067b2ee7d0115117fecaa8a39dfa77e5bec7ac9fb9fa49f8711a93df6d92e172b3
+  data.tar.gz: ef4726ee3b9db797d1eab003d54ebd53dba4af804583a353ae96f0299fd4f0de8dca632beb214df43bb658935166eaa66788cbbb45e102a4698a2262e76a9630

data/.circleci/config.yml

@@ -22,3 +22,4 @@ jobs:
       - run:
           name: audit
           command: bundle exec bundle-audit update && bundle exec bundle-audit check
+      - ruby/rubocop-check

data/.rubocop.yml

@@ -5,6 +5,7 @@ inherit_from:
   - ./.rubocop-common.yml
   - ./.rubocop-performance.yml
 
-Metrics/MethodLength:
-  Exclude:
-    - "**/*test.rb"
+Metrics/CyclomaticComplexity:
+  Max: 10
+Metrics/PerceivedComplexity:
+  Max: 10

data/Gemfile

@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
 group :test, :development do
-  gem 'irb', require: false
-  gem 'simplecov', require: false
+  gem "irb", require: false
+  gem "simplecov", require: false
 end
 
 gemspec

data/Gemfile.lock

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

data/README.md

@@ -139,7 +139,7 @@ complex commands.
 
 ### Get a list of available fonts
 
-    fonts = MojoMagick::get_fonts
+    fonts = MojoMagick::available_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">
@@ -211,6 +211,14 @@ in the new code
 
 Recent Changes
 ==============
+#### Version 0.6.3
+
+* Major cleanup and refactor (https://github.com/rcode5/mojo_magick/pull/33)
+* Deprecated `MojoMagick.get_fonts` in favor of `MojoMagick.available_fonts`
+* Moved `raw_command` and `execute` and `execute!` methods into their own module (and added deprecation warnings)
+* Renamed `Util::Parser` to `Util::FontParser` because that's what it does 
+* Overall rubocop and ruby clean up
+
 #### Version 0.6.2
 
 * fix `annotate` option.  Now it takes keyword arguments for geometry.

data/lib/image_magick/fonts.rb

@@ -1,15 +1,8 @@
 module ImageMagick
-  module Fonts
-    def get_fonts
-      @parser ||= MojoMagick::Util::Parser.new
-      raw_fonts = begin
-        raw_command("identify", "-list font")
-      rescue Exception => e
-        puts e
-        puts "Failed to execute font list with raw_command - trying straight up execute"
-        `convert -list font`
-      end
-      @parser.parse_fonts(raw_fonts)
+  class Fonts
+    def self.all
+      raw_fonts = MojoMagick::Commands.raw_command("identify", "-list", "font")
+      MojoMagick::Util::FontParser.new(raw_fonts).parse
     end
   end
 end

data/lib/mojo_magick.rb

@@ -1,14 +1,12 @@
-cwd = File.dirname(__FILE__)
-require "open3"
-initializers_dir = File.expand_path(File.join(cwd, "initializers"))
-Dir.glob(File.join(initializers_dir, "*.rb")).sort.each { |f| require f }
-require File.join(cwd, "mojo_magick/util/parser")
-require File.join(cwd, "mojo_magick/errors")
-require File.join(cwd, "mojo_magick/command_status")
-require File.join(cwd, "image_magick/fonts")
-require File.join(cwd, "mojo_magick/opt_builder")
-require File.join(cwd, "mojo_magick/font")
 require "tempfile"
+require "open3"
+require_relative "./mojo_magick/util/font_parser"
+require_relative "./mojo_magick/errors"
+require_relative "./mojo_magick/command_status"
+require_relative "./mojo_magick/commands"
+require_relative "./image_magick/fonts"
+require_relative "./mojo_magick/opt_builder"
+require_relative "./mojo_magick/font"
 
 # MojoMagick is a stateless set of module methods which present a convient interface
 # for accessing common tasks for ImageMagick command line library.
@@ -34,7 +32,7 @@ require "tempfile"
 #
 # Equivalent to:
 #
-#   MojoMagick::raw_command('convert', 'source.jpg -crop 250x250+0+0\
+#   MojoMagick::Commands.raw_command('convert', 'source.jpg -crop 250x250+0+0\
 #         +repage -strip -set comment "my favorite file" dest.jpg')
 #
 # Example #mogrify usage:
@@ -43,7 +41,7 @@ require "tempfile"
 #
 # Equivalent to:
 #
-#   MojoMagick::raw_command('mogrify', '-shave 10x10 image.jpg')
+#   MojoMagick::Commands.raw_command('mogrify', '-shave 10x10 image.jpg')
 #
 # Example showing some additional options:
 #
@@ -60,34 +58,40 @@ require "tempfile"
 # bang (!) can be appended to command names to use the '+' versions
 # instead of '-' versions.
 #
-module MojoMagick
-  extend ImageMagick::Fonts
 
-  def self.windows?
-    !(RUBY_PLATFORM =~ /win32/).nil?
+module MojoMagickDeprecations
+  # rubocop:disable Naming/AccessorMethodName
+  def get_fonts
+    warn "DEPRECATION WARNING: #{__method__} is deprecated and will be removed with the next minor version release."\
+         "  Please use `available_fonts` instead"
+    MojoMagick.available_fonts
   end
 
-  def self.execute(command, *args)
-    execute = "#{command} #{args}"
-    out, outerr, status = Open3.capture3(command, *args.map(&:to_s))
-    CommandStatus.new execute, out, outerr, status
-  rescue Exception => e
-    raise MojoError, "#{e.class}: #{e.message}"
+  # rubocop:enable Naming/AccessorMethodName
+  ### Moved to `Commands`
+  def execute!(*args)
+    warn "DEPRECATION WARNING: #{__method__} is deprecated and will be removed with the next minor version release."\
+         "  Please use `MojoMagick::Commands.execute!` instead"
+    MojoMagick::Commands.send(:execute!, *args)
   end
 
-  def self.execute!(command, *args)
-    status = execute(command, *args)
-    unless status.success?
-      err_msg = "MojoMagick command failed: #{command}."
-      raise(MojoFailed, "#{err_msg} (Exit status: #{status.exit_code})\n" +
-            "  Command: #{status.command}\n" +
-            "  Error: #{status.error}")
-    end
-    status.return_value
+  def execute(*args)
+    warn "DEPRECATION WARNING: #{__method__} is deprecated and will be removed with the next minor version release."\
+         "  Please use `MojoMagick::Commands.execute!` instead"
+    MojoMagick::Commands.send(:execute, *args)
+  end
+
+  def raw_command(*args)
+    warn "DEPRECATION WARNING: #{__method__} is deprecated and will be removed with the next minor version release."\
+         "  Please use `MojoMagick::Commands.execute!` instead"
+    MojoMagick::Commands.raw_command(*args)
   end
+end
 
-  def self.raw_command(*args)
-    execute!(*args)
+module MojoMagick
+  extend MojoMagickDeprecations
+  def self.windows?
+    !RUBY_PLATFORM.include(win32)
   end
 
   def self.shrink(source_file, dest_file, options)
@@ -105,44 +109,49 @@ module MojoMagick
   # resizes an image and returns the filename written to
   # options:
   #   :width / :height => scale to these dimensions
-  #   :scale => pass scale options such as ">" to force shrink scaling only or "!" to force absolute width/height scaling (do not preserve aspect ratio)
+  #   :scale => pass scale options such as ">" to force shrink scaling only or
+  #             "!" to force absolute width/height scaling (do not preserve aspect ratio)
   #   :percent => scale image to this percentage (do not specify :width/:height in this case)
   def self.resize(source_file, dest_file, options)
-    scale_options = []
-    scale_options << ">" unless options[:shrink_only].nil?
-    scale_options << "<" unless options[:expand_only].nil?
-    scale_options << "!" unless options[:absolute_aspect].nil?
-    scale_options << "^" unless options[:fill].nil?
-    scale_options = scale_options.join
-
+    scale_options = extract_scale_options(options)
+    geometry = extract_geometry_options(options)
     extras = []
-    if !options[:width].nil? && !options[:height].nil?
-      geometry = "#{options[:width]}X#{options[:height]}"
-    elsif !options[:percent].nil?
-      geometry = "#{options[:percent]}%"
-    else
-      raise MojoMagickError, "Unknown options for method resize: #{options.inspect}"
-    end
     if !options[:fill].nil? && !options[:crop].nil?
       extras << "-gravity"
       extras << "Center"
       extras << "-extent"
       extras << geometry.to_s
     end
-    raw_command("convert",
-                source_file,
-                "-resize", "#{geometry}#{scale_options}",
-                *extras, dest_file)
+    Commands.raw_command("convert",
+                         source_file,
+                         "-resize", "#{geometry}#{scale_options}",
+                         *extras, dest_file)
     dest_file
   end
 
+  def self.convert(source = nil, dest = nil)
+    opts = OptBuilder.new
+    opts.file source if source
+    yield opts
+    opts.file dest if dest
+
+    Commands.raw_command("convert", *opts.to_a)
+  end
+
+  def self.mogrify(dest = nil)
+    opts = OptBuilder.new
+    yield opts
+    opts.file dest if dest
+    Commands.raw_command("mogrify", *opts.to_a)
+  end
+
   def self.available_fonts
     # returns width, height of image if available, nil if not
     Font.all
   end
 
   def self.get_format(source_file, format_string)
-    raw_command("identify", "-format", format_string, source_file)
+    Commands.raw_command("identify", "-format", format_string, source_file)
   end
 
   # returns an empty hash or a hash with :width and :height set (e.g. {:width => INT, :height => INT})
@@ -161,22 +170,6 @@ module MojoMagick
     { width: width, height: height }
   end
 
-  def self.convert(source = nil, dest = nil)
-    opts = OptBuilder.new
-    opts.file source if source
-    yield opts
-    opts.file dest if dest
-
-    raw_command("convert", *opts.to_a)
-  end
-
-  def self.mogrify(dest = nil)
-    opts = OptBuilder.new
-    yield opts
-    opts.file dest if dest
-    raw_command("mogrify", *opts.to_a)
-  end
-
   def self.tempfile(*opts)
     data = opts[0]
     rest = opts[1]
@@ -188,4 +181,27 @@ module MojoMagick
   ensure
     file.close
   end
+
+  class << self
+    private
+
+    def extract_geometry_options(options)
+      if !options[:width].nil? && !options[:height].nil?
+        "#{options[:width]}X#{options[:height]}"
+      elsif !options[:percent].nil?
+        "#{options[:percent]}%"
+      else
+        raise MojoMagickError, "Resize requires width and height or percentage: #{options.inspect}"
+      end
+    end
+
+    def extract_scale_options(options)
+      [].tap { |scale_options|
+        scale_options << ">" unless options[:shrink_only].nil?
+        scale_options << "<" unless options[:expand_only].nil?
+        scale_options << "!" unless options[:absolute_aspect].nil?
+        scale_options << "^" unless options[:fill].nil?
+      }.join
+    end
+  end
 end

data/lib/mojo_magick/commands.rb

@@ -0,0 +1,32 @@
+require_relative "opt_builder"
+
+module MojoMagick
+  class Commands
+    def self.raw_command(*args)
+      execute!(*args)
+    end
+
+    class << self
+      private
+
+      def execute(command, *args)
+        execute = "#{command} #{args}"
+        out, outerr, status = Open3.capture3(command, *args.map(&:to_s))
+        CommandStatus.new execute, out, outerr, status
+      rescue StandardError => e
+        raise MojoError, "#{e.class}: #{e.message}"
+      end
+
+      def execute!(command, *args)
+        status = execute(command, *args)
+        unless status.success?
+          err_msg = "MojoMagick command failed: #{command}."
+          raise(MojoFailed, "#{err_msg} (Exit status: #{status.exit_code})\n" \
+                            "  Command: #{status.command}\n" \
+                            "  Error: #{status.error}")
+        end
+        status.return_value
+      end
+    end
+  end
+end

data/lib/mojo_magick/font.rb

@@ -7,7 +7,6 @@ module MojoMagick
     end
 
     def initialize(property_hash = {})
-      property_hash.symbolize_keys!
       %i[name family style stretch weight glyphs].each do |f|
         setter = "#{f}="
         send(setter, property_hash[f])
@@ -15,7 +14,7 @@ module MojoMagick
     end
 
     def self.all
-      ImageMagick::Font.all.map { |font_info| Font.new(font_info) }
+      ImageMagick::Fonts.all
     end
   end
 end

data/lib/mojo_magick/opt_builder.rb

@@ -58,6 +58,7 @@ module MojoMagick
     end
 
     # Generic commands. Arguments will be formatted if necessary
+    # rubocop:disable Lint/MissingSuper, Style/MissingRespondToMissing
     def method_missing(command, *args)
       @opts << if command.to_s[-1, 1] == "!"
                  "+#{command.to_s.chop}"
@@ -68,10 +69,7 @@ module MojoMagick
       self
     end
 
-    def to_s
-      to_a.join " "
-    end
-
+    # rubocop:enable Lint/MissingSuper, Style/MissingRespondToMissing
     def to_a
       @opts.flatten
     end

data/lib/mojo_magick/util/font_parser.rb

@@ -0,0 +1,43 @@
+# rubocop:disable Lint/AssignmentInCondition
+module MojoMagick
+  module Util
+    class FontParser
+      attr_reader :raw_fonts
+
+      def initialize(raw_fonts)
+        @raw_fonts = raw_fonts
+      end
+
+      def parse
+        fonts = {}
+        enumerator = raw_fonts.split(/\n/).each
+        name = nil
+        while begin; line = enumerator.next; rescue StopIteration; line = nil; end
+          line.chomp!
+          line = enumerator.next if line_is_empty(line)
+          m = /^\s*Font:\s+(.*)$/.match(line)
+          if m
+            name = m[1].strip
+            fonts[name] = { name: name }
+          else
+            k, v = extract_key_value(line)
+            fonts[name][k] = v if k && name
+          end
+        end
+        fonts.values.map { |f| MojoMagick::Font.new f }
+      end
+
+      private
+
+      def extract_key_value(line)
+        key_val = line.split(/:/).map(&:strip)
+        [key_val[0].downcase.to_sym, key_val[1]]
+      end
+
+      def line_is_empty(line)
+        line.nil? || line.empty? || (/^\s+$/ =~ line)
+      end
+    end
+  end
+end
+# rubocop:enable Lint/AssignmentInCondition

data/lib/mojo_magick/util/parser.rb

@@ -1,28 +1,20 @@
-# rubocop:disable Lint/AssignmentInCondition
+require_relative "./font_parser"
 module MojoMagick
   module Util
     class Parser
-      # handle parsing outputs from ImageMagick commands
+      attr_reader :raw_fonts
 
-      def parse_fonts(raw_fonts)
-        fonts = {}
-        enumerator = raw_fonts.split(/\n/).each
-        name = nil
-        while begin; line = enumerator.next; rescue StopIteration; line = nil; end
-          line.chomp!
-          line = enumerator.next if line.nil? || line.empty? || (/^\s+$/ =~ line)
-          m = /^\s*Font:\s+(.*)$/.match(line)
-          if m
-            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]
-            fonts[name][k] = v if k && name
-          end
-        end
-        fonts.values.map { |f| MojoMagick::Font.new f }
+      def initialize
+        warn "DEPRECATION WARNING: This class has been deprecated and will be removed with"\
+             " the next minor version release."\
+             "  Please use `MojoMagick::Util::FontParser` instead"
+      end
+
+      def parse_fonts(fonts)
+        warn "DEPRECATION WARNING: #{__method__} has been deprecated and will be removed with"\
+             " the next minor version release."\
+             "  Please use `MojoMagick::Util::FontParser#parse` instead"
+        FontParser.new(fonts).parse
       end
     end
   end

data/lib/mojo_magick/version.rb

@@ -1,3 +1,3 @@
 module MojoMagick
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/mojo_magick.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_development_dependency("bundler")
   s.add_development_dependency("bundle-audit")
+  s.add_development_dependency("bundler")
   s.add_development_dependency("minitest")
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec-expectations")

data/test/{parser_test.rb → font_parser_test.rb}

@@ -19,10 +19,10 @@ IDENTIFY_FONT_RESPONSE = <<~EOFONT
 
 EOFONT
 
-class ParserTest < MiniTest::Test
+class FontParserTest < MiniTest::Test
   def test_parse_fonts
-    parser = MojoMagick::Util::Parser.new
-    parsed_fonts = parser.parse_fonts(IDENTIFY_FONT_RESPONSE)
+    parser = MojoMagick::Util::FontParser.new(IDENTIFY_FONT_RESPONSE)
+    parsed_fonts = parser.parse
     assert_equal parsed_fonts.length, 2
     assert_equal parsed_fonts[1].style, "Italic"
   end

data/test/mojo_magick_test.rb

@@ -6,6 +6,11 @@ class MojoMagickTest < MiniTest::Test
   def setup
     @fixtures_path = File.expand_path(File.join(File.dirname(__FILE__), "fixtures"))
     @working_path = File.join(@fixtures_path, "tmp")
+
+    reset_images
+
+    @test_image = File.join(@working_path, "5742.jpg")
+    @out_image = File.join(@working_path, "out1.jpg")
   end
 
   def reset_images
@@ -14,11 +19,9 @@ class MojoMagickTest < MiniTest::Test
     Dir.glob(File.join(@fixtures_path, "*")).each do |file|
       FileUtils.cp(file, @working_path) if File.file?(file)
     end
-    @test_image = File.join(@working_path, "5742.jpg")
   end
 
   def test_get_image_size
-    reset_images
     orig_image_size = File.size(@test_image)
     retval = MojoMagick.get_image_size(@test_image)
     assert_equal orig_image_size, File.size(@test_image)
@@ -28,7 +31,6 @@ class MojoMagickTest < MiniTest::Test
 
   def test_image_resize
     # test basic resizing
-    reset_images
     orig_image_size = File.size(@test_image)
     size_test_temp = Tempfile.new("mojo_test")
     size_test = size_test_temp.path
@@ -41,16 +43,15 @@ class MojoMagickTest < MiniTest::Test
     assert_equal 67, new_dimensions[:width]
 
     # we should be able to resize image right over itself
-    retval = MojoMagick.resize(@test_image, @test_image, { width: 100, height: 100 })
+    retval = MojoMagick.resize(@test_image, @test_image, { width: 150, height: 150 })
     assert_equal @test_image, retval
     refute_equal orig_image_size, File.size(@test_image)
     new_dimensions = MojoMagick.get_image_size(@test_image)
-    assert_equal 100, new_dimensions[:height]
-    assert_equal 67, new_dimensions[:width]
+    assert_equal 150, new_dimensions[:height]
+    assert_equal 100, new_dimensions[:width]
   end
 
   def test_image_resize_with_percentage
-    reset_images
     original_size = MojoMagick.get_image_size(@test_image)
     retval = MojoMagick.resize(@test_image, @test_image, { percent: 50 })
     assert_equal @test_image, retval
@@ -62,7 +63,6 @@ class MojoMagickTest < MiniTest::Test
 
   def test_shrink_with_big_dimensions
     # image shouldn't resize if we specify very large dimensions and specify "shrink_only"
-    reset_images
     size_test_temp = Tempfile.new("mojo_test")
     size_test = size_test_temp.path
     retval = MojoMagick.shrink(@test_image, size_test, { width: 1000, height: 1000 })
@@ -73,7 +73,6 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_shrink
-    reset_images
     # image should resize if we specify small dimensions and shrink_only
     retval = MojoMagick.shrink(@test_image, @test_image, { width: 1000, height: 100 })
     assert_equal @test_image, retval
@@ -83,7 +82,6 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_resize_with_shrink_only_options
-    reset_images
     # image should resize if we specify small dimensions and shrink_only
     retval = MojoMagick.resize(@test_image, @test_image, { shrink_only: true, width: 400, height: 400 })
     assert_equal @test_image, retval
@@ -94,7 +92,6 @@ class MojoMagickTest < MiniTest::Test
 
   def test_expand_with_small_dim
     # image shouldn't resize if we specify small dimensions and expand_only
-    reset_images
     _orig_image_size = File.size(@test_image)
     retval = MojoMagick.expand(@test_image, @test_image, { width: 10, height: 10 })
     assert_equal @test_image, retval
@@ -104,7 +101,6 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_expand
-    reset_images
     # image should resize if we specify large dimensions and expand_only
     retval = MojoMagick.expand(@test_image, @test_image, { width: 1000, height: 1000 })
     assert_equal @test_image, retval
@@ -125,7 +121,6 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_resize_with_fill
-    reset_images
     @test_image = File.join(@working_path, "5742.jpg")
     MojoMagick.resize(@test_image, @test_image, { fill: true, width: 100, height: 100 })
     dim = MojoMagick.get_image_size(@test_image)
@@ -134,7 +129,6 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_resize_with_fill_and_crop
-    reset_images
     @test_image = File.join(@working_path, "5742.jpg")
     MojoMagick.resize(@test_image, @test_image, { fill: true, crop: true, width: 150, height: 120 })
     dim = MojoMagick.get_image_size(@test_image)
@@ -151,7 +145,6 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_label
-    reset_images
     out_image = File.join(@working_path, "label_test.png")
 
     MojoMagick.convert do |c|
@@ -161,7 +154,6 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_label_with_quote
-    reset_images
     out_image = File.join(@working_path, "label_test.png")
 
     MojoMagick.convert do |c|
@@ -171,7 +163,6 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_label_with_apostrophe
-    reset_images
     out_image = File.join(@working_path, "label_test.png")
 
     MojoMagick.convert do |c|
@@ -181,7 +172,6 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_label_with_quotes
-    reset_images
     out_image = File.join(@working_path, "label_test.png")
 
     MojoMagick.convert do |c|
@@ -202,10 +192,7 @@ class MojoMagickTest < MiniTest::Test
            "Unable to find ImageMagick commandline error in the message"
   end
 
-  def test_blob
-    reset_images
-
-    # RGB8 test
+  def test_blob_rgb
     data = (Array.new(16) { [rand > 0.5 ? 0 : 255] * 3 }).flatten
     bdata = data.pack "C" * data.size
     out = "out.png"
@@ -217,48 +204,57 @@ class MojoMagickTest < MiniTest::Test
     assert r[:width] == 4
   end
 
-  def test_command_helpers
-    reset_images
-    test_image = File.join(@working_path, "5742.jpg")
-    out_image = File.join(@working_path, "out1.jpg")
-
-    # Simple convert test
+  def test_convert
     MojoMagick.convert do |c|
-      c.file test_image
+      c.file @test_image
       c.crop "92x64+0+0"
       c.repage!
-      c.file out_image
+      c.file @out_image
     end
-    retval = MojoMagick.get_image_size(out_image)
+    retval = MojoMagick.get_image_size(@out_image)
     assert_equal 92, retval[:width]
     assert_equal 64, retval[:height]
+  end
 
+  def test_mogrify
+    MojoMagick.convert do |c|
+      c.file @test_image
+      c.file @out_image
+    end
     # Simple mogrify test
     MojoMagick.mogrify do |m|
       m.crop "32x32+0+0"
       m.repage!
-      m.file out_image
+      m.file @out_image
     end
-    retval = MojoMagick.get_image_size(out_image)
+    retval = MojoMagick.get_image_size(@out_image)
     assert_equal 32, retval[:width]
     assert_equal 32, retval[:height]
+  end
 
-    # Convert test, using file shortcuts
-    MojoMagick.convert(test_image, out_image) do |c|
+  def test_convert_crop_and_repage
+    MojoMagick.convert(@test_image, @out_image) do |c|
       c.crop "100x100+0+0"
       c.repage!
     end
-    retval = MojoMagick.get_image_size(out_image)
+    retval = MojoMagick.get_image_size(@out_image)
     assert_equal 100, retval[:width]
     assert_equal 100, retval[:height]
+  end
 
-    # Mogrify test, using file shortcut
-    MojoMagick.mogrify(out_image) { |m| m.shave("25x25").repage! }
-    retval = MojoMagick.get_image_size(out_image)
+  def test_mogrify_with_shave_and_repage
+    MojoMagick.convert do |c|
+      c.file @test_image
+      c.crop "100x100+0+0"
+      c.file @out_image
+    end
+    MojoMagick.mogrify(@out_image) { |m| m.shave("25x25").repage! }
+    retval = MojoMagick.get_image_size(@out_image)
     assert_equal 50, retval[:width]
     assert_equal 50, retval[:height]
+  end
 
-    # RGB8 test
+  def test_convert_rgb
     bdata = "aaaaaabbbbbbccc"
     out = "out.png"
     MojoMagick.convert do |c|
@@ -268,7 +264,9 @@ class MojoMagickTest < MiniTest::Test
     r = MojoMagick.get_image_size(out)
     assert r[:height] == 1
     assert r[:width] == 5
+  end
 
+  def test_convert_rgba
     bdata = "1111222233334444"
     out = "out.png"
     MojoMagick.convert do |c|
@@ -279,4 +277,12 @@ class MojoMagickTest < MiniTest::Test
     assert r[:height] == 1
     assert r[:width] == 4
   end
+
+  def test_available_fonts
+    fonts = MojoMagick.available_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/opt_builder_test.rb

@@ -19,12 +19,12 @@ class MojoMagickOptBuilderTest < MiniTest::Test
     assert_equal %w[-annotate 0 it's], @builder.to_a
   end
 
-  def test_annotate_with_full_args
+  def test_annotate_with_multiple_args
     @builder.annotate "5 it's"
-    assert_equal %w[-annotate 5 it's], @builder.to_a
+    assert_equal ["-annotate", "0", "5 it's"], @builder.to_a
   end
 
-  def test_annotate_with_full_args
+  def test_annotate_with_geometry_args
     @builder.annotate "this thing", geometry: 3
     assert_equal ["-annotate", "3", "this thing"], @builder.to_a
   end
@@ -36,95 +36,104 @@ class MojoMagickOptBuilderTest < MiniTest::Test
 
   def test_option_builder_with_blocks
     # Passing in basic commands produces a string
-    b = MojoMagick::OptBuilder.new
-    b.image_block do
-      b.background "red"
+    @builder.image_block do
+      @builder.background "red"
     end
-    b.image_block do
-      b.background "blue"
+    @builder.image_block do
+      @builder.background "blue"
     end
-    assert_equal ['\(', "-background", "red", '\)', '\(', "-background", "blue", '\)'], b.to_a
+    assert_equal ['\(', "-background", "red", '\)', '\(', "-background", "blue", '\)'], @builder.to_a
   end
 
   def test_option_builder_with_hex_colors
-    b = MojoMagick::OptBuilder.new
-    b.background "#000000"
-    assert_equal %w[-background #000000], b.to_a
+    @builder.background "#000000"
+    assert_equal %w[-background #000000], @builder.to_a
   end
 
   def test_option_builder
-    # Passing in basic commands produces a string
-    b = MojoMagick::OptBuilder.new
-    b.strip
-    b.repage
-    assert_equal "-strip -repage", b.to_s
+    @builder.strip
+    @builder.repage
+    assert_equal %w[-strip -repage], @builder.to_a
+  end
 
-    # Chaining commands works
-    b = MojoMagick::OptBuilder.new.strip.repage
-    assert_equal "-strip -repage", b.to_s
+  def test_opt_builder_chaining_commands
+    assert_equal %w[-strip -repage], @builder.strip.repage.to_a
+  end
 
+  def test_opt_builder_interpreting_bang_suffix
     # Bang (!) indicates the plus version of commands
-    b = MojoMagick::OptBuilder.new
-    b.repage
-    b.repage!
-    assert_equal "-repage +repage", b.to_s
 
-    # Accepts raw data as-is
-    b = MojoMagick::OptBuilder.new
-    b.opt1
-    b << "a ! b !"
-    b.opt2
-    assert_equal "-opt1 a ! b ! -opt2", b.to_s
+    @builder.repage
+    @builder.repage!
+    assert_equal %w[-repage +repage], @builder.to_a
+  end
 
+  def test_opt_builder_pushing_raw_data
     # Treats an array of raw data as different arguments
-    b = MojoMagick::OptBuilder.new
-    b << ["leave this data", "alone"]
-    assert_equal "leave this data alone", b.to_s
-
-    # String includes command arguments
-    b = MojoMagick::OptBuilder.new
-    b.extent "256x256+0+0"
-    b.crop "64x64"
-    assert_equal %w[-extent 256x256+0+0 -crop 64x64], b.to_a
-
-    # Arguments are quoted (doublequote) if appropriate
-    b = MojoMagick::OptBuilder.new
-    b.comment "white space"
-    b.comment "w&b"
-    b.crop "6x6^"
-    assert_equal ["-comment", "white space", "-comment", "w&b", "-crop", "6x6^"], b.to_a
-
-    # Existing doublequotes are escaped
-    b = MojoMagick::OptBuilder.new
-    b.comment 'Fred "Woot" Rook'
-    assert_equal ["-comment", "Fred \"Woot\" Rook"], b.to_a
 
+    @builder << ["leave this data", "alone"]
+    assert_equal ["leave this data", "alone"], @builder.to_a
+  end
+
+  def test_opt_builder_complex_command_arg
+    @builder.extent "256x256+0+0"
+    @builder.crop "64x64"
+    assert_equal %w[-extent 256x256+0+0 -crop 64x64], @builder.to_a
+  end
+
+  def test_opt_builder_multi_arg_command_quoting
     # Multi-argument commands should not be quoted together
-    b = MojoMagick::OptBuilder.new
-    b.set "comment", 'the "best" comment'
-    assert_equal ["-set", "comment", "the \"best\" comment"], b.to_a
 
+    @builder.set "comment", 'the "best" comment'
+    assert_equal ["-set", "comment", "the \"best\" comment"], @builder.to_a
+  end
+
+  def test_opt_builder_with_custom_commands_and_raw_data
+    # Accepts raw data as-is
+
+    @builder.opt1
+    @builder << "a ! b !"
+    @builder.opt2
+    assert_equal ["-opt1", "a ! b !", "-opt2"], @builder.to_a
+  end
+
+  def test_opt_builder_file_and_files
     # File and files are helper methods
-    b = MojoMagick::OptBuilder.new
-    b.files "source.jpg", "source2.jpg"
-    b.append
-    b.crop "64x64"
-    b.file "dest%d.jpg"
-    assert_equal %w[source.jpg source2.jpg -append -crop 64x64 dest%d.jpg], b.to_a
-
-    # Files are quoted (doublequote) if appropriate
-    b = MojoMagick::OptBuilder.new
-    b.file "probably on windows.jpg"
-    assert_equal ["probably on windows.jpg"], b.to_a
-
-    # Blob is a shortcut for the #tempfile helper method
-    b = MojoMagick::OptBuilder.new
-    b.blob "binary data"
-    filename = b.to_s
+
+    @builder.files "source.jpg", "source2.jpg"
+    @builder.append
+    @builder.crop "64x64"
+    @builder.file "dest%d.jpg"
+    assert_equal %w[source.jpg source2.jpg -append -crop 64x64 dest%d.jpg], @builder.to_a
+  end
+
+  def test_opt_builder_file_preserves_whitespace
+    @builder.file "probably on windows.jpg"
+    assert_equal ["probably on windows.jpg"], @builder.to_a
+  end
+
+  def test_opt_builder_comment
+    @builder.comment "white space"
+    @builder.comment "w&b"
+    @builder.crop "6x6^"
+    assert_equal ["-comment", "white space", "-comment", "w&b", "-crop", "6x6^"], @builder.to_a
+  end
+
+  def test_opt_builder_comment_with_quoted_elements
+    @builder.comment 'Fred "Woot" Rook'
+    assert_equal ["-comment", "Fred \"Woot\" Rook"], @builder.to_a
+  end
+
+  def test_opt_builder_blob_writes_data_to_temp_file
+    @builder.blob "binary data"
+
+    filename = @builder.to_a.first
     File.open(filename, "rb") do |f|
       assert_equal "binary data", f.read
     end
+  end
 
+  def test_opt_builder_label
     # label for text should use 'label:"the string"' if specified
     [%w[mylabel mylabel],
      ['my " label', '"my \" label"'],
@@ -133,7 +142,7 @@ class MojoMagickOptBuilderTest < MiniTest::Test
      ["\#$%^&*", '"#$%^&*"']].each do |labels|
       b = MojoMagick::OptBuilder.new
       b.label labels[0]
-      assert_equal "label:#{labels[1]}", b.to_s
+      assert_equal ["label:#{labels[1]}"], b.to_a
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojo_magick
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Steve Midgley
@@ -10,10 +10,10 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: bundle-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -27,7 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundle-audit
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,12 +135,13 @@ files:
 - examples/composite.rb
 - init.rb
 - lib/image_magick/fonts.rb
-- lib/initializers/hash.rb
 - lib/mojo_magick.rb
 - lib/mojo_magick/command_status.rb
+- lib/mojo_magick/commands.rb
 - lib/mojo_magick/errors.rb
 - lib/mojo_magick/font.rb
 - lib/mojo_magick/opt_builder.rb
+- lib/mojo_magick/util/font_parser.rb
 - lib/mojo_magick/util/parser.rb
 - lib/mojo_magick/version.rb
 - mojo_magick.gemspec
@@ -148,11 +149,10 @@ files:
 - test/fixtures/not_an_image.jpg
 - test/fixtures/roll with it.jpg
 - test/fixtures/zero_byte_image.jpg
+- test/font_parser_test.rb
 - test/font_test.rb
-- test/fonts_test.rb
 - test/mojo_magick_test.rb
 - test/opt_builder_test.rb
-- test/parser_test.rb
 - test/test_helper.rb
 homepage: http://github.com/rcode5/mojo_magick
 licenses:
@@ -184,16 +184,15 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
-summary: mojo_magick-0.6.2
+summary: mojo_magick-0.6.3
 test_files:
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg
 - test/fixtures/roll with it.jpg
 - test/fixtures/zero_byte_image.jpg
+- test/font_parser_test.rb
 - test/font_test.rb
-- test/fonts_test.rb
 - test/mojo_magick_test.rb
 - test/opt_builder_test.rb
-- test/parser_test.rb
 - test/test_helper.rb
 ...

data/lib/initializers/hash.rb

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

data/test/fonts_test.rb

@@ -1,11 +0,0 @@
-require_relative "test_helper"
-
-class FontsTest < MiniTest::Test
-  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