ffi-gdal 1.0.0.beta3 → 1.0.0.beta4

data/spec/integration/{color_table_info_spec.rb → gdal/color_table_info_spec.rb}

@@ -1,12 +1,12 @@
 require 'spec_helper'
 require 'support/integration_help'
 require 'ffi-gdal'
-
+require 'gdal/dataset'
 
 TIF_FILES.each do |file|
   dataset =  GDAL::Dataset.open(file, 'r')
 
-  describe 'Color Table Info' do
+  RSpec.describe 'Color Table Info' do
     after :all do
       dataset.close
     end
@@ -34,26 +34,26 @@ TIF_FILES.each do |file|
     end
 
     describe '#color_entry' do
-      it 'returns a FFI::GDAL::GDALColorEntry' do
+      it 'returns a GDAL::ColorEntry' do
         next if subject.nil?
 
-        expect(subject.color_entry(0)).to be_a FFI::GDAL::GDALColorEntry
+        expect(subject.color_entry(0)).to be_a GDAL::ColorEntry
       end
 
       it 'has 4 Fixnum values, >= 0' do
         next if subject.nil?
 
-        expect(subject.color_entry(0)[:c1]).to be_a Fixnum
-        expect(subject.color_entry(0)[:c1]).to be >= 0
+        expect(subject.color_entry(0).color1).to be_a Fixnum
+        expect(subject.color_entry(0).color1).to be >= 0
 
-        expect(subject.color_entry(0)[:c2]).to be_a Fixnum
-        expect(subject.color_entry(0)[:c2]).to be >= 0
+        expect(subject.color_entry(0).color2).to be_a Fixnum
+        expect(subject.color_entry(0).color2).to be >= 0
 
-        expect(subject.color_entry(0)[:c3]).to be_a Fixnum
-        expect(subject.color_entry(0)[:c3]).to be >= 0
+        expect(subject.color_entry(0).color3).to be_a Fixnum
+        expect(subject.color_entry(0).color3).to be >= 0
 
-        expect(subject.color_entry(0)[:c4]).to be_a Fixnum
-        expect(subject.color_entry(0)[:c4]).to be >= 0
+        expect(subject.color_entry(0).color4).to be_a Fixnum
+        expect(subject.color_entry(0).color4).to be >= 0
       end
     end
   end

data/spec/integration/{dataset_info_spec.rb → gdal/dataset_info_spec.rb}

@@ -3,17 +3,13 @@ require 'support/integration_help'
 require 'ffi-gdal'
 
 TIF_FILES.each do |file|
-  describe 'Dataset Info' do
+  RSpec.describe 'Dataset Info' do
     subject do
       GDAL::Dataset.open(file, 'r')
     end
 
     it_behaves_like 'a major object'
 
-    describe '#open?' do
-      it { is_expected.to be_open }
-    end
-
     describe '#driver' do
       it 'is a GDAL::Driver' do
         expect(subject.driver).to be_a GDAL::Driver
@@ -88,7 +84,7 @@ TIF_FILES.each do |file|
 
     describe '#gcps' do
       it 'is a GDALGCP' do
-        expect(subject.gcps).to be_a FFI::GDAL::GDALGCP
+        expect(subject.gcps).to be_a FFI::GDAL::GCP
       end
     end
   end

data/spec/integration/{driver_info_spec.rb → gdal/driver_info_spec.rb}

@@ -3,17 +3,17 @@ require 'support/integration_help'
 require 'ffi-gdal'
 
 TIF_FILES.each do |file|
-  describe 'Driver Info' do
+  RSpec.describe 'Driver Info' do
     subject do
-      GDAL::Driver.open_by_file(file)
+      GDAL::Dataset.open(file, 'r').driver
     end
 
     it_behaves_like 'a major object'
 
-    describe '.driver_count' do
+    describe '.count' do
       it 'is a non-zero Integer' do
-        expect(GDAL::Driver.driver_count).to be_a Fixnum
-        expect(GDAL::Driver.driver_count).to be > 0
+        expect(GDAL::Driver.count).to be_a Fixnum
+        expect(GDAL::Driver.count).to be > 0
       end
     end
 

data/spec/integration/{geo_transform_info_spec.rb → gdal/geo_transform_info_spec.rb}

@@ -2,11 +2,10 @@ require 'spec_helper'
 require 'support/integration_help'
 require 'ffi-gdal'
 
-
 TIF_FILES.each do |file|
   dataset =  GDAL::Dataset.open(file, 'r')
 
-  describe 'GeoTransform Info' do
+  RSpec.describe 'GeoTransform Info' do
     after :all do
       dataset.close
     end
@@ -50,17 +49,5 @@ TIF_FILES.each do |file|
         expect(subject.pixel_height).to be_a Float
       end
     end
-
-    describe '#x_projection' do
-      it 'is a Float' do
-        expect(subject.x_projection(0, 0)).to be_a Float
-      end
-    end
-
-    describe '#y_projection' do
-      it 'is a Float' do
-        expect(subject.y_projection(0, 0)).to be_a Float
-      end
-    end
   end
 end

data/spec/integration/{raster_attribute_table_info_spec.rb → gdal/raster_attribute_table_info_spec.rb}

@@ -2,11 +2,10 @@ require 'spec_helper'
 require 'support/integration_help'
 require 'ffi-gdal'
 
-
 TIF_FILES.each do |file|
   dataset =  GDAL::Dataset.open(file, 'r')
 
-  describe 'Raster Band Info' do
+  RSpec.describe 'Raster Band Info' do
     after :all do
       dataset.close
     end

data/spec/integration/{raster_band_info_spec.rb → gdal/raster_band_info_spec.rb}

@@ -2,12 +2,11 @@ require 'spec_helper'
 require 'support/integration_help'
 require 'ffi-gdal'
 
-
 TIF_FILES.each do |file|
   dataset = GDAL::Dataset.open(file, 'r')
 
   dataset.each_band do |band_under_test|
-    describe "Raster Band Info" do
+    RSpec.describe 'Raster Band Info' do
       after :suite do
         dataset.close
       end
@@ -45,9 +44,9 @@ TIF_FILES.each do |file|
       end
 
       describe '#color_interpretation' do
-        it 'is a Symbol; one of FFI::GDAL::GDALColorInterp' do
+        it 'is a Symbol; one of FFI::GDAL::ColorInterp' do
           expect(subject.color_interpretation).to be_a Symbol
-          expect(FFI::GDAL::GDALColorInterp.symbols).to include subject.color_interpretation
+          expect(FFI::GDAL::ColorInterp.symbols).to include subject.color_interpretation
         end
       end
 
@@ -60,9 +59,9 @@ TIF_FILES.each do |file|
       end
 
       describe '#data_type' do
-        it 'is a Symbol; one of FFI::GDAL::GDALDataType' do
+        it 'is a Symbol; one of FFI::GDAL::DataType' do
           expect(subject.data_type).to be_a Symbol
-          expect(FFI::GDAL::GDALDataType.symbols).to include subject.data_type
+          expect(FFI::GDAL::DataType.symbols).to include subject.data_type
         end
       end
 
@@ -145,7 +144,7 @@ TIF_FILES.each do |file|
 
       describe '#mask_flags' do
         it 'returns an Array of Symbols' do
-          expect(subject.mask_flags).to eq [:GMF_ALL_VALID]
+          expect(subject.mask_flags).to eq([:GMF_ALL_VALID]).or eq([:GMF_PER_DATASET])
         end
       end
 
@@ -158,8 +157,8 @@ TIF_FILES.each do |file|
 
         it 'has a :minimum that ranges between 0.0/-32768.0 and 255.0' do
           min = subject.statistics[:minimum]
-          unless min == -32768.0
-            expect(subject.statistics[:minimum]).to((be >= 0.0) || (eq -32768.0))
+          unless min == -32_768.0
+            expect(subject.statistics[:minimum]).to (be >= 0.0).or eq(-32_768.0)
             expect(subject.statistics[:minimum]).to be <= 255.0
           end
         end
@@ -167,7 +166,7 @@ TIF_FILES.each do |file|
 
       describe '#scale' do
         it 'returns a Hash with populated values' do
-          expect(subject.statistics).to be_a Hash
+          expect(subject.scale).to be_a Hash
           expect(%i[value is_meaningful]).to eq subject.scale.keys
         end
 
@@ -235,24 +234,26 @@ TIF_FILES.each do |file|
         end
 
         it 'does nothing (because the file formats dont support it)' do
-          skip unless defined? FFI::GDAL::GDALSetRasterUnitType
-
-          subject.unit_type = 'ft'
-          expect(subject.unit_type).to eq 'ft'
+          if defined? FFI::GDAL::GDALSetRasterUnitType
+            subject.unit_type = 'ft'
+            expect(subject.unit_type).to eq 'ft'
+          else
+            skip 'GDALSetRasterUnitType not supported'
+          end
         end
       end
 
       describe '#default_histogram' do
         let!(:histogram) { subject.default_histogram }
 
-        it 'returns a Hash with :mininum, :maximum, :buckets, and :totals' do
+        it 'returns a Hash with :minimum, :maximum, :buckets, and :totals' do
           if histogram
             expect(histogram).to be_a Hash
             expect(histogram.keys).to eq %i[minimum maximum buckets totals]
           end
         end
 
-        it 'has :mimimum as a Float' do
+        it 'has :minimum as a Float' do
           expect(histogram[:minimum]).to be_a Float if histogram
         end
 
@@ -264,11 +265,11 @@ TIF_FILES.each do |file|
           expect(histogram[:buckets]).to be_a Fixnum if histogram
         end
 
-        it 'has :totals as an Array of 256 Fixnums' do
+        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
-            expect(histogram[:totals].all? { |t| t.class == Fixnum}).to eq true
+            expect(histogram[:totals].size).to eq(256).or eq(0)
+            expect(histogram[:totals].all? { |t| t.class == Fixnum }).to eq true
           end
         end
       end
@@ -277,33 +278,20 @@ TIF_FILES.each do |file|
         it 'returns a GDAL::RasterAttributeTable' do
           rat = subject.default_raster_attribute_table
 
-          if rat
-            expect(rat).to be_a GDAL::RasterAttributeTable
-          end
+          expect(rat).to be_a GDAL::RasterAttributeTable if rat
         end
       end
 
-      describe '#compute_min_max' do
-        it 'returns a 2-element Array of Floats' do
-          expect(subject.compute_min_max).to be_a Array
-          expect(subject.compute_min_max.size).to eq 2
-          expect(subject.compute_min_max.first).to be_a Float
-          expect(subject.compute_min_max.last).to be_a Float
+      describe '#min_max' do
+        it 'returns a Hash with :min and :max keys' do
+          expect(subject.min_max).to be_a Hash
+          expect(subject.min_max.size).to eq 2
+          expect(subject.min_max[:min]).to be_a Float
+          expect(subject.min_max[:max]).to be_a Float
         end
 
         it 'has a min that is < its max' do
-          min, max = subject.compute_min_max
-          expect(min).to be < max
-        end
-
-        it 'has a min that == statistics[:minimum]' do
-          min, _ = subject.compute_min_max
-          expect(min).to eq subject.statistics[:minimum]
-        end
-
-        it 'has a min that == minimum_value[:value]' do
-          min, _ = subject.compute_min_max
-          expect(min).to eq subject.minimum_value[:value]
+          expect(subject.min_max[:min]).to be < subject.min_max[:max]
         end
       end
 
