ffi-proj4 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deebc57c53d32d2674bcce2d97f2be749cc3d278
-  data.tar.gz: 03a3889603c3d63ec455e92fa6c0acdeab7f3eda
+  metadata.gz: 8a76e46b36d0c93594d2debd6dd2844f2cbccd70
+  data.tar.gz: 8a2a0f64bae739c547b46eef24e163d4777a203c
 SHA512:
-  metadata.gz: 28ea5707ede09f52e60c975948647395fd5562e7f983e3971ce4c1c54d585dcd92c5895be9b9fdb88232b754024e2b35e6b685acaa2fafc3da5fe7be3dfcb72b
-  data.tar.gz: b491fc6b49eecd633c9424769dd12ef6319e7eb810014024190f46bda233aed263dee8132f058d83beaf328482ed7849739b8bee40672e3dcd1c52fd0e89a9a9
+  metadata.gz: 91683690b8900f24fc7fb1eac8e89c61bbfba6d6bcf1cf87ed0053ff266aa8086645c3905863511cdac201755cdf905991e16f38ad54ffe6dc063427c7a8f9b5
+  data.tar.gz: 546838a53a9ee8a40c0c455ea9e284932bb6fc4006ea655a41eca04826d7cc44253e2077433b0df271169a3720cb2d50c2f7fcdbfa4bbbc5a7f971c993e826f7

data/.travis.yml

@@ -0,0 +1,14 @@
+cache: bundler
+sudo: false
+language: ruby
+rvm:
+  - 2.2.3
+  - 2.1.7
+  - 2.0.0
+  - 1.9.3
+  - rbx-2
+  - jruby-19mode
+addons:
+  apt:
+    packages:
+      - libproj-dev

data/Gemfile

@@ -6,10 +6,17 @@ gem "rdoc", "~> 3.12"
 gem "rake", "~> 10.0"
 gem "minitest"
 gem "minitest-reporters"
-gem "guard-minitest"
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end
+
 
 if RUBY_VERSION >= '1.9'
   gem "simplecov"
+  gem "guard"
+  gem 'guard-minitest'
 end
 
 if File.exists?('Gemfile.local')

data/MIT-LICENSE

@@ -1,22 +1,22 @@
-Copyright (c) 2012-2014 J Smith <dark.panda@gmail.com>
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2012-2015 J Smith <dark.panda@gmail.com>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -8,9 +8,9 @@
 
 Ruby versions known to work:
 
-* Ruby MRI 1.8.7, 1.9.2 and 1.9.3 x86_64, OSX
-* Ruby MRI 1.8.7, 1.9.2 and 1.9.3 x86_64, linux
-* JRuby 1.6.8 and 1.7.1
+* Ruby MRI 1.9.3, 2.0+, 2.1+ and 2.2+
+* JRuby 1.7.22+
+* Rubinius 2
 
 == Features
 

data/Rakefile

@@ -18,6 +18,8 @@ Rake::TestTask.new(:test) do |t|
   t.warning = !!ENV['WARNINGS']
 end
 
+task :default => :test
+
 desc 'Build docs'
 Rake::RDocTask.new do |t|
   t.title ="ffi-proj4 #{version}"

data/lib/ffi-proj4/point.rb

@@ -17,7 +17,6 @@ module Proj4
     def to_deg!
       self.x = rad_to_deg(self.x)
       self.y = rad_to_deg(self.y)
-      self.z = rad_to_deg(self.z) unless self.z.nil?
       self
     end
 
@@ -28,7 +27,6 @@ module Proj4
     def to_rad!
       self.x = deg_to_rad(self.x)
       self.y = deg_to_rad(self.y)
-      self.z = deg_to_rad(self.z) unless self.z.nil?
       self
     end
 

data/lib/ffi-proj4/projection.rb

@@ -185,7 +185,7 @@ module Proj4
     alias :transformRad :transform
 
     def transform_deg!(proj, *args)
-      self.transform!(proj, *args).to_deg!
+      self.transform!(proj, *args_deg_to_rad(*args)).to_deg!
     end
 
     def transform_deg(proj, *args)

data/lib/ffi-proj4/version.rb

@@ -1,5 +1,5 @@
 
 module Proj4
-  VERSION = "0.1.0"
+  VERSION = "0.2.0".freeze
 end
 

data/test/point_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class PointTests < MiniTest::Unit::TestCase
+class PointTests < Minitest::Test
   include TestHelper
 
   def rad_deg_tester(method, expected_x, expected_y, expected_z, x, y, z)
@@ -32,7 +32,7 @@ class PointTests < MiniTest::Unit::TestCase
       0.7853981633974483,
       60,
       90,
-      45
+      0.7853981633974483
     )
   end
 
@@ -43,7 +43,7 @@ class PointTests < MiniTest::Unit::TestCase
       45,
       1.0471975511965976,
       1.5707963267948966,
-      0.7853981633974483
+      45
     )
   end
 

data/test/projection_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class ProjectionTests < MiniTest::Unit::TestCase
+class ProjectionTests < Minitest::Test
   include TestHelper
 
   def definition_sorter(definition)

data/test/simple_transformation_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class SimpleTransformationTests < MiniTest::Unit::TestCase
+class SimpleTransformationTests < Minitest::Test
   include TestHelper
 
   LONG = 8.4302123334

data/test/transformation_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class TransformationTests < MiniTest::Unit::TestCase
+class TransformationTests < Minitest::Test
   include TestHelper
 
   def setup
@@ -26,6 +26,15 @@ class TransformationTests < MiniTest::Unit::TestCase
     assert_in_delta(0, to.z, TOLERANCE * (10 ** 3))
   end
 
+  def test_gk_to_wgs84_deg
+    from = Proj4::Point.new(@rw * Proj4::RAD_TO_DEG, @hw * Proj4::RAD_TO_DEG, @zw)
+    to = @proj_gk.transform_deg(@proj_wgs84, from)
+    refute_equal(from.object_id , to.object_id)
+    assert_in_delta(@lon, to.x, TOLERANCE)
+    assert_in_delta(@lat, to.y, TOLERANCE)
+    assert_in_delta(0, to.z, TOLERANCE * (10 ** 3))
+  end
+
   def test_gk_to_wgs84_inplace
     from = Proj4::Point.new(@rw, @hw, @zw)
     to = @proj_gk.transform!(@proj_wgs84, from)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-proj4
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -96,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: An ffi wrapper for the PROJ.4 Cartographic Projections library.