ffi-geos 2.0.0 → 2.1.0

data/.travis.yml

@@ -1,21 +1,33 @@
 cache: bundler
 sudo: false
 language: ruby
+dist: trusty
+
 rvm:
-  - 2.5.3
-  - 2.4.5
-  - 2.3.8
-  - 2.2.10
-  - rbx-3
+  - 2.7.0
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
   - jruby-head
-matrix:
-  allow_failures:
-    - rvm: rbx-3
-    - rvm: jruby-head
+
 addons:
   apt:
     packages:
       - libgeos-c1
+  sonarcloud:
+    organization: "dark-panda"
+    token:
+      secure: UiS3BU1SUSbIynvaup+3w9NNa85mH3lXSa+iCQx9luhp5Nc5Zg4xedycfGylCzpr6D6vRRH3gYefafitcvjS8LbhtNd2Z4oezp2T4fRt8W387HJ3wIcRkyOwBhmQqt/SiPiQr/rkDE9VomelLe7RSkelfAQQvpka5TMzc4wKYd4=
+
+git:
+  depth: false
+
 before_install:
-- gem update --system
-- gem install bundler
+  - gem install bundler
+
+before_script:
+  - bundle exec rubocop --format=json > rubocop-report.json || true
+
+script:
+  - bundle exec rake test
+  - sonar-scanner

data/Gemfile

@@ -1,23 +1,21 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
+gem 'guard'
+gem 'guard-minitest'
 gem 'minitest'
 gem 'minitest-reporters'
 gem 'rake', '~> 10.0'
 gem 'rdoc', '~> 3.12'
+gem 'rubocop', require: false
+gem 'simplecov', '~> 0.17.0', require: false
 
 platforms :rbx do
   gem 'rubinius-developer_tools'
   gem 'rubysl', '~> 2.0'
 end
 
-if RUBY_VERSION >= '1.9'
-  gem 'guard'
-  gem 'guard-minitest'
-  gem 'simplecov'
-end
-
-if File.exist?('Gemfile.local')
-  instance_eval File.read('Gemfile.local')
-end
+instance_eval File.read('Gemfile.local') if File.exist?('Gemfile.local')

data/Guardfile

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 
 guard 'minitest', test_folders: 'test', test_file_patterns: '*_tests.rb' do
-  watch(%r|^test/(.+)_tests\.rb|)
+  watch(%r{^test/(.+)_tests\.rb})
 
   watch(%r{^lib/(.*/)?([^/]+)\.rb$}) do |m|
     "test/#{m[2]}_tests.rb"
@@ -11,6 +12,4 @@ guard 'minitest', test_folders: 'test', test_file_patterns: '*_tests.rb' do
   end
 end
 
-if File.exist?('Guardfile.local')
-  instance_eval File.read('Guardfile.local')
-end
+instance_eval File.read('Guardfile.local') if File.exist?('Guardfile.local')

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017 J Smith <dark.panda@gmail.com>
+Copyright (c) 2010-2020 J Smith <dark.panda@gmail.com>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.rdoc

@@ -7,15 +7,8 @@
 * GEOS version 3.3.0 or greater. GEOS 3.2.2 and below will work to an extent,
   but some features and methods will be disabled or missing.
 
-Ruby versions known to work according to travis-ci and local testing:
-
-* Ruby MRI 1.9.3, 2.0+, 2.1+, 2.2+
-* Ruby MRI 1.8.7 works but as Ruby 1.8 is no longer being maintained, there's
-  no guarantee this will continue in the future and is therefore no longer
-  being tested with the same rigour as more modern versions of Ruby.
-* Rubinius 2
-* JRuby 1.6+, with the exception of versions of JRuby prior to 1.6.3 as per
-  below. This includes both 1.8 and 1.9 modes.
+We currently test on Travis CI using the current releases of MRI that are
+maintained. See `.travis.yml` for a list. We also test against jruby-head.
 
 === JRuby Notes
 
@@ -74,17 +67,6 @@ Ruby bindings along with the following enhancements and additions:
   entire GEOS C API is represented in ffi-geos along with all sorts of useful
   convenience methods and geometry conversion and manipulation methods.
 
-* *NEW IN ffi-geos 1.0.0* -- all errors thrown by ffi-geos are now instances of
-  Geos::Error or subclasses thereof. Geos::Error itself is a descendant
-  of RuntimeError as is the case with the native Geos extension. This means
-  that code like rescue RuntimeError should still work but you can now
-  further capture more precise error types by capturing errors like
-  Geos::Error, Geos::ParseError, etc.
-
-* *NEW IN ffi-geos 1.0.0* -- new methods for Geom::Geometry#voronoi_diagram,
-  Geos::MultiLineString#closed? and Geos::Geometry#clip_by_rect when using
-  GEOS 3.5.0+.
-
 == Thanks
 
 * Daniel Azuma for the testing and JRuby help.

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 # -*- ruby -*-
 
@@ -7,7 +8,7 @@ require 'rake/testtask'
 require 'rdoc/task'
 require 'bundler/gem_tasks'
 
-$:.push File.expand_path(File.dirname(__FILE__), 'lib')
+$LOAD_PATH.push File.expand_path(File.dirname(__FILE__), 'lib')
 
 version = Geos::VERSION
 
@@ -19,7 +20,7 @@ Rake::TestTask.new(:test) do |t|
   t.warning = !!ENV['WARNINGS']
 end
 
-task :default => :test
+task default: :test
 
 begin
   desc 'Build docs'

data/ffi-geos.gemspec

@@ -1,6 +1,6 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
-require File.expand_path('../lib/ffi-geos/version', __FILE__)
+require File.expand_path('lib/ffi-geos/version', __dir__)
 
 Gem::Specification.new do |s|
   s.name = 'ffi-geos'

data/lib/ffi-geos.rb

@@ -52,11 +52,11 @@ module Geos
     def self.search_paths
       @search_paths ||= begin
         if ENV['GEOS_LIBRARY_PATH']
-          [ ENV['GEOS_LIBRARY_PATH'] ]
+          [ENV['GEOS_LIBRARY_PATH']]
         elsif FFI::Platform::IS_WINDOWS
           ENV['PATH'].split(File::PATH_SEPARATOR)
         else
-          [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}', '/usr/lib/{x86_64,i386}-linux-gnu' ]
+          ['/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}', '/usr/lib/{x86_64,i386}-linux-gnu']
         end
       end
     end
@@ -65,9 +65,9 @@ module Geos
       if ENV['GEOS_LIBRARY_PATH'] && File.file?(ENV['GEOS_LIBRARY_PATH'])
         ENV['GEOS_LIBRARY_PATH']
       else
-        Dir.glob(search_paths.map { |path|
+        Dir.glob(search_paths.map do |path|
           File.expand_path(File.join(path, "#{lib}.#{FFI::Platform::LIBSUFFIX}{,.?}"))
-        }).first
+        end).first
       end
     end
 
@@ -81,7 +81,7 @@ module Geos
     # For backwards compatibility with older ffi-geos versions where this
     # used to return an Array.
     def self.geos_library_paths
-      [ geos_library_path ]
+      [geos_library_path]
     end
 
     extend ::FFI::Library
@@ -150,10 +150,10 @@ module Geos
         :pointer,
 
         # notice callback
-        callback([ :string, :string ], :void),
+        callback([:string, :string], :void),
 
         # error callback
-        callback([ :string, :string ], :void)
+        callback([:string, :string], :void)
       ],
 
       finishGEOS_r: [
@@ -163,16 +163,16 @@ module Geos
       # / deprecated in GEOS 3.5.0+
 
       # GEOS 3.5.0+
-      GEOS_init_r: [ :pointer ],
+      GEOS_init_r: [:pointer],
 
       GEOSContext_setNoticeMessageHandler_r: [
         # void, *handle, callback, *void
-        :void, :pointer, callback([ :string, :string ], :void), :pointer
+        :void, :pointer, callback([:string, :string], :void), :pointer
       ],
 
       GEOSContext_setErrorMessageHandler_r: [
         # void, *handle, callback, *void
-        :void, :pointer, callback([ :string, :string ], :void), :pointer
+        :void, :pointer, callback([:string, :string], :void), :pointer
       ],
 
       GEOS_finish_r: [
@@ -207,6 +207,21 @@ module Geos
         :pointer, :pointer, :pointer, :uint
       ],
 
+      GEOSPolygonize_valid_r: [
+        # *geom, *handle, **geoms, ngeoms
+        :pointer, :pointer, :pointer, :uint
+      ],
+
+      GEOSBuildArea_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
+      GEOSMakeValid_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
       GEOSPolygonizer_getCutEdges_r: [
         # *geom, *handle, **geoms, ngeoms
         :pointer, :pointer, :pointer, :uint
@@ -328,6 +343,11 @@ module Geos
         # 0 on exception, *handle, *coord_seq, (uint *) size
         :int, :pointer, :pointer, :pointer
       ],
+
+      GEOSCoordSeq_isCCW_r: [
+        # 0 on exception, *handle, *coord_seq, (char *) value
+        :int, :pointer, :pointer, :pointer
+      ],
       #### /CoordinateSequence functions ####
 
       #### Geometry functions ####
@@ -437,6 +457,11 @@ module Geos
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSCoverageUnion_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
       GEOSUnaryUnion_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -468,6 +493,11 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSMinimumBoundingCircle_r: [
+        # *geom, *handle, *geom, *double radius, **geom center
+        :pointer, :pointer, :pointer, :pointer, :pointer
+      ],
+
       GEOSEnvelope_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -478,6 +508,26 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSGeom_getXMin_r: [
+        # 0 on exception, *handle, (double *) value
+        :int, :pointer, :pointer, :pointer
+      ],
+
+      GEOSGeom_getXMax_r: [
+        # 0 on exception, *handle, (double *) value
+        :int, :pointer, :pointer, :pointer
+      ],
+
+      GEOSGeom_getYMin_r: [
+        # 0 on exception, *handle, (double *) value
+        :int, :pointer, :pointer, :pointer
+      ],
+
+      GEOSGeom_getYMax_r: [
+        # 0 on exception, *handle, (double *) value
+        :int, :pointer, :pointer, :pointer
+      ],
+
       GEOSSimplify_r: [
         # *geom, *handle, *geom, tolerance
         :pointer, :pointer, :pointer, :double
@@ -643,6 +693,11 @@ module Geos
         :int, :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSDistanceIndexed_r: [
+        # (0 on exception, 1 otherwise), *handle, *geom_a, *geom_b, (double *) distance
+        :int, :pointer, :pointer, :pointer, :pointer
+      ],
+
       GEOSHausdorffDistance_r: [
         # (0 on exception, 1 otherwise), *handle, *geom_a, *geom_b, (double *) distance
         :int, :pointer, :pointer, :pointer, :pointer
@@ -777,12 +832,12 @@ module Geos
 
       GEOSSTRtree_query_r: [
         # void, *handle, *tree, *geom, void query_callback((void *) item, (void *) user_data), (void *) user_data
-        :void, :pointer, :pointer, :pointer, callback([ :pointer, :pointer ], :void), :pointer
+        :void, :pointer, :pointer, :pointer, callback([:pointer, :pointer], :void), :pointer
       ],
 
       GEOSSTRtree_iterate_r: [
         # void, *handle, *tree, void query_callback((void *) item, (void *) user_data), (void *) user_data
-        :void, :pointer, :pointer, callback([ :pointer, :pointer ], :void), :pointer
+        :void, :pointer, :pointer, callback([:pointer, :pointer], :void), :pointer
       ],
 
       GEOSSTRtree_remove_r: [
@@ -797,7 +852,7 @@ module Geos
 
       GEOSSTRtree_nearest_generic_r: [
         # *void, *handle, *tree, *item, *item_envelope, int distance_callback(*item_1, *item_2, *double, void *user_data), *user_data
-        :pointer, :pointer, :pointer, :pointer, :pointer, callback([ :pointer, :pointer, :pointer, :pointer ], :int), :pointer
+        :pointer, :pointer, :pointer, :pointer, :pointer, callback([:pointer, :pointer, :pointer, :pointer], :int), :pointer
       ],
       #### /STRtree functions ####
 
@@ -1105,13 +1160,11 @@ module Geos
       def notice_handler=(method_or_block)
         @notice_handler = method_or_block
         FFIGeos.GEOSContext_setNoticeMessageHandler_r(@ptr, @notice_handler, nil)
-        @notice_handler
       end
 
       def error_handler=(method_or_block)
         @error_handler = method_or_block
         FFIGeos.GEOSContext_setErrorMessageHandler_r(@ptr, @error_handler, nil)
-        @error_handler
       end
 
       def notice_handler(&block)
@@ -1148,13 +1201,9 @@ module Geos
         FFIGeos.finishGEOS_r(ptr)
       end
 
-      def notice_handler
-        @notice_handler
-      end
+      attr_reader :notice_handler
 
-      def error_handler
-        @error_handler
-      end
+      attr_reader :error_handler
     end
 
     private
@@ -1170,7 +1219,7 @@ module Geos
 
   class << self
     def version
-      @version ||= FFIGeos.GEOSversion
+      @version ||= FFIGeos.GEOSversion.strip
     end
 
     def jts_port
@@ -1281,28 +1330,28 @@ module Geos
       GEOS_CAPI_VERSION,
       GEOS_CAPI_VERSION_MAJOR, GEOS_CAPI_VERSION_MINOR, GEOS_CAPI_VERSION_PATCH,
       GEOS_SVN_REVISION =
-        if !(versions = Geos.version.scan(/^
-          ((\d+)\.(\d+)\.(\d+)((?:dev|rc|beta|alpha)\d*)?)
-          -CAPI-
-          ((\d+)\.(\d+)\.(\d+))
-          (?:\s+r?(\h+))?
-        $/x)).empty?
-          versions = versions[0]
-          [
-            versions[0],
-            versions[1].to_i,
-            versions[2].to_i,
-            versions[3].to_i,
-            versions[4],
-            versions[5],
-            versions[6].to_i,
-            versions[7].to_i,
-            versions[8].to_i,
-            (versions[9].to_i if versions[9])
-          ]
-        else
-          [ '0.0.0', 0, 0, 0, nil, '0.0.0', 0, 0, 0 ]
-        end
+      if !(versions = Geos.version.scan(/^
+        ((\d+)\.(\d+)\.(\d+)((?:dev|rc|beta|alpha)\d*)?)
+        -CAPI-
+        ((\d+)\.(\d+)\.(\d+))
+        (?:\s+r?(\h+))?
+      $/x)).empty?
+        versions = versions[0]
+        [
+          versions[0],
+          versions[1].to_i,
+          versions[2].to_i,
+          versions[3].to_i,
+          versions[4],
+          versions[5],
+          versions[6].to_i,
+          versions[7].to_i,
+          versions[8].to_i,
+          versions[9]&.to_i
+        ]
+      else
+        ['0.0.0', 0, 0, 0, nil, '0.0.0', 0, 0, 0]
+      end
     GEOS_CAPI_FIRST_INTERFACE = GEOS_CAPI_VERSION_MAJOR.to_i
     GEOS_CAPI_LAST_INTERFACE = GEOS_CAPI_VERSION_MAJOR.to_i + GEOS_CAPI_VERSION_MINOR.to_i
   end

data/lib/ffi-geos/coordinate_sequence.rb

@@ -69,28 +69,26 @@ module Geos
           lengths = points.collect(&:length).uniq
 
           if lengths.empty?
-            [ 0, 0 ]
+            [0, 0]
           elsif lengths.length != 1
             raise ParseError, 'Different sized points found in Array'
           elsif !lengths.first.between?(1, 3)
             raise ParseError, 'Expected points to contain 1-3 elements'
           else
-            [ points.length, points.first.length ]
+            [points.length, points.first.length]
           end
         elsif args.first.is_a?(Hash)
           args.first.values_at(:size, :dimensions)
+        elsif !args.length.between?(0, 2)
+          raise ArgumentError, "wrong number of arguments (#{args.length} for 0-2)"
         else
-          if !args.length.between?(0, 2)
-            raise ArgumentError, "wrong number of arguments (#{args.length} for 0-2)"
-          else
-            [ args[0], args[1] ]
-          end
+          [args[0], args[1]]
         end
 
         size ||= 0
         dimensions ||= 0
 
-        [ FFIGeos.GEOSCoordSeq_create_r(Geos.current_handle_pointer, size, dimensions), true ]
+        [FFIGeos.GEOSCoordSeq_create_r(Geos.current_handle_pointer, size, dimensions), true]
       end
 
       @ptr = FFI::AutoPointer.new(
@@ -147,7 +145,7 @@ module Geos
     def [](*args)
       if args.length == 1 && args.first.is_a?(Numeric) && args.first >= 0
         i = args.first
-        ary = [ get_x(i), get_y(i) ]
+        ary = [get_x(i), get_y(i)]
         ary << get_z(i) if has_z?
         ary
       else
@@ -235,6 +233,16 @@ module Geos
       end
     end
 
+    if FFIGeos.respond_to?(:GEOSCoordSeq_isCCW_r)
+      # Available in GEOS 3.7+.
+      def counter_clockwise?
+        char_ptr = FFI::MemoryPointer.new(:char)
+        FFIGeos.GEOSCoordSeq_isCCW_r(Geos.current_handle_pointer, ptr, char_ptr)
+        Tools.bool_result(char_ptr.read_char)
+      end
+      alias ccw? counter_clockwise?
+    end
+
     def to_point(options = {})
       Geos.create_point(self, srid: options[:srid])
     end
@@ -258,11 +266,11 @@ module Geos
     end
 
     %w{ x y z }.each do |m|
-      class_eval(<<-EOF, __FILE__, __LINE__ + 1)
+      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
         def #{m}_max
           ret = nil
-          self.length.times do |i|
-            value = self.get_#{m}(i)
+          length.times do |i|
+            value = get_#{m}(i)
             ret = value if !ret || value >= ret
           end
           ret
@@ -270,23 +278,23 @@ module Geos
 
         def #{m}_min
           ret = nil
-          self.length.times do |i|
-            value = self.get_#{m}(i)
+          length.times do |i|
+            value = get_#{m}(i)
             ret = value if !ret || value <= ret
           end
           ret
         end
-      EOF
+      RUBY
     end
 
     def snap_to_grid!(*args)
       grid = {
-        :offset_x => 0, # 1
-        :offset_y => 0, # 2
-        :offset_z => 0, # -
-        :size_x => 0, # 3
-        :size_y => 0, # 4
-        :size_z => 0 # -
+        offset_x: 0, # 1
+        offset_y: 0, # 2
+        offset_z: 0, # -
+        size_x: 0, # 3
+        size_y: 0, # 4
+        size_z: 0 # -
       }
 
       if args.length == 1 && args[0].is_a?(Numeric)
@@ -295,9 +303,7 @@ module Geos
         grid.merge!(args[0])
       end
 
-      if grid[:size]
-        grid[:size_x] = grid[:size_y] = grid[:size_z] = grid[:size]
-      end
+      grid[:size_x] = grid[:size_y] = grid[:size_z] = grid[:size] if grid[:size]
 
       if grid[:offset]
         case grid[:offset]
@@ -310,55 +316,51 @@ module Geos
           when Array
             grid[:offset_x], grid[:offset_y], grid[:offset_z] = grid[:offset]
           else
-            raise ArgumentError.new("Expected :offset option to be a Geos::Point")
+            raise ArgumentError, 'Expected :offset option to be a Geos::Point'
         end
       end
 
-      self.length.times do |i|
-        if grid[:size_x] != 0
-          self.x[i] = ((self.x[i] - grid[:offset_x]) / grid[:size_x]).round * grid[:size_x] + grid[:offset_x]
-        end
+      length.times do |i|
+        x[i] = ((x[i] - grid[:offset_x]) / grid[:size_x]).round * grid[:size_x] + grid[:offset_x] if grid[:size_x] != 0
 
-        if grid[:size_y] != 0
-          self.y[i] = ((self.y[i] - grid[:offset_y]) / grid[:size_y]).round * grid[:size_y] + grid[:offset_y]
-        end
+        y[i] = ((y[i] - grid[:offset_y]) / grid[:size_y]).round * grid[:size_y] + grid[:offset_y] if grid[:size_y] != 0
 
-        if self.has_z? && grid[:size_z] != 0
-          self.z[i] = ((self.z[i] - grid[:offset_z]) / grid[:size_z]).round * grid[:size_z] + grid[:offset_z]
-        end
+        z[i] = ((z[i] - grid[:offset_z]) / grid[:size_z]).round * grid[:size_z] + grid[:offset_z] if has_z? && grid[:size_z] != 0
       end
 
-      cs = self.remove_duplicate_coords
+      cs = remove_duplicate_coords
       @ptr = cs.ptr
 
       self
     end
 
     def snap_to_grid(*args)
-      self.dup.snap_to_grid!(*args)
+      dup.snap_to_grid!(*args)
     end
 
     def remove_duplicate_coords
-      Geos::CoordinateSequence.new(self.to_a.inject([]) { |memo, v|
+      Geos::CoordinateSequence.new(to_a.each_with_object([]) do |v, memo|
         memo << v unless memo.last == v
-        memo
-      })
+      end)
     end
 
     def affine!(options)
       options.default = 0.0
 
-      if self.has_z?
-        self.length.times do |i|
-          x, y, z = self.x[i], self.y[i], self.z[i]
+      if has_z?
+        length.times do |i|
+          x = self.x[i]
+          y = self.y[i]
+          z = self.z[i]
 
           self.x[i] = options[:afac] * x + options[:bfac] * y + options[:cfac] * z + options[:xoff]
           self.y[i] = options[:dfac] * x + options[:efac] * y + options[:ffac] * z + options[:yoff]
           self.z[i] = options[:gfac] * x + options[:hfac] * y + options[:ifac] * z + options[:zoff]
         end
       else
-        self.length.times do |i|
-          x, y = self.x[i], self.y[i]
+        length.times do |i|
+          x = self.x[i]
+          y = self.y[i]
 
           self.x[i] = options[:afac] * x + options[:bfac] * y + options[:xoff]
           self.y[i] = options[:dfac] * x + options[:efac] * y + options[:yoff]
@@ -369,88 +371,88 @@ module Geos
     end
 
     def affine(options)
-      self.dup.affine!(options)
+      dup.affine!(options)
     end
 
-    def rotate!(radians, origin = [ 0.0, 0.0 ])
+    def rotate!(radians, origin = [0.0, 0.0])
       origin = case origin
         when Array
           origin
         when Geos::Geometry
           center = origin.centroid
-          [ center.x, center.y ]
+          [center.x, center.y]
         else
-          raise ArgumentError.new("Expected an Array or a Geos::Geometry for the origin")
+          raise ArgumentError, 'Expected an Array or a Geos::Geometry for the origin'
       end
 
-      self.affine!({
-        :afac => Math.cos(radians),
-        :bfac => -Math.sin(radians),
-        :cfac => 0,
-        :dfac => Math.sin(radians),
-        :efac => Math.cos(radians),
-        :ffac => 0,
-        :gfac => 0,
-        :hfac => 0,
-        :ifac => 1,
-        :xoff => origin[0] - Math.cos(radians) * origin[0] + Math.sin(radians) * origin[1],
-        :yoff => origin[1] - Math.sin(radians) * origin[0] - Math.cos(radians) * origin[1],
-        :zoff => 0
-      })
+      affine!(
+        afac: Math.cos(radians),
+        bfac: -Math.sin(radians),
+        cfac: 0,
+        dfac: Math.sin(radians),
+        efac: Math.cos(radians),
+        ffac: 0,
+        gfac: 0,
+        hfac: 0,
+        ifac: 1,
+        xoff: origin[0] - Math.cos(radians) * origin[0] + Math.sin(radians) * origin[1],
+        yoff: origin[1] - Math.sin(radians) * origin[0] - Math.cos(radians) * origin[1],
+        zoff: 0
+      )
     end
 
-    def rotate(radians, origin = [ 0.0, 0.0 ])
-      self.dup.rotate!(radians, origin)
+    def rotate(radians, origin = [0.0, 0.0])
+      dup.rotate!(radians, origin)
     end
 
     def rotate_x!(radians)
-      self.affine!({
-        :afac => 1,
-        :bfac => 0,
-        :cfac => 0,
-        :dfac => 0,
-        :efac => Math.cos(radians),
-        :ffac => -Math.sin(radians),
-        :gfac => 0,
-        :hfac => Math.sin(radians),
-        :ifac => Math.cos(radians),
-        :xoff => 0,
-        :yoff => 0,
-        :zoff => 0
-      })
+      affine!(
+        afac: 1,
+        bfac: 0,
+        cfac: 0,
+        dfac: 0,
+        efac: Math.cos(radians),
+        ffac: -Math.sin(radians),
+        gfac: 0,
+        hfac: Math.sin(radians),
+        ifac: Math.cos(radians),
+        xoff: 0,
+        yoff: 0,
+        zoff: 0
+      )
     end
 
     def rotate_x(radians)
-      self.dup.rotate_x!(radians)
+      dup.rotate_x!(radians)
     end
 
     def rotate_y!(radians)
-      self.affine!({
-        :afac => Math.cos(radians),
-        :bfac => 0,
-        :cfac => Math.sin(radians),
-        :dfac => 0,
-        :efac => 1,
-        :ffac => 0,
-        :gfac => -Math.sin(radians),
-        :hfac => 0,
-        :ifac => Math.cos(radians),
-        :xoff => 0,
-        :yoff => 0,
-        :zoff => 0
-      })
+      affine!(
+        afac: Math.cos(radians),
+        bfac: 0,
+        cfac: Math.sin(radians),
+        dfac: 0,
+        efac: 1,
+        ffac: 0,
+        gfac: -Math.sin(radians),
+        hfac: 0,
+        ifac: Math.cos(radians),
+        xoff: 0,
+        yoff: 0,
+        zoff: 0
+      )
     end
 
     def rotate_y(radians)
-      self.dup.rotate_y!(radians)
+      dup.rotate_y!(radians)
     end
 
     def rotate_z!(radians)
-      self.rotate!(radians)
+      rotate!(radians)
     end
 
     def rotate_z(radians)
-      self.dup.rotate!(radians)
+      dup.rotate!(radians)
     end
 
     def scale!(*args)
@@ -459,27 +461,27 @@ module Geos
       elsif args.length.between?(1, 3)
         args.values_at(0...3)
       else
-        raise ArgumentError.new("Wrong number of arguments #{args.length} for 1-3")
+        raise ArgumentError, "Wrong number of arguments #{args.length} for 1-3"
       end
 
-      self.affine!({
-        :afac => x || 1,
-        :bfac => 0,
-        :cfac => 0,
-        :dfac => 0,
-        :efac => y || 1,
-        :ffac => 0,
-        :gfac => 0,
-        :hfac => 0,
-        :ifac => z || 1,
-        :xoff => 0,
-        :yoff => 0,
-        :zoff => 0
-      })
+      affine!(
+        afac: x || 1,
+        bfac: 0,
+        cfac: 0,
+        dfac: 0,
+        efac: y || 1,
+        ffac: 0,
+        gfac: 0,
+        hfac: 0,
+        ifac: z || 1,
+        xoff: 0,
+        yoff: 0,
+        zoff: 0
+      )
     end
 
     def scale(*args)
-      self.dup.scale!(*args)
+      dup.scale!(*args)
     end
 
     def trans_scale!(*args)
@@ -488,7 +490,7 @@ module Geos
       elsif args.length.between?(1, 4)
         args.values_at(0...4)
       else
-        raise ArgumentError.new("Wrong number of arguments #{args.length} for 1-4")
+        raise ArgumentError, "Wrong number of arguments #{args.length} for 1-4"
       end
 
       x_factor ||= 1
@@ -496,24 +498,24 @@ module Geos
       delta_x ||= 0
       delta_y ||= 0
 
-      self.affine!({
-        :afac => x_factor,
-        :bfac => 0,
-        :cfac => 0,
-        :dfac => 0,
-        :efac => y_factor,
-        :ffac => 0,
-        :gfac => 0,
-        :hfac => 0,
-        :ifac => 1,
-        :xoff => delta_x * x_factor,
-        :yoff => delta_y * y_factor,
-        :zoff => 0
-      })
+      affine!(
+        afac: x_factor,
+        bfac: 0,
+        cfac: 0,
+        dfac: 0,
+        efac: y_factor,
+        ffac: 0,
+        gfac: 0,
+        hfac: 0,
+        ifac: 1,
+        xoff: delta_x * x_factor,
+        yoff: delta_y * y_factor,
+        zoff: 0
+      )
     end
 
     def trans_scale(*args)
-      self.dup.trans_scale!(*args)
+      dup.trans_scale!(*args)
     end
 
     def translate!(*args)
@@ -522,27 +524,27 @@ module Geos
       elsif args.length.between?(1, 3)
         args.values_at(0...3)
       else
-        raise ArgumentError.new("Wrong number of arguments #{args.length} for 1-3")
+        raise ArgumentError, "Wrong number of arguments #{args.length} for 1-3"
       end
 
-      self.affine!({
-        :afac => 1,
-        :bfac => 0,
-        :cfac => 0,
-        :dfac => 0,
-        :efac => 1,
-        :ffac => 0,
-        :gfac => 0,
-        :hfac => 0,
-        :ifac => 1,
-        :xoff => x || 0,
-        :yoff => y || 0,
-        :zoff => z || 1
-      })
+      affine!(
+        afac: 1,
+        bfac: 0,
+        cfac: 0,
+        dfac: 0,
+        efac: 1,
+        ffac: 0,
+        gfac: 0,
+        hfac: 0,
+        ifac: 1,
+        xoff: x || 0,
+        yoff: y || 0,
+        zoff: z || 1
+      )
     end
 
     def translate(*args)
-      self.dup.translate!(*args)
+      dup.translate!(*args)
     end
 
     protected