mojo_magick 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 50a45302825af74fc985fd903d6f493407c243f4
-  data.tar.gz: 7d535139b1d46cf04ffa4b003d290b3c806e7e2a
+SHA256:
+  metadata.gz: 30925f12cdcc0bbe8f6626d1f68266f00be28abe536a4c925522d8cbb99750dc
+  data.tar.gz: 1bf5dbdb09fa28ec7e5c0167d32c153f740d00c7541685840ce720d83f53c0fe
 SHA512:
-  metadata.gz: fd3cfe567c2f35d7a87a68843b7139f728ad388fdecbbac03ef0a1f97468dfe3c0b71fb4705372e5b36044c9a0f0cc2346efe8fa86119cf6493bcb462dfaedc3
-  data.tar.gz: 9b8db5160797881095e8551a4540cd4e10ef8f23efb4d8d2d22bcef9d2cc45f703c263442822caf04f169ff64192a511259eb1bbd44b2c5bdcbf523b79fa509c
+  metadata.gz: 29735844a173bc70ded217d142c8c11af8b78880f1396d4678837182d27c57f18e79b17c673d0174ab328e08f47a33aecb522e704701539c44f8723493bc8bab
+  data.tar.gz: 93907724a1c2822532e6009aef4a65b59db0e0197abbe214196b202dfbad337ab95ced02d38576ab68c420692403da1963e8d940637c99b627053afb9be7eb99

data/.ruby-version

@@ -1 +1 @@
-2.1.5
+2.6.6

data/Gemfile.lock

@@ -1,26 +1,35 @@
 PATH
   remote: .
   specs:
-    mojo_magick (0.5.6)
+    mojo_magick (0.5.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.4)
-    multi_json (1.8.2)
-    rake (0.9.2.2)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    diff-lcs (1.3)
+    docile (1.3.2)
+    json (2.2.0)
+    minitest (5.14.2)
+    rake (12.3.3)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    simplecov (0.17.0)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest
   mojo_magick!
   rake
   rspec-expectations
   simplecov
+
+BUNDLED WITH
+   1.17.2

data/README.md

