mojo_magick 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c114ee3beecac084311f267201862541bab25ce
-  data.tar.gz: c7baa01d41c1597b3ad6b43e6626d65b8e435c4c
+  metadata.gz: c0a8a82a1d4e74c03d2b1a3f919eb8476f6eac92
+  data.tar.gz: d32ab4063c73e53cf2ac43e1bcb45624062c4ed1
 SHA512:
-  metadata.gz: cd34898ed515e081d77c3a82631df8505220a40bd49ad88bc014517774f86b368fab21609df815777796ec32429721d7773ed6dcd13528163e025cfa2321cd9f
-  data.tar.gz: 395ab5c9bb6e222306d771cf0b0d388c3a8eeebdcf17e6d314d7565c2ec803b113b321f8aa3c511b1267903dfa72b294a70726614f51e50ed8e2cfdbf9f95637
+  metadata.gz: 604ef9d680f2735c2f60eb361a03d2abf29e7d45f00568bd7d5a12a13cd52d37569f3ea576321af419279c0db937eea3dc4f0178a73901982cf7397f157f1338
+  data.tar.gz: 32229f796daf59e3f94add73551c845efbd55648ac8e20e321fe6afbd97de036f2c1d9734aaaed5b814a823503e415da33946f03686204a78ab51ca1cae17761

data/Gemfile.lock

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

data/lib/image_magick/resource_limits.rb

@@ -31,7 +31,8 @@ module ImageMagick
       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
+          idx = options.index(resource)
+          resource == options.values_at(idx)[0].to_s.downcase.to_sym if idx
         end
       end
 

data/lib/mojo_magick/opt_builder.rb

@@ -28,6 +28,18 @@ module MojoMagick
       @opts << "label:#{quoted_arg(args.join)}"
     end
 
+    # annotate takes non-standard args
+    def annotate(*args)
+      @opts << '-annotate'
+      arguments = args.join.split
+      if arguments.length == 1
+        arguments.unshift '0'
+      end
+      arguments.each do |arg|
+        add_formatted arg
+      end
+    end
+
     # Create a temporary file for the given image and add to command line
     def format(*args)
       @opts << '-format'

data/lib/mojo_magick/util/parser.rb

@@ -36,6 +36,7 @@ module MojoMagick
 
         actual_values = {}
         readable_values = {}
+
         resources.each_index do |i|
           resource = resources[i].downcase.to_sym
           scale = limits[i].match(%r{[a-z]+$}) || []

data/lib/mojo_magick/version.rb

@@ -1,3 +1,3 @@
 module MojoMagick
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/mojo_magick.gemspec

@@ -14,6 +14,7 @@ EOF
 
 Gem::Specification.new do |s|
   s.name        = "mojo_magick"
+  s.license  = 'MIT'
   s.version     = MojoMagick::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Midgley", "Elliot Nelson", "Jon Rogers"]

data/test/font_test.rb

@@ -16,7 +16,7 @@ Font: Zapf-Dingbats
     glyphs: /Library/Fonts/Zapfino.ttf
 EOF
 
-class FontTest < Test::Unit::TestCase
+class FontTest < MiniTest::Unit::TestCase
 
   def test_font
     f = MojoMagick::Font.new

data/test/fonts_test.rb

@@ -1,6 +1,6 @@
 require File::join(File::dirname(__FILE__), 'test_helper')
 
-class FontsTest < Test::Unit::TestCase
+class FontsTest < MiniTest::Unit::TestCase
 
   def test_get_fonts
     fonts = MojoMagick::get_fonts

data/test/mojo_magick_test.rb

@@ -1,6 +1,6 @@
 require File::join(File::dirname(__FILE__), 'test_helper')
 
-class MojoMagickTest < Test::Unit::TestCase
+class MojoMagickTest < MiniTest::Unit::TestCase
 
   # we keep a fixtures path and a working path so that we can easily test image
   # manipulation routines without tainting the original images
@@ -45,7 +45,7 @@ class MojoMagickTest < Test::Unit::TestCase
     # we should be able to resize image right over itself
     retval = MojoMagick::resize(@test_image, @test_image, {:width=>100, :height=>100})
     assert_equal @test_image, retval
-    assert_not_equal orig_image_size, File::size(@test_image)
+    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]
@@ -119,9 +119,9 @@ class MojoMagickTest < Test::Unit::TestCase
     # test bad images
     bad_image = File::join(@working_path, 'not_an_image.jpg')
     zero_image = File::join(@working_path, 'zero_byte_image.jpg')
-    assert_raise(MojoMagick::MojoFailed) {MojoMagick::get_image_size(bad_image)}
-    assert_raise(MojoMagick::MojoFailed) {MojoMagick::get_image_size(zero_image)}
-    assert_raise(MojoMagick::MojoFailed) {MojoMagick::get_image_size('/file_does_not_exist_here_ok.jpg')}
+    assert_raises(MojoMagick::MojoFailed) {MojoMagick::get_image_size(bad_image)}
+    assert_raises(MojoMagick::MojoFailed) {MojoMagick::get_image_size(zero_image)}
+    assert_raises(MojoMagick::MojoFailed) {MojoMagick::get_image_size('/file_does_not_exist_here_ok.jpg')}
   end
 
   def test_resize_with_fill

data/test/opt_builder_test.rb

@@ -1,10 +1,30 @@
 require File::join(File::dirname(__FILE__), 'test_helper')
 
-class MojoMagickOptBuilderTest < Test::Unit::TestCase
+class MojoMagickOptBuilderTest < MiniTest::Unit::TestCase
 
   # 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

data/test/parser_test.rb

@@ -19,7 +19,7 @@ Font: Zapf-Dingbats
 
 EOF
 
-class ParserTest < Test::Unit::TestCase
+class ParserTest < MiniTest::Unit::TestCase
 
   def test_parse_fonts
     parser = MojoMagick::Util::Parser.new

data/test/resource_limits_test.rb

@@ -1,37 +1,51 @@
 require File::join(File::dirname(__FILE__), 'test_helper')
 
-class ResourceLimitsTest < Test::Unit::TestCase
+class ResourceLimitsTest < MiniTest::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
+  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_test = @orig_limits.dup
+    orig_limits_test.delete_if do |resource, value|
+      assert [:throttle, :area, :map, :disk, :memory, :file, :thread, :time].include?(resource), "Found unexpected resource #{resource}"
+      true
+    end
+    assert_equal 0, orig_limits_test.size
+  end
+
+  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]
+    assert_equal @orig_limits[:area], new_limits[:area]
+  end
 
+  def test_set_limits
     # 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]
+  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
+    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.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Steve Midgley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,7 +93,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+
 
@@ -122,7 +123,7 @@ rubyforge_project: mojo_magick
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: mojo_magick-0.5.2
+summary: mojo_magick-0.5.3
 test_files:
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg