ffi-gdal 1.0.0.beta7 → 1.0.0.beta8

data/lib/gdal/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'log_switch'
 
 module GDAL

data/lib/gdal/major_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../gdal'
 require 'multi_xml'
 

data/lib/gdal/merger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'driver'
 
 module GDAL

data/lib/gdal/options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
 module GDAL

data/lib/gdal/raster_attribute_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../gdal'
 require_relative 'raster_attribute_table_mixins/extensions'
 

data/lib/gdal/raster_attribute_table_mixins/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module GDAL
@@ -10,7 +12,7 @@ module GDAL
         case value.class
         when String then set_value_as_string(row, field, value)
         when Float then set_value_as_double(row, field, value)
-        when Fixnum then set_value_as_integer(row, field, value)
+        when Integer then set_value_as_integer(row, field, value)
         else raise GDAL::UnknownRasterAttributeTableType, "Unknown value type for value '#{value}'"
         end
       end

data/lib/gdal/raster_band.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'narray'
 require_relative '../gdal'
 require_relative 'raster_band_mixins/algorithm_extensions'
@@ -216,7 +218,7 @@ module GDAL
       flag_list.reverse_each.with_index do |flag, i|
         flag = flag.to_i
 
-        if i == 0 && flag == 1
+        if i.zero? && flag == 1
           flags << :GMF_ALL_VALID
         elsif i == 1 && flag == 1
           flags << :GMF_PER_DATASET
@@ -273,7 +275,7 @@ module GDAL
       standard_deviation = FFI::MemoryPointer.new(:double)
 
       handler = GDAL::CPLErrorHandler.new
-      handler.on_warning = proc { Hash.new }
+      handler.on_warning = proc { {} }
       handler.on_none = proc do
         {
           minimum: min.read_double,

data/lib/gdal/raster_band_classifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../gdal'
 
 module GDAL
@@ -72,13 +74,9 @@ module GDAL
         range_for_type(min, max)
       end
 
-      range_count.times.each_with_object([]) do |i, ranges|
+      Array.new(range_count) do |i|
         range = breakpoint_calculator.call(i)
-
-        ranges << {
-          range: range,
-          map_to: (i + 1).to_data_type(@raster_band.data_type)
-        }
+        { range: range, map_to: (i + 1).to_data_type(@raster_band.data_type) }
       end
     end
 

data/lib/gdal/raster_band_mixins/algorithm_extensions.rb

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

data/lib/gdal/raster_band_mixins/algorithm_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module RasterBandMixins
     module AlgorithmMethods
@@ -34,7 +36,8 @@ module GDAL
             colors,
             color_table.c_pointer,
             progress_function,
-            progress_arg)
+            progress_arg
+          )
 
           color_table
         end
@@ -75,7 +78,8 @@ module GDAL
             output_ptr,
             color_table_ptr,
             progress_function,
-            progress_arg)
+            progress_arg
+          )
 
           output_band
         end
@@ -97,7 +101,8 @@ module GDAL
           x_offset,
           y_offset,
           x_size,
-          y_size)
+          y_size
+        )
       end
 
       # Computes the proximity of all pixels in the proximity_band to those in
@@ -134,7 +139,8 @@ module GDAL
           proximity_band_ptr,
           options_ptr,
           progress_function,
-          progress_arg)
+          progress_arg
+        )
       end
 
       # Fill selected raster regions by interpolation from the edges. It
@@ -324,7 +330,8 @@ module GDAL
           connectedness,
           options_ptr,
           progress_function,
-          progress_arg)
+          progress_arg
+        )
       end
     end
   end

data/lib/gdal/raster_band_mixins/coloring_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module RasterBandMixins
     # RasterBand methods added for dealing with colorizing.
@@ -74,7 +76,7 @@ module GDAL
 
       # @param hex [String]
       def hex_to_rgb(hex)
-        hex.sub!(/^#/, '')
+        hex = hex.sub(/^#/, '')
         matches = hex.match(/(?<red>[a-zA-Z0-9]{2})(?<green>[a-zA-Z0-9]{2})(?<blue>[a-zA-Z0-9]{2})/)
 
         [matches[:red].to_i(16), matches[:green].to_i(16), matches[:blue].to_i(16)]

data/lib/gdal/raster_band_mixins/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module GDAL

data/lib/gdal/raster_band_mixins/io_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module RasterBandMixins
     # Methods for reading & writing RasterBands that didn't come from GDAL.
@@ -136,7 +138,7 @@ module GDAL
             read_block(x_block_number, y_block_number, data_pointer)
             pixels = GDAL._read_pointer(data_pointer, data_type, block_buffer_size)
 
-            yield(pixels, x_block_size, y_block_size)
+            yield(Array(pixels), x_block_size, y_block_size)
           end
         end
       end

data/lib/gdal/rpc_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require_relative '../gdal'
 

data/lib/gdal/transformer.rb

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

data/lib/gdal/transformers/approximate_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class ApproximateTransformer
@@ -18,7 +20,8 @@ module GDAL
         @c_pointer = FFI::GDAL::Alg.GDALCreateApproxTransformer(
           base_transformer_function,
           transformer_arg_ptr,
-          max_error)
+          max_error
+        )
       end
 
       def destroy!

data/lib/gdal/transformers/base_general_image_projection_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class BaseGeneralImageProjectionTransformer
@@ -32,7 +34,8 @@ module GDAL
         geo_transform_ptr = GDAL._pointer(GDAL::GeoTransform, geo_transform)
 
         FFI::GDAL::Alg.GDALSetGenImgProjTransformerDstGeoTransform(
-          @c_pointer, geo_transform_ptr)
+          @c_pointer, geo_transform_ptr
+        )
       end
     end
   end

data/lib/gdal/transformers/gcp_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class GCPTransformer
@@ -25,13 +27,15 @@ module GDAL
                          gcp_list.size,
                          gcp_list_ptr,
                          requested_polynomial_order,
-                         reversed)
+                         reversed
+                       )
                      else
                        FFI::GDAL::Alg.GDALCreateGCPTransformer(
                          gcp_list.size,
                          gcp_list_ptr,
                          requested_polynomial_order,
-                         reversed)
+                         reversed
+                       )
                      end
       end
 

data/lib/gdal/transformers/general_image_projection_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_general_image_projection_transformer'
 
 module GDAL

data/lib/gdal/transformers/general_image_projection_transformer2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_general_image_projection_transformer'
 
 module GDAL
@@ -43,7 +45,8 @@ module GDAL
         @c_pointer = FFI::GDAL::Alg.GDALCreateGenImgProjTransformer2(
           source_ptr,
           destination_ptr,
-          options_ptr)
+          options_ptr
+        )
 
         super()
       end

data/lib/gdal/transformers/general_image_projection_transformer3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_general_image_projection_transformer'
 
 module GDAL
@@ -16,7 +18,8 @@ module GDAL
           source_wkt,
           source_ptr,
           destination_wkt,
-          destination_ptr)
+          destination_ptr
+        )
 
         super()
       end

data/lib/gdal/transformers/geolocation_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class GeolocationTransformer
@@ -19,7 +21,8 @@ module GDAL
         @c_pointer = FFI::GDAL::Alg.CreateGeoLocTransformer(
           base_dataset_ptr,
           geolocation_info_ptr,
-          reversed)
+          reversed
+        )
       end
 
       def destroy!

data/lib/gdal/transformers/reprojection_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class ReprojectionTransformer

data/lib/gdal/transformers/rpc_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class RPCTransformer
@@ -33,7 +35,8 @@ module GDAL
           rpc_info,
           reversed,
           pixel_error_threshold,
-          options_ptr)
+          options_ptr
+        )
       end
 
       def destroy!

data/lib/gdal/transformers/tps_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class TPSTransformer

data/lib/gdal/version_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 
 module GDAL
@@ -6,33 +8,33 @@ module GDAL
     #
     # @return [String]
     def version_num
-      FFI::GDAL.GDALVersionInfo('VERSION_NUM'.freeze)
+      FFI::GDAL.GDALVersionInfo('VERSION_NUM')
     end
 
     # @return [Date]
     def release_date
-      Date.parse(FFI::GDAL.GDALVersionInfo('RELEASE_DATE'.freeze))
+      Date.parse(FFI::GDAL.GDALVersionInfo('RELEASE_DATE'))
     end
 
     # Version in the form "1.1.7".
     #
     # @return [String]
     def release_name
-      FFI::GDAL.GDALVersionInfo('RELEASE_NAME'.freeze)
+      FFI::GDAL.GDALVersionInfo('RELEASE_NAME')
     end
 
     # The long licensing info.
     #
     # @return [String]
     def license
-      FFI::GDAL.GDALVersionInfo('LICENSE'.freeze)
+      FFI::GDAL.GDALVersionInfo('LICENSE')
     end
 
     # Options used when building GDAL.
     #
     # @return [Hash{String => String}]
     def build_info
-      key_value_pairs = FFI::GDAL.GDALVersionInfo('BUILD_INFO'.freeze)
+      key_value_pairs = FFI::GDAL.GDALVersionInfo('BUILD_INFO')
       key_value_pairs.split.each_with_object({}) do |kv, obj|
         key, value = kv.split('=', 2)
         obj[key] = value
@@ -41,7 +43,7 @@ module GDAL
 
     # @return [String]
     def long_version
-      FFI::GDAL.GDALVersionInfo('--version'.freeze)
+      FFI::GDAL.GDALVersionInfo('--version')
     end
 
     # @param major [Fixnum]
@@ -49,7 +51,7 @@ module GDAL
     # @return [Boolean] +true+ if the runtime GDAL library matches the given
     #   version params.
     def check_version(major, minor)
-      FFI::GDAL.GDALCheckVersion(major, minor, 'FFI::GDAL'.freeze)
+      FFI::GDAL.GDALCheckVersion(major, minor, 'FFI::GDAL')
     end
   end
 end

data/lib/gdal/virtual_dataset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../gdal'
 require_relative 'major_object'
 

data/lib/gdal/warp_operation.rb

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

data/lib/gdal/warp_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../gdal'
 
 module GDAL
@@ -192,5 +194,9 @@ module GDAL
 
       @c_struct[meth]
     end
+
+    def respond_to_missing?(method_name, include_private = false)
+      FFI::GDAL::WarpOptions.members.include?(method_name) || super
+    end
   end
 end

data/lib/gdal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'ffi-gdal'
 
 module GDAL

data/lib/ogr/coordinate_transformation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'narray'
 require_relative '../ogr'
 require_relative '../gdal'

data/lib/ogr/data_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'json'
 require_relative '../gdal'

data/lib/ogr/data_source_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module DataSourceExtensions
     # @return [Array<OGR::Layer>]

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'

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'
 

data/lib/ogr/envelope_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module OGR

data/lib/ogr/error_handling.rb

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

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,

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

data/lib/ogr/feature_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module OGR

data/lib/ogr/field.rb

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

data/lib/ogr/field_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 
 module OGR
@@ -14,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!