ffi-geos 1.2.1 → 1.2.2

data/lib/ffi-geos/utils.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Geos
@@ -35,102 +34,87 @@ module Geos
           cs = args.first
         elsif args.length == 2
           cs = CoordinateSequence.new(1, 2)
-          cs.x[0], cs.y[0] = args[0].to_f, args[1].to_f
+          cs.x[0] = args[0].to_f
+          cs.y[0] = args[1].to_f
         elsif args.length == 3
           cs = CoordinateSequence.new(1, 3)
           cs.x[0], cs.y[0], cs.z[0] = args.map(&:to_f)
         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
 
         if cs.length != 1
-          raise ArgumentError.new("IllegalArgumentException: Point coordinate list must contain a single element")
+          raise ArgumentError, 'IllegalArgumentException: Point coordinate list must contain a single element'
         end
 
         cs_dup = cs.dup
         cs_dup.ptr.autorelease = false
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createPoint_r(Geos.current_handle_pointer, cs_dup.ptr), {
-          :srid => options[:srid]
-        })
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createPoint_r(Geos.current_handle_pointer, cs_dup.ptr), srid: options[:srid])
       end
 
       def create_line_string(cs, options = {})
         cs = cs_from_cs_or_geom(cs)
 
         if cs.length <= 1 && cs.length != 0
-          raise ArgumentError.new("IllegalArgumentException: point array must contain 0 or >1 elements")
+          raise ArgumentError, 'IllegalArgumentException: point array must contain 0 or >1 elements'
         end
 
         cs_dup = cs.dup
         cs_dup.ptr.autorelease = false
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createLineString_r(Geos.current_handle_pointer, cs_dup.ptr), {
-          :srid => options[:srid]
-        })
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createLineString_r(Geos.current_handle_pointer, cs_dup.ptr), srid: options[:srid])
       end
 
       def create_linear_ring(cs, options = {})
         cs = cs_from_cs_or_geom(cs)
 
         if cs.length <= 1 && cs.length != 0
-          raise ArgumentError.new("IllegalArgumentException: point array must contain 0 or >1 elements")
+          raise ArgumentError, 'IllegalArgumentException: point array must contain 0 or >1 elements'
         end
 
         cs.ptr.autorelease = false
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createLinearRing_r(Geos.current_handle_pointer, cs.ptr), {
-          :srid => options[:srid]
-        })
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createLinearRing_r(Geos.current_handle_pointer, cs.ptr), srid: options[:srid])
       end
 
       def create_polygon(outer, *args)
         options = extract_options!(args)
 
-        inner_dups = Array(args).flatten.collect { |i|
+        inner_dups = Array(args).flatten.collect do |i|
           force_to_linear_ring(i) or
-            raise TypeError.new("Expected inner Array to contain Geos::LinearRing or Geos::CoordinateSequence objects")
-        }
+            raise TypeError, 'Expected inner Array to contain Geos::LinearRing or Geos::CoordinateSequence objects'
+        end
 
         outer_dup = force_to_linear_ring(outer) or
-          raise TypeError.new("Expected outer shell to be a Geos::LinearRing or Geos::CoordinateSequence")
+          raise TypeError, 'Expected outer shell to be a Geos::LinearRing or Geos::CoordinateSequence'
 
         ary = FFI::MemoryPointer.new(:pointer, inner_dups.length)
         ary.write_array_of_pointer(inner_dups.map(&:ptr))
 
         outer_dup.ptr.autorelease = false
-        inner_dups.each { |i|
+        inner_dups.each do |i|
           i.ptr.autorelease = false
-        }
+        end
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createPolygon_r(Geos.current_handle_pointer, outer_dup.ptr, ary, inner_dups.length), {
-          :srid => options[:srid]
-        })
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createPolygon_r(Geos.current_handle_pointer, outer_dup.ptr, ary, inner_dups.length), srid: options[:srid])
       end
 
       def create_empty_point(options = {})
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyPoint_r(Geos.current_handle_pointer), {
-          :srid => options[:srid]
-        })
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyPoint_r(Geos.current_handle_pointer), srid: options[:srid])
       end
 
       def create_empty_line_string(options = {})
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyLineString_r(Geos.current_handle_pointer), {
-          :srid => options[:srid]
-        })
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyLineString_r(Geos.current_handle_pointer), srid: options[:srid])
       end
 
       def create_empty_polygon(options = {})
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyPolygon_r(Geos.current_handle_pointer), {
-          :srid => options[:srid]
-        })
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyPolygon_r(Geos.current_handle_pointer), srid: options[:srid])
       end
 
       def create_empty_collection(t, options = {})
         check_enum_value(Geos::GeometryTypes, t)
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyCollection_r(Geos.current_handle_pointer, t), {
-          :srid => options[:srid]
-        })
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyCollection_r(Geos.current_handle_pointer, t), srid: options[:srid])
       end
 
       def create_empty_multi_point(options = {})
