pg_searchable 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0244ce37cfcef0e4b9391ef9751d01a146660bf
-  data.tar.gz: 235f975076ef6ba068f78f6135d792c78e6e882b
+  metadata.gz: d0f35f235f18026427b95a9fd5620f83ad6236c6
+  data.tar.gz: 712e910b1aa3bf8a66e7bd353cb0fc18358f2626
 SHA512:
-  metadata.gz: 9293c648bdd76a2b81fe062ebfa787b72c03a74abe2a24ea3af433fdef62dca73fd2dfc7e2ffe49e1d0e679a2429fa9582e44c874d487ec8dc3360e1d7c77685
-  data.tar.gz: a7093702d6aa93692140325374e1f5a5f209baeabaf4d7fbd7d0c2b54c57eb1c321b41676b14a7a3bd3abf3958f29dedba40a1b7ec10cd218abe4b3eae316b69
+  metadata.gz: c5ba190060495e370921954a87f011b81806c5ab3122ddb9c878109ad77ee21280e7d064e42e5844f154da294a45d90ef1933398c5f63bce5a5e698e433af999
+  data.tar.gz: 9f7b4d1dfc96ab333f6181dd549e7af662ca10287e876ce014ab7d786356293dfd93194892f645ee1f215d96a0eb4b0b4fc3bffe0fa61b25009dc0b4e9d75171

data/lib/pg_searchable/active_record/extensions.rb

@@ -27,6 +27,10 @@ module PgSearchable
           scoped.search_for(term, options)
         end
 
+        def close_to(longitude, latitude, distance_in_miles = 5)
+          scoped.close_to(longitude, latitude, distance_in_miles)
+        end
+
       private
         def _pg_searchable_options
           @_pg_searchable_options ||= DEFAULT_OPTIONS.merge(columns: _pg_searchable_columns)

data/lib/pg_searchable/active_record/migration.rb

@@ -64,6 +64,21 @@ module ActiveRecord
       SQL
     end
 
+    def add_pg_searchable_point_index(table_name, longitude_column, latitude_column)
+      execute %{CREATE INDEX index_#{table_name}_on_#{longitude_column}_#{latitude_column}_point ON #{table_name} using gist (
+          ST_GeographyFromText(
+            'SRID=4326;POINT(' || #{table_name}.#{longitude_column} || ' ' || #{table_name}.#{latitude_column} || ')'
+          )
+        )
+      }
+    end
+
+    def remove_pg_searchable_point_index(table_name, longitude_column, latitude_column)
+      execute %{
+        DROP INDEX index_#{table_name}_on_#{longitude_column}_#{latitude_column}_point
+      }
+    end
+
   private
 
     def _add_pg_searchable_trigger(table_name, column_name, trigger_type = 'tsearch', column_data = '')

data/lib/pg_searchable/active_record/relation.rb

@@ -16,14 +16,18 @@ module PgSearchable
           conditions
         end
 
-        p conditions
-
-        joins(options[:in]).where("#{conditions.join(' OR ')}")
+        where("#{conditions.join(' OR ')}")
       end
 
-      def near(latitude, longitude)
-        puts "searching near #{latitude},#{longitude}"
-        self
+      def close_to(longitude, latitude, distance_in_miles = 5)
+        distance_in_meters  = (distance_in_miles.to_f * 1609.34).ceil
+        longitude_column    = "longitude"
+        latitude_column     = "latitude"
+
+        where("ST_DWithin(
+            ST_GeographyFromText('SRID=4326;POINT(' || #{arel_table.name}.#{longitude_column} || ' ' || #{arel_table.name}.#{latitude_column} || ')'),
+            ST_GeographyFromText('SRID=4326;POINT(%f %f)'), %d
+          )", longitude, latitude, distance_in_meters)
       end
 
       def rank_by(rank)

data/lib/pg_searchable/version.rb

@@ -1,3 +1,3 @@
 module PgSearchable
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_searchable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stephen St. Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel