geos-extensions 0.2.2 → 0.3.0

data/test/yaml_tests.rb

@@ -0,0 +1,203 @@
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+class YamlTests < MiniTest::Unit::TestCase
+  include TestHelper
+
+  # This is for 1.8 support, makes tests easier
+  unless YAML.const_defined?('ENGINE')
+    YAML::ENGINE = 'syck'
+  end
+
+  def munge_expected(expected)
+    # Sych expects a space after the tag, psych does not
+    if YAML::ENGINE == 'syck'
+      expected.sub!(/\n/, " \n")
+    else
+      expected
+    end
+  end
+
+  def test_point_wkt
+    geom = Geos.read('POINT(5 7)')
+    yaml = YAML.dump(geom)
+
+    expected = munge_expected <<-EOS
+--- !ruby/object:Geos::Point
+geom: POINT (5.0000000000000000 7.0000000000000000)
+EOS
+
+    assert_equal(expected, yaml)
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Point, new_geom)
+    assert_in_delta(5, new_geom.x, DELTA_TOLERANCE)
+    assert_in_delta(7, new_geom.y, DELTA_TOLERANCE)
+  end
+
+  def test_line_string
+    geom = Geos.read('LINESTRING (0 0, 10 10)')
+    yaml = YAML.dump(geom)
+
+    expected = munge_expected <<-EOS
+--- !ruby/object:Geos::LineString
+geom: LINESTRING (0.0000000000000000 0.0000000000000000, 10.0000000000000000 10.0000000000000000)
+EOS
+    assert_equal(expected, yaml)
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::LineString, new_geom)
+
+    assert_equal(2, new_geom.num_points)
+
+    point = geom.point_n(0)
+    assert_equal(0, point.x)
+    assert_equal(0, point.y)
+
+    point = geom.point_n(1)
+    assert_equal(10, point.x)
+    assert_equal(10, point.y)
+  end
+
+  def test_polygon
+    geom = Geos.read('POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))')
+    yaml = YAML.dump(geom)
+
+    expected = if YAML::ENGINE == 'syck' || RUBY_ENGINE == 'jruby'
+      munge_expected(<<-EOS)
+--- !ruby/object:Geos::Polygon
+geom: POLYGON ((0.0000000000000000 0.0000000000000000, 5.0000000000000000 0.0000000000000000, 5.0000000000000000 5.0000000000000000, 0.0000000000000000 5.0000000000000000, 0.0000000000000000 0.0000000000000000))
+EOS
+  else
+  <<-EOS
+--- !ruby/object:Geos::Polygon
+geom: POLYGON ((0.0000000000000000 0.0000000000000000, 5.0000000000000000 0.0000000000000000,
+  5.0000000000000000 5.0000000000000000, 0.0000000000000000 5.0000000000000000, 0.0000000000000000
+  0.0000000000000000))
+EOS
+    end
+
+    assert_equal(expected, yaml)
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Polygon, new_geom)
+
+    assert_equal(0, new_geom.num_interior_rings)
+    assert_equal(5, new_geom.exterior_ring.num_points)
+  end
+
+  def test_geometry_collection
+    geom = Geos.read('GEOMETRYCOLLECTION (POINT(5 7))')
+    yaml = YAML.dump(geom)
+
+    expected = munge_expected <<-EOS
+--- !ruby/object:Geos::GeometryCollection
+geom: GEOMETRYCOLLECTION (POINT (5.0000000000000000 7.0000000000000000))
+    EOS
+    assert_equal(expected, yaml)
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::GeometryCollection, new_geom)
+    assert_equal(1, new_geom.to_a.count)
+  end
+
+  def test_load_point_with_srid
+    yaml = <<-EOS
+--- !ruby/object:Geos::Point
+geom: SRID=4326;POINT (5.0000000000000000 7.0000000000000000)
+EOS
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Point, new_geom)
+    assert_equal(4326, new_geom.srid)
+    assert_equal(5, new_geom.x)
+    assert_equal(7, new_geom.y)
+  end
+
+  def test_load_wkb_hex
+    yaml = <<-EOS
+--- !ruby/object:Geos::Point
+geom: 010100000000000000000014400000000000001C40
+EOS
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Point, new_geom)
+    assert_equal(5, new_geom.x)
+    assert_equal(7, new_geom.y)
+  end
+
+  def test_load_ewkb_hex
+    yaml = <<-EOS
+--- !ruby/object:Geos::Point
+geom: 0101000020E610000000000000000014400000000000001C40
+EOS
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Point, new_geom)
+    assert_equal(4326, new_geom.srid)
+    assert_equal(5, new_geom.x)
+    assert_equal(7, new_geom.y)
+  end
+
+  def test_load_g_lat_lng_bounds_string
+    yaml = <<-EOS
+--- !ruby/object:Geos::Polygon
+geom: ((0.1, 0.1), (5.2, 5.2))
+EOS
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Polygon, new_geom)
+    assert_equal(0.1, new_geom.sw.x)
+    assert_equal(0.1, new_geom.sw.y)
+  end
+
+  def test_load_g_lat_lng_bounds_url_value
+    yaml = <<-EOS
+--- !ruby/object:Geos::Polygon
+geom: 0.1,0.1,5.2,5.2
+EOS
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Polygon, new_geom)
+    assert_equal(0.1, new_geom.sw.x)
+    assert_equal(0.1, new_geom.sw.y)
+  end
+
+  def test_load_g_lat_lng_string
+    yaml = <<-EOS
+--- !ruby/object:Geos::Point
+geom: (5, 7)
+EOS
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Point, new_geom)
+    assert_equal(7, new_geom.x)
+    assert_equal(5, new_geom.y)
+  end
+
+  def test_load_g_lat_lng_url_value
+    yaml = <<-EOS
+--- !ruby/object:Geos::Point
+geom: "5,7"
+EOS
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Point, new_geom)
+    assert_equal(7, new_geom.x)
+    assert_equal(5, new_geom.y)
+  end
+
+  def test_load_box2d
+    yaml = <<-EOS
+--- !ruby/object:Geos::Polygon
+geom: BOX(0.1 0.1, 5.2 5.2)
+EOS
+
+    new_geom = YAML.load(yaml)
+    assert_kind_of(Geos::Polygon, new_geom)
+    assert_equal(0.1, new_geom.sw.x)
+    assert_equal(0.1, new_geom.sw.y)
+  end
+end

metadata

@@ -1,96 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: geos-extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: ffi-geos
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: pg
-  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: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
+        version: '0.1'
   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'
+        version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+  name: ffi-geos
 description: Extensions for the GEOS library.
 email: code@zoocasa.com
 executables: []
@@ -100,80 +33,71 @@ extra_rdoc_files:
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/models/geos/geometry_column.rb
-- app/models/geos/spatial_ref_sys.rb
 - geos-extensions.gemspec
 - lib/geos-extensions.rb
-- lib/geos/active_record_extensions.rb
-- lib/geos/active_record_extensions/connection_adapters/postgresql_adapter.rb
-- lib/geos/active_record_extensions/spatial_columns.rb
-- lib/geos/active_record_extensions/spatial_scopes.rb
+- lib/geos/coordinate_sequence.rb
 - lib/geos/extensions/version.rb
+- lib/geos/geometry.rb
+- lib/geos/geometry_collection.rb
 - lib/geos/geos_helper.rb
 - lib/geos/google_maps.rb
 - lib/geos/google_maps/api_2.rb
 - lib/geos/google_maps/api_3.rb
+- lib/geos/google_maps/api_common.rb
 - lib/geos/google_maps/polyline_encoder.rb
-- lib/geos/rails/engine.rb
+- lib/geos/line_string.rb
+- lib/geos/multi_line_string.rb
+- lib/geos/multi_point.rb
+- lib/geos/multi_polygon.rb
+- lib/geos/point.rb
+- lib/geos/polygon.rb
+- lib/geos/yaml.rb
+- lib/geos/yaml/psych.rb
+- lib/geos/yaml/syck.rb
 - lib/geos_extensions.rb
-- lib/tasks/test.rake
-- test/adapter_tests.rb
-- test/database.yml
-- test/fixtures/foo3ds.yml
-- test/fixtures/foo_geographies.yml
-- test/fixtures/foos.yml
-- test/geography_columns_tests.rb
-- test/geometry_columns_tests.rb
 - test/google_maps_api_2_tests.rb
 - test/google_maps_api_3_tests.rb
 - test/google_maps_polyline_encoder_tests.rb
+- test/helper_tests.rb
 - test/misc_tests.rb
 - test/reader_tests.rb
-- test/spatial_scopes_geographies_tests.rb
-- test/spatial_scopes_tests.rb
 - test/test_helper.rb
 - test/writer_tests.rb
+- test/yaml_tests.rb
 homepage: http://github.com/zoocasa/geos-extensions
 licenses: []
+metadata: {}
 post_install_message: 
 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
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extensions for the GEOS library.
 test_files:
-- test/adapter_tests.rb
-- test/database.yml
-- test/fixtures/foo3ds.yml
-- test/fixtures/foo_geographies.yml
-- test/fixtures/foos.yml
-- test/geography_columns_tests.rb
-- test/geometry_columns_tests.rb
 - test/google_maps_api_2_tests.rb
 - test/google_maps_api_3_tests.rb
 - test/google_maps_polyline_encoder_tests.rb
+- test/helper_tests.rb
 - test/misc_tests.rb
 - test/reader_tests.rb
-- test/spatial_scopes_geographies_tests.rb
-- test/spatial_scopes_tests.rb
 - test/test_helper.rb
 - test/writer_tests.rb
+- test/yaml_tests.rb

data/app/models/geos/geometry_column.rb

@@ -1,39 +0,0 @@
-
-module Geos
-  class GeometryColumn < ::ActiveRecord::Base
-    set_table_name 'geometry_columns'
-    set_inheritance_column 'nonexistent_column_name_type'
-
-    belongs_to :spatial_ref_sys,
-      :foreign_key => :srid,
-      :inverse_of => :geometry_columns
-
-    after_initialize proc { |row|
-      row.f_table_catalog ||= ''
-    }
-
-    validates :f_table_catalog,
-      :length => {
-        :minimum => 0
-      }
-
-    validates :f_table_schema,
-      :presence => true
-
-    validates :f_table_name,
-      :presence => true
-
-    validates :f_geometry_column,
-      :presence => true
-
-    validates :coord_dimension,
-      :presence => true
-
-    validates :srid,
-      :presence => true
-
-    validates :type,
-      :presence => true
-  end
-end
-

data/app/models/geos/spatial_ref_sys.rb

@@ -1,12 +0,0 @@
-
-module Geos
-  class SpatialRefSys < ::ActiveRecord::Base
-    set_table_name 'spatial_ref_sys'
-    set_primary_key 'srid'
-
-    has_many :geometry_columns,
-      :foreign_key => :srid,
-      :inverse_of => :spatial_ref_sys
-  end
-end
-