mojo_magick 0.5.7 → 0.6.5

data/test/opt_builder_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require_relative "test_helper"
 
 class MojoMagickOptBuilderTest < MiniTest::Test
   # These tests make the assumption that if we call #raw_command with the
@@ -10,120 +10,139 @@ class MojoMagickOptBuilderTest < MiniTest::Test
   end
 
   def test_annotate
-    @builder.annotate 'blah'
-    assert_equal '-annotate 0 blah', @builder.to_s
+    @builder.annotate "blah"
+    assert_equal %w[-annotate 0 blah], @builder.to_a
   end
 
   def test_annotate_with_escapeable_string
-    @builder.annotate 'it\'s'
-    assert_equal '-annotate 0 "it\'s"', @builder.to_s
+    @builder.annotate "it's"
+    assert_equal %w[-annotate 0 it's], @builder.to_a
   end
 
-  def test_annotate_with_full_args
-    @builder.annotate '5 it\'s'
-    assert_equal '-annotate 5 "it\'s"', @builder.to_s
+  def test_annotate_with_multiple_args
+    @builder.annotate "5 it's"
+    assert_equal ["-annotate", "0", "5 it's"], @builder.to_a
+  end
+
+  def test_annotate_with_geometry_args
+    @builder.annotate "this thing", geometry: 3
+    assert_equal ["-annotate", "3", "this thing"], @builder.to_a
+  end
+
+  def test_annotate_with_full_array_args
+    @builder.annotate "this", "thing", geometry: 3
+    assert_equal ["-annotate", "3", "thisthing"], @builder.to_a
   end
 
   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_s
+    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 '-background "#000000"', b.to_s
+    @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 '-extent 256x256+0+0 -crop 64x64', b.to_s
-
-    # 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_s
-
-    # Existing doublequotes are escaped
-    b = MojoMagick::OptBuilder.new
-    b.comment 'Fred "Woot" Rook'
-    assert_equal '-comment "Fred \"Woot\" Rook"', b.to_s
 
+    @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_s
 
+    @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 'source.jpg source2.jpg -append -crop 64x64 dest%d.jpg', b.to_s
-
-    # Files are quoted (doublequote) if appropriate
-    b = MojoMagick::OptBuilder.new
-    b.file 'probably on windows.jpg'
-    assert_equal '"probably on windows.jpg"', b.to_s
-
-    # Blob is a shortcut for the #tempfile helper method
-    b = MojoMagick::OptBuilder.new
-    b.blob 'binary data'
-    filename = b.to_s
-    File.open(filename, 'rb') do |f|
-      assert_equal 'binary data', f.read
+
+    @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"'],
-     ['Rock it, cuz i said so!', '"Rock it, cuz i said so!"'],
+     ["Rock it, cuz i said so!", '"Rock it, cuz i said so!"'],
      ["it's like this", '"it\'s like this"'],
-     ['#$%^&*', '"#$%^&*"']].each do |labels|
+     ["\#$%^&*", '"#$%^&*"']].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

data/test/test_helper.rb

@@ -1,6 +1,7 @@
-require 'minitest/autorun'
-require 'minitest/pride'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'init'))
-require 'fileutils'
-require 'tempfile'
-require 'rspec/expectations'
+require "simplecov"
+SimpleCov.start
+
+require "minitest/autorun"
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))
+require "fileutils"
+require "tempfile"

metadata

@@ -1,17 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: mojo_magick
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.5
 platform: ruby
 authors:
 - Steve Midgley
 - Elliot Nelson
 - Jon Rogers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundle-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +69,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -76,7 +104,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
+- ".rubocop-common.yml"
+- ".rubocop-performance.yml"
+- ".rubocop.yml"
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
@@ -87,25 +120,24 @@ files:
 - examples/composite.rb
 - init.rb
 - lib/image_magick/fonts.rb
-- lib/image_magick/resource_limits.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
 - 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/resource_limits_test.rb
 - test/test_helper.rb
 homepage: http://github.com/rcode5/mojo_magick
 licenses:
@@ -127,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -135,18 +167,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
-summary: mojo_magick-0.5.7
+summary: mojo_magick-0.6.5
 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/resource_limits_test.rb
 - test/test_helper.rb
 ...

data/lib/image_magick/resource_limits.rb

@@ -1,91 +0,0 @@
-# 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)
-      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)
-      @@resource_limits.delete_if do |resource, _value|
-        idx = options.index(resource)
-        resource == options.values_at(idx)[0].to_s.downcase.to_sym if idx
-      end
-    end
-
-    # remove limits from resources
-    def unset_limits(options = {})
-      @@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 = {})
-      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 = {})
-      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]
-        status = execute('identify', '-list resource')
-        raw_limits = status.return_value
-      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} #{value.upcase} "
-      end
-      retval
-    end
-
-    def parser
-      @parser ||= MojoMagick::Util::Parser.new
-    end
-  end
-end