raise errors when they occur

manveru · Jan 8, 2014 · fcafd72 · fcafd72
1 parent e13cf31
commit fcafd72
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/lib/geonames.rb b/lib/geonames.rb
@@ -3,6 +3,8 @@
 require 'addressable/template'
 
 class GeoNames
+  class APIError < RuntimeError; end
+
   OPTIONS = {
     host: 'api.geonames.org',
     time_format: '%Y-%m-%d %T %z',
@@ -39,10 +41,17 @@ def query(name, parameters)
 
     uri = uris[name].expand(default.merge(parameters))
 
-    if block_given?
-      open(uri.to_s){|io| yield(io.read) }
+    result =
+      if block_given?
+        open(uri.to_s){|io| yield(io.read) }
+      else
+        open(uri.to_s){|io| JSON.parse(io.read) }
+      end
+
+    if status = result["status"]
+      raise APIError, status.inspect
     else
-      open(uri.to_s){|io| JSON.parse(io.read) }
+      result
     end
   end