mojo_magick 0.5.2 → 0.5.7

data/test/opt_builder_test.rb

@@ -1,10 +1,29 @@
-require File::join(File::dirname(__FILE__), 'test_helper')
-
-class MojoMagickOptBuilderTest < Test::Unit::TestCase
+require File.join(File.dirname(__FILE__), 'test_helper')
 
+class MojoMagickOptBuilderTest < MiniTest::Test
   # These tests make the assumption that if we call #raw_command with the
   # correct strings, ImageMagick itself will operate correctly. We're only
   # verifying that the option builder produces the correct strings
+
+  def setup
+    @builder = MojoMagick::OptBuilder.new
+  end
+
+  def test_annotate
+    @builder.annotate 'blah'
+    assert_equal '-annotate 0 blah', @builder.to_s
+  end
+
+  def test_annotate_with_escapeable_string
+    @builder.annotate 'it\'s'
+    assert_equal '-annotate 0 "it\'s"', @builder.to_s
+  end
+
+  def test_annotate_with_full_args
+    @builder.annotate '5 it\'s'
+    assert_equal '-annotate 5 "it\'s"', @builder.to_s
+  end
+
   def test_option_builder_with_blocks
     # Passing in basic commands produces a string
     b = MojoMagick::OptBuilder.new
@@ -17,7 +36,7 @@ class MojoMagickOptBuilderTest < Test::Unit::TestCase
     assert_equal '\( -background red \) \( -background blue \)', b.to_s
   end
 
-  def test_option_builder_with_hex_colors 
+  def test_option_builder_with_hex_colors
     b = MojoMagick::OptBuilder.new
     b.background '#000000'
     assert_equal '-background "#000000"', b.to_s
@@ -49,7 +68,7 @@ class MojoMagickOptBuilderTest < Test::Unit::TestCase
 
     # Treats an array of raw data as different arguments
     b = MojoMagick::OptBuilder.new
-    b << ['leave this data','alone']
+    b << ['leave this data', 'alone']
     assert_equal 'leave this data alone', b.to_s
 
     # String includes command arguments
@@ -93,20 +112,18 @@ class MojoMagickOptBuilderTest < Test::Unit::TestCase
     b.blob 'binary data'
     filename = b.to_s
     File.open(filename, 'rb') do |f|
-      assert_equal f.read, 'binary data'
+      assert_equal 'binary data', f.read
     end
 
-    #label for text should use 'label:"the string"' if specified
-    [[ 'mylabel', 'mylabel' ],
-     [ 'my " label', '"my \" label"' ],
-     [ 'Rock it, cuz i said so!', '"Rock it, cuz i said so!"'],
-     [ "it's like this", '"it\'s like this"'],
-     [ '#$%^&*', '"#$%^&*"']].each do |labels|
-
+    # 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!"'],
+     ["it's like this", '"it\'s like this"'],
+     ['#$%^&*', '"#$%^&*"']].each do |labels|
       b = MojoMagick::OptBuilder.new
       b.label labels[0]
       assert_equal "label:#{labels[1]}", b.to_s
     end
-
   end
 end

data/test/parser_test.rb

@@ -1,26 +1,25 @@
-require File::join(File::dirname(__FILE__), 'test_helper')
+require File.join(File.dirname(__FILE__), 'test_helper')
 
-IDENTIFY_FONT_RESPONSE =<<EOF
+IDENTIFY_FONT_RESPONSE = <<~EOF.freeze
 
-Font: Zapf-Dingbats
-    family: Zapf Dingbats
-    style: Normal
-    stretch: Normal
-    weight: 400
-    glyphs: /System/Library/Fonts/ZapfDingbats.ttf
+  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
+    Font: Zapfino
+      family: Zapfino
+      style: Italic
+      stretch: Normal
+      weight: 400
+      glyphs: /Library/Fonts/Zapfino.ttf
 
 
 EOF
 
-class ParserTest < Test::Unit::TestCase
-
+class ParserTest < MiniTest::Test
   def test_parse_fonts
     parser = MojoMagick::Util::Parser.new
     parsed_fonts = parser.parse_fonts(IDENTIFY_FONT_RESPONSE)

data/test/resource_limits_test.rb

@@ -1,37 +1,49 @@
-require File::join(File::dirname(__FILE__), 'test_helper')
+require File.join(File.dirname(__FILE__), 'test_helper')
 
-class ResourceLimitsTest < Test::Unit::TestCase
+class ResourceLimitsTest < MiniTest::Test
+  def setup
+    @orig_limits = MojoMagick.get_default_limits
+  end
+
+  def test_set_limits
+    # set area to 32mb limit
+    MojoMagick.set_limits(area: '32mb')
+    new_limits = MojoMagick.get_current_limits
+    assert_equal '32mb', new_limits[:area].downcase
+  end
+
+  def test_get_limits
+    assert(@orig_limits.size >= 7)
+  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}"
+    orig_limits_test = @orig_limits.dup
+    orig_limits_test.delete_if do |resource, _value|
+      assert %i[throttle area map disk memory file thread time].include?(resource), "Found unexpected resource #{resource}"
       true
     end
     assert_equal 0, orig_limits_test.size
+  end
 
-    # set area to 32mb limit
-    MojoMagick::set_limits(:area => '32mb')
-    new_limits = MojoMagick::get_current_limits
-    assert_equal '32mb', new_limits[:area].downcase
-
+  def test_get_current_limits
     # remove limits on area
-    MojoMagick::remove_limits(:area)
-    new_limits = MojoMagick::get_current_limits
-    assert_equal orig_limits[:area], new_limits[:area]
+    MojoMagick.remove_limits(:area)
+    new_limits = MojoMagick.get_current_limits
+    assert_equal @orig_limits[:area], new_limits[:area]
+  end
 
+  def test_set_limits_again
     # 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)
+    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]
+  end
 
+  def test_unset_limits
     # return to original/default limit values
-    MojoMagick::unset_limits
-    new_limits = MojoMagick::get_current_limits
-    assert_equal orig_limits, new_limits
+    MojoMagick.unset_limits
+    new_limits = MojoMagick.get_current_limits
+    assert_equal @orig_limits, new_limits
   end
-
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
-require 'test/unit'
-require File::expand_path(File::join(File::dirname(__FILE__), '..', 'init'))
+require 'minitest/autorun'
+require 'minitest/pride'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'init'))
 require 'fileutils'
 require 'tempfile'
 require 'rspec/expectations'
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojo_magick
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.7
 platform: ruby
 authors:
 - Steve Midgley
@@ -10,60 +10,74 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   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: simplecov
+  name: rake
   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: rspec-expectations
   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: simplecov
+  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'
 description: Simple Ruby stateless module interface to imagemagick.
 email:
-- public@misuse.org
+- science@misuse.org
 - jon@rcode5.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -74,9 +88,10 @@ files:
 - 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/command_status.rb
+- lib/mojo_magick/errors.rb
 - lib/mojo_magick/font.rb
 - lib/mojo_magick/opt_builder.rb
 - lib/mojo_magick/util/parser.rb
@@ -93,7 +108,8 @@ files:
 - test/resource_limits_test.rb
 - test/test_helper.rb
 homepage: http://github.com/rcode5/mojo_magick
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: |2+
 
@@ -109,20 +125,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: mojo_magick
-rubygems_version: 2.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: mojo_magick-0.5.2
+summary: mojo_magick-0.5.7
 test_files:
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg
@@ -134,3 +149,4 @@ test_files:
 - test/parser_test.rb
 - test/resource_limits_test.rb
 - test/test_helper.rb
+...