geos-extensions 0.2.1 → 0.2.2

data/geos-extensions.gemspec

@@ -21,9 +21,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("activerecord", [">= 2.3"])
-  s.add_dependency("ffi", ["~> 1.0.0"])
   s.add_dependency("ffi-geos", ["~> 0.0.4"])
-  s.add_dependency("pg")
+  if RUBY_PLATFORM == "java"
+    s.add_dependency("activerecord-jdbcpostgresql-adapter")
+  else
+    s.add_dependency("pg")
+  end
   s.add_dependency("rdoc")
   s.add_dependency("rake", ["~> 0.9"])
 end

data/lib/geos/active_record_extensions/spatial_columns.rb

@@ -162,11 +162,6 @@ module Geos
           # You can specify which spatial columns you want to apply
           # these accessors using the :only and :except options.
           def create_spatial_column_accessors!(options = nil)
-            options = {
-              :geometry_columns => true,
-              :geography_columns => true
-            }
-
             create_these = []
 
             if options.nil?

data/lib/geos/extensions/version.rb

@@ -1,7 +1,7 @@
 
 module Geos
   module Extensions
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end
 

data/lib/geos_extensions.rb

@@ -63,13 +63,17 @@ module Geos
 
   # Returns some kind of Geometry object from the given WKB in
   # binary.
-  def self.from_wkb_bin(wkb)
-    self.wkb_reader_singleton.read(wkb)
+  def self.from_wkb_bin(wkb, options = {})
+    geom = self.wkb_reader_singleton.read(wkb)
+    geom.srid = options[:srid].to_i if options[:srid]
+    geom
   end
 
   # Returns some kind of Geometry object from the given WKB in hex.
-  def self.from_wkb(wkb)
-    self.wkb_reader_singleton.read_hex(wkb)
+  def self.from_wkb(wkb, options = {})
+    geom = self.wkb_reader_singleton.read_hex(wkb)
+    geom.srid = options[:srid].to_i if options[:srid]
+    geom
   end
 
   # Tries its best to return a Geometry object.
@@ -78,15 +82,15 @@ module Geos
       when Geos::Geometry
         geom
       when REGEXP_WKT
-        Geos.from_wkt(geom)
+        Geos.from_wkt(geom, options)
       when REGEXP_WKB_HEX
-        Geos.from_wkb(geom)
+        Geos.from_wkb(geom, options)
       when REGEXP_G_LAT_LNG_BOUNDS, REGEXP_G_LAT_LNG
         Geos.from_g_lat_lng(geom, options)
       when REGEXP_BOX2D
         Geos.from_box2d(geom)
       when String
-        Geos.from_wkb(geom.unpack('H*').first.upcase)
+        Geos.from_wkb(geom.unpack('H*').first.upcase, options)
       when nil
         nil
       else
@@ -102,10 +106,10 @@ module Geos
 
   # Returns some kind of Geometry object from the given WKT. This method
   # will also accept PostGIS-style EWKT and its various enhancements.
-  def self.from_wkt(wkt)
+  def self.from_wkt(wkt, options = {})
     srid, raw_wkt = wkt.scan(REGEXP_WKT).first
     geom = self.wkt_reader_singleton.read(raw_wkt.upcase)
-    geom.srid = srid.to_i if srid
+    geom.srid = (options[:srid] || srid).to_i if options[:srid] || srid
     geom
   end
 
@@ -236,7 +240,17 @@ module Geos
       end
 
       ret = ''
-      ret << "SRID=#{self.srid};" if options[:include_srid]
+
+      if options[:include_srid]
+        srid = if options[:srid]
+          options[:srid]
+        else
+          self.srid
+        end
+
+        ret << "SRID=#{srid};"
+      end
+
       ret << writer.write(self, *args)
       ret
     end
@@ -454,9 +468,11 @@ module Geos
 
 
   class Point
-    # Returns the Y coordinate of the Point.
-    def y
-      self.to_a[1]
+    unless method_defined?(:y)
+      # Returns the Y coordinate of the Point.
+      def y
+        self.to_a[1]
+      end
     end
 
     %w{
@@ -467,9 +483,11 @@ module Geos
       EOF
     end
 
-    # Returns the X coordinate of the Point.
-    def x
-      self.to_a[0]
+    unless method_defined?(:x)
+      # Returns the X coordinate of the Point.
+      def x
+        self.to_a[0]
+      end
     end
 
     %w{
@@ -480,12 +498,14 @@ module Geos
       EOF
     end
 
-    # Returns the Z coordinate of the Point.
-    def z
-      if self.has_z?
-        self.to_a[2]
-      else
-        nil
+    unless method_defined?(:z)
+      # Returns the Z coordinate of the Point.
+      def z
+        if self.has_z?
+          self.to_a[2]
+        else
+          nil
+        end
       end
     end
 

data/test/reader_tests.rb

@@ -13,6 +13,17 @@ class GeosReaderTests < Test::Unit::TestCase
     assert_saneness_of_polygon(polygon)
   end
 
+  def test_from_wkb_bin_with_srid_option
+    point = Geos.from_wkb_bin(POINT_EWKB_BIN, :srid => 900913)
+    polygon = Geos.from_wkb_bin(POLYGON_EWKB_BIN, :srid => 900913)
+
+    assert_saneness_of_point(point)
+    assert_saneness_of_polygon(polygon)
+
+    assert_equal(900913, point.srid)
+    assert_equal(900913, polygon.srid)
+  end
+
   def test_from_wkb
     point = Geos.from_wkb(POINT_WKB)
     polygon = Geos.from_wkb(POLYGON_WKB)
@@ -21,6 +32,17 @@ class GeosReaderTests < Test::Unit::TestCase
     assert_saneness_of_polygon(polygon)
   end
 
+  def test_from_wkb_with_srid_option
+    point = Geos.from_wkb(POINT_EWKB, :srid => 900913)
+    polygon = Geos.from_wkb(POLYGON_EWKB, :srid => 900913)
+
+    assert_saneness_of_point(point)
+    assert_saneness_of_polygon(polygon)
+
+    assert_equal(900913, point.srid)
+    assert_equal(900913, polygon.srid)
+  end
+
   def test_from_wkt
     point = Geos.from_wkt(POINT_WKT)
     polygon = Geos.from_wkt(POLYGON_WKT)
@@ -29,6 +51,17 @@ class GeosReaderTests < Test::Unit::TestCase
     assert_saneness_of_polygon(polygon)
   end
 
+  def test_from_wkt_with_srid_option
+    point = Geos.from_wkt(POINT_EWKT, :srid => 900913)
+    polygon = Geos.from_wkt(POLYGON_EWKT, :srid => 900913)
+
+    assert_saneness_of_point(point)
+    assert_saneness_of_polygon(polygon)
+
+    assert_equal(900913, point.srid)
+    assert_equal(900913, polygon.srid)
+  end
+
   def test_from_ewkb_bin
     point = Geos.from_wkb_bin(POINT_EWKB_BIN)
     polygon = Geos.from_wkb_bin(POLYGON_EWKB_BIN)

data/test/test_helper.rb

@@ -37,7 +37,7 @@ if defined?(Geos::FFIGeos)
 end
 
 if ENV['TEST_ACTIVERECORD'] || defined?(IRB)
-  ActiveRecord::Base.logger = Logger.new("debug.log")
+  ActiveRecord::Base.logger = Logger.new("debug.log") if ENV['ENABLE_LOGGER']
   ActiveRecord::Base.configurations = {
     'arunit' => {}
   }

data/test/writer_tests.rb

@@ -56,6 +56,26 @@ class GeosWriterTests < Test::Unit::TestCase
     assert_in_delta(10.01, lat, 0.000001)
   end
 
+  def test_to_ewkt_with_srid_option
+    if @point.to_ewkt(:srid => 900913) =~ /^SRID=900913;\s*POINT\s*\((\d+\.\d+)\s*(\d+\.\d+)\)$/
+      lng, lat = $1.to_f, $2.to_f
+    end
+
+    assert_in_delta(10.00, lng, 0.000001)
+    assert_in_delta(10.01, lat, 0.000001)
+
+    assert_equal(4326, @point.srid)
+
+    if @point.to_ewkt(:srid => :default) =~ /^SRID=default;\s*POINT\s*\((\d+\.\d+)\s*(\d+\.\d+)\)$/
+      lng, lat = $1.to_f, $2.to_f
+    end
+
+    assert_in_delta(10.00, lng, 0.000001)
+    assert_in_delta(10.01, lat, 0.000001)
+
+    assert_equal(4326, @point.srid)
+  end
+
   def test_to_flickr_bbox
     assert_equal('0.0,0.0,5.0,5.0', @polygon.to_flickr_bbox)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geos-extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.3'
-- !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: ffi-geos
   requirement: !ruby/object:Gem::Requirement