geos-extensions 0.2.0 → 0.2.1

data/.gitignore

@@ -0,0 +1,21 @@
+.*.swp
+.*.swo
+*.tmp
+*.kpf
+*.komodoproject
+*~
+.DS_Store
+*tmp*
+pkg/
+doc/
+*.orig
+*.patch
+.vimrc_local
+debug.log
+test/local_database.yml
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock

data/Gemfile

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

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 2167961 Ontario Inc., Zoocasa <code@zoocasa.com>
+Copyright (c) 2012 2167961 Ontario Inc., Zoocasa <code@zoocasa.com>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.rdoc

@@ -10,10 +10,16 @@ extend the GEOS Ruby bindings module. From http://geos.refractions.net/ ...
   predicate functions and spatial operators, as well as specific JTS
   enhanced topology functions.
 
-The GEOS bindings for Ruby can be installed by installing the GEOS library
-itself using the --enable-ruby switch during configure or can often be
-installed via package managers. There is also an FFI-based Ruby gem being
-written available at https://github.com/dark-panda/ffi-geos .
+The GEOS bindings for Ruby come in two flavours these days: the native
+version bundled with the GEOS source itself and an FFI version. The
+native bindings seem to be rather abandoned these days while the FFI
+bindings are actively maintained by... well, the author of this gem,
+actually. We're going to effectively deprecate the use of the native
+bindings for the purposes of this gem and recommend that the FFI bindings
+be used instead and as such the ffi-geos gem will now become a dependency
+in the geos-extensions gemspec.
+
+The ffi-geos gem is available at https://github.com/dark-panda/ffi-geos .
 
 ZGEL contains a number of enhancements to the GEOS Ruby library:
 

data/Rakefile

@@ -8,6 +8,7 @@ gem 'rdoc', '~> 3.12'
 require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rdoc/task'
+require 'bundler/gem_tasks'
 
 if RUBY_VERSION >= '1.9'
   begin
@@ -19,27 +20,13 @@ end
 
 $:.push 'lib'
 
-version = File.read('VERSION') rescue ''
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "geos-extensions"
-    gem.summary = "Extensions for the GEOS library."
-    gem.description = gem.summary
-    gem.email = "code@zoocasa.com"
-    gem.homepage = "http://github.com/zoocasa/geos-extensions"
-    gem.authors =    [ "J Smith" ]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+version = Geos::Extensions::VERSION
 
 desc 'Test GEOS interface'
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_tests.rb']
-  t.verbose = false
+  t.verbose = !!ENV['VERBOSE_TESTS']
+  t.warning = !!ENV['WARNINGS']
 end
 
 desc 'Build docs'

data/geos-extensions.gemspec

@@ -1,70 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
+require File.expand_path('../lib/geos/extensions/version', __FILE__)
+
 Gem::Specification.new do |s|
   s.name = "geos-extensions"
-  s.version = "0.2.0"
+  s.version = Geos::Extensions::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J Smith"]
-  s.date = "2012-05-23"
   s.description = "Extensions for the GEOS library."
+  s.summary = s.description
   s.email = "code@zoocasa.com"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
-  s.files = [
-    "MIT-LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "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/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/polyline_encoder.rb",
-    "lib/geos/rails/engine.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/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"
-  ]
+  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/zoocasa/geos-extensions"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Extensions for the GEOS library."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  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")
+  s.add_dependency("rdoc")
+  s.add_dependency("rake", ["~> 0.9"])
 end
 

data/lib/geos/active_record_extensions/spatial_columns.rb

@@ -104,19 +104,22 @@ module Geos
 
           %w{ geometry geography }.each do |m|
             src, line = <<-EOF, __LINE__ + 1
+              undef :#{m}_columns
               def #{m}_columns
-                if @#{m}_columns.nil?
+                if !defined?(@#{m}_columns) || @#{m}_columns.nil?
                   @#{m}_columns = connection.#{m}_columns(self.table_name)
                   @#{m}_columns.freeze
                 end
                 @#{m}_columns
               end
 
+              undef :#{m}_columns!
               def #{m}_columns!
                 @#{m}_columns = nil
                 #{m}_columns
               end
 
+              undef :#{m}_column_by_name
               def #{m}_column_by_name(name)
                 @#{m}_column_by_name ||= self.#{m}_columns.inject(HashWithIndifferentAccess.new) do |memo, obj|
                   memo[obj.name] = obj

data/lib/geos/active_record_extensions/spatial_scopes.rb

@@ -339,12 +339,14 @@ module Geos
             #{SCOPE_METHOD} :st_#{relationship}, lambda { |*args|
               assert_arguments_length(args, 1, 2)
 
-              {
-                :conditions => build_function_call(
-                  '#{relationship}',
-                  *args
-                )
-              }
+              unless args.first.nil?
+                {
+                  :conditions => build_function_call(
+                    '#{relationship}',
+                    *args
+                  )
+                }
+              end
             }
           EOF
           base.class_eval(src, __FILE__, line)

data/lib/geos/extensions/version.rb

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

data/lib/geos/google_maps/polyline_encoder.rb

@@ -46,9 +46,6 @@ module Geos
           lng = 0
 
           while (index < encoded.length)
-            shift = 0
-            result = 0
-
             index, lat = decode_number(encoded, lat, index)
             index, lng = decode_number(encoded, lng, index)
 
@@ -99,4 +96,3 @@ module Geos
     end
   end
 end
-

data/lib/geos_extensions.rb

@@ -8,10 +8,12 @@ end
 
 require 'geos' unless defined?(Geos)
 
+require File.join(File.dirname(__FILE__), *%w{ geos extensions version })
+
 # Some custom extensions to the SWIG-based Geos Ruby extension.
 module Geos
   GEOS_EXTENSIONS_BASE = File.join(File.dirname(__FILE__))
-  GEOS_EXTENSIONS_VERSION = File.read(File.join(GEOS_EXTENSIONS_BASE, %w{ .. VERSION })).strip rescue nil
+  GEOS_EXTENSIONS_VERSION = Geos::Extensions::VERSION
 
   autoload :Helper, File.join(GEOS_EXTENSIONS_BASE, *%w{ geos geos_helper })
   autoload :ActiveRecord, File.join(GEOS_EXTENSIONS_BASE, *%w{ geos active_record_extensions })
@@ -43,6 +45,14 @@ module Geos
     \)?
   $/x
 
+  REGEXP_BOX2D = /^
+    BOX\s*\(\s*
+      #{REGEXP_FLOAT}\s+#{REGEXP_FLOAT}
+      \s*,\s*
+      #{REGEXP_FLOAT}\s+#{REGEXP_FLOAT}
+    \s*\)
+  $/mix
+
   def self.wkb_reader_singleton
     Thread.current[:geos_extensions_wkb_reader] ||= WkbReader.new
   end
@@ -73,6 +83,8 @@ module Geos
         Geos.from_wkb(geom)
       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)
       when nil
@@ -146,6 +158,23 @@ module Geos
     self.from_g_lat_lng(geometry, options.merge(:points => true))
   end
 
+  # Creates a Geometry from a PostGIS-style BOX string.
+  def self.from_box2d(geometry)
+    if geometry =~ REGEXP_BOX2D
+      coords = []
+      $~.captures.compact.each_slice(2) { |f|
+        coords << f.collect(&:to_f)
+      }
+
+      Geos.from_wkt("LINESTRING(%s, %s)" % [
+        coords[0].join(' '),
+        coords[1].join(' ')
+      ]).envelope
+    else
+      raise "Invalid BOX2D"
+    end
+  end
+
   # This is our base module that we use for some generic methods used all
   # over the place.
   class Geometry
@@ -371,7 +400,7 @@ module Geos
     # Build some XmlMarkup for GeoRSS GML. You should include the
     # appropriate georss and gml XML namespaces in your document.
     def to_georss *args
-      xml, options = Geos::Helper.xml_options(*args)
+      xml = Geos::Helper.xml_options(*args)[0]
 
       xml.georss(:where) do
         xml.gml(:LineString) do
@@ -507,7 +536,7 @@ module Geos
     # Build some XmlMarkup for GeoRSS. You should include the
     # appropriate georss and gml XML namespaces in your document.
     def to_georss *args
-      xml, options = Geos::Helper.xml_options(*args)
+      xml = Geos::Helper.xml_options(*args)[0]
       xml.georss(:where) do
         xml.gml(:Point) do
           xml.gml(:pos, "#{self.lat} #{self.lng}")
@@ -583,7 +612,7 @@ module Geos
     # Build some XmlMarkup for GeoRSS. You should include the
     # appropriate georss and gml XML namespaces in your document.
     def to_georss *args
-      xml, options = Geos::Helper.xml_options(*args)
+      xml = Geos::Helper.xml_options(*args)[0]
 
       xml.georss(:where) do
         xml.gml(:Polygon) do

data/test/geography_columns_tests.rb

@@ -147,7 +147,7 @@ if ENV['TEST_ACTIVERECORD']
     end
 
     def test_create_with_converting_from_900913_to_4326
-      foo = FooGeography.create!(
+      FooGeography.create!(
         :name => 'test_create_with_converting_from_900913_to_4326',
         :the_other_geom => "SRID=900913; #{POINT_WKT}"
       )

data/test/geometry_columns_tests.rb

@@ -148,7 +148,7 @@ if ENV['TEST_ACTIVERECORD']
 
     def test_create_with_converting_from_900913_to_4326
       assert_raise(Geos::ActiveRecord::GeometryColumns::CantConvertSRID) do
-        foo = Foo.create!(
+        Foo.create!(
           :name => 'test_create_with_converting_from_900913_to_4326',
           :the_other_geom => "SRID=900913; #{POINT_WKT}"
         )

data/test/google_maps_api_3_tests.rb

@@ -192,7 +192,7 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
     def test_to_g_marker
       marker = @point.to_g_marker
 
-      lat, lng, json = if marker =~ /^new\s+
+      lat, lng = if marker =~ /^new\s+
         google\.maps\.Marker\(\{
           "position":\s*
           new\s+google\.maps\.LatLng\(
@@ -201,7 +201,7 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
           \)
         \}\)
         /x
-        [ $1, $2, $3 ]
+        [ $1, $2 ]
       end
 
       assert_in_delta(10.00, lng.to_f, 0.000001)

data/test/reader_tests.rb

@@ -141,4 +141,11 @@ class GeosReaderTests < Test::Unit::TestCase
   def test_no_leading_digits
     assert_equal('POINT (0.01 0.02)', Geos.read('.02, .01').to_wkt(:trim => true))
   end
+
+  def test_from_box2d
+    assert_equal('POLYGON ((10 54, 123 54, 123 79, 10 79, 10 54))',
+      Geos.read('BOX(123.456 78.9, 9.876 54.321)').to_wkt(:rounding_precision => 0))
+
+    assert_equal('POINT (0 0)', Geos.read('BOX(0 0, 0 0)').to_wkt(:trim => true))
+  end
 end

data/test/spatial_scopes_tests.rb

@@ -86,6 +86,10 @@ if ENV['TEST_ACTIVERECORD']
       end
     end
 
+    def test_nil_relationship
+      assert_equal([ 1, 2, 3 ], Foo.st_within(nil).all.collect(&:id).sort)
+    end
+
     def test_with_column
       assert_equal([1, 2, 3], Foo.st_disjoint('POINT(100 100)', :column => :the_other_geom).all.collect(&:id).sort)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geos-extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
-dependencies: []
+date: 2012-07-25 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
+  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
+    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_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'
 description: Extensions for the GEOS library.
 email: code@zoocasa.com
 executables: []
@@ -18,10 +114,11 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- .gitignore
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - app/models/geos/geometry_column.rb
 - app/models/geos/spatial_ref_sys.rb
 - geos-extensions.gemspec
@@ -30,6 +127,7 @@ files:
 - 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/extensions/version.rb
 - lib/geos/geos_helper.rb
 - lib/geos/google_maps.rb
 - lib/geos/google_maps/api_2.rb
@@ -74,8 +172,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Extensions for the GEOS library.
-test_files: []
+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/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

data/VERSION

@@ -1 +0,0 @@
-0.2.0