weather-api 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d6e46994f572ac298e6ad32d292a6bce10f0cf85
+  data.tar.gz: 1d3c9f8ffc9e794194b0ac42c070aa7dd56c6249
+SHA512:
+  metadata.gz: 3f3011c676656e65dbc112325118f507bc9238020c10216068a20beebbca0e4bb11e6f674d1e8702c68068e2428380d4fb9f1cee70126549d71ac92100a0593a
+  data.tar.gz: d198fc6e28090b34bbb948440587a2ed073b3d28445676e88e18fb93dede73e7bf6778949a1ff7c728e265dcb9c80080461f2add517b60e18814424134f02f45

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
- - 1.8.7
  - 1.9.2
  - 1.9.3
+ - 2.0.0

data/Gemfile

@@ -1,9 +1,3 @@
-source :rubygems
-
-# Give guard growl notifications, if on OS X
-if RUBY_PLATFORM =~ /darwin/i
-  gem "rb-fsevent", :require => false
-  gem "ruby_gntp", :require => false
-end
+source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -8,7 +8,8 @@ A Ruby wrapper for the Yahoo! Weather XML RSS feed.
 
 ## Description
 
-Weather-API provides an object-oriented interface to the Yahoo! Weather XML RSS feed service.
+Weather-API provides an object-oriented interface to the Yahoo! Weather XML RSS
+feed service.
 
 Details on the service can be found [here](http://developer.yahoo.com/weather).
 
@@ -19,11 +20,9 @@ A simple example:
     require 'rubygems'
     require 'weather-api'
 
-    client = Weather::API.new
-
     # look up WOEID via http://weather.yahoo.com; enter location by city
     # name or zip and WOEID is at end of resulting page url.
-    response = client.lookup(9830)
+    response = Weather.lookup(9830)
 
     print <<EOT
     #{response.title}

data/Rakefile

@@ -8,5 +8,5 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Open an irb session preloaded with this library'
 task :console do
-  sh 'pry -Ilib -rweather-api'
+  sh 'irb -Ilib -rweather-api'
 end

data/lib/weather-api.rb

@@ -1,37 +1,59 @@
 require 'net/http'
-require 'nokogiri'
+require 'json'
+require 'map'
+
+require 'weather-api/astronomy'
+require 'weather-api/atmosphere'
+require 'weather-api/condition'
+require 'weather-api/forecast'
+require 'weather-api/image'
+require 'weather-api/location'
+require 'weather-api/response'
+require 'weather-api/units'
+require 'weather-api/utils'
+require 'weather-api/version'
+require 'weather-api/wind'
 
 module Weather
   class << self
+    # Yahoo! Weather info endpoint
+    ROOT = "http://query.yahooapis.com/v1/public/yql"
 
-    # Alias for Weather::API.new
+    # Public: Looks up current weather information using WOEID
     #
-    # Returns a Weather::API object
-    def new
-      Weather::API.new
-    end
+    # woeid - Int - Where On Earth IDentifier -- unique ID for
+    #         location to get weather data for. To find
+    #         a WOEID, refer to Yahoo!'s documentation
+    #         at http://developer.yahoo.com/weather/
+    #
+    # units - String - whether to retrieve data in Farenheit
+    #         or Celsius. Defaults to Farenheit
+    #
+    # Returns a Weather::Response object containing forecast
+    def lookup woeid, units = 'f'
+      url = ROOT
+      url += "?q=select%20*%20from%20weather.forecast%20"
+      url += "where%20woeid%3D#{woeid}%20and%20u%3D'#{units}'&format=json"
 
-    # Delegate to Weather::API
-    def method_missing(method, *args, &block)
-      return super unless new.respond_to?(method)
-      new.send(method, *args, &block)
+      doc = get_response url
+      Response.new woeid, url, doc
     end
 
-    def respond_to?(method, include_private=false)
-      new.respond_to?(method, include_private) || super(method, include_private)
+    private
+    def get_response url
+      begin
+        response = Net::HTTP.get_response(URI.parse url).body.to_s
+      rescue => e
+        raise "Failed to get weather [url=#{url}, e=#{e}]."
+      end
+
+      response = Map.new(JSON.parse(response))[:query][:results][:channel]
+
+      if response.nil?
+        raise "Failed to get weather [url=#{url}]."
+      end
+
+      response
     end
   end
-
-  autoload :API,        'weather-api/api'
-  autoload :Astronomy,  'weather-api/astronomy'
-  autoload :Atmosphere, 'weather-api/atmosphere'
-  autoload :Condition,  'weather-api/condition'
-  autoload :Forecast,   'weather-api/forecast'
-  autoload :Image,      'weather-api/image'
-  autoload :Location,   'weather-api/location'
-  autoload :Response,   'weather-api/response'
-  autoload :Units,      'weather-api/units'
-  autoload :Utils,      'weather-api/utils'
-  autoload :Version,    'weather-api/version'
-  autoload :Wind,       'weather-api/wind'
 end

data/lib/weather-api/astronomy.rb

@@ -6,9 +6,9 @@ module Weather
     # a Time object containing the sunset time for a location
     attr_reader :sunset
 
-    def initialize(payload)
-      @sunrise = Weather::Utils.parse_time payload['sunrise']
-      @sunset  = Weather::Utils.parse_time payload['sunset']
+    def initialize payload
+      @sunrise = Utils.parse_time payload[:sunrise]
+      @sunset = Utils.parse_time payload[:sunset]
     end
   end
 end

data/lib/weather-api/atmosphere.rb

@@ -23,14 +23,14 @@ module Weather
     attr_reader :barometer
 
     def initialize(payload)
-      @humidity   = payload['humidity'].to_i
-      @visibility = payload['visibility'].to_i
-      @pressure   = payload['pressure'].to_f
+      @humidity   = payload[:humidity].to_i
+      @visibility = payload[:visibility].to_i
+      @pressure   = payload[:pressure].to_f
 
       # map barometric pressure to appropriate constant
       @barometer = nil
 
-      case payload['rising'].to_i
+      case payload[:rising].to_i
         when 0 then @barometer = Barometer::STEADY
         when 1 then @barometer = Barometer::RISING
         when 2 then @barometer = Barometer::FALLING

data/lib/weather-api/condition.rb

@@ -12,11 +12,11 @@ module Weather
     # the brief prose text description of the weather conditions of the location.
     attr_reader :text
 
-    def initialize(payload)
-      @code = payload['code'].to_i
-      @date = Weather::Utils.parse_time(payload['date'])
-      @temp = payload['temp'].to_i
-      @text = payload['text']
+    def initialize payload
+      @code = payload[:code].to_i
+      @date = Utils.parse_time payload[:date]
+      @temp = payload[:temp].to_i
+      @text = payload[:text]
     end
   end
 end

data/lib/weather-api/forecast.rb

@@ -18,13 +18,13 @@ module Weather
     # the weather condition code, detailed at http://developer.yahoo.com/weather
     attr_reader :code
 
-    def initialize(payload)
-      @day  = payload['day']
-      @date = Weather::Utils.parse_time(payload['date'])
-      @low  = payload['low'].to_i
-      @high = payload['high'].to_i
-      @text = payload['text']
-      @code = payload['code'].to_i
+    def initialize payload
+      @day  = payload[:day]
+      @date = Utils.parse_time payload[:date]
+      @low  = payload[:low].to_i
+      @high = payload[:high].to_i
+      @text = payload[:text]
+      @code = payload[:code].to_i
     end
   end
 end

data/lib/weather-api/image.rb

@@ -1,26 +1,10 @@
 module Weather
   class Image
-    # the image height in pixels
-    attr_reader :height
-
-    # the image width in pixels
-    attr_reader :width
-
     # the full URL to the image
     attr_reader :url
 
-    # the link to the Yahoo! Weather home page
-    attr_reader :link
-
-    # the title of the image
-    attr_reader :title
-
-    def initialize(payload)
-      @height = payload.xpath('height').first.content.to_i
-      @width  = payload.xpath('width').first.content.to_i
-      @url    = payload.xpath('url').first.content
-      @link   = payload.xpath('link').first.content
-      @title  = payload.xpath('title').first.content
+    def initialize payload
+      @url = payload.scan(/src=\"(.*)\"/).flatten.first
     end
   end
 end

data/lib/weather-api/location.rb

@@ -9,10 +9,10 @@ module Weather
     # name of the region, such as a state or province
     attr_reader :region
 
-    def initialize(payload)
-      @city    = payload['city']
-      @country = payload['country']
-      @region  = payload['region']
+    def initialize payload
+      @city = payload[:city]
+      @country = payload[:country]
+      @region = payload[:region]
     end
   end
 end

data/lib/weather-api/response.rb

@@ -52,34 +52,30 @@ module Weather
     # the title of the weather information for the requested location
     attr_reader :title
 
-    def initialize(request_location, request_url, doc)
+    def initialize request_location, request_url, doc
       # save the request params
       @request_location = request_location
       @request_url      = request_url
 
-      # parse the xml element to get response data
-      root = doc.xpath('/rss/channel').first
+      @astronomy  = Astronomy.new doc[:astronomy]
+      @location   = Location.new doc[:location]
+      @units      = Units.new doc[:units]
+      @wind       = Wind.new doc[:wind]
+      @atmosphere = Atmosphere.new doc[:atmosphere]
+      @image      = Image.new doc[:item][:description]
 
-      @astronomy  = Weather::Astronomy.new(root.xpath('yweather:astronomy').first)
-      @location   = Weather::Location.new(root.xpath('yweather:location').first)
-      @units      = Weather::Units.new(root.xpath('yweather:units').first)
-      @wind       = Weather::Wind.new(root.xpath('yweather:wind').first)
-      @atmosphere = Weather::Atmosphere.new(root.xpath('yweather:atmosphere').first)
-      @image      = Weather::Image.new(root.xpath('image').first)
-
-      item = root.xpath('item').first
       @forecasts = []
 
-      @condition  = Weather::Condition.new(item.xpath('yweather:condition').first)
+      @condition  = Condition.new doc[:item][:condition]
 
-      item.xpath('yweather:forecast').each do |forecast|
-        @forecasts << Weather::Forecast.new(forecast)
+      doc[:item][:forecast].each do |forecast|
+        @forecasts << Forecast.new(forecast)
       end
 
-      @latitude    = item.xpath('geo:lat').first.content.to_f
-      @longitude   = item.xpath('geo:long').first.content.to_f
-      @title       = item.xpath('title').first.content
-      @description = item.xpath('description').first.content
+      @latitude    = doc[:item][:lat].to_f
+      @longitude   = doc[:item][:long].to_f
+      @title       = doc[:item][:title]
+      @description = doc[:item][:description]
     end
   end
 end

data/lib/weather-api/units.rb

@@ -19,11 +19,11 @@ module Weather
     # e.g. mph for miles per hour, and kph for kilometers per hour
     attr_reader :speed
 
-    def initialize(payload)
-      @temperature = payload['temperature']
-      @distance    = payload['distance']
-      @pressure    = payload['pressure']
-      @speed       = payload['speed']
+    def initialize payload
+      @temperature = payload[:temperature]
+      @distance = payload[:distance]
+      @pressure = payload[:pressure]
+      @speed = payload[:speed]
     end
   end
 end

data/lib/weather-api/utils.rb

@@ -6,15 +6,15 @@ module Weather
     # Attempts to convert passed text into a Time object
     #
     # Returns a Time object or nil
-    def self.parse_time(text = '')
+    def self.parse_time text = ''
       if text == ''
         return nil
       end
 
       begin
-        Time.parse(text)
+        Time.parse text
       rescue ArgumentError
-        Chronic.parse(text)
+        Chronic.parse text
       end
     end
   end

data/lib/weather-api/version.rb

@@ -12,14 +12,14 @@ module Weather
     #
     # Returns an int
     def self.minor
-      0
+      1
     end
 
     # The current patch version number
     #
     # Returns an int
     def self.patch
-      1
+      0
     end
 
     # The current pre version number

data/lib/weather-api/wind.rb

@@ -9,10 +9,10 @@ module Weather
     # the windspeed
     attr_reader :speed
 
-    def initialize(payload)
-      @chill     = payload['chill'].to_i
-      @direction = payload['direction'].to_i
-      @speed     = payload['speed'].to_i
+    def initialize payload
+      @chill = payload[:chill].to_i
+      @direction = payload[:direction].to_i
+      @speed = payload[:speed].to_i
     end
   end
 end

data/spec/fixtures/cassettes/Weather_Astronomy/should_contain_Time_objects_for_sunrise_and_sunset.yml

@@ -0,0 +1,62 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://query.yahooapis.com/v1/public/yql?format=json&q=select%20*%20from%20weather.forecast%20where%20woeid=9848%20and%20u='f'
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      Host:
+      - query.yahooapis.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Yql-Host:
+      - engine1.yql.ne1.yahoo.com
+      Access-Control-Allow-Origin:
+      - '*'
+      Cache-Control:
+      - public, max-age=3600
+      Content-Type:
+      - application/json;charset=utf-8
+      Vary:
+      - Accept-Encoding
+      Date:
+      - Fri, 29 Mar 2013 06:53:56 GMT
+      Server:
+      - YTS/1.20.13
+      Age:
+      - '1309'
+      Content-Length:
+      - '880'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"query":{"count":1,"created":"2013-03-29T06:53:57Z","lang":"en-US","results":{"channel":{"title":"Yahoo!
+        Weather - Victoria, CA","link":"http://us.rd.yahoo.com/dailynews/rss/weather/Victoria__CA/*http://weather.yahoo.com/forecast/CAXX0523_f.html","description":"Yahoo!
+        Weather for Victoria, CA","language":"en-us","lastBuildDate":"Thu, 28 Mar
+        2013 8:59 pm PDT","ttl":"60","location":{"city":"Victoria","country":"Canada","region":"BC"},"units":{"distance":"mi","pressure":"in","speed":"mph","temperature":"F"},"wind":{"chill":"46","direction":"230","speed":"5"},"atmosphere":{"humidity":"82","pressure":"30.11","rising":"1","visibility":""},"astronomy":{"sunrise":"6:59
+        am","sunset":"7:36 pm"},"image":{"title":"Yahoo! Weather","width":"142","height":"18","link":"http://weather.yahoo.com","url":"http://l.yimg.com/a/i/brand/purplelogo//uh/us/news-wea.gif"},"item":{"title":"Conditions
+        for Victoria, CA at 8:59 pm PDT","lat":"48.43","long":"-123.36","link":"http://us.rd.yahoo.com/dailynews/rss/weather/Victoria__CA/*http://weather.yahoo.com/forecast/CAXX0523_f.html","pubDate":"Thu,
+        28 Mar 2013 8:59 pm PDT","condition":{"code":"29","date":"Thu, 28 Mar 2013
+        8:59 pm PDT","temp":"48","text":"Partly Cloudy"},"description":"\n<img src=\"http://l.yimg.com/a/i/us/we/52/29.gif\"/><br
+        />\n<b>Current Conditions:</b><br />\nPartly Cloudy, 48 F<BR />\n<BR /><b>Forecast:</b><BR
+        />\nThu - Clear. High: 55 Low: 43<br />\nFri - AM Clouds/PM Sun. High: 55
+        Low: 44<br />\n<br />\n<a href=\"http://us.rd.yahoo.com/dailynews/rss/weather/Victoria__CA/*http://weather.yahoo.com/forecast/CAXX0523_f.html\">Full
+        Forecast at Yahoo! Weather</a><BR/><BR/>\n(provided by <a href=\"http://www.weather.com\"
+        >The Weather Channel</a>)<br/>\n","forecast":[{"code":"31","date":"28 Mar
+        2013","day":"Thu","high":"55","low":"43","text":"Clear"},{"code":"30","date":"29
+        Mar 2013","day":"Fri","high":"55","low":"44","text":"AM Clouds/PM Sun"}],"guid":{"isPermaLink":"false","content":"CAXX0523_2013_03_29_7_00_PDT"}}}}}}'
+    http_version: 
+  recorded_at: Fri, 29 Mar 2013 07:15:45 GMT
+recorded_with: VCR 2.4.0