spatial_features 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c444116b157b420217177f529332308d161673e0
-  data.tar.gz: d8bcc0fd9538d3620c2f49d82ba4c1b41b021eef
+  metadata.gz: 368274614091a12b36c62a95f362fc829ae452fa
+  data.tar.gz: 22e5db1774a8af7082adca889d1b7e74985d0cec
 SHA512:
-  metadata.gz: c1fbda7000d70e4c3c11bde1d690cf12bca36eac846f919e844288b6b6d8e4252572bc79c0c31e01b2fde0ab5e3edaae949d2ff924504d4b349a8e23c6dc62da
-  data.tar.gz: c8f900542d22c45ebb62c1fecb9a56eb8ab9ddc9883db5da809bfc57c6c79a35746e428829f2ad5a7c6458ee15e8b313b46dfe465f532df8da99d4bcf732f2db
+  metadata.gz: b0c77bf63c9696b8e483b48e7ad3ea550549cf6c50849360bd0af6ce329de8b9c0b71504b62373857c208838258cf9787c20efb974f59439fa4f6d6c9de560f4
+  data.tar.gz: 7cc3659ffb27e8fb8b28db603acb98ea320254fa36ae2a2bb99216ed34ba4143e865027b94ab1d51bfbfda742a6b3f3f8f37184fedd922dd8843e98a3ec93f2f

data/config/initializers/register_oids.rb

@@ -0,0 +1,4 @@
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.tap do |klass|
+  # Use identity which does no casting
+  klass::OID.register_type('geography', klass::OID::Identity.new)
+end

data/lib/spatial_features/engine.rb

@@ -0,0 +1,4 @@
+module SpatialFeatures
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/spatial_features/import/arcgis_kmz_features.rb

@@ -82,7 +82,7 @@ module ArcGISKmzFeatures
   end
 
   def build_feature(feature_type, name, metadata, geom)
-    Feature.new(spatial_model: self, name: name, metadata: metadata, feature_type: feature_type, geog: geom)
+    Feature.new(:spatial_model => self, :name => name, :metadata => metadata, :feature_type => feature_type, :geog => geom)
   end
 
   def open_kmz_url(url)

data/lib/spatial_features/models/feature.rb

@@ -1,8 +1,6 @@
 class Feature < ActiveRecord::Base
   belongs_to :spatial_model, :polymorphic => :true
 
-  self.rgeo_factory_generator = RGeo::Geos.factory_generator
-
   before_validation :sanitize_feature_type
   validates_presence_of :geog
   validate :geometry_is_valid
@@ -48,7 +46,7 @@ class Feature < ActiveRecord::Base
 
   def geometry_is_valid
     if geog?
-      instance = self.class.unscoped.invalid.from("(SELECT ST_GeometryFromText('#{self.geog}') AS geog) #{self.class.table_name}").to_a.first
+      instance = self.class.unscoped.invalid.from("(SELECT '#{sanitize_input_for_sql(self.geog)}'::geometry AS geog) #{self.class.table_name}").to_a.first
       errors.add :geog, instance.invalid_geometry_message if instance
     end
   end
@@ -56,4 +54,8 @@ class Feature < ActiveRecord::Base
   def sanitize_feature_type
     self.feature_type = self.feature_type.to_s.strip.downcase
   end
+
+  def sanitize_input_for_sql(input)
+    self.class.send(:sanitize_sql_for_conditions, input)
+  end
 end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/spatial_features.rb

@@ -1,6 +1,3 @@
-# GEMS
-require "activerecord-postgis-adapter"
-
 # LIB
 require 'spatial_features/caching'
 require 'spatial_features/venn_polygons'
@@ -14,6 +11,8 @@ require 'spatial_features/models/feature'
 require 'spatial_features/models/spatial_cache'
 require 'spatial_features/models/spatial_proximity'
 
+require 'spatial_features/engine'
+
 module SpatialFeatures
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan Wallace
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-postgis-adapter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -63,9 +49,11 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- config/initializers/register_oids.rb
 - lib/spatial_features.rb
 - lib/spatial_features/caching.rb
 - lib/spatial_features/controller_helpers/spatial_extensions.rb
+- lib/spatial_features/engine.rb
 - lib/spatial_features/has_spatial_features.rb
 - lib/spatial_features/import/arcgis_kmz_features.rb
 - lib/spatial_features/models/feature.rb