@@ -10,6 +10,7 @@ This tool came about because I wanted a fast, simple, lightweight, nothing-goes-
 because-it's-too-simple-to-break image tool.
 
 [![Gem Version](https://badge.fury.io/rb/mojo_magick.png)](http://badge.fury.io/rb/mojo_magick)
+[![Build Status](https://circleci.com/gh/rcode5/mojo_magick/tree/master.svg?style=shield&circle-token=8d2252bd460bf1a7cdaad5c2e169698605afb981)]()
 
 Using it
 ========

data/Rakefile

@@ -1,20 +1,13 @@
 require 'rubygems'
+require 'rake/testtask'
 
-task 'default' => :test
-
-desc "Default: run tests"
-task :test do
-  require 'simplecov'
-  SimpleCov.start
-  require 'rake/runtest'
-  files = Dir.glob(File.join(File.dirname(__FILE__), 'test/*_test.rb'))
-  files.each do |f|
-    Rake.run_tests f
-  end
+task default: 'test'
+Rake::TestTask.new do |task|
+  task.pattern = 'test/*_test.rb'
 end
 
-desc "Build gem"
+desc 'Build gem'
 task :build do
   `rm mojo_magick-*.gem`
-  puts `gem build mojo_magick.gemspec`  
+  puts `gem build mojo_magick.gemspec`
 end

data/examples/animated_gif.rb

@@ -3,7 +3,7 @@
 
 require 'mojo_magick'
 
-MojoMagick::convert(nil, 'animated.gif') do |c|
+MojoMagick.convert(nil, 'animated.gif') do |c|
   c.size '200x200'
   c.delay 100
   c.image_block do # first layer
@@ -19,4 +19,3 @@ MojoMagick::convert(nil, 'animated.gif') do |c|
     c.label 'SE'
   end
 end
-

data/examples/composite.rb

@@ -3,7 +3,7 @@
 
 require 'mojo_magick'
 
-MojoMagick::convert(nil, 'composite_out.png') do |c|
+MojoMagick.convert(nil, 'composite_out.png') do |c|
   c.size '200x200'
   c.delay 100
   c.image_block do # first layer
@@ -20,4 +20,3 @@ MojoMagick::convert(nil, 'composite_out.png') do |c|
   end
   c.composite
 end
-

data/init.rb

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

data/lib/image_magick/fonts.rb

@@ -3,10 +3,10 @@ module ImageMagick
     def get_fonts
       @parser ||= MojoMagick::Util::Parser.new
       raw_fonts = begin
-                    self.raw_command('identify', '-list font')
-                  rescue Exception => ex
-                    puts ex
-                    puts "Failed to execute font list with raw_command - trying straight up execute"
+                    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)

data/lib/image_magick/resource_limits.rb

@@ -20,71 +20,66 @@ module ImageMagick
     #   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
+    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)
-        mem_fix = 1
-        @@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
+    # 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 = {})
-        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
+    # 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
+    # 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
+    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 = {})
-        mem_fix = 1
-        parse_limits(options.merge(:get_current_limits => true))
-      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
+    alias get_limits get_current_limits
 
-      def parse_limits(options)
-        show_actual_values = options[:show_actual_values]
-        if options[:get_current_limits]
-          status = self.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
+    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
+    # 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} "
+        retval += " -limit #{type} #{value.upcase} "
       end
       retval
     end

data/lib/initializers/hash.rb

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

data/lib/mojo_magick.rb

@@ -1,17 +1,16 @@
-cwd = File::dirname(__FILE__)
+cwd = File.dirname(__FILE__)
 require 'open3'
-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, 'mojo_magick/errors')
-require File::join(cwd, 'mojo_magick/command_status')
-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')
+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, 'mojo_magick/errors')
+require File.join(cwd, 'mojo_magick/command_status')
+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'
 
-
 # MojoMagick is a stateless set of module methods which present a convient interface
 # for accessing common tasks for ImageMagick command line library.
 #
@@ -62,53 +61,50 @@ require 'tempfile'
 # instead of '-' versions.
 #
 module MojoMagick
-
   # enable resource limiting functionality
   extend ImageMagick::ResourceLimits
   extend ImageMagick::Fonts
 
-  def MojoMagick::windows?
-    mem_fix = 1
+  def self.windows?
     !(RUBY_PLATFORM =~ /win32/).nil?
   end
 
-  def MojoMagick::execute(command, args, options = {})
+  def self.execute(command, args, _options = {})
     # this suppress error messages to the console
     # err_pipe = windows? ? "2>nul" : "2>/dev/null"
-    begin
-      execute = "#{command} #{get_limits_as_params} #{args}"
-      out, outerr, status = Open3.capture3(execute)
-      CommandStatus.new execute, out, outerr, status
-    rescue Exception => e
-      raise MojoError, "#{e.class}: #{e.message}"
-    end
+
+    execute = "#{command} #{get_limits_as_params} #{args}"
+    out, outerr, status = Open3.capture3(execute)
+    CommandStatus.new execute, out, outerr, status
+  rescue Exception => e
+    raise MojoError, "#{e.class}: #{e.message}"
   end
-  
-  def MojoMagick::execute!(command, args, options = {})
+
+  def self.execute!(command, args, options = {})
     # this suppress error messages to the console
     # err_pipe = windows? ? "2>nul" : "2>/dev/null"
     status = execute(command, args, options)
