geocoder-sensis 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ee86bd708259c0c624d03ebd1623a4de4a65b16
-  data.tar.gz: e4746d5443ffe168b4dc680f70f5aef401c11f2c
+  metadata.gz: 29daad5f5ef3f4435d7367d5b9788c2656193039
+  data.tar.gz: 541861a9642e1368528214631a2b09a845204890
 SHA512:
-  metadata.gz: b4319a758539ec3aef97e2475266f25cb132e8b06b649989929d61aa83b88e9c2eb1077849b2b6bc6b3e776de04ad138b658e1eaf64572b8b7e1e4a5d39695a4
-  data.tar.gz: 42f229bda8568a4f737a754987e942be1fc3cad05365f6fa0de1808109e482e5fbacb961ab0ab744f307bfb2ccd10ed04c99824ca3180d64567d71829ebbf757
+  metadata.gz: 48e759a781a1b0f1e7f9cdd8f7ac4e020aaa314ec446bc19b061a0d813329ecae7ce1fcf1c5b05096b4d71870dc23093df19073cc0e25ebf8a32b13ea3ab0f05
+  data.tar.gz: a532bb5ba3e27e6c1dede487195e5bfd1ac9bee33137b73c1699d958977781f2f523163ab7fe4b4defa540b10db5b5b8b43ba03b7ac46a168965e6e2faf87ba8

data/lib/geocoder/sensis/version.rb

@@ -1,5 +1,5 @@
 module Geocoder
   module Sensis
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/geocoder/sensis.rb

@@ -30,6 +30,10 @@ module Geocoder
         "https"
       end
 
+      def cache_key(query)
+        query.to_s
+      end
+
       def results(query)
         doc = fetch_data(query)
         return [] unless doc
@@ -42,7 +46,7 @@ module Geocoder
       # TODO: Raise PR upstream to allow other request methods.
       #
       def make_api_request(query)
-        timeout(configuration.timeout) do
+        response = timeout(configuration.timeout) do
           uri = URI.parse(query_url(query))
           http_client.start(uri.host, uri.port, :use_ssl => true) do |client|
             req = Net::HTTP::Post.new(uri.request_uri, configuration.http_headers)
@@ -54,6 +58,15 @@ module Geocoder
             client.request(req)
           end
         end
+        case response.code.to_i
+        when 200
+          return response
+        when 400
+          raise_error ::Geocoder::InvalidRequest.new("Bad Request: #{response.body}")
+        else
+          raise_error ::Geocoder::Error.new("Unable to access Sensis API: #{response.code}. Body:\n#{response.body}")
+        end
+        response
       end
 
       def result_class
@@ -94,6 +107,7 @@ module Geocoder
     end
 
     class SensisStructured < SensisBase
+
       def name
         :sensis_structured
       end

data/spec/lib/geocoder/sensis_spec.rb

@@ -35,36 +35,59 @@ describe Geocoder::Sensis do
   end
 
   describe "Geocoding an address via structured api" do
+
     before do
       Geocoder.configure(
         :lookup => :sensis_structured,
         :api_key => [sensis_api_token, sensis_api_password],
         :use_https => true,
-        :timeout => 30000
+        :timeout => 30000,
+        :always_raise => :all,
       )
-      mock_sensis_api :request_type => :structured,
-        :address => '12 Powlett Street, East Melbourne',
-        :latitude => 44.66,
-        :longitude => 55.66
     end
 
-    it "returns the geocode from sensis" do
-      coords = Geocoder.coordinates(
-        "state" => "Vic",
-        "suburb" => "Richmond",
-        "postcode" => "3121",
-        "number" => "9",
-        "street" => {
-          "name" => "Victoria",
-          "type" => "Street",
-          "suffix" => ""
-      })
+    describe "with an invalid address (returning http 400)" do
+      it "throws an ::Geocoder::InvalidRequest" do
+        mock_sensis_api :request_type => :structured, :response_code => 400
+        expect {
+          Geocoder.coordinates({})
+        }.to raise_error(::Geocoder::InvalidRequest)
+      end
+    end
 
-      expect(coords).to eq [44.66, 55.66]
+    describe "when sensis is down (returning http 500)" do
+      it "throws an ::Geocoder::Error" do
+        mock_sensis_api :request_type => :structured, :response_code => 500
+        expect {
+          Geocoder.coordinates({})
+        }.to raise_error(::Geocoder::Error)
+      end
     end
 
-  end
+    describe "with a valid address" do
+      before do
+        mock_sensis_api(:request_type => :structured,
+                  :address => '12 Powlett Street, East Melbourne',
+                  :latitude => 44.66,
+                  :longitude => 55.66)
+      end
 
-end
+      it "returns the geocode from sensis" do
+        coords = Geocoder.coordinates(
+          "state" => "Vic",
+          "suburb" => "Richmond",
+          "postcode" => "3121",
+          "number" => "9",
+          "street" => {
+            "name" => "Victoria",
+            "type" => "Street",
+            "suffix" => ""
+        })
+
+        expect(coords).to eq [44.66, 55.66]
+      end
 
+    end
+  end
 
+end

data/spec/support/mock_sensis.rb

@@ -25,12 +25,11 @@ def mock_sensis_api(options = {})
         'X-Auth-Token' => sensis_api_token,
         'X-Auth-Password' => sensis_api_password
     }).
-    to_return(:status => sensis_response.code, :body => sensis_response.raw, :headers => {})
+    to_return(:status => sensis_response.response_code, :body => sensis_response.raw, :headers => {})
 end
 
-
 class SensisResponse
-  attr_reader :request_address, :request_type, :latitude, :longitude, :street_lat, :street_lon, :granularity, :code, :state, :suburb
+  attr_reader :request_address, :request_type, :latitude, :longitude, :street_lat, :street_lon, :granularity, :response_code, :state, :suburb
 
   def initialize(options = {})
     defaults.merge(options).each do |k, v|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder-sensis
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Daniel Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geocoder