@@ -318,7 +306,7 @@ TIF_FILES.each do |file|
         end
 
         it 'has a :is_tight that is nil (since the examples are geotiffs)' do
-          #expect(subject.minimum_value[:is_tight]).to eq nil
+          # expect(subject.minimum_value[:is_tight]).to eq nil
         end
       end
 
@@ -333,7 +321,7 @@ TIF_FILES.each do |file|
         end
 
         it 'has a :is_tight that is nil (since the examples are geotiffs)' do
-          #expect(subject.maximum_value[:is_tight]).to eq nil
+          # expect(subject.maximum_value[:is_tight]).to eq nil
         end
       end
     end

data/spec/integration/ogr/layer_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+RSpec.describe OGR::Layer do
+  let(:data_source) do
+    OGR::DataSource.open('spec/support/shapefiles/states_21basic/states.shp', 'r')
+  end
+
+  let(:layer0) do
+    data_source.layer(0)
+  end
+
+  subject do
+    layer0
+  end
+
+  describe '#name' do
+    subject { layer0.name }
+    it { is_expected.to eq 'states' }
+  end
+
+  describe '#geometry_type' do
+    subject { layer0.geometry_type }
+    it { is_expected.to eq :wkbPolygon }
+  end
+
+  describe '#feature_count' do
+    subject { layer0.feature_count }
+    it { is_expected.to eq 51 }
+  end
+
+  describe '#feature' do
+    subject { layer0.feature(0) }
+    it { is_expected.to be_a OGR::Feature }
+  end
+
+  describe '#next_feature' do
+    subject { layer0.next_feature }
+    it { is_expected.to be_a OGR::Feature }
+  end
+
+  describe '#features_read' do
+    subject { layer0.features_read }
+    it { is_expected.to be >= 0 }
+  end
+
+  describe '#features' do
+    subject { layer0.features }
+    it { is_expected.to be_an Array }
+    specify { expect(subject.first).to be_a OGR::Feature }
+    specify { expect(subject.size).to eq layer0.feature_count }
+  end
+
+  describe '#feature_definition' do
+    subject { layer0.feature_definition }
+    it { is_expected.to be_a OGR::FeatureDefinition }
+  end
+
+  describe '#spatial_reference' do
+    subject { layer0.spatial_reference }
+    it { is_expected.to be_a OGR::SpatialReference }
+  end
+
+  describe '#extent' do
+    subject { layer0.extent }
+    it { is_expected.to be_a OGR::Envelope }
+  end
+
+  describe '#fid_column' do
+    subject { layer0.fid_column }
+    it { is_expected.to be_a String }
+    it { is_expected.to be_empty }
+  end
+
+  describe '#geometry_column' do
+    subject { layer0.geometry_column }
+    it { is_expected.to be_a String }
+    it { is_expected.to be_empty }
+  end
+
+  describe '#style_table' do
+    subject { layer0.style_table }
+    it { is_expected.to be_nil }
+  end
+
+  describe '#geometry_from_extent' do
+    it 'is a Polygon' do
+      geometry = subject.geometry_from_extent
+      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

data/spec/spec_helper.rb

@@ -1,16 +1,105 @@
-$:.unshift File.expand_path('../lib', __FILE__)
-#$:.unshift File.expand_path('../spec', __FILE__)
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+  add_group 'GDAL', 'lib/gdal'
+  add_group 'OGR', 'lib/ogr'
+  add_group 'FFI', 'lib/ffi'
+  add_group 'ext', 'lib/ext'
+end
+
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'ffi-gdal'
 
-Dir['./spec/support/shared_examples/**/*.rb'].sort.each { |f| require f}
+require './spec/support/shared_contexts'
+Dir['./spec/support/shared_examples/**/*.rb'].sort.each { |f| require f }
 
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    # config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 3
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end
 
-OGR::Geometry.logging_enabled = true
+GDAL::Logger.logging_enabled = true

data/spec/support/integration_help.rb

@@ -1 +1,2 @@
 TIF_FILES = Dir.glob('spec/support/images/osgeo/**/*.tif')
+warn 'No Tiff files for integration specs!' if TIF_FILES.empty?

data/spec/support/shared_contexts.rb

@@ -0,0 +1,26 @@
+RSpec.shared_context 'OGR::Layer, spatial_reference' do
+  require 'ogr/driver'
+  require 'ogr/spatial_reference'
+
+  let(:driver) { OGR::Driver.by_name 'Memory' }
+  let(:data_source) { driver.create_data_source 'spec data source' }
+
+  subject(:layer) do
+    data_source.create_layer 'spec layer',
+      geometry_type: :wkbMultiPoint,
+      spatial_reference: OGR::SpatialReference.new_from_epsg(4326)
+  end
+end
+
+RSpec.shared_context 'OGR::Layer, no spatial_reference' do
+  require 'ogr/driver'
+  require 'ogr/spatial_reference'
+
+  let(:driver) { OGR::Driver.by_name 'Memory' }
+  let(:data_source) { driver.create_data_source 'spec data source' }
+
+  subject(:layer) do
+    data_source.create_layer 'spec layer',
+      geometry_type: :wkbMultiPoint
+  end
+end

data/spec/support/shared_examples/{major_object_examples.rb → gdal/major_object_examples.rb}

@@ -9,10 +9,10 @@ RSpec.shared_examples 'a major object' do
     end
   end
 
-  describe '#metadata_for_domain' do
+  describe '#metadata' do
     context 'default domain' do
       it 'is a Hash' do
-        expect(subject.metadata_for_domain).to be_a Hash
+        expect(subject.metadata).to be_a Hash
       end
     end
   end
@@ -21,8 +21,8 @@ RSpec.shared_examples 'a major object' do
     context 'default domain' do
       context 'first item in metadata list' do
         it 'is a String' do
-          unless subject.metadata_for_domain.empty?
-            key = subject.metadata_for_domain.keys.first
+          unless subject.metadata.empty?
+            key = subject.metadata.keys.first
 
             expect(subject.metadata_item(key)).to be_a String
           end
@@ -37,7 +37,7 @@ RSpec.shared_examples 'a major object' do
     end
 
     it 'has a DEFAULT key' do
-      expect(subject.all_metadata[:DEFAULT]).to eq subject.metadata_for_domain
+      expect(subject.all_metadata[:DEFAULT]).to eq subject.metadata
     end
   end
 

data/spec/support/shared_examples/ogr/a_25D_geometry.rb

@@ -0,0 +1,7 @@
+RSpec.shared_examples 'a 2.5D geometry' do
+  describe '#flatten_to_2d' do
+    it 'drops the z point(s)' do
+      skip
+    end
+  end
+end

data/spec/support/shared_examples/ogr/a_container_geometry.rb

@@ -0,0 +1,47 @@
+# Requirements:
+#   * :child_geometry - one that the described class can
+RSpec.shared_examples 'a container geometry' do
+  describe '#collection?' do
+    it 'returns true' do
+      expect(subject.collection?).to eq true
+    end
+  end
+
+  describe '#add_geometry' do
+    it 'adds the geometry to the container' do
+      skip
+    end
+  end
+
+  describe '#add_directly' do
+    it 'adds the geometry to the container' do
+      skip
+    end
+  end
+
+  describe '#remove_geometry' do
+    it 'removes the geometry to the container' do
+      skip
+    end
+  end
+
+  describe '#geometry_at' do
+    context 'geometry exists at the index' do
+      subject do
+        gc = described_class.new
+        gc.add_geometry(child_geometry)
+        gc
+      end
+
+      it 'returns the geometry' do
+        expect(subject.geometry_at(0)).to be_a(child_geometry.class)
+      end
+    end
+
+    context 'no geometries' do
+      it 'returns nil' do
+        expect(subject.geometry_at(0)).to be_nil
+      end
+    end
+  end
+end