geokit-rails 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 60cc7291a94e6384a48947ecb040a472b26c0ac6
-  data.tar.gz: e067b31c96bf53bbe4a3be1f6acf9f490e0c2c16
+SHA256:
+  metadata.gz: d8abd196ef01725dfea499611d751fe08d1f42da5473c7896d526b16044e5c7a
+  data.tar.gz: aef079a740792c981bb86d07d48c3686b2d939d5ce1792dd50d7d5c4bfe6bc05
 SHA512:
-  metadata.gz: 06e80fa935a623e414e484df78abbc3fb8795c59babe7c40acc152a415b0ca12563be5c3bbaca82be6b36701cea934a8d5d9ae79b1a77defd9a5dd7735e71eb3
-  data.tar.gz: 617c4629c9a48b244dbaa9c8afed2cfb7315de6309e11c1d775892174e5d4166c23158d150a506f6f8f7084c0fd1f42e7549baddc8194d83f4c8e62cf40e59b3
+  metadata.gz: 7de113ad53d0ae12a3919337e70ec69d91a59f1ae9147235ee2eb42ccdd20e73438784bba5eb6122da7bb1185e28cd8d321af7a63c654b153ead266ac96d548b
+  data.tar.gz: ad3e5699a610b9ef8ef451bd76bef841f36272a96896a04c2610d8cb21603f869a0c670a4754366d8b3df5dc13e3f03a3807f9a96848abe63ae0e30aa45b40e9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.2
+
+* Fix sqlite3 adapter error
+
 ## 2.3.1
 
 * Fix Rails 5.2 deprecation warning

data/README.markdown

