open_places 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbebad560b15e873b6c3d372093c029674815b75
-  data.tar.gz: a0fce46a7ed62944e0293e6dcb5c54a03498b447
+  metadata.gz: 3ec524fc7eed7c33638c7c6021d2f02a04e6288d
+  data.tar.gz: 397e1c0c9fd649e3ae5ee1f2438afcb2adfc0f5c
 SHA512:
-  metadata.gz: 49348b4d505f7ab91bbdc8b62335fe288b7b420a56e3298dce3fba4898200956b33277204ce84c035c78688e696344a54bf1b211c02c6525b2667e54f95c3e1f
-  data.tar.gz: 2410e34d18c676298390ac7ae6bbcf77bba88714a8bc3b655f07925a1f416f4ae9ca008d1d6ed81f95cc4106eb497511487d8657cb831df13d541bf79b03f720
+  metadata.gz: eda323608724ab9c9b470acffaf3c99e2699de8c8429a6d2e432ccea05044312cd8c2579a545faceff52027337d910e3a0916c4cea638579f4053448b15da509
+  data.tar.gz: 66bdee81e7c2e4d3bbe481c36b5a5afb83bdfdafd8c9d31efd88d6fa23cf719f7fc2ab6180d4733ff8fd4f1983099381672a24208c1d5a6232d16919d74134f9

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.order('scalerank ASC')
       @results = @results.autocomplete(query_string, op) if query_string.present?
       @results = @results.near(params[:near]) if params[:near].present?
+      @results = @results.order('scalerank ASC')
       @results = @results.limit(params[:limit])
       
       respond_to do |format|

data/app/models/open_places/geo.rb

@@ -27,7 +27,7 @@ module OpenPlaces
         return where("#{table_name}.#{field} = '#{string}'")
       elsif op == 'like'
         string = string.gsub(/\'/, "''").gsub(/\,/, "")
-        return where("#{table_name}.tsvector @@ to_tsquery(replace(quote_literal('#{string}'), '\s', '&')||':*')").order("to_tsquery(replace(quote_literal('#{string}'), '\s', '&')||':*') DESC")
+        return where("#{table_name}.tsvector @@ to_tsquery(replace(quote_literal('#{string}'), '\s', '&')||':*') ").order("similarity(#{table_name}.name, '#{string}') DESC, ts_rank(tsvector, to_tsquery(replace(quote_literal('#{string}'), ' ', '&')||':*')) DESC")
       elsif op == 'starts'
         return where("#{table_name}.#{field} LIKE '#{string}%'")
       elsif op == 'ends'

data/db/migrate/20150812211056_create_open_places.rb

@@ -1,6 +1,7 @@
 class CreateOpenPlaces < ActiveRecord::Migration
   def up
     ActiveRecord::Base.connection.execute("CREATE EXTENSION IF NOT EXISTS postgis;")
+    ActiveRecord::Base.connection.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm;")
     create_table(:open_places) do |t|
       t.string :geotype
       t.string :subtype

data/lib/open_places/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_places
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ty Rauber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails