rad_core_rails 0.9.0 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae4ae340b06a1da96202cc5dce7e727a3907edc48841586a125db38e427e8c8
-  data.tar.gz: 622d9c87e97ff694d590b3dd9002afbe2e83ac0931e86e71a3165be2b7a8348b
+  metadata.gz: 8d0dc43295dda40c1ac95be85803c9a2272eb31eca835df51e823862a58b3fb9
+  data.tar.gz: c8b0ce17d1612acb98a714f9b0caee76f5b9f81bd4cae018991b0dd2a7a69f70
 SHA512:
-  metadata.gz: 1975e49d1eb90781389bff974d63b0ae0ca948a88ea427258e34dd401b34bf922999f10fb3f0ac5ba5bb96ec5b1bbe03cad4601dc0252b3ea129f16cc39c451b
-  data.tar.gz: 8a69180847d8c03ecd95fe3c941d4d04d29bc5416638cf9752cdd7154c84e9e9325f1aa1e0fe46f4d3863028b13133ccdbd470cdc8fdb94fe493b8705e5978f7
+  metadata.gz: 6935eb8ed311670806c281cb93a2382c35f419b4cc65a6b4d7c78efa358ca78b3ba10de058c2074e62caa60d3568669c0655d1458e4d51210decda550ac67622
+  data.tar.gz: 38e156a6136accc13554513063b07453e9d24f83863b0ccde0a468c1740473f20560362bf05b5d761e86a7b6ea7c6416118c35b32c3d349821c4ed23a49ea7ec

data/Gemfile

@@ -15,6 +15,7 @@ gem "rake"
 group :test do
   gem 'byebug'
   gem 'pg'
+  gem 'database_cleaner'
   gem 'database_cleaner-active_record'
   gem 'factory_bot_rails'
   gem 'rspec-rails'

data/lib/rad_core_rails/query_generator.rb

@@ -281,8 +281,8 @@ module RadCoreRails
 
         vector_string = sanitize_vector_string(filter[:values][0], weight)
 
-        query = "(#{column_name} @@ to_tsquery('simple', ?))"
-        [query, [vector_string]]
+        query = "(#{column_name} @@ to_tsquery('simple', ?) OR #{column_name} @@ to_tsquery('english', ?))"
+        [query, [vector_string, vector_string]]
       end
 
       def generate_zip_codes_clause(column_name, filter)
@@ -357,19 +357,13 @@ module RadCoreRails
         args = []
 
         case option
-        when '='
-          str = "#{column_name}::date = ?::date"
-          args << values[0]
-        when '>'
-          str = "#{column_name}::date > ?::date"
-          args << values[0]
-        when '<'
-          str = "#{column_name}::date < ?::date"
-          args << values[0]
         when '..'
           str = "(#{column_name}::date BETWEEN ?::date AND ?::date)"
           args << values[0]
           args << values[1]
+        else
+          str = "#{column_name}::date #{option} ?::date"
+          args << values[0]
         end
         [str, args]
       end

data/lib/rad_core_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RadCoreRails
-  VERSION = '0.9.0'
+  VERSION = '0.9.3'
 end

data/lib/rad_core_rails/zip_code.rb

@@ -28,17 +28,23 @@ module RadCoreRails
       # Query for returning an array of zip codes around the zip-code sent to this function with a given radius in miles.
       def distance_query
         <<-SQL
-        WITH t AS (SELECT
-        zip, (
-          3959 * acos (
-            cos(RADIANS((#{lat_sub_query})))
-            * cos(RADIANS(zip_codes.latitude))
-            * cos(RADIANS(zip_codes.longitude) - RADIANS((#{lng_sub_query})))
-            + sin(RADIANS((#{lat_sub_query})))
-            * sin(RADIANS(zip_codes.latitude))
-          )
-        ) AS distance
-        FROM zip_codes) SELECT t.zip FROM t WHERE t.distance < ?
+	        WITH t AS (SELECT
+	        zip, (
+	          3959 * ACOS (
+	            LEAST(
+	              GREATEST(
+	                (
+										COS(RADIANS((#{lat_sub_query})))
+	                	* COS(RADIANS(zip_codes.latitude))
+	                	* COS(RADIANS(zip_codes.longitude) - RADIANS((#{lng_sub_query})))
+	                	+ SIN(RADIANS((#{lat_sub_query})))
+	                	* SIN(RADIANS(zip_codes.latitude))
+									), -1
+								), 1
+							)
+	          )
+	        ) AS distance
+	        FROM zip_codes) SELECT t.zip FROM t WHERE t.distance < ?
         SQL
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.3
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport