cb-ffi-proj4 0.0.3 → 0.0.6

data/Rakefile

@@ -2,9 +2,17 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
+
+if RUBY_VERSION >= '1.9'
+  begin
+    gem 'psych'
+  rescue Exception => e
+    # it's okay, fall back on the bundled psych
+  end
+end
 
 $:.push 'lib'
 
@@ -19,6 +27,7 @@ begin
     gem.email = "dark.panda@gmail.com"
     gem.homepage = "http://github.com/dark-panda/ffi-proj4"
     gem.authors =    [ "J Smith" ]
+    gem.add_dependency "ffi", "~> 1.0.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -27,15 +36,15 @@ end
 
 desc 'Test GEOS interface'
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_tests.rb'
+  t.test_files = FileList['test/**/*_tests.rb']
   t.verbose = !!ENV['VERBOSE_TESTS']
 end
 
 desc 'Build docs'
 Rake::RDocTask.new do |t|
-  require 'rdoc/rdoc'
+  require 'rdoc'
   t.title ="ffi-proj4 #{version}"
   t.main = 'README.rdoc'
   t.rdoc_dir = 'doc'
-  t.rdoc_files.include('README.rdoc', 'MIT-LICENSE', 'lib/**/*.rb')
+  t.rdoc_files.include('MIT-LICENSE', 'lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.6

data/lib/ffi-proj4.rb

@@ -3,6 +3,9 @@ require 'rubygems'
 require 'ffi'
 require 'rbconfig'
 
+#ENV['PROJ_LIB'] = File.join(File.dirname(__FILE__), %w{ .. data }) unless ENV['PROJ_LIB']
+#p ENV['PROJ_LIB']
+
 module Proj4
   PROJ4_BASE = File.join(File.dirname(__FILE__), 'ffi-proj4')
 
@@ -17,7 +20,7 @@ module Proj4
 
   module FFIProj4
     def self.proj4_library_path
-      return @proj4_library_paths if @proj4_library_paths
+      return @proj4_library_path if @proj4_library_path
 
       paths = if ENV['PROJ4_LIBRARY_PATH']
         [ ENV['PROJ4_LIBRARY_PATH'] ]
@@ -25,23 +28,26 @@ module Proj4
         [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}' ]
       end
 
-      lib = if [
-        Config::CONFIG['arch'],
-        Config::CONFIG['host_os']
-      ].detect { |c| c =~ /darwin/ }
+      lib = if FFI::Platform::IS_MAC
         'libproj.dylib'
+      elsif FFI::Platform::IS_WINDOWS
+        # For MinGW and the official binaries
+        '{libproj-?,proj}.dll'
       else
         'libproj.so'
       end
 
+      paths = if ENV['PROJ4_LIBRARY_PATH']
+        [ ENV['PROJ4_LIBRARY_PATH'] ]
+      elsif FFI::Platform::IS_WINDOWS
+        ENV['PATH'].split(File::PATH_SEPARATOR)
+      else
+        [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}' ]
+      end
+
       @proj4_library_path = Dir.glob(paths.collect { |path|
-          "#{path}/#{lib}"
+        File.expand_path(File.join(path, lib))
       }).first
-      
-      if Config::CONFIG['host_os'] =~ /win32/
-        @proj4_library_path = "#{ENV['PROJ4_LIBRARY_PATH'] + '\\' if ENV['PROJ4_LIBRARY_PATH']}proj.dll"
-      end
-      @proj4_library_path
     end
 
     extend ::FFI::Library
@@ -115,6 +121,10 @@ module Proj4
 
       :pj_datum_transform => [
         :int, :pointer, :pointer, :long, :int, :pointer, :pointer, :pointer
+      ],
+
+      :setenv => [
+        :int, :string, :string, :int
       ]
     }
 
@@ -131,9 +141,20 @@ module Proj4
   end
 
   class << self
+    attr_reader :proj_lib
+
     def version
       FFIProj4.pj_get_release
     end
+
+    def proj_lib=(lib)
+      @proj_lib = lib
+#      if RUBY_PLATFORM == 'java'
+#        FFIProj4.setenv('PROJ_LIB', lib, 1)
+#      else
+        ENV['PROJ_LIB'] = lib
+#      end
+    end
   end
 
   module Constants
@@ -146,7 +167,7 @@ module Proj4
     DEG_TO_RAD = 0.0174532925199432958
   end
 
-  ENV['PROJ_LIB'] = File.join(File.dirname(PROJ4_BASE), %w{ data }) unless ENV['PROJ_LIB']
-
   include Constants
+
+  self.proj_lib = ENV['PROJ_LIB'] || File.join(File.dirname(__FILE__), %w{ .. data })
 end

data/test/test_helper.rb

@@ -14,7 +14,7 @@ puts "PROJ version #{Proj4.version}"
 if defined?(Proj4::FFIProj4)
   puts "Using #{Array(Proj4::FFIProj4.proj4_library_path).join(', ')}"
 end
-puts "Using PROJ_LIB #{ENV['PROJ_LIB']}"
+puts "Using PROJ_LIB #{Proj4.proj_lib}"
 
 module TestHelper
   TOLERANCE = 0.00000001

metadata

@@ -1,33 +1,33 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cb-ffi-proj4
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-27 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
+date: 2011-12-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: &70314475501680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70314475501680
 description: An ffi wrapper for the PROJ.4 Cartographic Projections library.
 email: dark.panda@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - MIT-LICENSE
 - Rakefile
 - VERSION
@@ -62,39 +62,28 @@ files:
 - test/projection_tests.rb
 - test/test_helper.rb
 - test/transformation_tests.rb
-has_rdoc: true
 homepage: http://github.com/dark-panda/ffi-proj4
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An ffi wrapper for the PROJ.4 Cartographic Projections library.
 test_files: []
-