@@ -169,23 +153,21 @@ module Geos
 
         options = extract_options!(args)
 
-        geoms = Array(args).flatten.tap { |i|
+        geoms = Array(args).flatten.tap do |i|
           if i.detect { |g| !g.is_a?(klass) }
-            raise TypeError.new("Expected geoms Array to contain #{klass} objects")
+            raise TypeError, "Expected geoms Array to contain #{klass} objects"
           end
-        }
+        end
 
         geoms_dups = geoms.map(&:dup)
-        geoms_dups.each { |i|
+        geoms_dups.each do |i|
           i.ptr.autorelease = false
-        }
+        end
 
         ary = FFI::MemoryPointer.new(:pointer, geoms.length)
         ary.write_array_of_pointer(geoms_dups.map(&:ptr))
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createCollection_r(Geos.current_handle_pointer, t, ary, geoms_dups.length), {
-          :srid => options[:srid]
-        })
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createCollection_r(Geos.current_handle_pointer, t, ary, geoms_dups.length), srid: options[:srid])
       end
 
       def create_multi_point(*args)
@@ -205,6 +187,7 @@ module Geos
       end
 
       private
+
         def cs_from_cs_or_geom(geom_or_cs)
           case geom_or_cs
             when Array

data/lib/ffi-geos/version.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Geos
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end
-

data/lib/ffi-geos/wkb_reader.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Geos
@@ -24,19 +23,15 @@ module Geos
     end
 
     def read(wkb, options = {})
-      cast_geometry_ptr(FFIGeos.GEOSWKBReader_read_r(Geos.current_handle_pointer, self.ptr, wkb, wkb.bytesize), {
-        :srid => options[:srid]
-      })
+      cast_geometry_ptr(FFIGeos.GEOSWKBReader_read_r(Geos.current_handle_pointer, ptr, wkb, wkb.bytesize), srid: options[:srid])
     rescue Geos::GEOSException => e
-      raise ParseError.new(e)
+      raise ParseError, e
     end
 
     def read_hex(wkb, options = {})
-      cast_geometry_ptr(FFIGeos.GEOSWKBReader_readHEX_r(Geos.current_handle_pointer, self.ptr, wkb, wkb.bytesize), {
-        :srid => options[:srid]
-      })
+      cast_geometry_ptr(FFIGeos.GEOSWKBReader_readHEX_r(Geos.current_handle_pointer, ptr, wkb, wkb.bytesize), srid: options[:srid])
     rescue Geos::GEOSException => e
-      raise ParseError.new(e)
+      raise ParseError, e
     end
 
     def self.release(ptr) #:nodoc:

data/lib/ffi-geos/wkb_writer.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Geos
@@ -9,7 +8,7 @@ module Geos
 
     def initialize(options = {})
       options = {
-        :include_srid => false
+        include_srid: false
       }.merge(options)
 
       ptr = FFIGeos.GEOSWKBWriter_create_r(Geos.current_handle_pointer)
@@ -30,14 +29,14 @@ module Geos
     def write(geom, options = nil)
       unless options.nil?
         old_options = {
-          :include_srid => self.include_srid
+          include_srid: include_srid
         }
 
         set_options(options)
       end
 
       size_t = FFI::MemoryPointer.new(:size_t)
-      FFIGeos.GEOSWKBWriter_write_r(Geos.current_handle_pointer, self.ptr, geom.ptr, size_t).get_bytes(0, size_t.read_int)
+      FFIGeos.GEOSWKBWriter_write_r(Geos.current_handle_pointer, ptr, geom.ptr, size_t).get_bytes(0, size_t.read_int)
     ensure
       set_options(old_options) unless old_options.nil?
     end
@@ -45,53 +44,50 @@ module Geos
     def write_hex(geom, options = nil)
       unless options.nil?
         old_options = {
-          :include_srid => self.include_srid
+          include_srid: include_srid
         }
 
         set_options(options)
       end
 
       size_t = FFI::MemoryPointer.new(:size_t)
-      FFIGeos.GEOSWKBWriter_writeHEX_r(Geos.current_handle_pointer, self.ptr, geom.ptr, size_t).get_string(0, size_t.read_int)
+      FFIGeos.GEOSWKBWriter_writeHEX_r(Geos.current_handle_pointer, ptr, geom.ptr, size_t).get_string(0, size_t.read_int)
     ensure
       set_options(old_options) unless old_options.nil?
     end
 
     def output_dimensions=(dim)
       if dim < 2 || dim > 3
-        raise ArgumentError.new("Output dimensions must be either 2 or 3")
+        raise ArgumentError, 'Output dimensions must be either 2 or 3'
       end
-      FFIGeos.GEOSWKBWriter_setOutputDimension_r(Geos.current_handle_pointer, self.ptr, dim)
+      FFIGeos.GEOSWKBWriter_setOutputDimension_r(Geos.current_handle_pointer, ptr, dim)
     end
 
     def output_dimensions
-      FFIGeos.GEOSWKBWriter_getOutputDimension_r(Geos.current_handle_pointer, self.ptr)
+      FFIGeos.GEOSWKBWriter_getOutputDimension_r(Geos.current_handle_pointer, ptr)
     end
 
     def include_srid
-      bool_result(FFIGeos.GEOSWKBWriter_getIncludeSRID_r(Geos.current_handle_pointer, self.ptr))
+      bool_result(FFIGeos.GEOSWKBWriter_getIncludeSRID_r(Geos.current_handle_pointer, ptr))
     end
 
     def include_srid=(val)
-      FFIGeos.GEOSWKBWriter_setIncludeSRID_r(Geos.current_handle_pointer, self.ptr,
-        Geos::Tools.bool_to_int(val)
-      )
+      FFIGeos.GEOSWKBWriter_setIncludeSRID_r(Geos.current_handle_pointer, ptr, Geos::Tools.bool_to_int(val))
     end
 
     def byte_order
-      FFIGeos.GEOSWKBWriter_getByteOrder_r(Geos.current_handle_pointer, self.ptr)
+      FFIGeos.GEOSWKBWriter_getByteOrder_r(Geos.current_handle_pointer, ptr)
     end
 
     def byte_order=(val)
       check_enum_value(Geos::ByteOrders, val)
-      FFIGeos.GEOSWKBWriter_setByteOrder_r(Geos.current_handle_pointer, self.ptr, val)
+      FFIGeos.GEOSWKBWriter_setByteOrder_r(Geos.current_handle_pointer, ptr, val)
     end
 
     private
+
       def set_options(options) #:nodoc:
-        [ :include_srid ].each do |k|
-          self.send("#{k}=", options[k]) if options.has_key?(k)
-        end
+        self.include_srid = options[:include_srid] if options.key?(:include_srid)
       end
   end
 end

data/lib/ffi-geos/wkt_reader.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Geos
@@ -24,11 +23,9 @@ module Geos
     end
 
     def read(wkt, options = {})
-      cast_geometry_ptr(FFIGeos.GEOSWKTReader_read_r(Geos.current_handle_pointer, self.ptr, wkt), {
-        :srid => options[:srid]
-      })
+      cast_geometry_ptr(FFIGeos.GEOSWKTReader_read_r(Geos.current_handle_pointer, ptr, wkt), srid: options[:srid])
     rescue Geos::GEOSException => e
-      raise ParseError.new(e)
+      raise ParseError, e
     end
 
     def self.release(ptr) #:nodoc:

data/lib/ffi-geos/wkt_writer.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Geos
@@ -10,10 +9,10 @@ module Geos
 
     def initialize(options = {})
       options = {
-        :trim => false,
-        :old_3d => false,
-        :rounding_precision => -1,
-        :output_dimensions => 2
+        trim: false,
+        old_3d: false,
+        rounding_precision: -1,
+        output_dimensions: 2
       }.merge(options)
 
       ptr = FFIGeos.GEOSWKTWriter_create_r(Geos.current_handle_pointer)
@@ -31,7 +30,7 @@ module Geos
 
     def set_options(options) #:nodoc:
       [ :trim, :old_3d, :rounding_precision, :output_dimensions ].each do |k|
-        self.send("#{k}=", options[k]) if self.respond_to?("#{k}=") && options.has_key?(k)
+        send("#{k}=", options[k]) if respond_to?("#{k}=") && options.key?(k)
       end
     end
     private :set_options
@@ -42,16 +41,16 @@ module Geos
     def write(geom, options = nil)
       unless options.nil?
         old_options = {
-          :trim => self.trim,
-          :old_3d => self.old_3d,
-          :rounding_precision => self.rounding_precision,
-          :output_dimensions => self.output_dimensions
+          trim: trim,
+          old_3d: old_3d,
+          rounding_precision: rounding_precision,
+          output_dimensions: output_dimensions
         }
 
         set_options(options)
       end
 
-      FFIGeos.GEOSWKTWriter_write_r(Geos.current_handle_pointer, self.ptr, geom.ptr)
+      FFIGeos.GEOSWKTWriter_write_r(Geos.current_handle_pointer, ptr, geom.ptr)
     ensure
       set_options(old_options) unless options.nil?
     end
@@ -60,9 +59,7 @@ module Geos
       # Available in GEOS 3.3+.
       def trim=(val)
         @trim = !!val
-        FFIGeos.GEOSWKTWriter_setTrim_r(Geos.current_handle_pointer, self.ptr,
-          Geos::Tools.bool_to_int(@trim)
-        )
+        FFIGeos.GEOSWKTWriter_setTrim_r(Geos.current_handle_pointer, ptr, Geos::Tools.bool_to_int(@trim))
       end
     end
 
@@ -71,11 +68,11 @@ module Geos
       def rounding_precision=(r)
         r = r.to_i
         if r > 255
-          raise ArgumentError.new("Rounding precision cannot be greater than 255")
+          raise ArgumentError, 'Rounding precision cannot be greater than 255'
         end
 
         @rounding_precision = r
-        FFIGeos.GEOSWKTWriter_setRoundingPrecision_r(Geos.current_handle_pointer, self.ptr, @rounding_precision)
+        FFIGeos.GEOSWKTWriter_setRoundingPrecision_r(Geos.current_handle_pointer, ptr, @rounding_precision)
       end
     end
 
@@ -83,9 +80,7 @@ module Geos
       # Available in GEOS 3.3+.
       def old_3d=(val)
         @old_3d = !!val
-        FFIGeos.GEOSWKTWriter_setOld3D_r(Geos.current_handle_pointer, self.ptr,
-          Geos::Tools.bool_to_int(@old_3d)
-        )
+        FFIGeos.GEOSWKTWriter_setOld3D_r(Geos.current_handle_pointer, ptr, Geos::Tools.bool_to_int(@old_3d))
       end
     end
 
@@ -94,16 +89,16 @@ module Geos
       def output_dimensions=(dim)
         dim = dim.to_i
         if dim < 2 || dim > 3
-          raise ArgumentError.new("Output dimensions must be either 2 or 3")
+          raise ArgumentError, 'Output dimensions must be either 2 or 3'
         end
-        FFIGeos.GEOSWKTWriter_setOutputDimension_r(Geos.current_handle_pointer, self.ptr, dim)
+        FFIGeos.GEOSWKTWriter_setOutputDimension_r(Geos.current_handle_pointer, ptr, dim)
       end
     end
 
     if FFIGeos.respond_to?(:GEOSWKTWriter_getOutputDimension_r)
       # Available in GEOS 3.3+.
       def output_dimensions
-        FFIGeos.GEOSWKTWriter_getOutputDimension_r(Geos.current_handle_pointer, self.ptr)
+        FFIGeos.GEOSWKTWriter_getOutputDimension_r(Geos.current_handle_pointer, ptr)
       end
     end
   end

data/test/.rubocop.yml

@@ -0,0 +1,36 @@
+
+inherit_from:
+  - ../.rubocop.yml
+
+Metrics/BlockLength:
+  Description: 'Avoid long blocks with many lines.'
+  Enabled: false
+
+Metrics/ModuleLength:
+  Description: 'Avoid modules longer than 300 lines of code.'
+  Enabled: false
+  Max: 300
+
+Metrics/MethodLength:
+  Description: 'Avoid methods longer than 10 lines of code.'
+  StyleGuide: '#short-methods'
+  Enabled: false
+  Max: 50
+
+Metrics/AbcSize:
+  Description: >-
+                 A calculated magnitude based on number of assignments,
+                 branches, and conditions.
+  Reference: 'http://c2.com/cgi/wiki?AbcMetric'
+  Enabled: true
+  Max: 50
+
+Metrics/ClassLength:
+  Description: 'Avoid classes longer than 300 lines of code.'
+  Enabled: false
+  Max: 300
+
+Metrics/ParameterLists:
+  Description: 'Avoid parameter lists longer than three or four parameters.'
+  StyleGuide: '#too-many-params'
+  Enabled: false