ohm-geoindex 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0df31f7ce55dccb5db41ff451c27b638b601697
-  data.tar.gz: da98c5300d8050312ad692499ec26d7d91d35c9d
+  metadata.gz: 5954ef928642867c601f0d3d0e1d250c9e83b6c5
+  data.tar.gz: 5cac02b2e91128831b6d986d56a2ec39d562f167
 SHA512:
-  metadata.gz: da972d8ea43b074973b1c80e3ca08cd4acce50da15ddfe8b9c6ae5306952dfec8137cbfc972b9142e33600e58c01757bc4ca49213c487878e5eb14131fe2e76b
-  data.tar.gz: d333e5d8359ccc5e24684516633ab1ba2ae6396dcafa35e911caf167496289b47f7e2999d992aa18d681e6fa52d6f54229d7f9a0bc8f465151ece172b8920956
+  metadata.gz: c2d09eb9a7869a3e7732796907f2a3019145a1bd6db28d8e63f11ed66bea80b35d1d1b20bb4c024058522862084efb6a58568b49de163b88e13ed0d5c3976276
+  data.tar.gz: 2215425b98bce463f19e3fd7d543d96634e6f777963d5251fbd28acd5ded4b272a92bfbc7c3c4e0b6e515deeeda5ffb4cd79238838ea1ef9933638fe160a4636

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 test/redis-server
 test/tmp
 vendor/*
+*.gem

data/README.md

@@ -7,16 +7,19 @@ ohm-geoindex
 
 A plugin for [Ohm](https://github.com/soveran/ohm) models which enables basic geospatial queries via the Redis [geohashing](http://redis.io/commands#geo) [API](http://cristian.regolo.cc/2015/07/07/introducing-the-geo-api-in-redis.html).
 
-Setup
+Installation
 -----
 
-1. Add the gem:
+Add the gem:
 
 ```ruby
 gem 'ohm-geoindex', require: 'ohm/geoindex'
 ````
 
-2. Include the module in your model and specify the attributes to be indexed. (Note that `(longitude, latitude)` is the ordering convention used throughout the geo API.)
+Usage
+-----
+
+Include the module in your model and specify the attributes to be indexed. (Note that `(longitude, latitude)` is the ordering convention used throughout the geo API.)
 
 ```ruby
 class Beach < Ohm::Model
@@ -28,9 +31,6 @@ class Beach < Ohm::Model
 end
 ```
 
-Usage
------
-
 To perform a radius query, use the `within` class method.
 
 ```ruby

data/lib/ohm/geoindex.rb

@@ -2,7 +2,7 @@ require 'ohm'
 
 module Ohm
   module Geoindex
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
     
     def self.included(model)
       begin
@@ -35,15 +35,19 @@ module Ohm
         @geoindex = coords
       end
 
-      def within(center, radius, withdist: nil, sort: nil)
+      def within(center, radius, withdist: nil, sort: nil, count: nil)
         raise IndexNotFound unless @geoindex
-        raise raise ArgumentError, "center must be a set of coordinates or model already in the index." unless center
+        unless center.is_a?(self.ancestors.first) || (center.is_a?(Array) && center.size == 2)
+          raise ArgumentError, "center must be a set of [lng, lat] coordinates or model already in the index." 
+        end
 
         args = center.is_a?(self.ancestors.first) ? ['GEORADIUSBYMEMBER', key[:geoindex], center.id] : ['GEORADIUS', key[:geoindex], *center]
         args << parse_radius(radius)
+        args << "withdist" if withdist
         args << sort if sort
-        args << 'withdist' if withdist
-        results = redis.call(*args.flatten)
+        args << ["count", count] if count
+
+        results = redis.call(*(args.flatten))
 
         # extract ids so we can fetch all at once
         # can be [:id, :id, ...] or [[:id, :dist], [:id, :dist], ...]

data/test/geoindex_test.rb

@@ -38,6 +38,12 @@ class GeoindexTest < Test::Unit::TestCase
     assert_equal(@coogee, a.last)
   end
 
+  def test_count
+    a = Beach.within([151.257566, -33.921017], '10 km', sort: 'asc', count: 1) # coogee
+    assert_equal(1, a.size)
+    assert_equal(@coogee, a.first)
+  end
+   
   def test_within_with_distance
     a = Beach.within(@coogee, '10 km', sort: 'asc', withdist: true)
     assert_equal(2, a.size)
@@ -46,6 +52,15 @@ class GeoindexTest < Test::Unit::TestCase
     assert_equal(2, a.size)
   end
 
+  def test_center_missing
+    assert_raise do
+      Beach.within(nil, '100 m', sort: 'asc')
+    end
+    assert_raise do
+      Beach.within([40, 40, 40], '100 m', sort: 'asc')
+    end
+  end
+
   def test_index_update
     a = Ohm.redis.call('ZSCORE', @bondi.class.key[:geoindex], @bondi.id)
     @bondi.update(lat: -33.921017, lng: 151.257566)  # bondi moves to coogee
@@ -60,8 +75,12 @@ class GeoindexTest < Test::Unit::TestCase
     assert_equal([@coogee, @bondi], a)
     a = Beach.within(@coogee, '10000m', sort: 'asc')
     assert_equal([@coogee, @bondi], a)
+    a = Beach.within(@coogee, '10000    m', sort: 'asc')
+    assert_equal([@coogee, @bondi], a)
+    a = Beach.within(@coogee, '0 km', sort: 'asc')
+    assert_equal([@coogee], a)
     assert_raise do
-      a = Beach.within(@coogee, 'one billion feet', 'asc')
+      Beach.within(@coogee, 'one billion feet', sort: 'asc')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohm-geoindex
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Eliot Shepard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm