dr-postgis_adapter 0.8.3 → 0.8.4

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 gemspec
 
 platforms :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter', :git => 'git://github.com/dryade/activerecord-jdbc-adapter.git'
+  gem 'activerecord-jdbcpostgresql-adapter'
   gem 'jruby-openssl'
 end
 

data/Gemfile.lock

@@ -1,16 +1,7 @@
-GIT
-  remote: git://github.com/dryade/activerecord-jdbc-adapter.git
-  revision: 0bf424bc3bcaf9f44646976cc4c1a8e9e57f11b4
-  specs:
-    activerecord-jdbc-adapter (1.2.2)
-    activerecord-jdbcpostgresql-adapter (1.2.2)
-      activerecord-jdbc-adapter (~> 1.2.2)
-      jdbc-postgres (>= 9.0, < 9.2)
-
 PATH
   remote: .
   specs:
-    dr-postgis_adapter (0.8.3)
+    dr-postgis_adapter (0.8.4)
       nofxx-georuby
       rake
 
@@ -20,16 +11,11 @@ GEM
     ZenTest (4.5.0)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    bouncy-castle-java (1.5.0146.1)
-    diff-lcs (1.1.2)
-    jdbc-postgres (9.0.801)
-    jruby-openssl (0.7.7)
-      bouncy-castle-java (>= 1.5.0146.1)
+    diff-lcs (1.1.3)
     nofxx-georuby (1.9.2)
     pg (0.11.0)
-    rake (10.1.1)
+    rake (10.3.1)
     rcov (0.9.9)
-    rcov (0.9.9-java)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -40,11 +26,10 @@ GEM
     rspec-mocks (2.3.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  activerecord-jdbcpostgresql-adapter!
+  activerecord-jdbcpostgresql-adapter
   autotest
   dr-postgis_adapter!
   jruby-openssl

data/lib/postgis_adapter/acts_as_geom.rb

@@ -4,46 +4,43 @@
 # http://github.com/nofxx/postgis_adapter
 #
 module PostgisAdapter
-module Functions
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
+  module Functions
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
 
-  module ClassMethods
+    module ClassMethods
 
-    # has_geom :db_field => :geom_type
-    # Examples:
-    #
-    # has_geom :data => :point
-    # has_geom :geom => :line_string
-    # has_geom :geom => :polygon
-    #
-    def has_geom(*geom)
-      cattr_accessor :postgis_geoms
-      self.postgis_geoms = geom[0].keys.first # {:columns => column }
-      send :include, case geom[0].values[0]
-        when :point       then  PointFunctions
-        when :polygon     then PolygonFunctions
-        when :line_string, :multi_line_string then  LineStringFunctions
-        when :multi_polygon then MultiPolygonFunctions
-        when :geometry    then GeometryFunctions
-      end unless geom[0].kind_of? Symbol
-    end
-    alias :acts_as_geom :has_geom
+      # has_geom :db_field => :geom_type
+      # Examples:
+      #
+      # has_geom :data => :point
+      # has_geom :geom => :line_string
+      # has_geom :geom => :polygon
+      #
+      def has_geom(*geom)
+        cattr_accessor :postgis_geoms
+        self.postgis_geoms = geom[0].keys.first # {:columns => column }
+        send :include, case geom[0].values[0]
+                       when :point       then  PointFunctions
+                       when :polygon     then PolygonFunctions
+                       when :line_string, :multi_line_string then  LineStringFunctions
+                       when :multi_polygon then MultiPolygonFunctions
+                       when :geometry    then GeometryFunctions
+                       end unless geom[0].kind_of? Symbol
+      end
+      alias :acts_as_geom :has_geom
 
-    def get_geom_type(column)
-      self.postgis_geoms.values[0] rescue nil
-    #   self.columns.select { |c| c.name == column.to_s }[0].geometry_type
-    # rescue ActiveRecord::StatementInvalid => e
-    #   nil
-    end
+      def get_geom_type(column)
+        self.postgis_geoms.values[0] rescue nil
+      end
 
-    def default_geometry
-      postgis_geoms
-    end
+      def default_geometry
+        postgis_geoms
+      end
 
+    end
   end
 end
-end
 
 ActiveRecord::Base.send :include, PostgisAdapter::Functions

data/lib/postgis_adapter/functions/class.rb

@@ -1,5 +1,5 @@
 module PostgisAdapter
-module Functions
+  module Functions
 
     #
     # Class Methods
@@ -10,59 +10,54 @@ module Functions
       # Returns the closest record
       def closest_to(p, opts = {})
         srid = opts.delete(:srid) || 4326
-        opts.merge!(:order => "ST_Distance(#{default_geometry}, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))")
-        find(:first, opts)
+        order("ST_Distance(#{default_geometry}, '#{p.as_ewkt}' )").first
       end
 
       #
       # Order by distance
       def close_to(p, opts = {})
         srid = opts.delete(:srid) || 4326
-        opts.merge!(:order => "ST_Distance(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))")
-        find(:all, opts)
+        order "ST_Distance(#{default_geometry}, '#{p.as_ewkt}' )"
       end
 
       def by_length opts = {}
         sort = opts.delete(:sort) || 'asc'
-        opts.merge!(:order => "ST_length(geom) #{sort}")
-        find(:all, opts)
+        order "ST_length(#{default_geometry}) #{sort}"        
       end
 
       def longest
-        find(:first, :order => "ST_length(geom) DESC")
+        order("ST_length(geom) DESC").first
       end
 
       def contains(p, srid=4326)
-        find(:all, :conditions => ["ST_Contains(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))"])
+        where "ST_Contains(#{default_geometry}, '#{p.as_ewkt}' )" 
       end
 
       def contain(p, srid=4326)
-        find(:first, :conditions => ["ST_Contains(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))"])
+        where("ST_Contains(#{default_geometry}, '#{p.as_ewkt}' )").first
       end
 
       def by_area sort='asc'
-        find(:all, :order => "ST_Area(geom) #{sort}" )
+        order "ST_Area(#{default_geometry}) #{sort}"
       end
 
       def by_perimeter sort='asc'
-        find(:all, :order => "ST_Perimeter(geom) #{sort}" )
+        order "ST_Perimeter(#{default_geometry}) #{sort}" 
       end
 
       def all_dwithin(other, margin=1)
-        # find(:all, :conditions => "ST_DWithin(geom, ST_GeomFromEWKB(E'#{other.as_ewkt}'), #{margin})")
-        # where "ST_DWithin(ST_GeomFromText(?, 4326), geometry, ?)", location_as_text, distance
-        where "ST_DWithin(#{default_geometry}, ST_GeomFromEWKT(?), ?)", other.as_hex_ewkb, margin
+        where "ST_DWithin(#{default_geometry}, '#{other.as_ewkt}', #{margin})"
       end
 
       def all_within(other)
-        find(:all, :conditions => "ST_Within(geom, ST_GeomFromEWKT(E'#{other.as_hex_ewkb}'))")
+        where "ST_Within(#{default_geometry}, '#{other.as_ewkt}' )"
       end
 
       def by_boundaries sort='asc'
-        find(:all, :order => "ST_Boundary(geom) #{sort}" )
+        order "ST_Boundary(#{default_geometry}) #{sort}"
       end
 
     end
 
-end
+  end
 end

data/postgis_adapter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name     = 'dr-postgis_adapter'
-  spec.version  = '0.8.3'
+  spec.version  = '0.8.4'
   spec.authors  = ['Marcos Piccinini', 'Luc Donnet', 'Marc Florisson']
   spec.summary  = 'PostGIS Adapter for Active Record'
   spec.email    = 'x@nofxx.com, luc.donnet@free.fr, mflorisson@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dr-postgis_adapter
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nofxx-georuby
@@ -52,34 +52,36 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- Gemfile
-- Gemfile.lock
+- rails/init.rb
 - History.txt
-- lib/postgis_adapter/acts_as_geom.rb
 - lib/postgis_adapter/common_spatial_adapter.rb
-- lib/postgis_adapter/functions/bbox.rb
+- lib/postgis_adapter/functions.rb
+- lib/postgis_adapter/railtie.rb
+- lib/postgis_adapter/acts_as_geom.rb
 - lib/postgis_adapter/functions/class.rb
 - lib/postgis_adapter/functions/common.rb
-- lib/postgis_adapter/functions.rb
+- lib/postgis_adapter/functions/bbox.rb
 - lib/postgis_adapter/init.rb
-- lib/postgis_adapter/railtie.rb
 - lib/postgis_adapter.rb
-- MIT-LICENSE
-- pkg/dr-postgis_adapter-0.8.3.gem
-- postgis_adapter.gemspec
-- rails/init.rb
+- pkg/dr-postgis_adapter-0.8.4.gem
+- pkg/dr-postgis_adapter-0.8.2.gem
+- pkg/dr-postgis_adapter-0.8.1.gem
+- Gemfile.lock
 - Rakefile
-- README.rdoc
-- spec/db/models_postgis.rb
-- spec/db/schema_postgis.rb
 - spec/postgis_adapter/acts_as_geom_spec.rb
 - spec/postgis_adapter/common_spatial_adapter_spec.rb
+- spec/postgis_adapter/functions_spec.rb
 - spec/postgis_adapter/functions/bbox_spec.rb
-- spec/postgis_adapter/functions/class_spec.rb
 - spec/postgis_adapter/functions/common_spec.rb
-- spec/postgis_adapter/functions_spec.rb
-- spec/postgis_adapter_spec.rb
+- spec/postgis_adapter/functions/class_spec.rb
 - spec/spec_helper.rb
+- spec/postgis_adapter_spec.rb
+- spec/db/schema_postgis.rb
+- spec/db/models_postgis.rb
+- README.rdoc
+- postgis_adapter.gemspec
+- Gemfile
+- MIT-LICENSE
 homepage: http://github.com/dryade/postgis_adapter
 licenses: []
 post_install_message: 
@@ -95,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4083219340546474572
+      hash: -2230142580083608280
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4083219340546474572
+      hash: -2230142580083608280
 requirements: []
 rubyforge_project: postgis_adapter
 rubygems_version: 1.8.23
@@ -112,13 +114,13 @@ signing_key:
 specification_version: 3
 summary: PostGIS Adapter for Active Record
 test_files:
-- spec/db/models_postgis.rb
-- spec/db/schema_postgis.rb
 - spec/postgis_adapter/acts_as_geom_spec.rb
 - spec/postgis_adapter/common_spatial_adapter_spec.rb
+- spec/postgis_adapter/functions_spec.rb
 - spec/postgis_adapter/functions/bbox_spec.rb
-- spec/postgis_adapter/functions/class_spec.rb
 - spec/postgis_adapter/functions/common_spec.rb
-- spec/postgis_adapter/functions_spec.rb
-- spec/postgis_adapter_spec.rb
+- spec/postgis_adapter/functions/class_spec.rb
 - spec/spec_helper.rb
+- spec/postgis_adapter_spec.rb
+- spec/db/schema_postgis.rb
+- spec/db/models_postgis.rb