ffi-gdal 1.0.0.beta6 → 1.0.0.beta11

data/lib/ogr/layer_mixins/ogr_sql_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module LayerMixins
     module OGRSQLMethods
@@ -35,9 +37,7 @@ module OGR
 
       # @return [Boolean]
       def transact
-        unless supports_transactions?
-          raise OGR::UnsupportedOperation, 'This layer does not support transactions.'
-        end
+        raise OGR::UnsupportedOperation, 'This layer does not support transactions.' unless supports_transactions?
 
         ogr_err = yield
 

data/lib/ogr/spatial_reference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 require_relative '../gdal'
 require_relative 'spatial_reference_extensions'
@@ -22,9 +24,17 @@ module OGR
     include SpatialReferenceMixins::ParameterGetterSetters
     include SpatialReferenceMixins::TypeChecks
 
-    class_eval FFI::OGR::SRSAPI::SRS_UL.to_ruby
+    # class_eval FFI::OGR::SRSAPI::SRS_UL.to_ruby
+    FFI::OGR::SRSAPI::SRS_UL.constants.each do |_name, obj|
+      const_set(obj.ruby_name, obj.value)
+    end
+
     METER_TO_METER = 1.0
-    class_eval FFI::OGR::SRSAPI::SRS_UA.to_ruby
+
+    FFI::OGR::SRSAPI::SRS_UA.constants.each do |_name, obj|
+      const_set(obj.ruby_name, obj.value)
+    end
+
     RADIAN_TO_RADIAN = 1.0
 
     # @return [Array<String>]

data/lib/ogr/spatial_reference_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module OGR
@@ -28,31 +30,5 @@ module OGR
     rescue NameError
       raise NameError, "Param must be a known linear unit type: #{unit_label}"
     end
-
-    # @return [Hash]
-    def as_json(_options = nil)
-      {
-        angular_units: angular_units,
-        epsg_treats_as_lat_long: epsg_treats_as_lat_long?,
-        epsg_treats_as_northing_easting: epsg_treats_as_northing_easting?,
-        is_compound: compound?,
-        is_geocentric: geocentric?,
-        is_geographic: geographic?,
-        is_local: local?,
-        is_projected: projected?,
-        is_vertical: vertical?,
-        linear_units: linear_units,
-        prime_meridian: prime_meridian,
-        semi_major: semi_major,
-        semi_minor: semi_minor,
-        spheroid_inverse_flattening: spheroid_inverse_flattening,
-        utm_zone: utm_zone
-      }
-    end
-
-    # @return [String]
-    def to_json(options = nil)
-      as_json(options).to_json
-    end
   end
 end

data/lib/ogr/spatial_reference_mixins/coordinate_system_getter_setters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module CoordinateSystemGetterSetters
@@ -76,7 +78,8 @@ module OGR
           @c_pointer,
           x_distance, y_distance, z_distance,
           x_rotation, y_rotation, z_rotation,
-          scaling_factor)
+          scaling_factor
+        )
 
         ogr_err.handle_result
       end
@@ -93,7 +96,8 @@ module OGR
           @c_pointer,
           name,
           horizontal_spatial_ref_ptr,
-          vertical_spatial_ref_ptr)
+          vertical_spatial_ref_ptr
+        )
 
         ogr_err.handle_result
       end
@@ -186,7 +190,8 @@ module OGR
           @c_pointer,
           target_key,
           authority,
-          code)
+          code
+        )
 
         ogr_err.handle_result
       end
@@ -278,7 +283,8 @@ module OGR
           zone,
           nad83,
           override_unit_label,
-          override_unit_transform)
+          override_unit_transform
+        )
 
         ogr_err.handle_result
       end
@@ -458,7 +464,8 @@ module OGR
           @c_pointer,
           center_lat, center_long,
           scale,
-          false_easting, false_northing)
+          false_easting, false_northing
+        )
 
         ogr_err.handle_result
       end

data/lib/ogr/spatial_reference_mixins/exporters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module Exporters

data/lib/ogr/spatial_reference_mixins/importers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module Importers
@@ -198,7 +200,8 @@ module OGR
           projection_system_code,
           zone,
           proj_ptr,
-          datum)
+          datum
+        )
 
         ogr_err.handle_result
       end
@@ -227,7 +230,8 @@ module OGR
           @c_pointer,
           projection_name,
           datum_name,
-          linear_unit_name)
+          linear_unit_name
+        )
 
         ogr_err.handle_result
       end

data/lib/ogr/spatial_reference_mixins/morphers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module Morphers

data/lib/ogr/spatial_reference_mixins/parameter_getter_setters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module ParameterGetterSetters

data/lib/ogr/spatial_reference_mixins/type_checks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module TypeChecks

data/lib/ogr/style_table.rb

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

data/lib/ogr/style_table_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module OGR
@@ -20,15 +22,5 @@ module OGR
 
       styles
     end
-
-    # @return [Hash]
-    def as_json(_options = nil)
-      styles
-    end
-
-    # @return [String]
-    def to_json(options = nil)
-      as_json(options).to_json
-    end
   end
 end

data/lib/ogr/style_tool.rb

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

data/spec/ffi-gdal_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 

data/spec/integration/gdal/color_table_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'

data/spec/integration/gdal/dataset_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'
@@ -77,18 +79,18 @@ RSpec.describe 'Dataset Info', type: :integration do
 
     context 'param is an valid projection string' do
       let(:wkt) do
-        <<-WKT
-GEOGCS["WGS 84",
-  DATUM["WGS_1984",
-    SPHEROID["WGS 84",6378137,298.257223563,
-        AUTHORITY["EPSG",7030]],
-    TOWGS84[0,0,0,0,0,0,0],
-    AUTHORITY["EPSG",6326]],
-  PRIMEM["Greenwich",0,AUTHORITY["EPSG",8901]],
-  UNIT["DMSH",0.0174532925199433,AUTHORITY["EPSG",9108]],
-  AXIS["Lat",NORTH],
-  AXIS["Long",EAST],
-  AUTHORITY["EPSG",4326]]
+        <<~WKT
+          GEOGCS["WGS 84",
+            DATUM["WGS_1984",
+              SPHEROID["WGS 84",6378137,298.257223563,
+                  AUTHORITY["EPSG",7030]],
+              TOWGS84[0,0,0,0,0,0,0],
+              AUTHORITY["EPSG",6326]],
+            PRIMEM["Greenwich",0,AUTHORITY["EPSG",8901]],
+            UNIT["DMSH",0.0174532925199433,AUTHORITY["EPSG",9108]],
+            AXIS["Lat",NORTH],
+            AXIS["Long",EAST],
+            AUTHORITY["EPSG",4326]]
         WKT
       end
 
@@ -185,7 +187,7 @@ GEOGCS["WGS 84",
 
   describe '#gcp_count' do
     it 'is a Fixnum' do
-      expect(subject.gcp_count).to be_a Fixnum
+      expect(subject.gcp_count).to be_a Integer
     end
   end
 

data/spec/integration/gdal/driver_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'
@@ -20,7 +22,7 @@ RSpec.describe 'Driver Info', type: :integration do
 
   describe '.count' do
     it 'is a non-zero Integer' do
-      expect(GDAL::Driver.count).to be_a Fixnum
+      expect(GDAL::Driver.count).to be_a Integer
       expect(GDAL::Driver.count).to be > 0
     end
   end

data/spec/integration/gdal/geo_transform_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'

data/spec/integration/gdal/gridder_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'gdal/gridder'
 require 'ogr/data_source'

data/spec/integration/gdal/raster_attribute_table_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'

data/spec/integration/gdal/raster_band_algorithms_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'gdal/dataset'
 require 'gdal/raster_band'

data/spec/integration/gdal/raster_band_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'
@@ -8,6 +10,13 @@ RSpec.describe 'Raster Band Info', type: :integration do
     File.expand_path(path, __dir__)
   end
 
+  let(:nodata_tiff) do
+    path = '../../../spec/support/images/123.tiff'
+    File.expand_path(path, __dir__)
+  end
+
+  let(:nodata_dataset) { GDAL::Dataset.open(nodata_tiff, 'r') }
+
   let(:tmp_tiff) { make_temp_test_file(original_tiff) }
   let(:dataset) { GDAL::Dataset.open(tmp_tiff, 'w') }
   after { dataset.close }
@@ -17,14 +26,14 @@ RSpec.describe 'Raster Band Info', type: :integration do
 
   describe '#x_size' do
     it 'is a non-zero Integer' do
-      expect(subject.x_size).to be_a Fixnum
+      expect(subject.x_size).to be_a Integer
       expect(subject.x_size).to be > 0
     end
   end
 
   describe '#y_size' do
     it 'is a non-zero Integer' do
-      expect(subject.y_size).to be_a Fixnum
+      expect(subject.y_size).to be_a Integer
       expect(subject.y_size).to be > 0
     end
   end
@@ -35,7 +44,7 @@ RSpec.describe 'Raster Band Info', type: :integration do
 
   describe '#number' do
     it 'is a non-zero Integer' do
-      expect(subject.number).to be_a Fixnum
+      expect(subject.number).to be_a Integer
       expect(subject.number).to be > 0
     end
   end
@@ -49,9 +58,7 @@ RSpec.describe 'Raster Band Info', type: :integration do
 
   describe '#color_table' do
     it 'is a GDAL::ColorTable' do
-      if subject.color_table
-        expect(subject.color_table).to be_a GDAL::ColorTable
-      end
+      expect(subject.color_table).to be_a GDAL::ColorTable if subject.color_table
     end
   end
 
@@ -89,18 +96,33 @@ RSpec.describe 'Raster Band Info', type: :integration do
     end
   end
 
-  describe '#no_data_value' do
-    it 'is a Hash with :value and :is_associated keys' do
-      expect(subject.no_data_value).to be_an Hash
+  context 'no data not set' do
+    describe '#no_data_value' do
+      it 'is a Hash with :value and :is_associated keys' do
+        expect(subject.no_data_value).to be_an Hash
 
-      expect(subject.no_data_value[:value]).to be_a Float
-      expect(subject.no_data_value[:is_associated]).to_not be_nil
+        expect(subject.no_data_value[:value]).to be_nil
+        expect(subject.no_data_value[:is_associated]).to_not be_nil
+      end
+    end
+  end
+
+  context 'no data is set' do
+    subject { nodata_dataset.raster_band(1) }
+
+    describe '#no_data_value' do
+      it 'is a Hash with :value and :is_associated keys' do
+        expect(subject.no_data_value).to be_an Hash
+
+        expect(subject.no_data_value[:value]).to be_a Float
+        expect(subject.no_data_value[:is_associated]).to_not be_nil
+      end
     end
   end
 
   describe '#overview_count' do
     it 'is a Fixnum' do
-      expect(subject.overview_count).to be_a Fixnum
+      expect(subject.overview_count).to be_a Integer
     end
   end
 
@@ -147,7 +169,7 @@ RSpec.describe 'Raster Band Info', type: :integration do
     it 'has a :minimum that ranges between 0.0/-32768.0 and 255.0' do
       min = subject.statistics[:minimum]
       unless min == -32_768.0
-        expect(subject.statistics[:minimum]).to satisfy { |v| v >= 0 || v == -32_768 }
+        expect(subject.statistics[:minimum]).to(satisfy { |v| v >= 0 || v == -32_768 })
         expect(subject.statistics[:minimum]).to be <= 255.0
       end
     end
@@ -233,14 +255,14 @@ RSpec.describe 'Raster Band Info', type: :integration do
     end
 
     it 'has :buckets as a Fixnum' do
-      expect(histogram[:buckets]).to be_a Fixnum if histogram
+      expect(histogram[:buckets]).to be_a Integer if histogram
     end
 
     it 'has :totals as an Array of 0 or 256 Fixnums' do
       if histogram
         expect(histogram[:totals]).to be_an Array
         expect(histogram[:totals].size).to eq(256).or eq(0)
-        expect(histogram[:totals].all? { |t| t.class == Fixnum }).to eq true
+        expect(histogram[:totals].all? { |t| t.class == Integer }).to eq true
       end
     end
   end

data/spec/integration/ogr/layer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ogr'
 
@@ -90,10 +92,4 @@ RSpec.describe 'OGR::Layer' do
       expect(geometry).to be_a OGR::Polygon
     end
   end
-
-  describe '#as_json' do
-    specify do
-      expect { subject.as_json }.to_not raise_exception
-    end
-  end
 end