cb-ffi-proj4 0.0.7 → 0.0.8

data/.gitignore

@@ -0,0 +1,11 @@
+*.kpf
+*.komodoproject
+*~
+.DS_Store
+*tmp*
+pkg/
+doc/
+*.orig
+*.patch
+.vimrc_local
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 J Smith <dark.panda@gmail.com>
+Copyright (c) 2012 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

data/Rakefile

@@ -2,9 +2,13 @@
 # -*- ruby -*-
 
 require 'rubygems'
+
+gem 'rdoc', '~> 3.12'
+
 require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rdoc/task'
+require 'bundler/gem_tasks'
 
 if RUBY_VERSION >= '1.9'
   begin
@@ -16,33 +20,17 @@ end
 
 $:.push 'lib'
 
-version = File.read('VERSION') rescue ''
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "cb-ffi-proj4"
-    gem.summary = "An ffi wrapper for the PROJ.4 Cartographic Projections library."
-    gem.description = gem.summary
-    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
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+version = Proj4::VERSION
 
-desc 'Test GEOS interface'
+desc 'Test Proj4 interface'
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_tests.rb']
   t.verbose = !!ENV['VERBOSE_TESTS']
+  t.warning = !!ENV['WARNINGS']
 end
 
 desc 'Build docs'
 Rake::RDocTask.new do |t|
-  require 'rdoc'
   t.title ="ffi-proj4 #{version}"
   t.main = 'README.rdoc'
   t.rdoc_dir = 'doc'

data/ffi-proj4.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path('../lib/ffi-proj4/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = "cb-ffi-proj4"
+  s.version = Proj4::VERSION
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["J Smith"]
+  s.description = "An ffi wrapper for the PROJ.4 Cartographic Projections library."
+  s.summary = s.description
+  s.email = "dark.panda@gmail.com"
+  s.files = `git ls-files`.split($\)
+  s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.homepage = "http://github.com/dark-panda/ffi-proj4"
+  s.require_paths = ["lib"]
+
+  s.add_dependency("ffi", [">= 1.0.0"])
+  s.add_dependency("rdoc")
+  s.add_dependency("rake", ["~> 0.9"])
+end
+

data/lib/ffi-proj4.rb

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'ffi'
 require 'rbconfig'
+require 'ffi-proj4/version'
 
 #ENV['PROJ_LIB'] = File.join(File.dirname(__FILE__), %w{ .. data }) unless ENV['PROJ_LIB']
 #p ENV['PROJ_LIB']
@@ -20,7 +21,7 @@ module Proj4
 
   module FFIProj4
     def self.proj4_library_path
-      return @proj4_library_path if @proj4_library_path
+      return @proj4_library_path if defined?(@proj4_library_path)
 
       paths = if ENV['PROJ4_LIBRARY_PATH']
         [ ENV['PROJ4_LIBRARY_PATH'] ]
@@ -122,6 +123,10 @@ module Proj4
       :pj_datum_transform => [
         :int, :pointer, :pointer, :long, :int, :pointer, :pointer, :pointer
       ],
+
+      :setenv => [
+        :int, :string, :string, :int
+      ]
     }
 
     FFI_LAYOUT.each do |fun, ary|
@@ -145,16 +150,15 @@ module Proj4
 
     def proj_lib=(lib)
       @proj_lib = lib
-#      if RUBY_PLATFORM == 'java'
-#        FFIProj4.setenv('PROJ_LIB', lib, 1)
-#      else
+      if RUBY_PLATFORM == 'java'
+        FFIProj4.setenv('PROJ_LIB', lib, 1)
+      else
         ENV['PROJ_LIB'] = lib
-#      end
+      end
     end
   end
 
   module Constants
-    VERSION = File.read(File.join(PROJ4_BASE, %w{ .. .. VERSION })).strip
     PROJ4_VERSION = if Proj4.version =~ /Rel\. (\d+)\.(\d+)\.(\d+)/
       "#{$1}#{$2}#{$3}".to_f
     end

data/lib/ffi-proj4/projection.rb

@@ -89,7 +89,7 @@ module Proj4
       ret = FFIProj4.pj_fwd(xy, self.ptr)
       errno = FFIProj4.pj_get_errno_ref.read_int
       if errno == 0
-        Point.new(ret.x, ret.y)
+        Point.new(ret[:x], ret[:y])
       else
         raise TransformError.new(FFIProj4.pj_strerrno(errno))
       end
@@ -123,11 +123,11 @@ module Proj4
 
       x_ptr = FFI::MemoryPointer.new(:double)
       y_ptr = FFI::MemoryPointer.new(:double)
-      z_ptr = FFI::MemoryPointer.new(:double) unless z.nil?
+      z_ptr = FFI::MemoryPointer.new(:double)
 
       x_ptr.write_double(x)
       y_ptr.write_double(y)
-      z_ptr.write_double(z) unless z.nil?
+      z_ptr.write_double(z.nil? ? 0 : z)
 
       result = FFIProj4.pj_transform(self.ptr, proj.ptr, 1, 1, x_ptr, y_ptr, z_ptr)
 

data/lib/ffi-proj4/projxy.rb

@@ -7,20 +7,15 @@ module Proj4
     )
 
     def initialize(*args)
-      if args.first.is_a?(FFI::Pointer)
-        super(*args)
-      else
-        self[:x] = if args.first.respond_to?(:read_double)
-          args.first.read_double
+      case args.first
+        when FFI::Pointer, FFI::Buffer
+          super(*args)
+        when FFI::Buffer
+          super(*args)
         else
-          args.first.to_f
-        end
-
-        self[:y] = if args[1].respond_to?(:read_double)
-          args.first.read_double
-        else
-          args[1].to_f
-        end
+          if !args.empty?
+            self[:x], self[:y] = args.map(&:to_f)
+          end
       end
     end
 
@@ -39,5 +34,10 @@ module Proj4
     def y
       self[:y]
     end
+
+    private
+      def is_ffi?(arg)
+        arg.is_a?(FFI::Pointer) || arg.is_a?(FFI::Buffer)
+      end
   end
 end

data/lib/ffi-proj4/version.rb

@@ -0,0 +1,5 @@
+
+module Proj4
+  VERSION = "0.0.8"
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cb-ffi-proj4
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,28 +9,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70270841744980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70270841744980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: An ffi wrapper for the PROJ.4 Cartographic Projections library.
 email: dark.panda@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- Gemfile
 - MIT-LICENSE
 - Rakefile
-- VERSION
 - data/GL27
 - data/MD
 - data/TN
@@ -54,11 +92,13 @@ files:
 - data/stlrnc
 - data/stpaul
 - data/world
+- ffi-proj4.gemspec
 - lib/ffi-proj4.rb
 - lib/ffi-proj4/point.rb
 - lib/ffi-proj4/projection.rb
 - lib/ffi-proj4/projxy.rb
 - lib/ffi-proj4/tools.rb
+- lib/ffi-proj4/version.rb
 - test/projection_tests.rb
 - test/test_helper.rb
 - test/transformation_tests.rb
@@ -74,16 +114,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4521183960401673612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An ffi wrapper for the PROJ.4 Cartographic Projections library.
-test_files: []
+test_files:
+- test/projection_tests.rb
+- test/test_helper.rb
+- test/transformation_tests.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.7