rmagick 6.2.0 → 7.0.0

data/lib/rmagick_internal.rb

@@ -1,14 +1,7 @@
 # frozen_string_literal: true
 
-# $Id: rmagick_internal.rb,v 1.84 2009/09/15 22:08:41 rmagick Exp $
-#==============================================================================
-#                  Copyright (C) 2009 by Timothy P. Hunter
-#   Name:       rmagick_internal.rb
-#   Author:     Tim Hunter
-#   Purpose:    Extend Ruby to interface with ImageMagick.
-#   Notes:      RMagick2.so defines the classes. The code below adds methods
-#               to the classes.
-#==============================================================================
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
 
 if RUBY_PLATFORM.match?(/mingw/i)
   require 'ruby_installer'
@@ -775,9 +768,9 @@ module Magick
 
     # Provide an alternate version of Draw#annotate, for folks who
     # want to find it in this class.
-    def annotate(draw, width, height, x, y, text, &block)
+    def annotate(draw, width, height, x, y, text, &)
       check_destroyed
-      draw.annotate(self, width, height, x, y, text, &block)
+      draw.annotate(self, width, height, x, y, text, &)
       self
     end
 
@@ -1389,8 +1382,8 @@ module Magick
     end
     alias size length
 
-    def sort!(*args, &block)
-      @images.sort!(*args, &block)
+    def sort!(*args, &)
+      @images.sort!(*args, &)
       self
     end
 
@@ -1406,17 +1399,17 @@ module Magick
     end
 
     # override Enumerable#collect
-    def collect(&block)
+    def collect(&)
       current = get_current
-      a = @images.map(&block)
+      a = @images.map(&)
       ilist = self.class.new
       a.each { |image| ilist << image }
       ilist.set_current current
       ilist
     end
 
-    def collect!(&block)
-      @images.map!(&block)
+    def collect!(&)
+      @images.map!(&)
       assert_image_array @images
       self
     end
@@ -1474,10 +1467,10 @@ module Magick
       @images.each { |f| f.delay = Integer(d) }
     end
 
-    def delete(obj, &block)
+    def delete(obj, &)
       assert_image obj
       current = get_current
-      a = @images.delete(obj, &block)
+      a = @images.delete(obj, &)
       set_current current
       a
     end
@@ -1489,9 +1482,9 @@ module Magick
       a
     end
 
-    def delete_if(&block)
+    def delete_if(&)
       current = get_current
-      @images.delete_if(&block)
+      @images.delete_if(&)
       set_current current
       self
     end
@@ -1529,9 +1522,9 @@ module Magick
     end
 
     # Override Enumerable's find_all
-    def find_all(&block)
+    def find_all(&)
       current = get_current
-      a = @images.select(&block)
+      a = @images.select(&)
       ilist = self.class.new
       a.each { |image| ilist << image }
       ilist.set_current current
@@ -1603,35 +1596,35 @@ module Magick
     def marshal_load(ary)
       @scene = ary.shift
       @images = []
-      ary.each { |a| @images << Marshal.load(a) }
+      ary.each { |a| @images << Marshal.load(a) } # rubocop:disable Security/MarshalLoad
     end
 
     # The ImageList class supports the Magick::Image class methods by simply sending
     # the method to the current image. If the method isn't explicitly supported,
     # send it to the current image in the array. If there are no images, send
     # it up the line. Catch a NameError and emit a useful message.
-    def method_missing(meth_id, *args, &block)
+    def method_missing(meth_id, *args, &)
       if @scene
         img = @images[@scene]
-        new_img = img.public_send(meth_id, *args, &block)
+        new_img = img.public_send(meth_id, *args, &)
         img.equal?(new_img) ? self : new_img
       else
         super
       end
     rescue NoMethodError
       Kernel.raise NoMethodError, "undefined method `#{meth_id.id2name}' for #{self.class}"
-    rescue Exception
+    rescue StandardError
       $ERROR_POSITION.delete_if { |s| /:in `send'$/.match(s) || /:in `method_missing'$/.match(s) }
       Kernel.raise
     end
 
     # Create a new image and add it to the end
-    def new_image(cols, rows, *fill, &info_blk)
-      self << Magick::Image.new(cols, rows, *fill, &info_blk)
+    def new_image(cols, rows, *fill, &)
+      self << Magick::Image.new(cols, rows, *fill, &)
     end
 
-    def partition(&block)
-      a = @images.partition(&block)
+    def partition(&)
+      a = @images.partition(&)
       t = self.class.new
       a[0].each { |img| t << img }
       t.set_current nil
@@ -1678,18 +1671,18 @@ module Magick
     end
 
     # override Enumerable's reject
-    def reject(&block)
+    def reject(&)
       current = get_current
       ilist = self.class.new
-      a = @images.reject(&block)
+      a = @images.reject(&)
       a.each { |image| ilist << image }
       ilist.set_current current
       ilist
     end
 
-    def reject!(&block)
+    def reject!(&)
       current = get_current
-      a = @images.reject!(&block)
+      a = @images.reject!(&)
       @images = a unless a.nil?
       set_current current
       a.nil? ? nil : self
@@ -1732,8 +1725,8 @@ module Magick
       self
     end
 
-    def reverse_each(&block)
-      @images.reverse_each(&block)
+    def reverse_each(&)
+      @images.reverse_each(&)
       self
     end
 

data/lib/rvg/clippath.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: clippath.rb,v 1.5 2009/02/28 23:52:13 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     class ClipPath

data/lib/rvg/container.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: container.rb,v 1.5 2009/02/28 23:52:13 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     # Content is simply an Array with a deep_copy method.

data/lib/rvg/deep_equal.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     [PathData, Styles, Transforms].each do |c|

data/lib/rvg/describable.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: describable.rb,v 1.5 2009/02/28 23:52:13 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     #--
@@ -13,7 +12,7 @@ module Magick
     module Describable
       private
 
-      def initialize(*args, &block)
+      def initialize(*args, &)
         super
         @title, @desc, @metadata = nil
       end

data/lib/rvg/embellishable.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: embellishable.rb,v 1.9 2009/02/28 23:52:13 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     # Parent class of Circle, Ellipse, Text, etc.
@@ -332,8 +331,8 @@ module Magick
       # transforms specified on this object will be used by objects
       # contained within, unless overridden by an inner container or
       # the contained object itself.
-      def rvg(cols, rows, x = 0, y = 0, &block)
-        rvg = Magick::RVG.new(cols, rows, &block)
+      def rvg(cols, rows, x = 0, y = 0, &)
+        rvg = Magick::RVG.new(cols, rows, &)
         begin
           x = Float(x)
           y = Float(y)
@@ -355,8 +354,8 @@ module Magick
       # the contained object itself.
       # Define grouped elements by calling RVG::Embellishable
       # methods within the associated block.
-      def g(&block)
-        group = Group.new(&block)
+      def g(&)
+        group = Group.new(&)
         @content << group
         group
       end

data/lib/rvg/misc.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-# $Id: misc.rb,v 1.17 2010/03/21 01:43:01 baror Exp $
-# Copyright (C) 2009 Timothy P. Hunter
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     # This is a standard deep_copy method that is used in most classes.
@@ -315,7 +316,7 @@ module Magick
   class RVG
     class Utility
       class TextAttributes
-        WRITING_MODE = %w[lr-tb lr rl-tb rl tb-rl tb]
+        WRITING_MODE = %w[lr-tb lr rl-tb rl tb-rl tb].freeze
 
         def initialize
           @affine = []
@@ -445,39 +446,39 @@ module Magick
           expanded: Magick::ExpandedStretch,
           extra_expanded: Magick::ExtraExpandedStretch,
           ultra_expanded: Magick::UltraExpandedStretch
-        }
+        }.freeze
 
         FONT_STYLE = {
           normal: Magick::NormalStyle,
           italic: Magick::ItalicStyle,
           oblique: Magick::ObliqueStyle
-        }
+        }.freeze
 
         FONT_WEIGHT = {
           normal: Magick::NormalWeight,
           bold: Magick::BoldWeight,
           bolder: Magick::BolderWeight,
           lighter: Magick::LighterWeight
-        }
+        }.freeze
 
         TEXT_ANCHOR = {
           start: Magick::StartAnchor,
           middle: Magick::MiddleAnchor,
           end: Magick::EndAnchor
-        }
+        }.freeze
 
         ANCHOR_TO_ALIGN = {
           start: Magick::LeftAlign,
           middle: Magick::CenterAlign,
           end: Magick::RightAlign
-        }
+        }.freeze
 
         TEXT_DECORATION = {
           none: Magick::NoDecoration,
           underline: Magick::UnderlineDecoration,
           overline: Magick::OverlineDecoration,
           line_through: Magick::LineThroughDecoration
-        }
+        }.freeze
 
         TEXT_STRATEGIES = {
           'lr-tb' => LRTextStrategy,
@@ -486,7 +487,7 @@ module Magick
           'rl' => RLTextStrategy,
           'tb-rl' => TBTextStrategy,
           'tb' => TBTextStrategy
-        }
+        }.freeze
 
         def self.degrees_to_radians(deg)
           Math::PI * (deg % 360.0) / 180.0
@@ -524,8 +525,8 @@ module Magick
           init_matrix
         end
 
-        def method_missing(meth_id, *args, &block)
-          @gc.__send__(meth_id, *args, &block)
+        def method_missing(meth_id, *args, &)
+          @gc.__send__(meth_id, *args, &)
         end
 
         def affine(sx, rx, ry, sy, tx, ty)

data/lib/rvg/paint.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: paint.rb,v 1.6 2009/02/28 23:52:28 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 # Defines paint server classes.
 # Eventually this will include gradients.
 module Magick

data/lib/rvg/pathdata.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: pathdata.rb,v 1.5 2009/02/28 23:52:28 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     # The PathData class provides an object-oriented way to produce an SVG

data/lib/rvg/rvg.rb

@@ -1,34 +1,8 @@
 # frozen_string_literal: true
 
-#--############################################################################
-# $Id: rvg.rb,v 1.10 2009/02/28 23:52:28 rmagick Exp $
-#
-#                    Copyright (C) 2009 by Timothy P. Hunter
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-#
-# This software is OSI Certified Open Source Software.
-# OSI Certified is a certification mark of the Open Source Initiative.
-#
-#++############################################################################
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 require 'rmagick'
 require 'rvg/misc'
 require 'rvg/describable'

data/lib/rvg/stretchable.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: stretchable.rb,v 1.7 2009/02/28 23:52:28 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     module PreserveAspectRatio
@@ -111,7 +110,7 @@ module Magick
         # Add a non-scaled translation if meet or slice
         gc.translate(tx, ty) if tx.abs > 1.0e-10 || ty.abs > 1.0e-10
         # Scale viewbox as necessary
-        gc.scale(sx, sy) if sx != 1.0 || sy != 1.0
+        gc.scale(sx, sy) if (sx - 1.0).abs > Float::EPSILON || (sy - 1.0).abs > Float::EPSILON
         # Add a scaled translation if non-0 origin
         gc.translate(-@vbx_x, -@vbx_y) if @vbx_x.abs != 0.0 || @vbx_y.abs != 0
       end

data/lib/rvg/stylable.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: stylable.rb,v 1.7 2009/02/28 23:52:28 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     # :stopdoc:
@@ -15,7 +14,7 @@ module Magick
       text_anchor text_decoration
       glyph_orientation_vertical glyph_orientation_horizontal
       letter_spacing word_spacing baseline_shift writing_mode
-    ]
+    ].freeze
 
     Styles = Struct.new(*STYLES)
 

data/lib/rvg/text.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: text.rb,v 1.7 2009/02/28 23:52:28 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 # Text-related classes
 module Magick
   class RVG
@@ -124,9 +123,9 @@ module Magick
       # at the current text position.
       #
       # Tspan objects can contain Tspan objects.
-      def initialize(text = nil, x = nil, y = nil, &block)
+      def initialize(text = nil, x = nil, y = nil, &)
         @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
-        super(text, &block)
+        super(text, &)
       end
     end # class Tspan
 
@@ -145,9 +144,9 @@ module Magick
       #     t.tspan("Red text").styles(:fill=>'red')
       #     t.tspan("Blue text").styles(:fill=>'blue')
       #  end
-      def initialize(x = 0, y = 0, text = nil, &block)
+      def initialize(x = 0, y = 0, text = nil, &)
         @cx, @cy = Magick::RVG.convert_to_float(x, y)
-        super(text, &block)
+        super(text, &)
       end
 
       # Reference a Tspan object. <tt>x</tt> and <tt>y</tt> are just
@@ -168,8 +167,8 @@ module Magick
       # Draw a text string at (<tt>x</tt>,<tt>y</tt>). The string can
       # be omitted. Optionally, define text chunks within the associated
       # block.
-      def text(x = 0, y = 0, text = nil, &block)
-        t = Text.new(x, y, text, &block)
+      def text(x = 0, y = 0, text = nil, &)
+        t = Text.new(x, y, text, &)
         @content << t
         t
       end

data/lib/rvg/transformable.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-#--
-# $Id: transformable.rb,v 1.5 2009/02/28 23:52:28 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
-#++
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     # Transforms is an Array with a deep_copy method.

data/lib/rvg/units.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-# $Id: units.rb,v 1.5 2009/02/28 23:52:28 rmagick Exp $
-# Copyright (C) 2009 Timothy P. Hunter
+# Copyright (c) 2002 - 2009 Timothy P. Hunter
+# Copyright (c) 2009 -      RMagick contributors
+
 module Magick
   class RVG
     # Define RVG.dpi and RVG.dpi=. Add conversions to Integer and Float classes

data/rmagick.gemspec

@@ -19,15 +19,17 @@ Gem::Specification.new do |s|
   s.metadata['rubygems_mfa_required'] = 'true'
 
   tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
-  file_exclusion_regex = /\A(doc|benchmarks|examples|spec|Steepfile)/
-  files = tracked_files.reject { |file| file[file_exclusion_regex] }
+  file_exclusion_regex = /\A(\.|doc|benchmarks|examples|spec|Steepfile|before_install)/
+  files = tracked_files.reject do |file|
+    file != '.yardopts' && file[file_exclusion_regex]
+  end
 
   s.files = files
   s.require_paths << 'ext'
 
   s.extensions = %w[ext/RMagick/extconf.rb]
-  s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"
-  s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
+  s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}" # rubocop:disable Gemspec/RequiredRubyVersion
+  s.requirements << "ImageMagick #{Magick::MIN_IM6_VERSION}+ (for ImageMagick 6) or #{Magick::MIN_IM7_VERSION}+ (for ImageMagick 7)"
 
   s.add_dependency 'observer', '~> 0.1'
   s.add_dependency 'pkg-config', '~> 1.4'

data/sig/rmagick.rbs

@@ -16,7 +16,8 @@ module Magick
 
   VERSION: String
   MIN_RUBY_VERSION: String
-  MIN_IM_VERSION: String
+  MIN_IM6_VERSION: String
+  MIN_IM7_VERSION: String
 
   QuantumRange: Integer
   MAGICKCORE_QUANTUM_DEPTH: Integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -47,19 +47,6 @@ extensions:
 - ext/RMagick/extconf.rb
 extra_rdoc_files: []
 files:
-- ".devcontainer/Dockerfile"
-- ".devcontainer/ImageMagick6/devcontainer.json"
-- ".devcontainer/devcontainer.json"
-- ".devcontainer/setup-repo.sh"
-- ".devcontainer/setup-user.sh"
-- ".editorconfig"
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/ISSUE_TEMPLATE/report.yml"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -68,8 +55,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- before_install_linux.sh
-- before_install_osx.sh
 - ext/RMagick/extconf.rb
 - ext/RMagick/rmagick.cpp
 - ext/RMagick/rmagick.h
@@ -150,15 +135,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- ImageMagick 6.8.9 or later
-rubygems_version: 4.0.6
+- ImageMagick 6.9.0+ (for ImageMagick 6) or 7.1.0+ (for ImageMagick 7)
+rubygems_version: 4.0.11
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []

data/.devcontainer/Dockerfile

@@ -1,14 +0,0 @@
-ARG RUBY_VERSION
-
-FROM ruby:${RUBY_VERSION}
-
-ARG IMAGEMAGICK_VERSION
-
-RUN mkdir /setup
-ADD *.sh /setup
-
-ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION}
-
-RUN /setup/setup-user.sh
-
-WORKDIR /workspaces/rmagick

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -1,11 +0,0 @@
-{
-  "name": "ImageMagick 6",
-  "build": {
-    "dockerfile": "../Dockerfile",
-    "args": {
-      "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "6.9.13-33"
-    }
-  },
-  "onCreateCommand": "/setup/setup-repo.sh"
-}

data/.devcontainer/devcontainer.json

@@ -1,11 +0,0 @@
-{
-  "name": "ImageMagick 7",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "args": {
-      "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "7.1.2-8"
-    }
-  },
-  "onCreateCommand": "/setup/setup-repo.sh"
-}