proj4rb 2.0.0 → 3.0.0

data/lib/proj.rb

@@ -1,31 +1,31 @@
-# encoding: UTF-8
-
-require_relative 'api/api'
-require_relative './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 './pj_object'
-require_relative './operation'
-require_relative './crs'
-require_relative './projection'
-require_relative './transformation'
-
-module Proj
-  def self.info
-    Api.proj_info
-  end
-
-  def self.version
-    self.info[:version]
-  end
-end
-
-Proj::Config.instance.set_search_paths
+# encoding: UTF-8
+
+require_relative 'api/api'
+require_relative 'proj/config'
+
+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 'proj/pj_object'
+require_relative 'proj/operation'
+require_relative 'proj/crs'
+require_relative 'proj/projection'
+require_relative 'proj/transformation'
+
+module Proj
+  def self.info
+    Api.proj_info
+  end
+
+  def self.version
+    self.info[:version]
+  end
+end
+
+Proj::Config.instance.set_search_paths

data/proj4rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = 'proj4rb'
-  spec.version = '2.0.0'
+  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.
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   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.9'
+  spec.required_ruby_version = '>= 2.4.1'
   spec.license = 'MIT'
 
   spec.requirements << 'Proj (Proj4) Library'
@@ -19,13 +19,15 @@ Gem::Specification.new do |spec|
                    'proj4rb.gemspec',
                    'Rakefile',
                    'README.rdoc',
-                   'lib/*.rb',
+                   '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/context_test.rb

@@ -1,82 +1,82 @@
-# encoding: UTF-8
-
-require_relative './abstract_test'
-
-class ContextTest < AbstractTest
-  def test_create
-    context = Proj::Context.new
-    assert(context.to_ptr)
-  end
-
-  def test_finalize
-    500.times do
-      context = Proj::Context.new
-      assert(context.to_ptr)
-      GC.start
-    end
-    assert(true)
-  end
-
-  def test_one_per_thread
-    context_1 = Proj::Context.current
-    context_2 = Proj::Context.current
-    assert_same(context_1, context_2)
-  end
-
-  def test_database_path
-    refute_nil(Proj::Context.current.database_path)
-  end
-
-  def test_log_level
-    assert_equal(:PJ_LOG_NONE, Proj::Context.current.log_level)
-  end
-
-  def test_set_log_level
-    context = Proj::Context.new
-    context.log_level = :PJ_LOG_ERROR
-    assert_equal(:PJ_LOG_ERROR, context.log_level)
-  end
-
-  def test_invalid_database_path
-    path = '/wrong'
-    error = assert_raises(Proj::Error) do
-      Proj::Context.current.database_path = path
-    end
-    # TODO - if you run this test on its own you get a useful error message, if you run all tests
-    # at once you get a useless error message. Not sure what is causing the difference
-    assert_match(/No such file or directory|generic error of unknown origin/, error.to_s)
-  end
-
-  def test_set_log_function
-    context = Proj::Context.new
-    called = false
-
-    data = FFI::MemoryPointer.new(:int)
-    data.write_int(5)
-
-    context.set_log_function(data) do |pointer, int, message|
-      called = true
-      refute(pointer.null?)
-      assert_equal(5, pointer.read_int)
-      assert_equal(1, int)
-      assert_equal('proj_context_set_database_path: Open of /wrong failed', message)
-    end
-
-    begin
-      context.database_path = '/wrong'
-    rescue
-    end
-
-    assert(called)
-  end
-
-  def test_use_proj4_init_rules
-    refute(Proj::Context.current.use_proj4_init_rules)
-
-    Proj::Context.current.use_proj4_init_rules = true
-    assert(Proj::Context.current.use_proj4_init_rules)
-
-    Proj::Context.current.use_proj4_init_rules = false
-    refute(Proj::Context.current.use_proj4_init_rules)
-  end
+# encoding: UTF-8
+
+require_relative './abstract_test'
+
+class ContextTest < AbstractTest
+  def test_create
+    context = Proj::Context.new
+    assert(context.to_ptr)
+  end
+
+  def test_finalize
+    500.times do
+      context = Proj::Context.new
+      assert(context.to_ptr)
+      GC.start
+    end
+    assert(true)
+  end
+
+  def test_one_per_thread
+    context_1 = Proj::Context.current
+    context_2 = Proj::Context.current
+    assert_same(context_1, context_2)
+  end
+
+  def test_database_path
+    refute_nil(Proj::Context.current.database_path)
+  end
+
+  def test_log_level
+    assert_equal(:PJ_LOG_NONE, Proj::Context.current.log_level)
+  end
+
+  def test_set_log_level
+    context = Proj::Context.new
+    context.log_level = :PJ_LOG_ERROR
+    assert_equal(:PJ_LOG_ERROR, context.log_level)
+  end
+
+  def test_invalid_database_path
+    path = '/wrong'
+    error = assert_raises(Proj::Error) do
+      Proj::Context.current.database_path = path
+    end
+    # TODO - if you run this test on its own you get a useful error message, if you run all tests
+    # at once you get a useless error message. Not sure what is causing the difference
+    assert_match(/No such file or directory|generic error of unknown origin/, error.to_s)
+  end
+
+  def test_set_log_function
+    context = Proj::Context.new
+    called = false
+
+    data = FFI::MemoryPointer.new(:int)
+    data.write_int(5)
+
+    context.set_log_function(data) do |pointer, int, message|
+      called = true
+      refute(pointer.null?)
+      assert_equal(5, pointer.read_int)
+      assert_equal(1, int)
+      assert_equal('proj_context_set_database_path: Open of /wrong failed', message)
+    end
+
+    begin
+      context.database_path = '/wrong'
+    rescue
+    end
+
+    assert(called)
+  end
+
+  def test_use_proj4_init_rules
+    refute(Proj::Context.current.use_proj4_init_rules)
+
+    Proj::Context.current.use_proj4_init_rules = true
+    assert(Proj::Context.current.use_proj4_init_rules)
+
+    Proj::Context.current.use_proj4_init_rules = false
+    refute(Proj::Context.current.use_proj4_init_rules)
+  end
 end

data/test/crs_test.rb

@@ -221,7 +221,7 @@ class CrsTest < AbstractTest
     crs = Proj::Crs.new('EPSG:26915')
     expected = <<~EOS
       {
-        "$schema": "https://proj.org/schemas/v0.1/projjson.schema.json",
+        "$schema": "https://proj.org/schemas/v0.2/projjson.schema.json",
         "type": "ProjectedCRS",
         "name": "NAD83 / UTM zone 15N",
         "base_crs": {

data/test/proj_test.rb

@@ -5,11 +5,11 @@ require_relative './abstract_test'
 class ProjTest < AbstractTest
   def test_info
     info = Proj.info
-    assert_equal(6, info[:major])
-    assert_equal(2, info[:minor])
-    assert_equal(1, info[:patch])
-    assert_equal('Rel. 6.2.1, November 1st, 2019', info[:release])
-    assert_equal('6.2.1', info[:version])
+    assert([4,6,7,8].include?(info[:major]))
+    assert([0,1,2,3].include?(info[:minor]))
+    assert([0,1,2,3].include?(info[:patch]))
+    refute_nil(info[:release])
+    assert_match(/\d\.\d\.\d/, info[:version])
     refute_nil(info[:searchpath])
     refute(info[:paths].null?)
     assert_equal(1, info[:path_count])