rgeo 3.0.0.pre.rc.3 → 3.0.1

data/lib/rgeo/wkrep/wkb_parser.rb

@@ -42,7 +42,6 @@ module RGeo
     # [<tt>:default_srid</tt>]
     #   A SRID to pass to the factory generator if no SRID is present in
     #   the input. Defaults to nil (i.e. don't specify a SRID).
-
     class WKBParser
       # Create and configure a WKB parser. See the WKBParser
       # documentation for the options that can be passed.
@@ -118,9 +117,7 @@ module RGeo
             obj = parse_object(false)
             unless @ignore_extra_bytes
               bytes = bytes_remaining
-              if bytes > 0
-                raise Error::ParseError, "Found #{bytes} extra bytes at the end of the stream."
-              end
+              raise Error::ParseError, "Found #{bytes} extra bytes at the end of the stream." if bytes > 0
             end
           ensure
             @data = nil
@@ -133,7 +130,7 @@ module RGeo
       private
 
       def parse_object(contained)
-        endian_value = get_byte
+        endian_value = byte
         case endian_value
         when 0
           little_endian = false
@@ -161,14 +158,20 @@ module RGeo
           if contained != true && contained != type_code
             raise Error::ParseError, "Enclosed type=#{type_code} is different from container constraint #{contained}"
           end
+
           if has_z != @cur_has_z
             raise Error::ParseError, "Enclosed hasZ=#{has_z} is different from toplevel hasZ=#{@cur_has_z}"
           end
+
           if has_m != @cur_has_m
             raise Error::ParseError, "Enclosed hasM=#{has_m} is different from toplevel hasM=#{@cur_has_m}"
           end
+
           if srid && srid != @cur_srid
-            raise Error::ParseError, "Enclosed SRID #{srid} is different from toplevel srid #{@cur_srid || '(unspecified)'}"
+            raise(
+              Error::ParseError,
+              "Enclosed SRID #{srid} is different from toplevel srid #{@cur_srid || '(unspecified)'}"
+            )
           end
         else
           @cur_has_z = has_z
@@ -176,9 +179,11 @@ module RGeo
           @cur_dims = 2 + (@cur_has_z ? 1 : 0) + (@cur_has_m ? 1 : 0)
           @cur_srid = srid
           @cur_factory = @factory_generator.call(srid: @cur_srid, has_z_coordinate: has_z, has_m_coordinate: has_m)
+
           if @cur_has_z && !@cur_factory.property(:has_z_coordinate)
             raise Error::ParseError, "Data has Z coordinates but the factory doesn't have Z coordinates"
           end
+
           if @cur_has_m && !@cur_factory.property(:has_m_coordinate)
             raise Error::ParseError, "Data has M coordinates but the factory doesn't have M coordinates"
           end
@@ -222,29 +227,23 @@ module RGeo
         @len - @pos
       end
 
-      def get_byte
-        if @pos + 1 > @len
-          raise Error::ParseError, "Not enough bytes left to fulfill 1 byte"
-        end
+      def byte
+        raise Error::ParseError, "Not enough bytes left to fulfill 1 byte" if @pos + 1 > @len
         str = @data[@pos, 1]
         @pos += 1
-        str.unpack("C").first
+        str.unpack1("C")
       end
 
       def get_integer(little_endian)
-        if @pos + 4 > @len
-          raise Error::ParseError, "Not enough bytes left to fulfill 1 integer"
-        end
+        raise Error::ParseError, "Not enough bytes left to fulfill 1 integer" if @pos + 4 > @len
         str = @data[@pos, 4]
         @pos += 4
-        str.unpack(little_endian ? "V" : "N").first
+        str.unpack1(little_endian ? "V" : "N")
       end
 
       def get_doubles(little_endian, count)
         len = 8 * count
-        if @pos + len > @len
-          raise Error::ParseError, "Not enough bytes left to fulfill #{count} doubles"
-        end
+        raise Error::ParseError, "Not enough bytes left to fulfill #{count} doubles" if @pos + len > @len
         str = @data[@pos, len]
         @pos += len
         str.unpack("#{little_endian ? 'E' : 'G'}*")

data/lib/rgeo/wkrep/wkt_generator.rb

@@ -45,15 +45,16 @@ module RGeo
     #   letters to lower case; or nil, indicating no case changes from
     #   the default (which is not specified exactly, but is chosen by the
     #   generator to emphasize readability.) Default is nil.
-
     class WKTGenerator
       # Create and configure a WKT generator. See the WKTGenerator
       # documentation for the options that can be passed.
 
       def initialize(opts = {})
         @tag_format = opts[:tag_format] || opts[:type_format] || :wkt11
-        @emit_ewkt_srid = @tag_format == :ewkt ?
-          (opts[:emit_ewkt_srid] ? true : false) : nil
+        @emit_ewkt_srid =
+          if @tag_format == :ewkt
+            (opts[:emit_ewkt_srid] ? true : false)
+          end
         @square_brackets = opts[:square_brackets] ? true : false
         @convert_case = opts[:convert_case]
       end
@@ -99,10 +100,11 @@ module RGeo
           support_z = factory.property(:has_z_coordinate)
           support_m = factory.property(:has_m_coordinate)
         end
-        str = generate_feature(obj, support_z, support_m, true)
-        if @convert_case == :upper
+        str = generate_feature(obj, support_z, support_m, toplevel: true)
+        case @convert_case
+        when :upper
           str.upcase
-        elsif @convert_case == :lower
+        when :lower
           str.downcase
         else
           str
@@ -111,20 +113,22 @@ module RGeo
 
       private
 
-      def generate_feature(obj, support_z, support_m, toplevel = false)
+      def generate_feature(obj, support_z, support_m, toplevel: false)
         type = obj.geometry_type
         type = Feature::LineString if type.subtype_of?(Feature::LineString)
         tag = type.type_name.dup
-        if @tag_format == :ewkt
+        case @tag_format
+        when :ewkt
           tag << "M" if support_m && !support_z
           tag = "SRID=#{obj.srid};#{tag}" if toplevel && @emit_ewkt_srid
-        elsif @tag_format == :wkt12
+        when :wkt12
           if support_z
-            if support_m
-              tag << " ZM"
-            else
-              tag << " Z"
-            end
+            tag <<
+              if support_m
+                " ZM"
+              else
+                " Z"
+              end
           elsif support_m
             tag << " M"
           end
@@ -163,7 +167,8 @@ module RGeo
         if obj.empty?
           "EMPTY"
         else
-          "#{@begin_bracket}#{obj.points.map { |p| generate_coords(p, support_z, support_m) }.join(', ')}#{@end_bracket}"
+          points = obj.points.map { |p| generate_coords(p, support_z, support_m) }
+          "#{@begin_bracket}#{points.join(', ')}#{@end_bracket}"
         end
       end
 
@@ -171,7 +176,9 @@ module RGeo
         if obj.empty?
           "EMPTY"
         else
-          "#{@begin_bracket}#{([generate_line_string(obj.exterior_ring, support_z, support_m)] + obj.interior_rings.map { |r| generate_line_string(r, support_z, support_m) }).join(', ')}#{@end_bracket}"
+          lines = [generate_line_string(obj.exterior_ring, support_z, support_m)]
+          lines += obj.interior_rings.map { |r| generate_line_string(r, support_z, support_m) }
+          "#{@begin_bracket}#{lines.join(', ')}#{@end_bracket}"
         end
       end
 

data/lib/rgeo/wkrep/wkt_parser.rb

@@ -48,7 +48,6 @@ module RGeo
     # [<tt>:default_srid</tt>]
     #   A SRID to pass to the factory generator if no SRID is present in
     #   the input. Defaults to nil (i.e. don't specify a SRID).
-
     class WKTParser
       # Create and configure a WKT parser. See the WKTParser
       # documentation for the options that can be passed.
@@ -66,7 +65,12 @@ module RGeo
         end
         @support_ewkt = opts[:support_ewkt] ? true : false
         @support_wkt12 = opts[:support_wkt12] ? true : false
-        @strict_wkt11 = @support_ewkt || @support_wkt12 ? false : opts[:strict_wkt11] ? true : false
+        @strict_wkt11 =
+          if @support_ewkt || @support_wkt12
+            false
+          else
+            opts[:strict_wkt11] ? true : false
+          end
         @ignore_extra_tokens = opts[:ignore_extra_tokens] ? true : false
         @default_srid = opts[:default_srid]
         @mutex = Mutex.new
@@ -127,12 +131,13 @@ module RGeo
           @cur_expect_m = nil
           @cur_srid = @default_srid
           if @support_ewkt && str =~ /^srid=(\d+);/i
-            str = $'
+            str = Regexp.last_match&.post_match
             @cur_srid = Regexp.last_match(1).to_i
           end
           begin
             start_scanner(str)
             obj = parse_type_tag
+
             if @cur_token && !@ignore_extra_tokens
               raise Error::ParseError, "Extra tokens beginning with #{@cur_token.inspect}."
             end
@@ -149,14 +154,19 @@ module RGeo
         if @cur_expect_z && !@cur_factory_support_z
           raise Error::ParseError, "Geometry calls for Z coordinate but factory doesn't support it."
         end
-        if @cur_expect_m && !@cur_factory_support_m
-          raise Error::ParseError, "Geometry calls for M coordinate but factory doesn't support it."
-        end
+
+        return unless @cur_expect_m && !@cur_factory_support_m
+
+        raise Error::ParseError, "Geometry calls for M coordinate but factory doesn't support it."
       end
 
       def ensure_factory
         unless @cur_factory
-          @cur_factory = @factory_generator.call(srid: @cur_srid, has_z_coordinate: @cur_expect_z, has_m_coordinate: @cur_expect_m)
+          @cur_factory = @factory_generator.call(
+            srid: @cur_srid,
+            has_z_coordinate: @cur_expect_z,
+            has_m_coordinate: @cur_expect_m
+          )
           @cur_factory_support_z = @cur_factory.property(:has_z_coordinate) ? true : false
           @cur_factory_support_m = @cur_factory.property(:has_m_coordinate) ? true : false
           check_factory_support unless @cur_expect_z.nil?
@@ -202,7 +212,7 @@ module RGeo
         end
         case type
         when "point"
-          parse_point(true)
+          parse_point(convert_empty: true)
         when "linestring"
           parse_line_string
         when "polygon"
@@ -238,9 +248,11 @@ module RGeo
           num_extras -= 1 if @cur_expect_z
           @cur_expect_m = num_extras > 0 && (!@cur_factory || @cur_factory_support_m) ? true : false
           num_extras -= 1 if @cur_expect_m
+
           if num_extras > 0
             raise Error::ParseError, "Found #{extra.size + 2} coordinates, which is too many for this factory."
           end
+
           ensure_factory
         else
           val = 0
@@ -261,7 +273,7 @@ module RGeo
         @cur_factory.point(x, y, *extra)
       end
 
-      def parse_point(convert_empty = false)
+      def parse_point(convert_empty: false)
         if convert_empty && @cur_token == "empty"
           point = ensure_factory.multi_point([])
         else
@@ -390,13 +402,11 @@ module RGeo
       end
 
       def expect_token_type(type)
-        unless type === @cur_token
-          raise Error::ParseError, "#{type.inspect} expected but #{@cur_token.inspect} found."
-        end
+        raise Error::ParseError, "#{type.inspect} expected but #{@cur_token.inspect} found." unless type === @cur_token
       end
 
       def next_token
-        if @scanner.scan_until(/\(|\)|\[|\]|,|[^\s\(\)\[\],]+/)
+        if @scanner.scan_until(/\(|\)|\[|\]|,|[^\s()\[\],]+/)
           token = @scanner.matched
           case token
           when /^[-+]?(\d+(\.\d*)?|\.\d+)(e[-+]?\d+)?$/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.rc.3
+  version: 3.0.1
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -238,14 +238,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: RGeo is a geospatial data library for Ruby.