ffi-gdal 1.0.0.beta6 → 1.0.0.beta11

data/lib/ogr/data_source_mixins/capability_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module DataSourceMixins
     # Helper methods for determining the current DataSource's capabilities.

data/lib/ogr/driver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 require_relative '../gdal'
 require_relative '../gdal/major_object'
@@ -72,9 +74,7 @@ module OGR
 
       data_source_ptr = FFI::OGR::API.OGR_Dr_Open(@c_pointer, file_name, update)
 
-      if data_source_ptr.null?
-        raise OGR::InvalidDataSource, "Unable to open data source at #{file_name}"
-      end
+      raise OGR::InvalidDataSource, "Unable to open data source at #{file_name}" if data_source_ptr.null?
 
       OGR::DataSource.new(data_source_ptr, nil)
     end
@@ -122,9 +122,7 @@ module OGR
     def copy_data_source(source_data_source, new_file_name, **options)
       source_ptr = GDAL._pointer(OGR::DataSource, source_data_source)
 
-      if source_ptr.nil? || source_ptr.null?
-        raise OGR::InvalidDataSource, source_data_source
-      end
+      raise OGR::InvalidDataSource, source_data_source if source_ptr.nil? || source_ptr.null?
 
       options_ptr = GDAL::Options.pointer(options)
 

data/lib/ogr/driver_mixins/capability_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module DriverMixins
     # Helper methods for testing capabilities of the current driver.

data/lib/ogr/envelope.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 require_relative 'envelope_extensions'
 
@@ -69,7 +71,7 @@ module OGR
 
     # @param new_z_min [Float]
     def z_min=(new_z_min)
-      return nil unless @c_struct.is_a? FFI::OGR::Envelope3D
+      return unless @c_struct.is_a? FFI::OGR::Envelope3D
 
       @c_struct[:min_z] = new_z_min
     end
@@ -83,7 +85,7 @@ module OGR
 
     # @param new_z_max [Float]
     def z_max=(new_z_max)
-      return nil unless @c_struct.is_a? FFI::OGR::Envelope3D
+      return unless @c_struct.is_a? FFI::OGR::Envelope3D
 
       @c_struct[:max_z] = new_z_max
     end

data/lib/ogr/envelope_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module OGR
@@ -101,28 +103,6 @@ module OGR
       polygon
     end
 
-    # @return [Hash]
-    def as_json(_options = nil)
-      json = {
-        x_min: x_min,
-        x_max: x_max,
-        y_min: y_min,
-        y_max: y_max
-      }
-
-      if @c_struct.is_a? FFI::OGR::Envelope3D
-        json[:z_min] = z_min
-        json[:z_max] = z_max
-      end
-
-      json
-    end
-
-    # @return [String]
-    def to_json(options = nil)
-      as_json(options).to_json
-    end
-
     def to_a
       [x_min, y_min, x_max, y_max]
     end

data/lib/ogr/error_handling.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'exceptions'
 
 module OGR
@@ -23,7 +25,7 @@ module OGR
     # @return [Proc]
     def error_class_map(error_class)
       {
-        OGRERR_NONE: proc { true },
+        OGRERR_NONE: ->(_msg) { true },
         OGRERR_NOT_ENOUGH_DATA: ->(msg) { raise_exception(OGR::NotEnoughData, msg) },
         OGRERR_NOT_ENOUGH_MEMORY: ->(msg) { raise_exception(::NoMemoryError, msg) },
         OGRERR_UNSUPPORTED_GEOMETRY_TYPE: ->(msg) { raise_exception(OGR::UnsupportedGeometryType, msg) },

data/lib/ogr/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   class CorruptData < RuntimeError
   end
@@ -12,7 +14,7 @@ module OGR
           msg
         elsif driver.is_a? String
           "Driver not found with name '#{driver}'."
-        elsif driver.is_a? Fixnum
+        elsif driver.is_a? Integer
           "Driver at index #{driver} not found."
         end
 

data/lib/ogr/feature.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require_relative '../ogr'
 require_relative '../gdal'
@@ -20,9 +22,9 @@ module OGR
                      fd_or_pointer
                    end
 
-      if !@c_pointer.is_a?(FFI::Pointer) || @c_pointer.null?
-        raise OGR::InvalidFeature, "Unable to create Feature with #{fd_or_pointer}"
-      end
+      return if @c_pointer.is_a?(FFI::Pointer) && !@c_pointer.null?
+
+      raise OGR::InvalidFeature, "Unable to create Feature with #{fd_or_pointer}"
     end
 
     def destroy!
@@ -101,7 +103,8 @@ module OGR
       FFI::OGR::API.OGR_F_SetFieldStringList(
         @c_pointer,
         index,
-        values_ptr)
+        values_ptr
+      )
     end
 
     # @param index [Fixnum]
@@ -114,7 +117,8 @@ module OGR
         @c_pointer,
         index,
         values.size,
-        values_ptr)
+        values_ptr
+      )
     end
 
     # @param index [Fixnum]
@@ -127,7 +131,8 @@ module OGR
         @c_pointer,
         index,
         values.size,
-        values_ptr)
+        values_ptr
+      )
     end
 
     # @param index [Fixnum]
@@ -150,14 +155,15 @@ module OGR
         @c_pointer,
         index,
         value.length,
-        value_ptr)
+        value_ptr
+      )
     end
 
     # @param index [Fixnum]
     # @param value [Date, Time, DateTime]
     def set_field_date_time(index, value)
       time = value.to_time
-      zone = OGR._format_time_zone_for_ogr(time.zone)
+      zone = OGR._format_time_zone_for_ogr(value.zone)
 
       FFI::OGR::API.OGR_F_SetFieldDateTime(@c_pointer, index,
         time.year,
@@ -333,7 +339,7 @@ module OGR
     # @param index [Fixnum]
     # @return [String]
     def field_as_string(index)
-      FFI::OGR::API.OGR_F_GetFieldAsString(@c_pointer, index)
+      FFI::OGR::API.OGR_F_GetFieldAsString(@c_pointer, index).force_encoding(Encoding::UTF_8)
     end
 
     # @param index [Fixnum]
@@ -386,6 +392,7 @@ module OGR
 
       formatted_tz = OGR._format_time_zone_for_ruby(time_zone_flag_ptr.read_int)
 
+      # rubocop:disable Style/DateTime
       if formatted_tz
         DateTime.new(
           year_ptr.read_int,
@@ -406,6 +413,7 @@ module OGR
           second_ptr.read_int
         )
       end
+      # rubocop:enable Style/DateTime
     end
 
     # @return [String]

data/lib/ogr/feature_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 require_relative 'feature_definition_extensions'
 
@@ -19,9 +21,9 @@ module OGR
                      name_or_pointer
                    end
 
-      if !@c_pointer.is_a?(FFI::Pointer) || @c_pointer.null?
-        raise OGR::InvalidFeatureDefinition, "Unable to create #{self.class.name} from #{name_or_pointer}"
-      end
+      return if @c_pointer.is_a?(FFI::Pointer) && !@c_pointer.null?
+
+      raise OGR::InvalidFeatureDefinition, "Unable to create #{self.class.name} from #{name_or_pointer}"
     end
 
     def release!
@@ -67,7 +69,8 @@ module OGR
     def delete_field_definition(index)
       ogr_err = FFI::OGR::API.OGR_FD_DeleteFieldDefn(
         @c_pointer,
-        index)
+        index
+      )
 
       ogr_err.handle_result "Unable to delete field definition at index #{index}"
     end

data/lib/ogr/feature_definition_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module OGR
@@ -33,23 +35,5 @@ module OGR
 
       geometry_field_definition(g)
     end
-
-    # @return [Hash]
-    def as_json(_options = nil)
-      {
-        field_count: field_count,
-        field_definitions: field_definitions.map(&:as_json),
-        geometry_field_count: geometry_field_count,
-        geometry_type: geometry_type,
-        is_geometry_ignored: geometry_ignored?,
-        is_style_ignored: style_ignored?,
-        name: name
-      }
-    end
-
-    # @return [String]
-    def to_json(options = nil)
-      as_json(options).to_json
-    end
   end
 end

data/lib/ogr/feature_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module OGR
@@ -81,32 +83,5 @@ module OGR
     def geometry_fields
       each_geometry_field.to_a
     end
-
-    # @return [Hash]
-    def as_json(options = nil)
-      fields_with_nested_json = fields.map.with_index do |f, i|
-        {
-          field_definition: field_definition(i).as_json(options),
-          value: f
-        }
-      end
-
-      {
-        definition: definition.as_json(options),
-        fid: fid,
-        field_count: field_count,
-        fields: fields_with_nested_json,
-        geometry: geometry ? geometry.as_json(options) : nil,
-        geometry_field_count: geometry_field_count,
-        geometry_field_definition: each_geometry_field_definition.map { |gfd| gfd.as_json(options) },
-        style_string: style_string,
-        style_table: style_table ? style_table.as_json(options) : nil
-      }
-    end
-
-    # @return [String]
-    def to_json(options = nil)
-      as_json(options).to_json
-    end
   end
 end

data/lib/ogr/field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require_relative '../ogr'
 
@@ -50,7 +52,7 @@ module OGR
 
     # TODO: This blows up when another value type has been set.
     def string
-      return '' if @c_struct[:string] && @c_struct[:string].null?
+      return '' if @c_struct[:string]&.null?
 
       @c_struct[:string].read_string
     end
@@ -184,6 +186,7 @@ module OGR
 
       formatted_tz = OGR._format_time_zone_for_ruby(c_date[:tz_flag].to_i)
 
+      # rubocop:disable Style/DateTime
       DateTime.new(c_date[:year],
         c_date[:month],
         c_date[:day],
@@ -191,6 +194,7 @@ module OGR
         c_date[:minute],
         c_date[:second],
         formatted_tz)
+      # rubocop:enable Style/DateTime
     end
 
     # @param new_date [Date, Time, DateTime]

data/lib/ogr/field_definition.rb

@@ -1,10 +1,9 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
-require_relative 'field_definition_extensions'
 
 module OGR
   class FieldDefinition
-    include FieldDefinitionExtensions
-
     # @return [FFI::Pointer] C pointer to the C FieldDefn.
     attr_reader :c_pointer
 
@@ -17,9 +16,9 @@ module OGR
                      name_or_pointer
                    end
 
-      unless @c_pointer.is_a?(FFI::Pointer) && !@c_pointer.null?
-        raise OGR::InvalidFieldDefinition, "Unable to create #{self.class.name} from #{name_or_pointer}"
-      end
+      return if @c_pointer.is_a?(FFI::Pointer) && !@c_pointer.null?
+
+      raise OGR::InvalidFieldDefinition, "Unable to create #{self.class.name} from #{name_or_pointer}"
     end
 
     def destroy!

data/lib/ogr/geocoder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 
 module OGR

data/lib/ogr/geometries/geometry_collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../geometry_types/container'
 require_relative '../geometry_types/surface'
 

data/lib/ogr/geometries/geometry_collection_25d.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'geometry_collection'
 
 module OGR

data/lib/ogr/geometries/line_string.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require_relative '../geometry_types/curve'
 
 module OGR
   class LineString
     include OGR::Geometry
     include GeometryTypes::Curve
-
     def self.approximate_arc_angles(center_x, center_y, z, primary_radius, secondary_radius,
       rotation, start_angle, end_angle, max_angle_step_size_degrees = 0)
       geometry_ptr = FFI::GDAL::GDAL.OGR_G_ApproximateArcAngles(

data/lib/ogr/geometries/line_string_25d.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'line_string'
 
 module OGR

data/lib/ogr/geometries/linear_ring.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'line_string'
 
 module OGR

data/lib/ogr/geometries/multi_line_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../geometry_types/curve'
 require_relative '../geometry_types/container'
 

data/lib/ogr/geometries/multi_line_string_25d.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'multi_line_string'
 
 module OGR

data/lib/ogr/geometries/multi_point.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../geometry_types/container'
 
 module OGR

data/lib/ogr/geometries/multi_point_25d.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'multi_point'
 
 module OGR