-    if !status.success? 
+    unless status.success?
       err_msg = options[: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
-  
-  def MojoMagick::raw_command(*args)
-    self.execute! *args
+
+  def self.raw_command(*args)
+    execute!(*args)
   end
 
-  def MojoMagick::shrink(source_file, dest_file, options)
+  def self.shrink(source_file, dest_file, options)
     opts = options.dup
     opts.delete(:expand_only)
-    MojoMagick::resize(source_file, dest_file, opts.merge(:shrink_only => true))
+    MojoMagick.resize(source_file, dest_file, opts.merge(shrink_only: true))
   end
 
-  def MojoMagick::expand(source_file, dest_file, options)
+  def self.expand(source_file, dest_file, options)
     opts = options.dup
     opts.delete(:shrink_only)
-    MojoMagick::resize(source_file, dest_file, opts.merge(:expand_only => true))
+    MojoMagick.resize(source_file, dest_file, opts.merge(expand_only: true))
   end
 
   # resizes an image and returns the filename written to
@@ -116,13 +112,12 @@ module MojoMagick
   #   :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)
   #   :percent => scale image to this percentage (do not specify :width/:height in this case)
-  def MojoMagick::resize(source_file, dest_file, options)
-    retval = nil
+  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 << '>' 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
 
     extras = []
@@ -134,37 +129,39 @@ module MojoMagick
       raise MojoMagickError, "Unknown options for method resize: #{options.inspect}"
     end
     if !options[:fill].nil? && !options[:crop].nil?
-      extras << "-gravity Center"
+      extras << '-gravity Center'
       extras << "-extent #{geometry}"
     end
-    retval = raw_command("convert", "\"#{source_file}\" -resize \"#{geometry}#{scale_options}\" #{extras.join(' ')} \"#{dest_file}\"")
+    raw_command('convert', "\"#{source_file}\" -resize \"#{geometry}#{scale_options}\" #{extras.join(' ')} \"#{dest_file}\"")
     dest_file
   end
 
-  def MojoMagick::available_fonts
+  def self.available_fonts
     # returns width, height of image if available, nil if not
     Font.all
   end
 
-  def MojoMagick::get_format(source_file, format_string)
-    retval = raw_command("identify", "-format \"#{format_string}\" \"#{source_file}\"")
+  def self.get_format(source_file, format_string)
+    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})
   # raises MojoFailed when results are indeterminate (width and height could not be determined)
-  def MojoMagick::get_image_size(source_file)
+  def self.get_image_size(source_file)
     # returns width, height of image if available, nil if not
-    retval = self.get_format(source_file, %q|w:%w h:%h|)
-    return {} if !retval
-    width = retval.match(%r{w:([0-9]+) })
+    retval = get_format(source_file, 'w:%w h:%h')
+    return {} unless retval
+
+    width = retval.match(/w:([0-9]+) /)
     width = width ? width[1].to_i : nil
-    height = retval.match(%r{h:([0-9]+)})
+    height = retval.match(/h:([0-9]+)/)
     height = height ? height[1].to_i : nil
     raise(MojoFailed, "Indeterminate results in get_image_size: #{source_file}") if !height || !width
-    {:width=>width, :height=>height}
+
+    { width: width, height: height }
   end
 
-  def MojoMagick::convert(source = nil, dest = nil)
+  def self.convert(source = nil, dest = nil)
     opts = OptBuilder.new
     opts.file source if source
     yield opts
@@ -172,27 +169,22 @@ module MojoMagick
     raw_command('convert', opts.to_s)
   end
 
-  def MojoMagick::mogrify(dest = nil)
+  def self.mogrify(dest = nil)
     opts = OptBuilder.new
     yield opts
     opts.file dest if dest
     raw_command('mogrify', opts.to_s)
   end
 
-  def MojoMagick::tempfile(*opts)
-    begin
-      data = opts[0]
-      rest = opts[1]
-      ext = rest && rest[:format]
-      file = Tempfile.new(["mojo", ext ? '.' + ext.to_s : ''])
-      file.binmode
-      file.write(data)
-      file.path
-    rescue Exception => ex
-      raise
-    ensure
-      file.close
-    end
+  def self.tempfile(*opts)
+    data = opts[0]
+    rest = opts[1]
+    ext = rest && rest[:format]
+    file = Tempfile.new(['mojo', ext ? '.' + ext.to_s : ''])
+    file.binmode
+    file.write(data)
+    file.path
+  ensure
+    file.close
   end
-
 end # MojoMagick