proj4rb 2.2.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec1833a8b87e9d94521de30e1179f81f6cf04896c1200ce1949df372ed68b3c9
-  data.tar.gz: 192835632d10989b94df05a038c17595c4735787bb6a0d8dde7edb55a60e0948
+  metadata.gz: 4d2946731ccd3cf4e96e214fce1e8e3c7fc46313f5f1d1fcc119c84e9b88f26f
+  data.tar.gz: 17ca8b08ed1b03be5d910ba77013b7028d88e45160b352764619799f7f156887
 SHA512:
-  metadata.gz: 8dd8fa60741b1db78714fd63c496d33ad07439c7bf248bdffee0ecbe96f299dcb6527dc22eb014c8ee3024ae91094ebad3cb39df293438a759e704aa818677dc
-  data.tar.gz: 252a6e5efd3fd85f136a281dc69d82f9993d630b0c5b7d4fbfe67739af1dd7cb19d4c863deb81dd8a5ec0a7c71c45cdcedfe8092feba267b85775eb77013bcae
+  metadata.gz: 6a23e8938aa5d6289dabe4b1f0e5ad2aa204281f6ff2f0073fcbc20b6d404bc6b265120cb0c22561ad68338248a16959fd36873777cdbe7ebae4cbf86258ad2f
+  data.tar.gz: 78b42798c55214f7d73df85575b5d6a4a64283ab51583656a9441a725c369fde5a7b12c36944a8dd0a66c67bdf9ef6b48e189e34a3c6d280f11e0adca4116835

data/ChangeLog

@@ -1,67 +1,72 @@
-2.2.2 (January 10, 2020)
-=========================
-* Move proj_context_set_autoclose_database to api 6.2 (Jan Klimke)
-* Improve search path generation code (Charlie Savage)
-
-2.2.1 (January 8, 2020)
-=========================
-* Move proj_as_projjson from version 6.0 to 6.2 api (Charlie Savage)
-* Improve search path generation code (Charlie Savage)
-
-2.2.0 (January 7, 2020)
-=========================
-* Fix broken gem - was not including all api files (Jan Klimke)
-* Add paths on MacOS when using Brew (Jan Klimke)
-* Various code cleanups (Charlie Savage)
-
-2.1.0 (January 5, 2020)
-=========================
-* Set Ruby 2.4.1 to be the minimum allowed version (Samuel Williams)
-* Fix incorrect use of context, reduce warnings when running tests (Samuel Williams)
-* Fix `bundle exec rake test` (Samuel Williams)
-* Add 2.4.1 to the travis test matrix  (Samuel Williams)
-
-2.0.0 (December 30, 2019)
-=========================
-- Full rewrite to support API changes in Proj versions 5 and 6 (Charlie Savage)
-- As part of rewrite switch bindings to use FFI versus a C extension (Charlie Savage)
-- Split Ruby code into multiple files based on classes (Charlie Savage)
-- Add in a bunch of new classes including Context, Crs, Coordinate, Ellipsoid, Prime Meridian and Transform (Charlie Savage)
-- Deprecate Projection and Point - these will stop working with Proj 7 since the use an older deprecated API (Charlie Savage)
-
-1.0.0 (December 14, 2014)
-=========================
-- Calling this 1.0.0 since its a very stable gem  (Charlie Savage)
-
-0.4.3 (August 30, 2011)
-=========================
-- Remove reference to now private projects.h header
-
-0.4.2 (August 15, 2011)
-=========================
-- Minor build tweak to support MSVC++
-
-0.4.1 (July 30, 2011)
-=========================
-- Search first for binaries when using windows gems
-- Add # encoding to test files
-- Reformat tests files to use standard ruby 2 space indenting
-
-0.4.0 (July 30, 2011)
-=========================
-- Update to compile on Ruby 1.9.* (Fabio Renzo Panettieri)
-- Add in gemspec file (Charlie Savage)
-- Add rake-compiler as development dependency, remove older MinGW build system (Charlie Savage)
-- Move to GitHub (Charlie Savage)
-
-0.3.1 (December 23, 2009)
-=========================
-- Update extconf.conf file to be more flexible to make it easier to build
-    on OS X when using MacPorts
-- Updated windows binary to link against proj4.7
-
-0.3.0 (August 14, 2008)
-=========================
-- Removed Proj4::UV class which was previously deprecated
-- New build infrastructure for Windows (Charlie Savage)
+3.0.0 (September 26, 2021)
+=========================
+* Support Proj 8 which removes the old Proj API (Charlie Savage)
+* Support newer versions of FFI which remove support for returning strings from callbacks (Charlie Savage)
+
+2.2.2 (January 10, 2020)
+=========================
+* Move proj_context_set_autoclose_database to api 6.2 (Jan Klimke)
+* Improve search path generation code (Charlie Savage)
+
+2.2.1 (January 8, 2020)
+=========================
+* Move proj_as_projjson from version 6.0 to 6.2 api (Charlie Savage)
+* Improve search path generation code (Charlie Savage)
+
+2.2.0 (January 7, 2020)
+=========================
+* Fix broken gem - was not including all api files (Jan Klimke)
+* Add paths on MacOS when using Brew (Jan Klimke)
+* Various code cleanups (Charlie Savage)
+
+2.1.0 (January 5, 2020)
+=========================
+* Set Ruby 2.4.1 to be the minimum allowed version (Samuel Williams)
+* Fix incorrect use of context, reduce warnings when running tests (Samuel Williams)
+* Fix `bundle exec rake test` (Samuel Williams)
+* Add 2.4.1 to the travis test matrix  (Samuel Williams)
+
+2.0.0 (December 30, 2019)
+=========================
+- Full rewrite to support API changes in Proj versions 5 and 6 (Charlie Savage)
+- As part of rewrite switch bindings to use FFI versus a C extension (Charlie Savage)
+- Split Ruby code into multiple files based on classes (Charlie Savage)
+- Add in a bunch of new classes including Context, Crs, Coordinate, Ellipsoid, Prime Meridian and Transform (Charlie Savage)
+- Deprecate Projection and Point - these will stop working with Proj 7 since the use an older deprecated API (Charlie Savage)
+
+1.0.0 (December 14, 2014)
+=========================
+- Calling this 1.0.0 since its a very stable gem  (Charlie Savage)
+
+0.4.3 (August 30, 2011)
+=========================
+- Remove reference to now private projects.h header
+
+0.4.2 (August 15, 2011)
+=========================
+- Minor build tweak to support MSVC++
+
+0.4.1 (July 30, 2011)
+=========================
+- Search first for binaries when using windows gems
+- Add # encoding to test files
+- Reformat tests files to use standard ruby 2 space indenting
+
+0.4.0 (July 30, 2011)
+=========================
+- Update to compile on Ruby 1.9.* (Fabio Renzo Panettieri)
+- Add in gemspec file (Charlie Savage)
+- Add rake-compiler as development dependency, remove older MinGW build system (Charlie Savage)
+- Move to GitHub (Charlie Savage)
+
+0.3.1 (December 23, 2009)
+=========================
+- Update extconf.conf file to be more flexible to make it easier to build
+    on OS X when using MacPorts
+- Updated windows binary to link against proj4.7
+
+0.3.0 (August 14, 2008)
+=========================
+- Removed Proj4::UV class which was previously deprecated
+- New build infrastructure for Windows (Charlie Savage)
 - Fixed memory leaks in forward() and inverse() methods (Charlie Savage)

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in tensorflow-ruby.gemspec
-gemspec
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in tensorflow-ruby.gemspec
+gemspec

data/README.rdoc

@@ -24,8 +24,8 @@ If you are using the old Proj4 namespace, then you can do this:
   require 'proj4'
 
 === Crs
-If you are using Proj 6 create a coordinate system. To create a coordinate system, you can use CRS codes, well-known text (WKT) strings
-or old-style Proj4 strings (which are deprecated).
+If you are using Proj 6, or newer, create a coordinate system. To create a coordinate system, you can use CRS codes,
+well-known text (WKT) strings or old-style Proj4 strings (which are deprecated).
 
     crs1 = Proj::Crs.new('EPSG:4326')
 
@@ -114,7 +114,7 @@ to using Context.current
 
 === Projection
 If you are using Proj 4, then instead of using Coordinates, Crses and Tranformations you need to us Points and Projections.
-Those are deprecated classes but will continue to work until the release of Proj 7.  Please refer to the documentation
+Those are deprecated classes but will continue to work with Proj version 7 and older.  Please refer to the documentation
 for more information.
 
 == Error handling
@@ -136,9 +136,8 @@ https://proj.org/development/migration.html. Note that the gem should gracefully
 the version of Proj you are using.
 
 To ensure backwards compatiblity, the Ruby bindings still include the older Point and Projection
-classes. However, these classes are no longer documented in this Readme because they will be
-removed upon the release of Proj 7 which will remove the underlying API's they depend on.
-So please port your code! But take note of the changes in Proj 6 described below.
+classes. However, these classes are no longer documented in this Readme because the underlying API
+they rely on was removed in Proj 8. So please port your code! But take note of the changes in Proj 6 described below.
 
 Proj 5 introduced the Coordinate, Crs and Tranformation APIs. However, it wasn't until Proj 6 that additional
 metadata APIs were added, so the amount of information about each object is somewhat limited in Proj 5.

data/Rakefile

@@ -1,28 +1,28 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "rake/testtask"
-require "rubygems/package_task"
-require "yard"
-require "yaml"
-
-# Read the spec file
-GEM_NAME = "proj4rb"
-spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
-
-# Setup generic gem
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.package_dir = 'pkg'
-  pkg.need_tar    = false
-end
-
-# Yard Task
-desc "Generate documentation"
-YARD::Rake::YardocTask.new
-
-# Test Task
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
-  t.verbose = true
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "rake/testtask"
+require "rubygems/package_task"
+require "yard"
+require "yaml"
+
+# Read the spec file
+GEM_NAME = "proj4rb"
+spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
+
+# Setup generic gem
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.package_dir = 'pkg'
+  pkg.need_tar    = false
+end
+
+# Yard Task
+desc "Generate documentation"
+YARD::Rake::YardocTask.new
+
+# Test Task
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
 end

data/lib/api/api.rb

@@ -6,7 +6,9 @@ module Proj
     extend FFI::Library
 
     def self.library_versions
-      [17, # 6.2 *and* 6.1
+      [22, # 8.0 and 8.1
+       19, # 7.x
+       17, # 6.2 *and* 6.1
        15, # 6.0
        14, # 5.2
        13, # 5.0
@@ -63,9 +65,6 @@ module Proj
 
     ffi_lib self.search_paths
 
-    # Load the old deprecated api - supported by all Proj versions (until Proj 7!)
-    require_relative './api_4_9'
-
     library = ffi_libraries.first
 
     # proj_info was introduced in Proj 5
@@ -73,6 +72,9 @@ module Proj
       require_relative './api_5_0'
       PROJ_VERSION = Gem::Version.new(self.proj_info[:version])
     else
+      # Load the old deprecated api
+      require_relative './api_4_9'
+
       release = self.pj_get_release
       version = release.match(/\d\.\d\.\d/)
       PROJ_VERSION = Gem::Version.new(version)
@@ -89,6 +91,11 @@ module Proj
     end
   end
 
+  # Load the old deprecated API for versions before version 8
+  if Api::PROJ_VERSION < Gem::Version.new('8.0.0')
+    require_relative './api_4_9'
+  end
+
   if Api::PROJ_VERSION >= Gem::Version.new('5.1.0')
     require_relative './api_5_1'
   end

data/lib/api/api_6_0.rb

@@ -1,6 +1,6 @@
 module Proj
   module Api
-    callback :proj_file_finder, [:PJ_CONTEXT, :string, :pointer], :string
+    callback :proj_file_finder, [:PJ_CONTEXT, :string, :pointer], :pointer
     attach_function :proj_context_set_file_finder, [:PJ_CONTEXT, :proj_file_finder, :pointer], :void
     attach_function :proj_context_set_search_paths, [:PJ_CONTEXT, :int, :pointer], :void
 

data/lib/proj.rb

@@ -1,22 +1,22 @@
 # encoding: UTF-8
 
 require_relative 'api/api'
-require_relative './config'
+require_relative 'proj/config'
 
-require_relative './area'
-require_relative './context'
-require_relative './coordinate'
-require_relative './ellipsoid'
-require_relative './error'
-require_relative './point'
-require_relative './prime_meridian'
-require_relative './unit'
+require_relative 'proj/area'
+require_relative 'proj/context'
+require_relative 'proj/coordinate'
+require_relative 'proj/ellipsoid'
+require_relative 'proj/error'
+require_relative 'proj/point'
+require_relative 'proj/prime_meridian'
+require_relative 'proj/unit'
 
-require_relative './pj_object'
-require_relative './operation'
-require_relative './crs'
-require_relative './projection'
-require_relative './transformation'
+require_relative 'proj/pj_object'
+require_relative 'proj/operation'
+require_relative 'proj/crs'
+require_relative 'proj/projection'
+require_relative 'proj/transformation'
 
 module Proj
   def self.info
@@ -28,4 +28,4 @@ module Proj
   end
 end
 
-Proj::Config.instance.set_search_paths
+Proj::Config.instance.set_search_paths

data/proj4rb.gemspec

@@ -1,33 +1,33 @@
-Gem::Specification.new do |spec|
-  spec.name = 'proj4rb'
-  spec.version = '2.2.2'
-  spec.summary = 'Ruby bindings for the Proj.4 Carthographic Projection library'
-  spec.description = <<-EOF
-    Proj4rb is a ruby binding for the Proj.4 Carthographic Projection library, that supports conversions between a very large number of geographic coordinate systems and datumspec.
-  EOF
-  spec.platform = Gem::Platform::RUBY
-  spec.authors = ['Guilhem Vellut', 'Jochen Topf', 'Charlie Savage']
-  spec.homepage = 'https://github.com/cfis/proj4rb'
-  spec.required_ruby_version = '>= 2.4.1'
-  spec.license = 'MIT'
-
-  spec.requirements << 'Proj (Proj4) Library'
-  spec.require_path = 'lib'
-  spec.files = Dir['ChangeLog',
-                   'Gemfile',
-                   'MIT-LICENSE',
-                   'proj4rb.gemspec',
-                   'Rakefile',
-                   'README.rdoc',
-                   'lib/**/*.rb',
-                   'test/*.rb']
-
-  spec.test_files = Dir["test/test_*.rb"]
-
-  spec.add_dependency "ffi"
-
-  spec.add_development_dependency('bundler')
-  spec.add_development_dependency('rake')
-  spec.add_development_dependency('minitest')
-  spec.add_development_dependency('yard')
+Gem::Specification.new do |spec|
+  spec.name = 'proj4rb'
+  spec.version = '3.0.0'
+  spec.summary = 'Ruby bindings for the Proj.4 Carthographic Projection library'
+  spec.description = <<-EOF
+    Proj4rb is a ruby binding for the Proj.4 Carthographic Projection library, that supports conversions between a very large number of geographic coordinate systems and datumspec.
+  EOF
+  spec.platform = Gem::Platform::RUBY
+  spec.authors = ['Guilhem Vellut', 'Jochen Topf', 'Charlie Savage']
+  spec.homepage = 'https://github.com/cfis/proj4rb'
+  spec.required_ruby_version = '>= 2.4.1'
+  spec.license = 'MIT'
+
+  spec.requirements << 'Proj (Proj4) Library'
+  spec.require_path = 'lib'
+  spec.files = Dir['ChangeLog',
+                   'Gemfile',
+                   'MIT-LICENSE',
+                   'proj4rb.gemspec',
+                   'Rakefile',
+                   'README.rdoc',
+                   'lib/**/*.rb',
+                   'test/*.rb']
+
+  spec.test_files = Dir["test/test_*.rb"]
+
+  spec.add_dependency "ffi"
+
+  spec.add_development_dependency('bundler')
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('minitest')
+  spec.add_development_dependency('yard')
 end

data/test/abstract_test.rb

@@ -1,7 +1,7 @@
-require 'bundler/setup'
-require 'minitest/autorun'
-require 'proj'
-
-class AbstractTest < Minitest::Test
-end
-
+require 'bundler/setup'
+require 'minitest/autorun'
+require 'proj'
+
+class AbstractTest < Minitest::Test
+end
+

data/test/coordinate_test.rb

@@ -1,35 +1,35 @@
-# encoding: UTF-8
-
-require_relative './abstract_test'
-
-class CoordinateTest < AbstractTest
-  def test_create_xyzt
-    coord = Proj::Coordinate.new(:x => 1, :y => 2, :z => 3, :t => 4)
-    assert_equal('v0: 1.0, v1: 2.0, v2: 3.0, v3: 4.0', coord.to_s)
-  end
-
-  def test_create_uvwt
-    coord = Proj::Coordinate.new(:u => 5, :v => 6, :w => 7, :t => 8)
-    assert_equal('v0: 5.0, v1: 6.0, v2: 7.0, v3: 8.0', coord.to_s)
-  end
-
-  def test_create_lpzt
-    coord = Proj::Coordinate.new(:lam => 9, :phi => 10, :z => 11, :t => 12)
-    assert_equal('v0: 9.0, v1: 10.0, v2: 11.0, v3: 12.0', coord.to_s)
-  end
-
-  def test_create_geod
-    coord = Proj::Coordinate.new(:s => 13, :a1 => 14, :a2 => 15)
-    assert_equal('v0: 13.0, v1: 14.0, v2: 15.0, v3: 0.0', coord.to_s)
-  end
-
-  def test_create_opk
-    coord = Proj::Coordinate.new(:o => 16, :p => 17, :k => 18)
-    assert_equal('v0: 16.0, v1: 17.0, v2: 18.0, v3: 0.0', coord.to_s)
-  end
-
-  def test_create_enu
-    coord = Proj::Coordinate.new(:e => 19, :n => 20, :u => 21)
-    assert_equal('v0: 19.0, v1: 20.0, v2: 21.0, v3: 0.0', coord.to_s)
-  end
+# encoding: UTF-8
+
+require_relative './abstract_test'
+
+class CoordinateTest < AbstractTest
+  def test_create_xyzt
+    coord = Proj::Coordinate.new(:x => 1, :y => 2, :z => 3, :t => 4)
+    assert_equal('v0: 1.0, v1: 2.0, v2: 3.0, v3: 4.0', coord.to_s)
+  end
+
+  def test_create_uvwt
+    coord = Proj::Coordinate.new(:u => 5, :v => 6, :w => 7, :t => 8)
+    assert_equal('v0: 5.0, v1: 6.0, v2: 7.0, v3: 8.0', coord.to_s)
+  end
+
+  def test_create_lpzt
+    coord = Proj::Coordinate.new(:lam => 9, :phi => 10, :z => 11, :t => 12)
+    assert_equal('v0: 9.0, v1: 10.0, v2: 11.0, v3: 12.0', coord.to_s)
+  end
+
+  def test_create_geod
+    coord = Proj::Coordinate.new(:s => 13, :a1 => 14, :a2 => 15)
+    assert_equal('v0: 13.0, v1: 14.0, v2: 15.0, v3: 0.0', coord.to_s)
+  end
+
+  def test_create_opk
+    coord = Proj::Coordinate.new(:o => 16, :p => 17, :k => 18)
+    assert_equal('v0: 16.0, v1: 17.0, v2: 18.0, v3: 0.0', coord.to_s)
+  end
+
+  def test_create_enu
+    coord = Proj::Coordinate.new(:e => 19, :n => 20, :u => 21)
+    assert_equal('v0: 19.0, v1: 20.0, v2: 21.0, v3: 0.0', coord.to_s)
+  end
 end