weatheruby 0.6.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef81a1f522c927a6742c86c1ad121d10f912c01d
-  data.tar.gz: a61998454d2e9f01d8142bf0e32afc7dbc9e1f7a
+  metadata.gz: 217f72114c4d922e058e95acda948b549ba8a91e
+  data.tar.gz: 8084acda49e9aad4bddb921d32b45c9e17cffe6d
 SHA512:
-  metadata.gz: 2899edb7672c61f8879eeb9fb7496695fa31773a4694cfc8df6ccef9daf0fdc69e0833be75067fb85230db6c7cdabe56af667586861a5d4fe5c7da279f01d04e
-  data.tar.gz: 440bf75169474ae8a3a4311890a002a3796221a1f7e3308367192efbce2944d71b285823986cd3fec37aa6a8ecf1f59fde1380ee1c8a98e3ae0ebb021aabd060
+  metadata.gz: 1a40e220d7f4491383c53da7784f51b569ea491e0d4c35e402ca0073f63b4799e5a054d956a88edc1f49101e7c32552a9e999e160b703cf37fcbe1d79ecbb7f2
+  data.tar.gz: cfb1aeeac85b2334f7b35f5f0413f22d1a6c7d0682ffbeac8f88003f540a5a258da85475bb5805c5366dbdced6b1d71f5b1de2f423be3ec2e2fac7fb97d30951

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
+
+## Version 1
+
+### Version 1.0.0
+* New `#sun_info` method for sunset/sunrise times
+* Add `:image_url` to simple forecast return hash
+* Add `:date`, `:weekday_name`, and `:image_url` to complex forecast return data
+* Improve documentation across the library. The recommended place for docs is now 
+[GitHub Pages](http://elifoster.github.io/weatheruby/) instead of RubyDocs.info
+* `#get` is now private
+* Remove `autoparse` parameter from `#get`
+* Fix `#hurricane_data` by ignoring the `WeatherError` thrown by that API
+* Return `Time` and `DateTime` objects instead of `String`s for timestamp values across the library.
+
 ## Version 0
+
 ### Version 0.6.1
 * Update to StringUtility 3.0
 

data/lib/weather/actions.rb

@@ -1,10 +1,17 @@
+require 'time'
+
 module Weather
   module Actions
     # Gets alert information for a location.
     # @param location [String] The place to get the alert data for.
-    # @return [Hash/String] Nil if there are no alerts, or a hash of hashes
-    #   containing relevant data if not. Each array in the hash contains
-    #   information for a different alert.
+    # @return [Array<Hash<Symbol, String>>] A list of alerts for the given location. The array will be empty if there
+    #   are no alerts. Each value in the array is a hash containing symbol keys:
+    #
+    #   * `:type` (`String`) — The 3 character identifier for the alert type (see Wunderground API docs)
+    #   * `:description` (`String`) — The full name of the alert type
+    #   * `:date` (`Time`) — The date that the alert begins to take effect, using the local timezone to this location.
+    #   * `:expires` (`Time`) — The date that the alert is no longer in effect, using the local timezone to this location.
+    #   * `:message` (`String`) — The full message for the alert (this is usually dozens of paragraphs long)
     def alerts(location)
       response = get('alerts', location)
       ret = []
@@ -13,8 +20,8 @@ module Weather
         ret[count] = {
           type: a['type'],
           description: a['description'],
-          date: a['date'],
-          expires: a['expires'],
+          date: Time.parse(a['date']),
+          expires: Time.parse(a['expires']),
           message: a['message']
         }
         count += 1
@@ -25,9 +32,9 @@ module Weather
 
     # Gets the current moon phase of the location.
     # @param location [String] The place to get the phase for.
-    # @return [Hash/String] A hash of two integers for the moon phase
-    #   information. The age key in the hash contains the moon's age in days,
-    #   and the illumination key contains the percentage of how illuminated it
+    # @return [Hash<Symbol, Integer>] A hash of two integers for the moon phase
+    #   information. The `:age` key in the hash contains the moon's age in days,
+    #   and the `:illumination` key contains the percentage of how illuminated it
     #   is.
     def moon_phase(location)
       response = get('astronomy', location)
@@ -37,9 +44,54 @@ module Weather
       }
     end
 
+    # Gets sunrise and sunset information for the current day at the current location.
+    # @param location [String] The place to get the info for.
+    # @return [Hash<Symbol, Hash<Symbol, Integer>>] A hash containing two hashes at keys :rise and :set for sunrise
+    #   and sunset information respectively. They each contain an :hour key and a :minute key which point to the hour
+    #   and minute that the sun will rise or set.
+    def sun_info(location)
+      response = get('astronomy', location)
+      {
+        rise: {
+          hour: response['moon_phase']['sunrise']['hour'].to_i,
+          minute: response['moon_phase']['sunrise']['minute'].to_i
+        },
+        set: {
+          hour: response['moon_phase']['sunset']['hour'].to_i,
+          minute: response['moon_phase']['sunset']['minute'].to_i
+        }
+      }
+    end
+
     # Gets weather conditions for the location.
     # @param location [String] The place to get the weather report for.
-    # @return [Hash] A hash containing strings of relevant weather information.
+    # @return [Hash<Symbol, Object>] A hash containing strings of relevant weather information. It contains the
+    #   following keys:
+    #
+    #   * `:full_name` (`String`) — The full name of the location
+    #   * `:city_name` (`String`) — The name of the city
+    #   * `:state_abbreviation` (`String`) — The abbreviation for the state (or national equivalent)
+    #   * `:state_name` (`String`) — The name of the state (or national equivalent)
+    #   * `:country` (`String`) — The name of the country
+    #   * `:zip_code` (`Integer`) — The zip code for this location
+    #   * `:updated` (`String`) — A string describing the date for when this data was last updated.
+    #   * `:weather` (`String`) — A brief description of the current weather conditions in this location (e.g., Partly
+    #   Cloudy)
+    #   * `:formatted_temperature` (`String`) — The formatted temperature as provided by the API. It does not contain °
+    #   symbols. Its format is "XX F (YY C)"
+    #   * `:temperature_f` (`Float`) — The current temperature in fahrenheit
+    #   * `:temperature_c` (`Float`) — The current temperature in celsius
+    #   * `:humidity` (`Integer`) — The humidity percentage
+    #   * `:formatted_wind` (`String`) — A brief description of the current wind conditions (e.g., Calm)
+    #   * `:wind_direction` (`String`) — The direction (East, West, etc.) that the wind is blowing
+    #   * `:wind_degrees` (`Integer`) — The angle of the wind
+    #   * `:wind_speed` (`Float`) — The speed of the wind in miles per hour
+    #   * `:wind_gust_speed` (`Integer`) — The speed of the gusts of wind in miles per hour
+    #   * `:formatted_feelslike` (`String`) — The formatted string for the "feels like" temperature data as provided
+    #   by the API. See :formatted_temperature for the format.
+    #   * `:feelslike_f` (`Integer`) — The temperature that it feels like (not always the same as the temperature it
+    #   is) in fahrenheit
+    #   * `:feelslike_c` (`Integer`) — Like feelslike_f but in celsius
     def conditions(location)
       response = get('conditions', location)
       current_observation = response['current_observation']
@@ -75,7 +127,13 @@ module Weather
 
     # Gets the record low for the location.
     # @param location [String] The place to get the record low for.
-    # @return [Hash] A hash containing a few integers of data.
+    # @return [Hash<Symbol, Integer>] A hash containing a few integers of data:
+    #
+    #   * `:average_low_f` (`Integer`) — The average low temperature in this location in fahrenheit
+    #   * `:average_low_c` (`Integer`) — The average low temperature in this location in celsius
+    #   * `:record_year` (`Integer`) — The year in which this location had its lowest temperatures
+    #   * `:record_low_f` (`Integer`) — The lowest temperature this location has had in fahrenheit
+    #   * `:record_low_c` (`Integer`) — The lowest temperature this location has had in celsius
     def record_low(location)
       response = get('almanac', location)
       {
@@ -89,7 +147,13 @@ module Weather
 
     # Gets the record high for the location.
     # @param location [String] The place to get the record high for.
-    # @return [Hash] A hash containing a few integers of data.
+    # @return [Hash<Symbol, Integer>] A hash containing a few integers of data:
+    #
+    #   * `:average_high_f` (`Integer`) — The average high temperature in this location in fahrenheit
+    #   * `:average_high_c` (`Integer`) — The average high temperature in this location in celsius
+    #   * `:record_year` (`Integer`) — The year in which this location had its highest temperatures
+    #   * `:record_high_f` (`Integer`) — The highest temperature this location has had in fahrenheit
+    #   * `:record_high_c` (`Integer`) — The highest temperature this location has had in celsius
     def record_high(location)
       response = get('almanac', location)
       {
@@ -101,11 +165,30 @@ module Weather
       }
     end
 
-    # Gets data for currently-happening hurricanes around the world.
-    # @return [Hash] A hash containing hashes of data. Each sub-hash is named
-    #   as the "nice" name for the hurricane (example: Hurricane Daniel).
+    # Gets data for currently-happening storms around the world.
+    # @return [Hash<String, Hash<Symbol, String/Integer>>] A hash containing hashes of data. Each sub-hash is named
+    #   as the name for the storm including the type (example: Hurricane Daniel). The sub-hash values are as follows:
+    #
+    #   * `:name` (`String`) — The name of the hurricane (example: Daniel)
+    #   * `:number` (`String`) — The ID of the storm, 8 characters with a 2 letter basin ID.
+    #   * `:category` (`String`) — The type of storm according to the Saffir-Simpson scale.
+    #   * `:time` (`Time`) — The time the storm is recorded to start or have started using the local timezone for this
+    #   location.
+    #   * `:wind_speed_mph` (`Integer`) — The speed of the wind in this storm in miles per hour.
+    #   * `:wind_speed_kts` (`Integer`) — The speed of the wind in this storm in knots.
+    #   * `:wind_speed_kph` (`Integer`) — The speed of the wind in this storm in kilometers per hour.
+    #   * `:gust_speed_mph` (`Integer`) — The speed of the gusts of wind in this storm in miles per hour.
+    #   * `:gust_speed_kts` (`Integer`) — The speed of the gusts of wind in this storm in knots.
+    #   * `:gust_speed_kph` (`Integer`) — The speed of the gusts of wind in this storm in kilometers per hour.
     def hurricane_data
-      response = get('currenthurricane', 'view')
+      begin
+        response = get('currenthurricane', 'view')
+      rescue Weatheruby::WeatherError => e
+        # For some reason the API always errors with this when getting current hurricane data.
+        fail e unless e.message.start_with?('querynotfound')
+        response = e.full_response
+      end
+      p response
 
       ret = {}
       response['currenthurricane'].each do |h|
@@ -113,7 +196,7 @@ module Weather
           name: h['stormInfo']['stormName'],
           number: h['stormInfo']['stormNumber'],
           category: h['Current']['Category'],
-          time: h['Current']['Time']['pretty'],
+          time: Time.parse(h['Current']['Time']['pretty']),
           wind_speed_mph: h['Current']['WindSpeed']['Mph'],
           wind_speed_kts: h['Current']['WindSpeed']['Kts'],
           wind_speed_kph: h['Current']['WindSpeed']['Kph'],
@@ -139,30 +222,29 @@ module Weather
       parse_simple_forecast(response)
     end
 
-    # Gets more complicated forecast information for the location. Only gets
-    #   the forecast for the next three days.
+    # Gets more complicated forecast information for the location. Only gets the forecast for the next three days.
     # @param location [String] The place to get the forecast for.
-    # @return [Hash] A hash containing hashes of information. Sub-hashes are
-    #   named as their "period", or the day in relation to the current day.
-    #   For example: 0 is today, 1 is tomorrow, etc. It does not organize itself
-    #   by weekday. Unlike simple_forecast, you do not get very many strings in
-    #   this method.
+    # @return [Hash] A hash containing hashes of information. Sub-hashes are named as their "period", or the day in
+    #   relation to the current day. For example: 0 is today, 1 is tomorrow, etc. It does not organize itself by
+    #   weekday. Unlike simple_forecast, you do not get very many strings in this method.
     def complex_forecast(location)
       response = get('forecast', location)
 
       parse_complex_forecast(response)
     end
 
-    # Exactly the same as #simple_forecast, except that it gets the data for
-    #   10 days.
+    # Exactly the same as {#simple_forecast}, except that it gets the data for 10 days.
+    # @param (see #simple_forecast)
+    # @return (see #simple_forecast)
     def simple_forecast_10day(location)
       response = get('forecast10day', location)
 
       parse_simple_forecast(response)
     end
 
-    # Exactly the same as #complex_forecast, except that it gets the data for
-    #   10 days.
+    # Exactly the same as {#complex_forecast}, except that it gets the data for 10 days.
+    # @param (see #complex_forecast)
+    # @return (see #complex_forecast)
     def complex_forecast_10day(location)
       response = get('forecast10day', location)
 
@@ -179,7 +261,8 @@ module Weather
         ret[f['period']] = {
           weekday_name: f['title'],
           text: f['fcttext'],
-          text_metric: f['fcttext_metric']
+          text_metric: f['fcttext_metric'],
+          image_url: f['icon_url']
         }
       end
 
@@ -191,12 +274,16 @@ module Weather
       ret = {}
 
       response['forecast']['simpleforecast']['forecastday'].each do |f|
+        date = f['date']
         ret[f['period'] - 1] = {
+          date: DateTime.new(date['year'], date['month'], date['day'], date['hour'], date['min'].to_i, date['sec'], date['tz_short']),
+          weekday_name: date['weekday'],
           high_f: f['high']['fahrenheit'].to_i,
           high_c: f['high']['celsius'].to_i,
           low_f: f['low']['fahrenheit'].to_i,
           low_c: f['low']['celsius'].to_i,
           conditions: f['conditions'].to_i,
+          image_url: f['icon_url'],
           snow: {
             snow_total_in: f['snow_allday']['in'],
             snow_total_cm: f['snow_allday']['cm'],

data/lib/weather/planner.rb

@@ -1,122 +1,140 @@
 module Weather
   module Planner
     # Gets the chance of snow within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_snow(start_date, end_date, location)
       get_chance_of('chanceofsnowday', start_date, end_date, location)
     end
 
     # Gets the chance of hail within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_hail(start_date, end_date, location)
       get_chance_of('chanceofhailday', start_date, end_date, location)
     end
 
     # Gets the chance of temperatures above 0 C/32 F within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_not_freezing(start_date, end_date, location)
       get_chance_of('tempoverfreezing', start_date, end_date, location)
     end
 
     # Gets the chance of temperatures below 0 C/32 F within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_freezing(start_date, end_date, location)
       get_chance_of('tempbelowfreezing', start_date, end_date, location)
     end
 
     # Gets chance of sultry within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_sultry(start_date, end_date, location)
       get_chance_of('chanceofsultryday', start_date, end_date, location)
     end
 
     # Gets the chance of a tornado within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_tornado(start_date, end_date, location)
       get_chance_of('chanceoftornadoday', start_date, end_date, location)
     end
 
     # Gets the chance of snow on the ground within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_groundsnow(start_date, end_date, location)
       get_chance_of('chanceofsnowonground', start_date, end_date, location)
     end
 
     # Gets the chance of thunderstorms within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_thunderstorms(start_date, end_date, location)
       get_chance_of('chanceofthunderday', start_date, end_date, location)
     end
 
     # Gets the chance of temperatures above 32.2 C/90 F within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_heat(start_date, end_date, location)
       get_chance_of('tempoverninety', start_date, end_date, location)
     end
 
     # Gets the chance of rain within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_rain(start_date, end_date, location)
       get_chance_of('chanceofrainday', start_date, end_date, location)
     end
 
     # Gets the chance of precipitation within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_precipitation(start_date, end_date, location)
       get_chance_of('chanceofprecip', start_date, end_date, location)
     end
 
     # Gets the chance of humidity within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_humid(start_date, end_date, location)
       get_chance_of('chanceofhumidday', start_date, end_date, location)
     end
 
     # Gets the chance of fog within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_fog(start_date, end_date, location)
       get_chance_of('chanceoffogday', start_date, end_date, location)
     end
 
     # Gets the chance of cloudy conditions within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_cloudy(start_date, end_date, location)
       get_chance_of('chanceofcloudyday', start_date, end_date, location)
     end
 
     # Gets the chance of sunshine within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_sunny(start_date, end_date, location)
       get_chance_of('chanceofsunnycloudyday', start_date, end_date, location)
     end
 
     # Gets the chance of partially cloudy conditions within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_partlycloudy(start_date, end_date, location)
       get_chance_of('chanceofpartlycloudyday', start_date, end_date, location)
     end
 
     # Gets the chance of high winds within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_high_wind(start_date, end_date, location)
       get_chance_of('chanceofwindyday', start_date, end_date, location)
     end
 
     # Gets the chance of a temperature of 15.5 C/60 F within the date range.
-    # @see #get_planner_response
+    # @param (see #get_planner_response)
+    # @return (see #get_chance_of)
     def chance_of_warmth(start_date, end_date, location)
       get_chance_of('tempoversixty', start_date, end_date, location)
     end
 
     # Gets the dewpoint highs and lows for the date range.
-    # @see #get_planner_response
-    # @return [Hash] Highs and lows minimum, average, and maximum for both
+    # @param (see #get_planner_response)
+    # @return [Hash<Symbol, Hash<Symbol, Hash<Symbol, Integer>>>] Highs and lows minimum, average, and maximum for both
     #   metric and imperial systems.
     # @return [String] The error if possible.
+    # @todo Raise an error instead of returning a String.
     def get_dewpoints(start_date, end_date, location)
       response = get_planner_response(start_date, end_date, location)
-      return response['response']['error'] unless
-      response['response']['error'].nil?
+      return response['response']['error'] unless response['response']['error'].nil?
       highs = response['trip']['dewpoint_high']
       lows = response['trip']['dewpoint_low']
 
@@ -150,9 +168,10 @@ module Weather
 
     # Gets the precipitation amounts (not chance) for the date range.
     # @see #get_planner_response
-    # @return [Hash] Minimum, maximum, and average precipitation quantities for
+    # @return [Hash<Symbol, Hash<Symbol, Integer>>] Minimum, maximum, and average precipitation quantities for
     #   the location in both inches and centimeters.
     # @return [String] The error if possible.
+    # @todo Raise an error instead of returning a String.
     def get_precipitation(start_date, end_date, location)
       response = get_planner_response(start_date, end_date, location)
       return response['response']['error'] unless
@@ -179,7 +198,7 @@ module Weather
 
     # Gets the highs and lows for the date range.
     # @see #get_planner_response
-    # @return [Hash] Highs and lows minimum, average, and maximum for both
+    # @return [Hash<Symbol, Hash<Symbol, Hash<Symbol, Integer>>>] Highs and lows minimum, average, and maximum for both
     #   metric and imperial systems.
     def get_temperatures(start_date, end_date, location)
       response = get_planner_response(start_date, end_date, location)
@@ -217,25 +236,20 @@ module Weather
     private
 
     # Gets the full planner API response.
-    # @param start_date [DateTime] The date to start at. Only month and day
-    # actually matter.
-    # @param end_date [DateTime] The date to end at. Only month and day actually
-    # matter.
+    # @param start_date [DateTime] The date to start at. Only month and day actually matter.
+    # @param end_date [DateTime] The date to end at. Only month and day actually matter.
     # @param location [String] The location to get the planner data for.
     # @since 0.5.0
-    # @return [Hash] (see {Weatheruby#get #get})
+    # @return (see Weatheruby#get)
     def get_planner_response(start_date, end_date, location)
       start = start_date.strftime('%m%d')
       final = end_date.strftime('%m%d')
       get("planner_#{start}#{final}", location)
     end
 
-    # Gets the chance of any given string key in the chance_of hash returned by
-    # get_planner_response.
+    # Gets the chance of any given string key in the chance_of hash returned by {#get_planner_response}.
     # @param subject [String] The chance_of hash's key.
-    # @param start_date [DateTime] (see {#get_planner_response})
-    # @param end_date [DateTime] (see {#get_planner_response})
-    # @param location [String] (see {#get_planner_response})
+    # @param (see #get_planner_response)
     # @since 0.5.0
     # @return [Integer] The chance of the subject happening.
     def get_chance_of(subject, start_date, end_date, location)

data/lib/weatheruby.rb

@@ -3,8 +3,22 @@ require 'json'
 require_relative 'weather/actions'
 require_relative 'weather/planner'
 
+# @todo Return proper objects instead of ugly hashes throughout the library
 class Weatheruby
-  class WeatherError < StandardError; end
+  class WeatherError < StandardError
+    # @return [Hash] The full parsed HTTP response
+    attr_reader :full_response
+
+    def initialize(json, type, description)
+      @full_response = json
+      @type = type
+      @description = description
+    end
+
+    def message
+      "#{@type}: #{@description}"
+    end
+  end
 
   include Weather::Actions
   include Weather::Planner
@@ -25,29 +39,25 @@ class Weatheruby
     @client = HTTPClient.new
   end
 
+  private
+
   # Performs a generic HTTP GET request. This method should generally not be used by a standard user, unless there is
   # not a method for a particular action/feature.
   # @param feature [String] The "feature" parameter defined by Wunderground.
   # @param location [String] The location of the query.
-  # @param autoparse [Boolean] Whether to automatically parse the response.
-  # @return [Hash/HTTPMessage] Parsed JSON if autoparse is true, or raw response if not.
-  # @raise WeatherError if anything goes wrong with the API, or it returns too many results for us to handle.
-  def get(feature, location, autoparse = true)
-    url = "http://api.wunderground.com/api/#{@api_key}/#{feature}/lang:" \
-          "#{@language_key}/pws:#{@use_pws}/bestfct:#{@use_bestfct}/q/" \
-          "#{location}.json"
-    url = URI.encode(url)
-    uri = URI.parse(url)
-    res = @client.get(uri)
-    json = JSON.parse(res.body)
+  # @return [Hash] Parsed JSON response
+  # @raise [WeatherError] If anything goes wrong with the API, or it returns too many results for us to handle.
+  def get(feature, location)
+    url = "http://api.wunderground.com/api/#{@api_key}/#{feature}/lang:#{@language_key}/pws:#{@use_pws}/bestfct:#{@use_bestfct}/q/#{location}.json"
+    json = JSON.parse(@client.get(URI.parse(URI.encode(url))).body)
     if json['response'].key?('error')
-      fail(WeatherError, json['response']['error']['type'] + ': ' + json['response']['error']['description'].capitalize)
+      error = json['response']['error']
+      fail(WeatherError.new(json, error['type'], error['description'].capitalize))
     end
     if json['response'].key?('results')
-      fail(WeatherError, 'toomanyresults: Too many results were returned. Try narrowing your search.')
+      fail(WeatherError.new(json, 'toomanyresults', 'Too many results were returned. Try narrowing your search.'))
     end
 
-
-    autoparse ? json : res
+    json
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weatheruby
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Eli Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for accessing the Weather Underground API.