open_places 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cdc326660edafa4625ac7628cc95168927493b8
-  data.tar.gz: fd1541155d81556d3fbd253b6338716500ec8fd3
+  metadata.gz: 8ebc05f7e2896ab593680b3ed93bb6e5263de0d7
+  data.tar.gz: ac3dc9718e63adac690b42bd285f221f51a6e1ee
 SHA512:
-  metadata.gz: d1c423a0b2601e8c4d48d2330d9658ecc09b59b5093be855d74b72ccb59b32a7c743a7300c5815c2ba0ee338616e757e35b2b6661cff1ccd08d6bfe026e07288
-  data.tar.gz: 494cd92eaa5762edb13fdf781efc5585975ef52563ed7035abbb08c25bf518c66a14955789020415a2a079fb10795b7b6af3140b31dce56b18183a935d9a7c72
+  metadata.gz: 3ee5557cef56c3f3692810ac0d3ae22bb9b35f7ab97134874093f7be06c04186fe176409cabf812cf365ba42b52fc8480a90b666dac805248bd6161398517ecb
+  data.tar.gz: 7a14007363c7e6e1535fe2a6e6800867e094b53277a5b35019453c9391657b20c9d0868dd66e23441ef9ba391827f07481cade5275e7a18aa402a5b5e257caa8

data/app/controllers/open_places/autocomplete_controller.rb

@@ -9,9 +9,9 @@ module OpenPlaces
       op = (params.keys & ['q', 'like', 'contains', 'starts', 'ends']).flatten.shift
       @results = OpenPlaces::Geo
       @results = @results.where(geotype: params[:type].split(",").map{|t| "OpenPlaces::#{t}" }) if params[:type].present?
-      @results = @results.near(params[:near]) if params[:near].present?
-      @results = @results.autocomplete(query_string, op) if query_string.present?
       @results = @results.order('scalerank ASC')
+      @results = @results.autocomplete(query_string, op) if query_string.present?
+      @results = @results.near(params[:near]) if params[:near].present?
       @results = @results.limit(params[:limit])
       
       respond_to do |format|

data/app/models/open_places/geo.rb

@@ -37,13 +37,14 @@ module OpenPlaces
       end
     }
 
-    scope :near, -> (here=false, within='5', query=self.all){
+    scope :near, -> (here=false, query=self.all){
       return query unless here
       select("*,round(cast((ST_Distance_Sphere(latlng, ST_SetSRID(ST_MakePoint(#{here.toLngLat}), 4326))*0.000621371) AS NUMERIC),2) AS distance").order("latlng <-> st_setsrid(st_makepoint(#{here.toLngLat}),4326) ASC")
     }
 
-    scope :ordered, -> (query=self.all){
-      order('scalerank ASC')
+    scope :within, -> (here=false, within='5', query=self.all){
+      return query unless here
+      where("ST_DWithin(latlng, ST_SetSRID(ST_MakePoint(#{here.toLngLat}), 4326), #{within})")
     }
 
     scope :to_geojson, -> (field="geom", query=self.all) {

data/lib/open_places/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_places
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ty Rauber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails