rmagick 2.16.0 → 5.3.0

data/lib/rvg/text.rb

@@ -4,169 +4,173 @@
 #++
 # Text-related classes
 module Magick
-    class RVG
-        # Base class for Tspan, Tref and Text.
-        class TextBase
-            include Stylable
-            include Duplicatable
-
-          private
-
-            def initialize(text, &block)    #:nodoc:
-                super()
-                @text = text.to_s if text
-                @dx = @dy = 0
-                @rotation = 0
-                @tspans = Content.new
-                yield(self) if block_given?
-            end
-
-          public
-
-            # Create a new text chunk. Each chunk can have its own initial position and styles.
-            # If <tt>x</tt> and <tt>y</tt> are omitted the text starts at the current text
-            # position.
-            def tspan(text, x=nil, y=nil)
-                tspan = Tspan.new(text, x, y)
-                tspan.parent = self
-                @tspans << tspan
-                tspan
-            end
-
-            # Add <tt>x</tt> and <tt>y</tt> to the current text position.
-            def d(x, y=0)
-                @dx, @dy = Magick::RVG.convert_to_float(x, y)
-                yield(self) if block_given?
-                self
-            end
-
-            # Rotate the text about the current text position.
-            def rotate(degrees)
-                @rotation = Magick::RVG.convert_to_float(degrees)[0]
-                yield(self) if block_given?
-                self
-            end
-
-            # We do our own transformations.
-            def add_primitives(gc)  #:nodoc:
-                if @text || @tspans.length > 0
-                    gc.push
-                    x = cx + @dx
-                    y = cy + @dy
-                    if @rotation != 0
-                        gc.translate(x, y)
-                        gc.rotate(@rotation)
-                        gc.translate(-x, -y)
-                    end
-                    add_style_primitives(gc)
-                    if @text
-                        x2, y2 = gc.text(x, y, @text)
-                        self.cx = x + x2
-                        self.cy = y + y2
-                    end
-                    @tspans.each do |tspan|
-                        tspan.add_primitives(gc)
-                    end
-                    gc.pop
-                end
-            end
-        end     # class TextBase
-
-        # Tspan and Tref shared methods - read/update @cx, @cy in parent Text object.
-        module TextLink     #:nodoc:
-            def add_primitives(gc)
-                @parent.cx = @x if @x
-                @parent.cy = @y if @y
-                super
-            end
-
-            def cx
-                @parent.cx
-            end
-
-            def cy
-                @parent.cy
-            end
-
-            def cx=(x)
-                @parent.cx = x
-            end
-
-            def cy=(y)
-                @parent.cy = y
-            end
-        end     # module TextLink
-
-        class Tref < TextBase  #:nodoc:
-            include TextLink
-
-            def initialize(obj, x, y, parent)
-                @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
-                super(nil)
-                @tspans << obj
-                @parent = parent
-            end
-        end     # class Tref
-
-        class Tspan < TextBase  #:nodoc:
-            include TextLink
-
-            attr_accessor :parent
-
-            # Define a text segment starting at (<tt>x</tt>, <tt>y</tt>).
-            # If <tt>x</tt> and <tt>y</tt> are omitted the segment starts
-            # at the current text position.
-            #
-            # Tspan objects can contain Tspan objects.
-            def initialize(text=nil, x=nil, y=nil, &block)
-                @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
-                super(text, &block)
-            end
-        end     # class Tspan
-
-        class Text < TextBase
-            attr_accessor :cx, :cy  #:nodoc:
-
-            # Define a text string starting at [<tt>x</tt>, <tt>y</tt>].
-            # Use the RVG::TextConstructors#text method to create Text objects in a container.
-            #
-            #  container.text(100, 100, "Simple text").styles(:font=>'Arial')
-            #
-            # Text objects can contain Tspan objects.
-            #
-            #  container.text(100, 100).styles(:font=>'Arial') do |t|
-            #     t.tspan("Red text").styles(:fill=>'red')
-            #     t.tspan("Blue text").styles(:fill=>'blue')
-            #  end
-            def initialize(x=0, y=0, text=nil, &block)
-                @cx, @cy = Magick::RVG.convert_to_float(x, y)
-                super(text, &block)
-            end
-
-            # Reference a Tspan object. <tt>x</tt> and <tt>y</tt> are just
-            # like <tt>x</tt> and <tt>y</tt> in RVG::TextBase#tspan
-            def tref(obj, x=nil, y=nil)
-                unless obj.is_a?(Tspan)
-                    fail ArgumentError, "wrong argument type #{obj.class} (expected Tspan)"
-                end
-                obj = obj.deep_copy
-                obj.parent = self
-                tref = Tref.new(obj, x, y, self)
-                @tspans << tref
-                tref
-            end
-        end     # class Text
-
-        # Methods that construct text objects within a container
-        module TextConstructors
-            # 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)
-                @content << t
-                t
-            end
-        end     # module TextConstructors
-    end # class RVG
+  class RVG
+    # Base class for Tspan, Tref and Text.
+    class TextBase
+      include Stylable
+      include Duplicatable
+
+      private
+
+      def initialize(text)
+        super()
+        @text = text.to_s if text
+        @dx = @dy = 0
+        @rotation = 0
+        @tspans = Content.new
+        yield(self) if block_given?
+      end
+
+      public
+
+      # Create a new text chunk. Each chunk can have its own initial position and styles.
+      # If <tt>x</tt> and <tt>y</tt> are omitted the text starts at the current text
+      # position.
+      def tspan(text, x = nil, y = nil)
+        tspan = Tspan.new(text, x, y)
+        tspan.parent = self
+        @tspans << tspan
+        tspan
+      end
+
+      # Add <tt>x</tt> and <tt>y</tt> to the current text position.
+      def d(x, y = 0)
+        @dx, @dy = Magick::RVG.convert_to_float(x, y)
+        yield(self) if block_given?
+        self
+      end
+
+      # Rotate the text about the current text position.
+      def rotate(degrees)
+        @rotation = Magick::RVG.convert_to_float(degrees)[0]
+        yield(self) if block_given?
+        self
+      end
+
+      # We do our own transformations.
+      # @private
+      def add_primitives(gc)
+        return if !@text && @tspans.empty?
+
+        gc.push
+        x = cx + @dx
+        y = cy + @dy
+        if @rotation != 0
+          gc.translate(x, y)
+          gc.rotate(@rotation)
+          gc.translate(-x, -y)
+        end
+        add_style_primitives(gc)
+        if @text
+          x2, y2 = gc.text(x, y, @text)
+          self.cx = x + x2
+          self.cy = y + y2
+        end
+        @tspans.each do |tspan|
+          tspan.add_primitives(gc)
+        end
+        gc.pop
+      end
+    end # class TextBase
+
+    # Tspan and Tref shared methods - read/update @cx, @cy in parent Text object.
+    # @private
+    module TextLink
+      def add_primitives(gc)
+        @parent.cx = @x if @x
+        @parent.cy = @y if @y
+        super
+      end
+
+      def cx
+        @parent.cx
+      end
+
+      def cy
+        @parent.cy
+      end
+
+      def cx=(x)
+        @parent.cx = x
+      end
+
+      def cy=(y)
+        @parent.cy = y
+      end
+    end # module TextLink
+
+    # @private
+    class Tref < TextBase
+      include TextLink
+
+      def initialize(obj, x, y, parent)
+        @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
+        super(nil)
+        @tspans << obj
+        @parent = parent
+      end
+    end # class Tref
+
+    # @private
+    class Tspan < TextBase
+      include TextLink
+
+      attr_accessor :parent
+
+      # Define a text segment starting at (<tt>x</tt>, <tt>y</tt>).
+      # If <tt>x</tt> and <tt>y</tt> are omitted the segment starts
+      # at the current text position.
+      #
+      # Tspan objects can contain Tspan objects.
+      def initialize(text = nil, x = nil, y = nil, &block)
+        @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
+        super(text, &block)
+      end
+    end # class Tspan
+
+    class Text < TextBase
+      # @private
+      attr_accessor :cx, :cy
+
+      # Define a text string starting at [<tt>x</tt>, <tt>y</tt>].
+      # Use the RVG::TextConstructors#text method to create Text objects in a container.
+      #
+      #  container.text(100, 100, "Simple text").styles(:font=>'Arial')
+      #
+      # Text objects can contain Tspan objects.
+      #
+      #  container.text(100, 100).styles(:font=>'Arial') do |t|
+      #     t.tspan("Red text").styles(:fill=>'red')
+      #     t.tspan("Blue text").styles(:fill=>'blue')
+      #  end
+      def initialize(x = 0, y = 0, text = nil, &block)
+        @cx, @cy = Magick::RVG.convert_to_float(x, y)
+        super(text, &block)
+      end
+
+      # Reference a Tspan object. <tt>x</tt> and <tt>y</tt> are just
+      # like <tt>x</tt> and <tt>y</tt> in RVG::TextBase#tspan
+      def tref(obj, x = nil, y = nil)
+        raise ArgumentError, "wrong argument type #{obj.class} (expected Tspan)" unless obj.is_a?(Tspan)
+
+        obj = obj.deep_copy
+        obj.parent = self
+        tref = Tref.new(obj, x, y, self)
+        @tspans << tref
+        tref
+      end
+    end # class Text
+
+    # Methods that construct text objects within a container
+    module TextConstructors
+      # 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)
+        @content << t
+        t
+      end
+    end # module TextConstructors
+  end # class RVG
 end # module Magick

data/lib/rvg/transformable.rb

@@ -6,13 +6,14 @@ module Magick
   class RVG
     # Transforms is an Array with a deep_copy method.
     # During unit-testing it also has a deep_equal method.
-    class Transforms < Array #:nodoc:
-      def deep_copy(h = nil)
+    # @private
+    class Transforms < Array
+      def deep_copy(_h = nil)
         copy = self.class.new
         each { |transform| copy << [transform[0], transform[1].dup] }
         copy
       end
-    end     # class Transform
+    end # class Transform
 
     # Transformations are operations on the coordinate system.
     # All the transformations defined within a container (an RVG object
@@ -30,7 +31,7 @@ module Magick
         @transforms.each { |transform| gc.__send__(transform[0], *transform[1]) }
       end
 
-      def initialize(*args, &block)
+      def initialize(*_args)
         super()
         @transforms = Transforms.new
       end
@@ -82,19 +83,19 @@ module Magick
       def rotate(angle, *args)
         begin
           case args.length
-            when 0
-              @transforms << [:rotate, [Float(angle)]]
-            when 2
-              cx = Float(args[0])
-              cy = Float(args[1])
-              @transforms << [:translate, [cx, cy]]
-              @transforms << [:rotate, [angle]]
-              @transforms << [:translate, [-cx, -cy]]
-            else
-              fail ArgumentError, "wrong number of arguments (#{args.length} for 1 or 3)"
+          when 0
+            @transforms << [:rotate, [Float(angle)]]
+          when 2
+            cx = Float(args[0])
+            cy = Float(args[1])
+            @transforms << [:translate, [cx, cy]]
+            @transforms << [:rotate, [angle]]
+            @transforms << [:translate, [-cx, -cy]]
+          else
+            raise ArgumentError, "wrong number of arguments (#{args.length} for 1 or 3)"
           end
         rescue ArgumentError
-          raise ArgumentError, "arguments must be convertable to float (got #{[angle, *args].collect {|a| a.class}.join(', ')})"
+          raise ArgumentError, "arguments must be convertable to float (got #{[angle, *args].map(&:class).join(', ')})"
         end
         yield(self) if block_given?
         self
@@ -121,6 +122,6 @@ module Magick
         yield(self) if block_given?
         self
       end
-    end     # module Transformable
+    end # module Transformable
   end # class RVG
 end # module Magick

data/lib/rvg/units.rb

@@ -2,13 +2,13 @@
 # Copyright (C) 2009 Timothy P. Hunter
 module Magick
   class RVG
-    # Define RVG.dpi and RVG.dpi=. Add conversions to Fixnum and Float classes
+    # Define RVG.dpi and RVG.dpi=. Add conversions to Integer and Float classes
     class << self
       attr_reader :dpi
       def dpi=(n)
         unless defined?(@dpi)
-          [Float, Fixnum].each do |c|
-            c.class_eval <<-END_DEFS
+          [Float, Integer].each do |c|
+            c.class_eval <<-END_DEFS, __FILE__, __LINE__ + 1
               # the default measurement - 1px is 1 pixel
               def px
                 self
@@ -54,10 +54,10 @@ module Magick
         end
 
         @dpi = Float(n)
-        return @dpi
+        @dpi
       rescue ArgumentError
         raise TypeError, "Can't convert `#{n}' to Float"
       end
-    end     # class << self
+    end # class << self
   end # class RVG
 end # module Magick

data/rmagick.gemspec

@@ -2,13 +2,6 @@ require 'date'
 require 'English'
 require './lib/rmagick/version'
 
-def v(version)
-  Gem::Version.new(version)
-end
-
-RUBY     = v(RUBY_VERSION.dup)
-RUBYGEMS = v(Gem::VERSION.dup)
-
 Gem::Specification.new do |s|
   s.name = 'rmagick'
   s.version = Magick::VERSION
@@ -21,43 +14,27 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
-  file_exclusion_regex = %r{(\Alib/rvg/to_c.rb)}
-  files         = tracked_files.reject{|file| file[file_exclusion_regex] }
-  test_files    = files.grep(%r{^(test|spec|features)/})
-  executables   = files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  file_exclusion_regex = %r{\A(doc|benchmarks|examples|spec|lib/rvg/to_c.rb)}
+  files = tracked_files.reject { |file| file[file_exclusion_regex] }
 
-  s.files                       = files
-  s.test_files                  = test_files
-  s.executables                 = executables
-  s.require_paths << 'ext' << 'deprecated'
+  s.files = files
+  s.require_paths << 'ext'
 
-  s.rubyforge_project = 'rmagick'
-  s.extensions = %w{ext/RMagick/extconf.rb}
-  s.has_rdoc = false
+  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.add_development_dependency 'rspec', '~> 3.2.0'
-
-  if RUBY < v('1.9.0')
-    s.add_development_dependency 'rake', '~> 10.0'
-  end
-
-  if RUBY < v('2.0.0')
-    s.add_development_dependency 'json', '~> 1.0'
-  end
-
-  if RUBY >= v('1.9.2')
-    s.add_development_dependency 'rubocop', '~> 0.33.0'
-  end
-
-  if RUBY >= v('2.2.0')
-    s.add_development_dependency 'test-unit', '~> 2'
-  end
+  s.add_runtime_dependency 'pkg-config', '~> 1.4'
 
-  if RUBYGEMS < v('1.8.25')
-    s.add_development_dependency 'rake-compiler', '~> 0.8.0'
-  else
-    s.add_development_dependency 'rake-compiler'
+  s.add_development_dependency 'pry', '~> 0.14'
+  s.add_development_dependency 'rake-compiler', '~> 1.0'
+  s.add_development_dependency 'rspec', '~> 3.8'
+  s.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
+  if RUBY_PLATFORM !~ /mswin|mingw/
+    s.add_development_dependency 'rubocop', '~> 0.81.0'
+    s.add_development_dependency 'rubocop-rspec', '~> 1.38.1'
+    s.add_development_dependency 'rubocop-performance', '~> 1.5.2'
   end
+  s.add_development_dependency 'simplecov', '~> 0.16.1'
+  s.add_development_dependency 'yard', '~> 0.9.24'
 end