proj4rb 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc96e86f24cffe40c1a80db776c80e5e83fd76a6194b3267c9e6e2c4b5641326
-  data.tar.gz: bd9043ce0c2c1c0640b783ff802d4bd23adc6419bd59bb038a03abd8b9466438
+  metadata.gz: e159814e14a3d1aabbf8f092eb5dd8a507e1f4bd61d016a6e409f75db89ca961
+  data.tar.gz: 2ee9e34d84e7a148770beb24d2dff0666c4be80722e602849ae277b084e39e0a
 SHA512:
-  metadata.gz: e47e9dbb00d9cfe529aaab596dae15aff43a09a04d6550641a71674a626fd4e79ad177ee18dd402e8d0f1ebae1cd1e05fa61459534e2f601164b9ad1edbc545c
-  data.tar.gz: 752a5933c869f26be5fd84e085fe6c12b602dd969b7a363929cf47757abb23f0c65b607dd273f891046c1d8a986cffddda518a738b20f1a7a792b3427594d55a
+  metadata.gz: 27545786f9a350a0256a9191a2d15fc49843acffc2093b88d58f861bcbc15c2f95ab018e7625fdcf3f80fb8f077c02c24f82ccf7ee40232d976a4bad82593fc9
+  data.tar.gz: 3f56592e59d06ff1a9e74a240e6502504c2899451d06603ae129775e254d669535e6a4b270c20737a348161dc253fbb1c503f4c8aa34a9434aba798367a7b1f8

data/ChangeLog

@@ -1,10 +1,15 @@
-2.1.0 (January 7, 2020)
+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.0.1 (January 5, 2020)
+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)

data/lib/api/api.rb

@@ -3,18 +3,38 @@ require 'ffi'
 module Proj
   module Api
     extend FFI::Library
-    ffi_lib ['libproj-15', # Mingw64 Proj 6
-             'libproj.so.15', # Linux (Postgresql repository )Proj 6
-             'libproj.so.13', # Linux (Fedora 31) Proj 5
-             'libproj.so.12', # Linux (Ubuntu 18.04 ) Proj 4
-             'libproj-12', # Mingw64 Proj 4
-             '/opt/local/lib/proj6/lib/libproj.15.dylib', # Macports Proj 6
-             '/opt/local/lib/proj5/lib/libproj.13.dylib', # Macports Proj 5
-             '/opt/local/lib/proj49/lib/libproj.12.dylib', # Macports Proj 5
-             '/usr/local/lib/libproj.15.dylib', # mac homebrew mac Proj 6
-             '/usr/local/lib/libproj.13.dylib', # mac howbrew Proj 5
-             '/usr/local/lib/libproj.12.dylib' # mac howbrew Proj 5
-            ] 
+
+    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'

data/lib/api/api_6_0.rb

@@ -20,7 +20,6 @@ module Proj
     # Export to various formats
     attach_function :proj_as_wkt, [:PJ_CONTEXT, :PJ, :PJ_WKT_TYPE, :pointer], :string
     attach_function :proj_as_proj_string, [:PJ_CONTEXT, :PJ, :PJ_PROJ_STRING_TYPE, :pointer], :string
-    attach_function :proj_as_projjson, [:PJ_CONTEXT, :PJ, :pointer], :string
 
     # Projection database functions
     attach_function :proj_context_set_autoclose_database, [:PJ_CONTEXT, :int], :void

data/lib/api/api_6_2.rb

@@ -1,5 +1,6 @@
 module Proj
   module Api
+    attach_function :proj_as_projjson, [:PJ_CONTEXT, :PJ, :pointer], :string
     attach_function :proj_create_crs_to_crs_from_pj, [:PJ_CONTEXT, :PJ, :PJ, :PJ_AREA, :string], :PJ
   end
 end

data/proj4rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = 'proj4rb'
-  spec.version = '2.2.0'
+  spec.version = '2.2.1'
   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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proj4rb
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Guilhem Vellut
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Proj (Proj4) Library
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Proj.4 Carthographic Projection library