@@ -264,6 +264,12 @@ If you are displaying points on a map, you probably need to query for whatever f
 Store.in_bounds([sw_point,ne_point]).all
 ```
 
+If you want the query to return things that are located on the rectangular bounds, specify the `inclusive` option set to true:
+
+```ruby
+Store.in_bounds([sw_point,ne_point], :inclusive => true).all
+```
+
 The input to `bounds` can be an array with the two points or a Bounds object. However you provide them, the order should always be the southwest corner, northeast corner of the rectangle. Typically, you will be getting the sw\_point and ne\_point from a map that is displayed on a web page.
 
 If you need to calculate the bounding box from a point and radius, you can do that:

data/geokit-rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '>= 3.0'
   spec.add_dependency 'geokit', '~> 1.5'
   spec.add_development_dependency "bundler", "> 1.0"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov", "~> 0.16.1"
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'test-unit'

data/lib/geokit-rails/acts_as_mappable.rb

@@ -141,11 +141,12 @@ module Geokit
       end
 
       def in_bounds(bounds, options = {})
+        inclusive = options.delete(:inclusive) || false
         options[:bounds] = bounds
         #geo_scope(options)
         #where(distance_conditions(options))
         bounds  = extract_bounds_from_options(options)
-        where(bound_conditions(bounds))
+        where(bound_conditions(bounds, inclusive))
       end
 
       def by_distance(options = {})
@@ -153,9 +154,9 @@ module Geokit
         units   = extract_units_from_options(options)
         formula = extract_formula_from_options(options)
         distance_column_name = distance_sql(origin, units, formula)
-        with_latlng.order(Arel.sql(
-          "#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}"
-        ))
+        with_latlng.order(
+          Arel.sql(distance_column_name).send(options[:reverse] ? 'desc' : 'asc')
+        )
       end
 
       def with_latlng
@@ -233,7 +234,7 @@ module Geokit
       # If it's a :within query, add a bounding box to improve performance.
       # This only gets called if a :bounds argument is not otherwise supplied.
       def formulate_bounds_from_distance(options, origin, units)
-        distance = options[:within] if options.has_key?(:within)
+        distance = options[:within] if options.has_key?(:within) && options[:within].is_a?(Numeric)
         distance = options[:range].last-(options[:range].exclude_end?? 1 : 0) if options.has_key?(:range)
         if distance
           Geokit::Bounds.from_point_and_radius(origin,distance,:units=>units)
@@ -248,22 +249,39 @@ module Geokit
         formula = extract_formula_from_options(options)
         distance_column_name = distance_sql(origin, units, formula)
 
-        res = if options.has_key?(:within)
-          "#{distance_column_name} <= #{options[:within]}"
+        if options.has_key?(:within)
+          Arel.sql(distance_column_name).lteq(options[:within])
         elsif options.has_key?(:beyond)
-          "#{distance_column_name} > #{options[:beyond]}"
+          Arel.sql(distance_column_name).gt(options[:beyond])
         elsif options.has_key?(:range)
-          "#{distance_column_name} >= #{options[:range].first} AND #{distance_column_name} <#{'=' unless options[:range].exclude_end?} #{options[:range].last}"
+          min_condition = Arel.sql(distance_column_name).gteq(options[:range].begin)
+          max_condition = if options[:range].exclude_end?
+                            Arel.sql(distance_column_name).lt(options[:range].end)
+                          else
+                            Arel.sql(distance_column_name).lteq(options[:range].end)
+                          end
+          min_condition.and(max_condition)
         end
-        Arel::Nodes::SqlLiteral.new("(#{res})") if res.present?
       end
 
-      def bound_conditions(bounds)
+      def bound_conditions(bounds, inclusive = false)
+        return nil unless bounds
+        if inclusive
+          lt_operator = :lteq
+          gt_operator = :gteq
+        else
+          lt_operator = :lt
+          gt_operator = :gt
+        end
         sw,ne = bounds.sw, bounds.ne
-        lng_sql = bounds.crosses_meridian? ? "(#{qualified_lng_column_name}<#{ne.lng} OR #{qualified_lng_column_name}>#{sw.lng})" : "#{qualified_lng_column_name}>#{sw.lng} AND #{qualified_lng_column_name}<#{ne.lng}"
-        res = "#{qualified_lat_column_name}>#{sw.lat} AND #{qualified_lat_column_name}<#{ne.lat} AND #{lng_sql}"
-        #Arel::Nodes::SqlLiteral.new("(#{res})") if res.present?
-        res if res.present?
+        lat, lng = Arel.sql(qualified_lat_column_name), Arel.sql(qualified_lng_column_name)
+        lat.send(gt_operator, sw.lat).and(lat.send(lt_operator, ne.lat)).and(
+          if bounds.crosses_meridian?
+            lng.send(lt_operator, ne.lng).or(lng.send(gt_operator, sw.lng))
+          else
+            lng.send(gt_operator, sw.lng).and(lng.send(lt_operator, ne.lng))
+          end
+        )
       end
 
       # Extracts the origin instance out of the options if it exists and returns

data/lib/geokit-rails/adapters/sqlite.rb

@@ -3,7 +3,7 @@ module Geokit
     class SQLite < Abstract
       
       def self.add_numeric(name) 
-        @@connection.create_function name, 1, :numeric do |func, *args|
+        @@connection.create_function name, 1, SQLite3::Constants::TextRep::ANY do |func, *args|
           func.result = yield(*args)
         end
       end
@@ -50,4 +50,4 @@ module Geokit
       
     end
   end
-end
+end

data/lib/geokit-rails/version.rb

@@ -1,3 +1,3 @@
 module GeokitRails
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

data/test/acts_as_mappable_test.rb

@@ -108,6 +108,12 @@ class ActsAsMappableTest < GeokitTestCase
     assert_equal 5, locations.count
   end
 
+  def test_find_within_with_column_as_distance
+    locations = Location.joins(:company).within(Company.arel_table[:max_distance], origin: @loc_a)
+    assert_equal 4, locations.to_a.size
+    assert_equal 4, locations.count
+  end
+
   def test_find_with_compound_condition
     #locations = Location.geo_scope(:origin => @loc_a).where("distance < 5 and city = 'Coppell'")
     locations = Location.within(5, :origin => @loc_a).where("city = 'Coppell'")
@@ -383,6 +389,16 @@ class ActsAsMappableTest < GeokitTestCase
     assert_equal 2, locations.count
   end
 
+  def test_find_within_bounds_with_inclusive
+    sw = Geokit::LatLng.new(@loc_a.lat,@loc_a.lng)
+    ne = sw
+    bounds = [sw,ne]
+    locations = Location.in_bounds(bounds, :inclusive => false)
+    assert_equal 0, locations.count
+    locations = Location.in_bounds(bounds, :inclusive => true)
+    assert_equal 1, locations.count
+  end
+
   def test_find_within_bounds_ordered_by_distance
     #locations = Location.in_bounds([@sw,@ne], :origin=>@bounds_center).order('distance asc')
     locations = Location.in_bounds([@sw,@ne]).by_distance(:origin => @bounds_center)

data/test/fixtures/companies.yml

@@ -1,7 +1,9 @@
 starbucks:
   id: 1
   name: Starbucks
+  max_distance: 1.7
 
 barnes_and_noble:
   id: 2
-  name: Barnes & Noble
+  name: Barnes & Noble
+  max_distance: 2.0

data/test/schema.rb

@@ -1,6 +1,7 @@
 ActiveRecord::Schema.define(:version => 0) do
   create_table :companies, :force => true do |t|
     t.column :name, :string
+    t.column :max_distance, :float
   end  
   
   create_table :locations, :force => true do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Michael Noack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,16 +59,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
@@ -279,8 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Geokit helpers for rails apps.