geocoder-neo4j_spatial 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b79c9ae93a2976c8b4cfd20ab54d2dd7a43798
-  data.tar.gz: 443004f5e33232627807efed17677a9ad719ba52
+  metadata.gz: 1414165c59044babc2c24f02a1b2d9539e4f66f1
+  data.tar.gz: 74bfbb8d7fe2d1fe81c063ccc402156382049747
 SHA512:
-  metadata.gz: 798d58b3e37a7484f61904613833670462f92f42e67b069135a87187ff99f6960f320e8fd57beceaa5ff7943c2c0ed3723eb43e551e6928e76588cfcad9aadf3
-  data.tar.gz: 4ef9eb3cce5466009a3817beeabc533b5cb23ffeed49c208e0ed98bfc962f57cc3af56cc36f7a005fc0abf98b2ca000e0edaa22bea8bcb1f2aff7343527c939f
+  metadata.gz: 40c8aa7f3cf0749529d195663f808fee68b9367117c0fb6eb030d77dbb67bf5d4cdd6ed3e31ecc9f89704cf157a113552fc9d094a0f0d818d5a9cc98d86d3239
+  data.tar.gz: bf0536a402d7ef01a05e09c8ddec48a0a8ab8dc77787f42bf90c40adb48f699e6b5a59b7beba12f1f7f98afacac198700006a22e407cc77b1243b9e27cbe4c2e

data/README.md

@@ -1,9 +1,5 @@
 # Geocoder::Neo4jSpatial
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/geocoder/neo4j_spatial`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -46,10 +42,21 @@ end
 Restaurant.near(location: 'Eiffel Tower', radius: 10.0).to_a
 ```
 
+or
+
+```ruby
+Restaurant.near(location: [48.85837009999999, 2.2944813], radius: 10.0).to_a
+```
+
+will generate following query:
+
 ```
  CYPHER 9ms START result_restaurant = node:restaurants({spatial_params}) MATCH (result_restaurant:`Restaurant`) MATCH (result_restaurant:`Restaurant`) RETURN result_restaurant | {:spatial_params=>"withinDistance:[48.85837009999999, 2.2944813, 10.0]"}
 ```
 
+* not implemented yet
+- within_bounding_box
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/geocoder/neo4j_spatial/version.rb

@@ -1,5 +1,5 @@
 module Geocoder
   module Neo4jSpatial
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/geocoder/stores/neo4j.rb

@@ -15,17 +15,27 @@ module Geocoder::Store
         }
 
         scope :near, -> (location:, radius:) {
-          coordinates = Geocoder::Calculations.extract_coordinates(location)
+          if location.is_a?(Array)
+            coordinates = location << radius.to_f
 
-          if Geocoder::Calculations.coordinates_present?(*coordinates)
-            coordinates << radius
-
-            query_proxy = instance_variable_get(:@query_proxy)
-            spatial_match(query_proxy.node_identity, "withinDistance:#{coordinates}")
+            within(coordinates)
           else
-            []
+            coordinates = Geocoder::Calculations.extract_coordinates(location)
+
+            if Geocoder::Calculations.coordinates_present?(*coordinates)
+              coordinates << radius.to_f
+
+              within(coordinates)
+            else
+              []
+            end
           end
         }
+
+        scope :within, -> (coordinates) {
+          query_proxy = instance_variable_get(:@query_proxy)
+          spatial_match(query_proxy.node_identity, "withinDistance:#{coordinates}")
+        }
       end
     end
 
@@ -33,8 +43,10 @@ module Geocoder::Store
       do_lookup(false) do |o, rs|
         if r = rs.first
           unless r.latitude.nil? or r.longitude.nil?
-            o.__send__  "#{self.class.geocoder_options[:latitude]}=",  r.latitude
-            o.__send__  "#{self.class.geocoder_options[:longitude]}=", r.longitude
+            o.__send__ "#{self.class.geocoder_options[:latitude]}=",  r.latitude
+            o.__send__ "#{self.class.geocoder_options[:longitude]}=", r.longitude
+
+            o.add_to_spatial_index o.class.spatial_index_name
           end
 
           r.coordinates
@@ -53,5 +65,11 @@ module Geocoder::Store
         end
       end
     end
+
+    def nearbys(radius = 20)
+      return nil unless geocoded?
+
+      self.class.near(location: to_coordinates, radius: radius)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder-neo4j_spatial
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kajisha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j