proj4rb 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e159814e14a3d1aabbf8f092eb5dd8a507e1f4bd61d016a6e409f75db89ca961
-  data.tar.gz: 2ee9e34d84e7a148770beb24d2dff0666c4be80722e602849ae277b084e39e0a
+  metadata.gz: ec1833a8b87e9d94521de30e1179f81f6cf04896c1200ce1949df372ed68b3c9
+  data.tar.gz: 192835632d10989b94df05a038c17595c4735787bb6a0d8dde7edb55a60e0948
 SHA512:
-  metadata.gz: 27545786f9a350a0256a9191a2d15fc49843acffc2093b88d58f861bcbc15c2f95ab018e7625fdcf3f80fb8f077c02c24f82ccf7ee40232d976a4bad82593fc9
-  data.tar.gz: 3f56592e59d06ff1a9e74a240e6502504c2899451d06603ae129775e254d669535e6a4b270c20737a348161dc253fbb1c503f4c8aa34a9434aba798367a7b1f8
+  metadata.gz: 8dd8fa60741b1db78714fd63c496d33ad07439c7bf248bdffee0ecbe96f299dcb6527dc22eb014c8ee3024ae91094ebad3cb39df293438a759e704aa818677dc
+  data.tar.gz: 252a6e5efd3fd85f136a281dc69d82f9993d630b0c5b7d4fbfe67739af1dd7cb19d4c863deb81dd8a5ec0a7c71c45cdcedfe8092feba267b85775eb77013bcae

data/ChangeLog

@@ -1,62 +1,67 @@
-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)
+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/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

@@ -1,84 +1,111 @@
-require 'ffi'
-
-module Proj
-  module Api
-    extend FFI::Library
-
-    proj_library_versions = {'proj6' => 15,
-                             'proj5' => 13,
-                             'proj49' => 12}
-
-    file_patterns = ["libproj-%d", # Mingw64
-                     "libproj.so.%d", # Linux
-                     "/opt/local/lib/%s/lib/libproj.%d.dylib", # Macports
-                     "/usr/local/lib/libproj.%d.dylib"] # Mac HomeBrew
-
-    search_paths = file_patterns.map do |file_pattern|
-                     proj_library_versions.map do |proj_version, proj_library_version|
-                       formats = file_pattern.count("%") == 1 ? [proj_library_version] : [proj_version, proj_library_version]
-                       file_pattern % formats
-                     end
-                   end.flatten
-
-    # Generates this array
-    # [0] = "libproj-15"
-    # [1] = "libproj-13"
-    # [2] = "libproj-12"
-    # [3] = "libproj.so.15"
-    # [4] = "libproj.so.13"
-    # [5] = "libproj.so.12"
-    # [6] = "/opt/local/lib/proj6/lib/libproj.15.dylib"
-    # [7] = "/opt/local/lib/proj5/lib/libproj.13.dylib"
-    # [8] = "/opt/local/lib/proj49/lib/libproj.12.dylib"
-    # [9] = "/usr/local/lib/libproj.15.dylib"
-    # [10] = "/usr/local/lib/libproj.13.dylib"
-    # [11] = "/usr/local/lib/libproj.12.dylib"
-
-    ffi_lib 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
-    if library.find_function('proj_info')
-      require_relative './api_5_0'
-      PROJ_VERSION = Gem::Version.new(self.proj_info[:version])
-    else
-      release = self.pj_get_release
-      version = release.match(/\d\.\d\.\d/)
-      PROJ_VERSION = Gem::Version.new(version)
-    end
-  end
-
-  if Api::PROJ_VERSION < Gem::Version.new('5.0.0')
-    def Api.proj_torad(value)
-      value * 0.017453292519943296
-    end
-
-    def Api.proj_todeg(value)
-      value * 57.295779513082321
-    end
-  end
-
-  if Api::PROJ_VERSION >= Gem::Version.new('5.1.0')
-    require_relative './api_5_1'
-  end
-
-  if Api::PROJ_VERSION >= Gem::Version.new('5.2.0')
-    require_relative './api_5_2'
-  end
-
-  if Api::PROJ_VERSION >= Gem::Version.new('6.0.0')
-    require_relative './api_6_0'
-  end
-
-  if Api::PROJ_VERSION >= Gem::Version.new('6.1.0')
-    require_relative './api_6_1'
-  end
-
-  if Api::PROJ_VERSION >= Gem::Version.new('6.2.0')
-    require_relative './api_6_2'
-  end
+require 'rbconfig'
+require 'ffi'
+
+module Proj
+  module Api
+    extend FFI::Library
+
+    def self.library_versions
+      [17, # 6.2 *and* 6.1
+       15, # 6.0
+       14, # 5.2
+       13, # 5.0
+       12, # 4.9
+       11] # 4.9
+    end
+
+    def self.search_paths
+      result = case RbConfig::CONFIG['host_os']
+                 when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+                   self.windows_search_paths
+                 when /darwin|mac os/
+                   self.macos_search_paths
+                 else
+                   self.linux_search_paths
+               end
+
+      result << 'libproj'
+      result
+    end
+
+    def self.windows_search_paths
+      self.library_versions.map do |version|
+        "libproj-#{version}"
+      end
+    end
+
+    def self.linux_search_paths
+      self.library_versions.map do |version|
+        "libproj.so.#{version}"
+      end
+    end
+
+    def self.macos_search_paths
+      # Mac Ports
+      paths1 = self.library_versions.map do |version|
+        case version
+          when 15..17
+            "/opt/local/lib/proj6/lib/libproj.#{version}.dylib"
+          when 13..14
+            "/opt/local/lib/proj5/lib/libproj.#{version}.dylib"
+          when 11..12
+            "/opt/local/lib/proj49/lib/libproj.#{version}.dylib"
+        end
+      end
+
+      # Mac HomeBrew
+      paths2 = self.library_versions.map do |version|
+        "/usr/local/lib/libproj.#{version}.dylib"
+      end
+
+      paths1 + paths2
+    end
+
+    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
+    if library.find_function('proj_info')
+      require_relative './api_5_0'
+      PROJ_VERSION = Gem::Version.new(self.proj_info[:version])
+    else
+      release = self.pj_get_release
+      version = release.match(/\d\.\d\.\d/)
+      PROJ_VERSION = Gem::Version.new(version)
+    end
+  end
+
+  if Api::PROJ_VERSION < Gem::Version.new('5.0.0')
+    def Api.proj_torad(value)
+      value * 0.017453292519943296
+    end
+
+    def Api.proj_todeg(value)
+      value * 57.295779513082321
+    end
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('5.1.0')
+    require_relative './api_5_1'
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('5.2.0')
+    require_relative './api_5_2'
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('6.0.0')
+    require_relative './api_6_0'
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('6.1.0')
+    require_relative './api_6_1'
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('6.2.0')
+    require_relative './api_6_2'
+  end
 end

data/lib/api/api_4_9.rb

@@ -1,31 +1,31 @@
-module Proj
-  module Api
-    #########  Deprecated API from proj_api.h. Don't use these anymore! ##############
-    typedef :pointer, :projPJ
-
-    class ProjUV < FFI::Struct
-      layout :u, :double,
-             :v, :double
-    end
-
-    ProjXY = ProjUV
-    ProjLP = ProjUV
-
-    attach_function :pj_init, [:int, :pointer], :projPJ
-    attach_function :pj_free, [:projPJ], :void
-
-    attach_function :pj_get_release, [], :string
-    attach_function :pj_set_searchpath, [:int, :pointer], :void
-
-    attach_function :pj_get_errno_ref, [], :pointer
-    attach_function :pj_strerrno, [:int], :string
-
-    attach_function :pj_get_def, [:projPJ, :int], :string
-    attach_function :pj_is_latlong, [:projPJ], :bool
-    attach_function :pj_is_geocent, [:projPJ], :bool
-
-    attach_function :pj_fwd, [ProjLP.by_value, :projPJ], ProjXY.by_value
-    attach_function :pj_inv, [ProjXY.by_value, :projPJ], ProjLP.by_value
-    attach_function :pj_transform, [:projPJ, :projPJ, :long, :int, :pointer, :pointer, :pointer], :bool
-  end
+module Proj
+  module Api
+    #########  Deprecated API from proj_api.h. Don't use these anymore! ##############
+    typedef :pointer, :projPJ
+
+    class ProjUV < FFI::Struct
+      layout :u, :double,
+             :v, :double
+    end
+
+    ProjXY = ProjUV
+    ProjLP = ProjUV
+
+    attach_function :pj_init, [:int, :pointer], :projPJ
+    attach_function :pj_free, [:projPJ], :void
+
+    attach_function :pj_get_release, [], :string
+    attach_function :pj_set_searchpath, [:int, :pointer], :void
+
+    attach_function :pj_get_errno_ref, [], :pointer
+    attach_function :pj_strerrno, [:int], :string
+
+    attach_function :pj_get_def, [:projPJ, :int], :string
+    attach_function :pj_is_latlong, [:projPJ], :bool
+    attach_function :pj_is_geocent, [:projPJ], :bool
+
+    attach_function :pj_fwd, [ProjLP.by_value, :projPJ], ProjXY.by_value
+    attach_function :pj_inv, [ProjXY.by_value, :projPJ], ProjLP.by_value
+    attach_function :pj_transform, [:projPJ, :projPJ, :long, :int, :pointer, :pointer, :pointer], :bool
+  end
 end