ffi-geos 0.1.0 → 0.1.1

data/.gitignore

@@ -9,6 +9,7 @@
 *tmp*
 pkg/
 doc/
+coverage/
 *.orig
 *.patch
 .vimrc_local
@@ -16,3 +17,5 @@ doc/
 test-all.sh
 .rbx
 Gemfile.lock
+Gemfile.local
+Guardfile.local

data/Gemfile

@@ -1,3 +1,18 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "rdoc", "~> 3.12"
+gem "rake", "~> 10.0"
+gem "minitest"
+gem "minitest-reporters"
+gem "guard-minitest"
+
+if RUBY_VERSION >= '1.9'
+  gem "simplecov"
+end
+
+if File.exists?('Gemfile.local')
+  instance_eval File.read('Gemfile.local')
+end
+

data/Guardfile

@@ -0,0 +1,17 @@
+
+guard 'minitest', :test_folders => 'test', :test_file_patterns => '*_tests.rb' do
+  watch(%r|^test/(.+)_tests\.rb|)
+
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$}) do |m|
+    "test/#{m[2]}_tests.rb"
+  end
+
+  watch(%r|^test/test_helper\.rb|) do
+    "test"
+  end
+end
+
+if File.exists?('Guardfile.local')
+  instance_eval File.read('Guardfile.local')
+end
+

data/Rakefile

@@ -2,23 +2,12 @@
 # -*- 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
-    gem 'psych'
-  rescue Exception => e
-    # it's okay, fall back on the bundled psych
-  end
-end
-
-$:.push 'lib'
+$:.push File.expand_path(File.dirname(__FILE__), 'lib')
 
 version = Geos::VERSION
 

data/ffi-geos.gemspec

@@ -21,9 +21,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("ffi", [">= 1.0.0"])
-  s.add_dependency("rdoc")
-  s.add_dependency("rake", ["~> 0.9"])
-  s.add_dependency("minitest")
-  s.add_dependency("turn")
 end
 

data/lib/ffi-geos.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 require 'ffi'
 require 'rbconfig'

data/lib/ffi-geos/buffer_params.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class BufferParams

data/lib/ffi-geos/coordinate_sequence.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
 

data/lib/ffi-geos/geometry.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class Geometry

data/lib/ffi-geos/geometry_collection.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class GeometryCollection < Geometry

data/lib/ffi-geos/line_string.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class LineString < Geometry

data/lib/ffi-geos/linear_ring.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class LinearRing < LineString

data/lib/ffi-geos/multi_line_string.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class MultiLineString < GeometryCollection

data/lib/ffi-geos/multi_point.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class MultiPoint < GeometryCollection

data/lib/ffi-geos/multi_polygon.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class MultiPolygon < GeometryCollection

data/lib/ffi-geos/point.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class Point < Geometry

data/lib/ffi-geos/polygon.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class Polygon < Geometry

data/lib/ffi-geos/prepared_geometry.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class PreparedGeometry

data/lib/ffi-geos/strtree.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class STRtree

data/lib/ffi-geos/tools.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   module Tools
@@ -51,6 +52,8 @@ module Geos
     end
 
     def pick_srid_from_geoms(srid_a, srid_b, policy = Geos.srid_copy_policy)
+      policy = Geos.srid_copy_policy_default if policy == :default
+
       case policy
         when :zero
           0
@@ -58,12 +61,16 @@ module Geos
           srid_a
         when :strict
           raise Geos::MixedSRIDsError.new(srid_a, srid_b)
+        else
+          raise ArgumentError.new("Unexpected policy value: #{policy}")
       end
     end
 
     def pick_srid_according_to_policy(srid, policy = Geos.srid_copy_policy)
-      if srid != 0 && Geos.srid_copy_policy != :zero
-        self.srid
+      policy = Geos.srid_copy_policy_default if policy == :default
+
+      if srid != 0 && policy != :zero
+        srid
       else
         0
       end
@@ -81,7 +88,8 @@ module Geos
     end
 
     def check_enum_value(enum, value)
-      raise TypeError.new("Couldn't find valid #{enum.tag} value: #{value}") unless enum[value]
+      enum[value] or
+        raise TypeError.new("Couldn't find valid #{enum.tag} value: #{value}")
     end
 
     def symbol_for_enum(enum, value)
@@ -91,5 +99,9 @@ module Geos
         enum[value]
       end
     end
+
+    class << self
+      include Geos::Tools
+    end
   end
 end

data/lib/ffi-geos/utils.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   module Utils

data/lib/ffi-geos/version.rb

@@ -1,5 +1,6 @@
+# encoding: UTF-8
 
 module Geos
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
 

data/lib/ffi-geos/wkb_reader.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class WkbReader

data/lib/ffi-geos/wkb_writer.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class WkbWriter

data/lib/ffi-geos/wkt_reader.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class WktReader

data/lib/ffi-geos/wkt_writer.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Geos
   class WktWriter

data/test/coordinate_sequence_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -97,6 +98,12 @@ class CoordinateSequenceTests < MiniTest::Unit::TestCase
     assert_equal(3, cs.dimensions)
   end
 
+  def test_with_all_sorts_of_arguments
+    assert_raises(ArgumentError) do
+      Geos::CoordinateSequence.new(0, 1, 2, 3, 4, 5)
+    end
+  end
+
   def test_read_from_array
     cs = Geos::CoordinateSequence.new([
       [ 0, 0 ],

data/test/geometry_collection_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/geometry_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -1602,4 +1603,39 @@ class GeometryTests < MiniTest::Unit::TestCase
   ensure
     Geos.srid_copy_policy = :default
   end
+
+  def test_bad_srid_copy_policy
+    assert_raises(ArgumentError) do
+      Geos.srid_copy_policy = :blart
+    end
+  end
+
+  def test_srid_copy_policy_default
+    Geos.srid_copy_policy_default = :default
+    assert_equal(:zero, Geos.srid_copy_policy_default)
+
+    Geos.srid_copy_policy_default = :lenient
+    assert_equal(:lenient, Geos.srid_copy_policy_default)
+
+    Geos.srid_copy_policy_default = :strict
+    assert_equal(:strict, Geos.srid_copy_policy_default)
+
+    assert_raises(ArgumentError) do
+      Geos.srid_copy_policy_default = :blart
+    end
+  ensure
+    Geos.srid_copy_policy_default = :default
+  end
+
+  def test_empty_geometry_has_0_area
+    assert_equal(0, read('POLYGON EMPTY').area)
+  end
+
+  def test_empty_geometry_has_0_length
+    assert_equal(0, read('POLYGON EMPTY').length)
+  end
+
+  def test_to_s
+    assert_match(/^\#<Geos::Point: .+>$/, read('POINT(0 0)').to_s)
+  end
 end

data/test/line_string_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/linear_ring_tests.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 $: << File.dirname(__FILE__)
 require 'test_helper'
 

data/test/misc_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/point_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -89,4 +90,11 @@ class PointTests < MiniTest::Unit::TestCase
   ensure
     Geos.srid_copy_policy = :default
   end
+
+  def test_normalize
+    geom = read('POINT(10 10)')
+
+    assert_equal(geom.object_id, geom.normalize.object_id)
+    assert_equal(geom.object_id, geom.normalize!.object_id)
+  end
 end

data/test/polygon_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/prepared_geometry_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/strtree_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/test_helper.rb

@@ -1,7 +1,18 @@
+# encoding: BINARY
+
+if RUBY_VERSION >= '1.9'
+  require 'simplecov'
+
+  SimpleCov.command_name('Unit Tests')
+  SimpleCov.merge_timeout(3600)
+  SimpleCov.start do
+    add_filter '/test/'
+  end
+end
 
 require 'rubygems'
 require 'minitest/autorun'
-require 'turn/autorun'
+require 'minitest/reporters' if RUBY_VERSION >= '1.9'
 
 if ENV['USE_BINARY_GEOS']
   require 'geos'
@@ -85,11 +96,7 @@ module TestHelper
   end
 end
 
-if ENV['autotest']
-  module Turn::Colorize
-    def self.color_supported?
-      true
-    end
-  end
+if RUBY_VERSION >= '1.9'
+  MiniTest::Reporters.use!(MiniTest::Reporters::SpecReporter.new)
 end
 

data/test/tools_tests.rb

@@ -0,0 +1,85 @@
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+class ToolsTests < MiniTest::Unit::TestCase
+  include TestHelper
+
+  def test_check_geometry
+    assert_raises(TypeError) do
+      Geos::Tools.check_geometry(:foo)
+    end
+  end
+
+  def test_bool_result
+    assert(Geos::Tools.bool_result(1))
+    refute(Geos::Tools.bool_result(0))
+
+    assert_raises(RuntimeError) do
+      Geos::Tools.bool_result(-1)
+    end
+  end
+
+  def test_pick_srid_from_geoms
+    Geos.srid_copy_policy = :default
+    assert_equal(0, Geos::Tools.pick_srid_from_geoms(4326, 4269))
+
+    Geos.srid_copy_policy = :zero
+    assert_equal(0, Geos::Tools.pick_srid_from_geoms(4326, 4269))
+
+    Geos.srid_copy_policy = :lenient
+    assert_equal(4326, Geos::Tools.pick_srid_from_geoms(4326, 4269))
+
+    Geos.srid_copy_policy = :strict
+    assert_raises(Geos::MixedSRIDsError) do
+      Geos::Tools.pick_srid_from_geoms(4326, 4269)
+    end
+  ensure
+    Geos.srid_copy_policy = :default
+  end
+
+  def test_pick_srid_from_geoms_with_option
+    assert_equal(0, Geos::Tools.pick_srid_from_geoms(4326, 4269, :default))
+    assert_equal(0, Geos::Tools.pick_srid_from_geoms(4326, 4269, :zero))
+    assert_equal(4326, Geos::Tools.pick_srid_from_geoms(4326, 4269, :lenient))
+
+    assert_raises(Geos::MixedSRIDsError) do
+      Geos::Tools.pick_srid_from_geoms(4326, 4269, :strict)
+    end
+
+    assert_raises(ArgumentError) do
+      Geos::Tools.pick_srid_from_geoms(4326, 4269, :blart)
+    end
+  end
+
+  def test_pick_srid_according_to_policy
+    Geos.srid_copy_policy = :default
+    assert_equal(0, Geos::Tools.pick_srid_according_to_policy(4326))
+
+    Geos.srid_copy_policy = :zero
+    assert_equal(0, Geos::Tools.pick_srid_according_to_policy(4326))
+
+    Geos.srid_copy_policy = :lenient
+    assert_equal(4326, Geos::Tools.pick_srid_according_to_policy(4326))
+
+    Geos.srid_copy_policy = :strict
+    assert_equal(4326, Geos::Tools.pick_srid_according_to_policy(4326))
+  ensure
+    Geos.srid_copy_policy = :default
+  end
+
+  def test_check_enum_value
+    assert_equal(1, Geos::Tools.check_enum_value(Geos::BufferCapStyles, :round))
+
+    assert_raises(TypeError) do
+      Geos::Tools.check_enum_value(Geos::BufferCapStyles, :what)
+    end
+  end
+
+  def test_symbol_for_enum
+    assert_equal(:round, Geos::Tools.symbol_for_enum(Geos::BufferCapStyles, :round))
+    assert_equal(:round, Geos::Tools.symbol_for_enum(Geos::BufferCapStyles, 1))
+  end
+end
+

data/test/utils_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -60,6 +61,12 @@ class UtilsTests < MiniTest::Unit::TestCase
     assert_equal('POINT Z (10 20 30)', write(Geos.create_point(10, 20, 30), :trim => true, :output_dimensions => 3))
   end
 
+  def test_create_point_with_too_many_arguments
+    assert_raises(ArgumentError) do
+      Geos.create_point(10, 20, 30, 40, 50)
+    end
+  end
+
   def test_bad_create_point
     cs = Geos::CoordinateSequence.new(0, 0)
     assert_raises(RuntimeError) do
@@ -343,6 +350,13 @@ class UtilsTests < MiniTest::Unit::TestCase
         )
       end
     end
+
+    def test_create_geometry_collection_with_options
+      geom = Geos.create_collection(:multi_line_string, :srid => 4326)
+
+      assert_kind_of(Geos::MultiLineString, geom)
+      assert_equal(4326, geom.srid)
+    end
   end
 
   if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_empty_point)

data/test/wkb_reader_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/wkb_writer_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -25,6 +26,12 @@ class WkbWriterTests < MiniTest::Unit::TestCase
       @wkb_writer.write(geom)
     end
 
+    if ''.respond_to?(:force_encoding)
+      expected.force_encoding('BINARY')
+    end
+
+    assert_equal(Geos::Tools.symbol_for_enum(Geos::ByteOrders, byte_order), @wkb_writer.byte_order)
+    assert_equal(dimensions, @wkb_writer.output_dimensions)
     assert_equal(expected, result)
   end
 
@@ -432,4 +439,14 @@ class WkbWriterTests < MiniTest::Unit::TestCase
       assert_equal('0101000000000000000000F03F0000000000000040', @wkb_writer.write_hex(geom))
     end
   end
+
+  def test_illegal_output_dimensions
+    assert_raises(RuntimeError) do
+      @wkb_writer.output_dimensions = 10
+    end
+
+    assert_raises(RuntimeError) do
+      @wkb_writer.output_dimensions = 0
+    end
+  end
 end

data/test/wkt_reader_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/wkt_writer_tests.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -67,6 +68,12 @@ class WktWriterTests < MiniTest::Unit::TestCase
       tester['POINT (6.1 7.1)', 1]
       tester['POINT (6 7)', 0]
     end
+
+    def test_rounding_precision_too_high
+      assert_raises(RuntimeError) do
+        @writer.rounding_precision = 1000
+      end
+    end
   end
 
   if ENV['FORCE_TESTS'] || Geos::WktWriter.method_defined?(:output_dimensions)

metadata

@@ -1,96 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 0.1.0
   prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi
-  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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  name: ffi
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: turn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 1.0.0
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
 email: dark.panda@gmail.com
 executables: []
@@ -100,6 +36,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -136,6 +73,7 @@ files:
 - test/prepared_geometry_tests.rb
 - test/strtree_tests.rb
 - test/test_helper.rb
+- test/tools_tests.rb
 - test/utils_tests.rb
 - test/wkb_reader_tests.rb
 - test/wkb_writer_tests.rb
@@ -148,17 +86,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -177,6 +115,7 @@ test_files:
 - test/prepared_geometry_tests.rb
 - test/strtree_tests.rb
 - test/test_helper.rb
+- test/tools_tests.rb
 - test/utils_tests.rb
 - test/wkb_reader_tests.rb
 - test/wkb_writer_tests.rb