geo_query 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 067870f16295abd5335d979eaff90afe4fc43193
-  data.tar.gz: f0b5a9c5ae41d5fc49b9cc548968b0356d652257
+  metadata.gz: f4e3a23fa1c89f60d664ce9ee75373be8892286f
+  data.tar.gz: a78743b2e1201b7005cea4ad1370c17f6bff65e4
 SHA512:
-  metadata.gz: 8d0efcf1edb11f5276814a205e8787592bfc04d2ffb5b677c3afbaa53a554ca0a58c6fd69d480580021e1b8de584bfd45f862230bded6bcf9da469135b85a600
-  data.tar.gz: 440a3a9ab8c43cd7ff3270af33f9f7899d9166a173b7ec9bc1bd33600dc2c7bac9e0988a7e3748023dc01479d8db50a5ff618403bada00442d29817627dc0cac
+  metadata.gz: 51e64f9a53a33b0d6304ab27545c0f45aff4f0fa93548d2a040a03902772831ddb7c4e844d3d0be8f9020a04132790a19f73a97da764034faee276f2a5591f25
+  data.tar.gz: 1a7dc59f46be27cfa3e221bf3f1737b893b65a91616d3e0d7deb8d2081a2e7e796e168e29be94d53e303d525904560eb9afcfe6bf60885df619ebe88f79abe27

data/lib/geo_query/engine.rb

@@ -1,4 +1,5 @@
 require 'activerecord-postgis-adapter'
+require 'rgeo-activerecord'
 
 module GeoQuery
   class Engine < ::Rails::Engine

data/lib/geo_query/geo_queryable.rb

@@ -7,32 +7,49 @@ module GeoQuery
       mattr_accessor :point_column
       @@point_column = nil
 
-      # Validations
-      before_validation :save_coordinates
-
       attr_accessor :lat, :lng
 
-      # Instance Methods
+      # Validations
+      validate :save_coordinates
+
       def save_coordinates
         if lat.present? && lng.present?
           self.coordinates = "POINT(#{lng} #{lat})"
+        elsif (lat.present? && lng.blank?) || (lng.present? && lat.blank?)
+          errors.add(self.point_column, "requires both latitude and longitude")
         end
       end
 
+      # Instance Methods
+      def rgeo_factory
+        RGeo::Geographic.spherical_factory(:srid => 4326)
+      end
+
+      def near(radius=500) #radius in metres
+        # x = longitude && y = latitude
+        return User.near_lat_lng(st_coordinates.y, st_coordinates.x, radius) if st_coordinates
+        self.class.none
+      end
+
+      def st_coordinates
+        send("#{self.point_column}")
+      end
+
       # Class methods
       ## Returns other objects within the given radius of a point
       def self.near_lat_lng(lat, lng, radius=500) #radius in metres
-        select("#{self.base_class.table_name}.*, ST_Distance(#{self.base_class.point_column}, ST_GeographyFromText('POINT(#{lng} #{lat})')) AS distance")
-        .where("ST_DWithin(#{self.base_class.point_column} , ST_GeographyFromText('POINT(#{lng} #{lat})'), #{radius})")
+        select("#{self.table_name}.*, ST_Distance(#{self.point_column}, ST_GeographyFromText('POINT(#{lng} #{lat})')) AS distance")
+        .where("ST_DWithin(#{self.point_column} , ST_GeographyFromText('POINT(#{lng} #{lat})'), #{radius})")
         .order("distance ASC")
       end
 
       ## Returns all objects within a bounding box
       def self.within_bounding_box(min_lat, min_lng, max_lat, max_lng)
-        select("#{self.base_class.table_name}.*").
-        where("#{self.base_class.point_column} && ST_MakeEnvelope(?, ?, ?, ?, 4326)",
+        select("#{self.table_name}.*").
+        where("#{self.point_column} && ST_MakeEnvelope(?, ?, ?, ?, 4326)",
           min_lng, min_lat, max_lng, max_lat)
       end
+
     end
 
     module ClassMethods

data/lib/geo_query/version.rb

@@ -1,3 +1,3 @@
 module GeoQuery
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_query
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - William Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails