geo_query 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1700215c27817c36bd125a589ea6bc2ab66272c
-  data.tar.gz: 9c692a5cef1a889827fa38833e5a20481115b0b1
+  metadata.gz: 6b42919fce03a439c5b52569ce78142cdb180140
+  data.tar.gz: 1d2bbc101cd898b836ceda5f428e7ea0f7b3baf5
 SHA512:
-  metadata.gz: 5891c8c67bda15a82a7e6a52fbf01d00b01f0a6cb19704995864d70b179ccf4bf3688d08c14853fc17c64c4028d5c2fac852fa37817c0d97f75ec46fe152ee55
-  data.tar.gz: 2b8584c6158e9cbaba1695a4d5e7c7bcfd38838311f976e7e545dd7c7a323d2e521df292c88b413f2ee9ad3ec44e056c307d42d9ba77235e190440c50352b623
+  metadata.gz: 3b9c13306bc6eb17e946bd613d7bba06def653289c99d2f52f0b99bee465692a40cc49d6ff49bff10b5d51ada7e60fd5c3e9592986fd65e8b0f1633aba15fcbb
+  data.tar.gz: d60f6037fe67d02b8b8f81553da38fbf70622003fbe1b6abf8ea32da4689b24f4754a1fa4b32198a8d18d5bc511e6bbd5361487f3b5cb13c0145d65a537191be

data/lib/geo_query/geo_queryable.rb

@@ -7,10 +7,13 @@ module GeoQuery
       mattr_accessor :point_column
       @@point_column = :coordinates
 
+      mattr_accessor :track_updates
+      @@track_updates = false
+
       # Accessors
-      attr_accessor :lat, :lng
+      attr_accessor :lat, :lon
 
-      def location_changed?
+      def location_did_change?
         method("#{self.point_column}_changed?").call
       end
 
@@ -19,9 +22,9 @@ module GeoQuery
       end
 
       def save_coordinates
-        if lat.present? && lng.present?
-          self.coordinates = "POINT(#{lng} #{lat})"
-        elsif (lat.present? && lng.blank?) || (lng.present? && lat.blank?)
+        if lat.present? && lon.present?
+          self.coordinates = "POINT(#{lon} #{lat})"
+        elsif (lat.present? && lon.blank?) || (lon.present? && lat.blank?)
           errors.add(self.point_column, "requires both latitude and longitude")
         end
       end
@@ -33,7 +36,7 @@ module GeoQuery
 
       def near(radius=500) #radius in metres
         # x = longitude && y = latitude
-        return self.class.near_lat_lng(st_coordinates.y, st_coordinates.x, radius) if st_coordinates
+        return self.class.near_lat_lon(st_coordinates.y, st_coordinates.x, radius) if st_coordinates
         self.class.none
       end
 
@@ -43,17 +46,17 @@ module GeoQuery
 
       # 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.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})")
+      def self.near_lat_lon(lat, lon, radius=500) #radius in metres
+        select("#{self.table_name}.*, ST_Distance(#{self.point_column}, ST_GeographyFromText('POINT(#{lon} #{lat})')) AS distance")
+        .where("ST_DWithin(#{self.table_name}.#{self.point_column} , ST_GeographyFromText('POINT(#{lon} #{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)
+      def self.within_bounding_box(min_lat, min_lon, max_lat, max_lon)
         select("#{self.table_name}.*").
-        where("#{self.point_column} && ST_MakeEnvelope(?, ?, ?, ?, 4326)",
-          min_lng, min_lat, max_lng, max_lat)
+        where("#{self.table_name}.#{self.point_column} && ST_MakeEnvelope(?, ?, ?, ?, 4326)",
+          min_lon, min_lat, max_lon, max_lat)
       end
 
     end
@@ -61,13 +64,17 @@ module GeoQuery
     module ClassMethods
       # Init method
       def geo_queryable(options = {})
-        self.base_class.point_column = options[:coordinates] || :coordinates
+        self.base_class.point_column  = options[:column] || :coordinates
+        self.base_class.track_updates = options[:track_updates] || false
 
         # Validations
         validate :save_coordinates
 
-        # Callbacks
-        before_save :set_location_updated_at, if: :location_changed?
+        if self.base_class.track_updates
+
+          # Callbacks
+          before_save :set_location_updated_at, if: :location_did_change?
+        end
       end
     end
   end

data/lib/geo_query/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_query
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - William Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta5
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta5
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement