asari 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ee219d6feb2cf54eeaddd1fd259618b2e877884
-  data.tar.gz: 2554d88f618b327ca3f1a7fc1dcf0e73b4c1bfa1
+  metadata.gz: 2c3b4f8b5b8bfcf0c57a73a1166fc8c4937d1b9a
+  data.tar.gz: ce62113fd651f0b4a0d904a3a9b977de3fdf6b09
 SHA512:
-  metadata.gz: 644ee6278143ee097db1f5a85b994de8c076e264eb1a135c355c93631efe80d69b0147699266f88ea5d785c67af24970ba52edcb71ddac7b65fdb08f89f56149
-  data.tar.gz: d9f6b562b44862d6d66fbee0e911cc0ab81ea8e0278b0641eeddfe0885cd03d49c8804254375723388e72cd06b4f59209ff0467d192a1a35a20538c745aab96c
+  metadata.gz: 230b8c490d07f061b1a94decdc0a38c82b7155209312ac85fe15e0402bf9b5ea96ab4242b87108978258bec18d9f0e9cb3b8f115cb92d4d04055263e742a372c
+  data.tar.gz: 748909669f060872abe47f4cc54b7c50d8080c76d08c13496e89829051931fa64d8b2fec859ce1d8b76fe7b0319c6a43ded3f8166420414df6628f8e2b9657ec

data/README.md

@@ -28,12 +28,27 @@ Amazon Cloud Search will give you a Search Endpoint and Document Endpoint.  When
 #### Boolean Query Usage
 
     asari.search(filter: { and: { title: "donut", type: "cruller" }})
-    asari.search("boston creme", filter: { and: { title: "donut", or: { type: "cruller",
-type: "twist" }}}) # Full text search and nested boolean logic
+    asari.search("boston creme", filter: { and: { title: "donut", or: { type: "cruller", type: "twist" }}}) # Full text search and nested boolean logic
 
 For more information on how to use Cloudsearch boolean queries, [see the
 documentation.](http://docs.aws.amazon.com/cloudsearch/latest/developerguide/booleansearch.html)
 
+### Geospatial Query Usage
+
+While Cloudsearch does not natively support location search, you can implement rudimentary location search by representing latitude and longitude as integers in your search domain. Asari has a Geography module you can use to simplify the conversion of latitude and longitude to cartesian coordinates as well as the generation of a coordinate box to search within. Asari's Boolean Query syntax can then be used to search within the area. Note that because Cloudsearch only supports 32-bit unsigned integers, it is only possible to store latitude and longitude to two place values. This means very precise search isn't possible using Asari and Cloudsearch. 
+
+    coordinates = Asari::Geography.degrees_to_int(lat: 45.52, lng: 122.68)
+      #=> { lat: 2506271416, lng: 111298648 }
+    asari.add_item("1", { name: "Tommy Morgan", lat: coordinates[:lat], lng: coordinates[:lng] })
+      #=> nil
+    coordinate_box = Asari::Geography.coordinate_box(lat: 45.2, lng: 122.85, meters: 7500)
+      #=> { lat: 2505521415..2507021417, lng: 111263231..111334065 } 
+    asari.search("tommy", filter: { and: coordinate_box }
+      #=> ["1"] = a list of document IDs
+
+For more information on how to use Cloudsearch for location search, [see the
+documentation.](http://docs.aws.amazon.com/cloudsearch/latest/developerguide/geosearch.html)
+
 #### Sandbox Mode
 
 Because there is no "local" version of CloudSearch, and search instances can be

data/lib/asari.rb

@@ -89,13 +89,13 @@ class Asari
     begin
       response = HTTParty.get(url)
     rescue Exception => e
-      ae = Asari::SearchException.new("#{e.class}: #{e.message}")
+      ae = Asari::SearchException.new("#{e.class}: #{e.message} (#{url})")
       ae.set_backtrace e.backtrace
       raise ae
     end
 
     unless response.response.code == "200"
-      raise Asari::SearchException.new("#{response.response.code}: #{response.response.msg}")
+      raise Asari::SearchException.new("#{response.response.code}: #{response.response.msg} (#{url})")
     end
 
     Asari::Collection.new(response, page_size)
@@ -202,7 +202,11 @@ class Asari
           sub_query = reduce.call(value)
           memo += "(#{key}#{sub_query})" unless sub_query.empty?
         else
-          memo += " #{key}:'#{value}'" unless value.to_s.nil? || value.to_s.empty?
+          if value.is_a?(Range) || value.is_a?(Integer)
+            memo += " #{key}:#{value}"
+          else
+            memo += " #{key}:'#{value}'" unless value.to_s.empty?
+          end
         end
         memo
       end

data/lib/asari/geography.rb

@@ -10,7 +10,7 @@ class Asari
 
     class << self
 
-      # Public: Converts coordinates to unsigned integers that store up to three
+      # Public: Converts coordinates to unsigned integers that store up to two
       # place values.
       #
       #     options - the options hash requires:
@@ -87,21 +87,21 @@ class Asari
 
       private
       def latitude_to_int(degrees)
-        ((degrees + 180) * METERS_PER_DEGREE_OF_LATITUDE * 1000).round
+        ((degrees + 180) * METERS_PER_DEGREE_OF_LATITUDE * 100).round
       end
 
       def latitude_to_degrees(int)
-        ((int / METERS_PER_DEGREE_OF_LATITUDE / 1000.0) - 180).round(3)
+        ((int / METERS_PER_DEGREE_OF_LATITUDE / 100.0) - 180).round(3)
       end
 
       def longitude_to_int(degrees, latitude)
         meters = meters_per_degree_of_longitude(latitude)
-        ((degrees + 180) * meters * 1000).round
+        ((degrees + 180) * meters * 100).round
       end
 
       def longitude_to_degrees(int, latitude_in_degrees)
         meters = meters_per_degree_of_longitude(latitude_in_degrees)
-        ((int / meters / 1000.0) - 180).round(3)
+        ((int / meters / 100.0) - 180).round(3)
       end
 
       def meters_per_degree_of_longitude(latitude)

data/lib/asari/version.rb

@@ -1,3 +1,3 @@
 class Asari
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/spec/geography_spec.rb

@@ -6,25 +6,25 @@ describe Asari::Geography do
 
   describe "#degrees_to_int" do
     it "converts standard lat and lng to integers" do
-      result = convert.degrees_to_int(lat: 45.52, lng: 122.682)
-      expect(result).to eq({ lat: 25062714160, lng: 1112993834 })
+      result = convert.degrees_to_int(lat: 45.52, lng: 122.68)
+      expect(result).to eq({ lat: 2506271416, lng: 111298648 })
     end
   end
 
   describe "#int_to_degrees" do
     it "converts back successfully" do
-      integers = convert.degrees_to_int(lat: -45.52, lng: 122.682)
+      integers = convert.degrees_to_int(lat: -45.52, lng: 122.68)
       result = convert.int_to_degrees(integers)
-      expect(result).to eq({ lat: -45.52, lng: 122.682 })
+      expect(result).to eq({ lat: -45.52, lng: 122.68 })
     end
   end
 
   describe "#coordinate_box" do
-    it "creates a range from a coordinate and a distance in miles" do
+    it "creates a range from a coordinate and a distance in meters" do
       result = convert.coordinate_box(lat: 45.52, lng: 122.682, meters: 5000)
       expect(result).to eq({
-        lat: 25057714154..25067714166,
-        lng: 1112757718..1113229951
+        lat: 2505771415..2506771417,
+        lng: 111275772..111322995
       })
     end
   end

data/spec/search_spec.rb

@@ -143,4 +143,11 @@ describe Asari do
       })
     end
   end
+
+  describe "geography searching" do
+    it "builds a proper query string" do
+      HTTParty.should_receive(:get).with("http://search-testdomain.us-east-1.cloudsearch.amazonaws.com/2011-02-01/search?q=&bq=%28and+lat%3A2505771415..2506771417+lng%3A111275735..111322958%29&size=10")
+      @asari.search filter: { and: Asari::Geography.coordinate_box(meters: 5000, lat: 45.52, lng: 122.6819) }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asari
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Tommy Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty