ffi-gdal 1.0.0.beta16 → 1.0.0

data/lib/ogr/style_tool.rb

@@ -4,21 +4,34 @@ require_relative '../ogr'
 
 module OGR
   class StyleTool
+    # @param pointer [FFI::Pointer]
+    def self.release(pointer)
+      return unless pointer && !pointer.null?
+
+      FFI::OGR::API.OGR_ST_Destroy(pointer)
+    end
+
     # @return [FFI::Pointer] C pointer to the C style tool.
     attr_reader :c_pointer
 
     # @param style_tool_class [FFI::OGR::Core::STClassId] Must be one of :OGRSTCPen,
     #   :OGRSTCBrush, :OGRSTCSymbol, :OGRSTCLabel.
     def initialize(style_tool_class)
-      @c_pointer = FFI::OGR::API.OGR_ST_Create(style_tool_class)
-      return if @c_pointer && !@c_pointer.null?
+      pointer = FFI::OGR::API.OGR_ST_Create(style_tool_class)
 
-      raise OGR::CreateFailure, "Unable to create StyleTool using class #{style_tool_class}"
+      if !pointer || pointer.null?
+        raise OGR::CreateFailure, "Unable to create StyleTool using class #{style_tool_class}"
+      end
+
+      @c_pointer = FFI::AutoPointer.new(pointer, StyleTool.method(:release))
     end
 
     # @return [String, nil]
     def style_string
-      FFI::OGR::API.OGR_ST_GetStyleString(@c_pointer)
+      style, ptr = FFI::OGR::API.OGR_ST_GetStyleString(@c_pointer)
+      ptr.autorelease = false
+
+      style
     end
 
     # @return [FFI::OGR::Core::STClassId]
@@ -37,7 +50,7 @@ module OGR
       FFI::OGR::API.OGR_ST_SetUnit(@c_pointer, new_unit, ground_to_paper_scale)
     end
 
-    # @param param_number [Fixnum]
+    # @param param_number [Integer]
     # @return [Float, nil]
     def param_as_double(param_number)
       value_is_null_ptr = FFI::MemoryPointer.new(:int)
@@ -47,15 +60,15 @@ module OGR
     end
     alias param_as_float param_as_double
 
-    # @param param_number [Fixnum]
+    # @param param_number [Integer]
     # @param value [Float]
     def set_param_as_double(param_number, value)
       FFI::OGR::API.OGR_ST_SetParamDbl(@c_pointer, param_number, value)
     end
     alias set_param_as_float set_param_as_double
 
-    # @param param_number [Fixnum]
-    # @return [Fixnum, nil]
+    # @param param_number [Integer]
+    # @return [Integer, nil]
     def param_as_number(param_number)
       value_is_null_ptr = FFI::MemoryPointer.new(:int)
       value = FFI::OGR::API.OGR_ST_GetParamNum(@c_pointer, param_number, value_is_null_ptr)
@@ -64,23 +77,24 @@ module OGR
     end
     alias param_as_integer param_as_number
 
-    # @param param_number [Fixnum]
-    # @param value [Fixnum]
+    # @param param_number [Integer]
+    # @param value [Integer]
     def set_param_as_number(param_number, value)
       FFI::OGR::API.OGR_ST_SetParamNum(@c_pointer, param_number, value)
     end
     alias set_param_as_integer set_param_as_number
 
-    # @param param_number [Fixnum]
+    # @param param_number [Integer]
     # @return [String, nil]
     def param_as_string(param_number)
       value_is_null_ptr = FFI::MemoryPointer.new(:int)
-      value = FFI::OGR::API.OGR_ST_GetParamStr(@c_pointer, param_number, value_is_null_ptr)
+      value, ptr = FFI::OGR::API.OGR_ST_GetParamStr(@c_pointer, param_number, value_is_null_ptr)
+      ptr.autorelease = false
 
       value_is_null_ptr.read_int.to_bool ? nil : value
     end
 
-    # @param param_number [Fixnum]
+    # @param param_number [Integer]
     # @param value [String]
     def set_param_as_string(param_number, value)
       FFI::OGR::API.OGR_ST_SetParamStr(@c_pointer, param_number, value)
@@ -89,7 +103,7 @@ module OGR
     # Returns the R, G, B, A components of a #RRGGBB[AA] formatted string.
     #
     # @param color_string [String]
-    # @return [Hash{red => Fixnum, green => Fixnum, blue => Fixnum, alpha => Fixnum}]
+    # @return [Hash{red => Integer, green => Integer, blue => Integer, alpha => Integer}]
     def rgb_from_string(color_string)
       red_ptr = FFI::MemoryPointer.new(:int)
       green_ptr = FFI::MemoryPointer.new(:int)
@@ -97,7 +111,7 @@ module OGR
       alpha_ptr = FFI::MemoryPointer.new(:int)
 
       boolean_result = FFI::OGR::API.OGR_ST_GetRGBFromString(@c_pointer,
-        color_string, red_ptr, green_ptr, blue_ptr, alpha_ptr)
+                                                             color_string, red_ptr, green_ptr, blue_ptr, alpha_ptr)
 
       if boolean_result
         {

data/lib/ogr.rb

@@ -3,6 +3,7 @@
 require_relative 'ffi-gdal'
 require_relative 'ogr/internal_helpers'
 require_relative 'ogr/exceptions'
+require_relative 'ogr/error_handling'
 
 module OGR
   include InternalHelpers

data/rakelib/docker.rake

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+namespace :docker do
+  namespace :gdal2 do
+    desc 'Run specs in the gdal2 docker container'
+    task :spec do
+      sh 'docker-compose run --rm gdal2 bundle exec rake spec'
+    end
+  end
+end