barometer 0.8.0 → 0.9.0

data/lib/barometer/weather_services/wunderground_v1/response/sun.rb

@@ -0,0 +1,53 @@
+module Barometer
+  module WeatherService
+    class WundergroundV1
+      class Response
+        class Sun
+          def initialize(payload, timezone, response)
+            @payload = payload
+            @timezone = timezone
+            @response = response
+          end
+
+          def parse
+            Data::Sun.new(rise: utc_rise_time, set: utc_set_time)
+          end
+
+          private
+
+          attr_reader :payload, :timezone, :response
+
+          def utc_rise_time
+            return unless response.current
+            Utils::Time.utc_from_base_plus_local_time(
+              timezone, response.current.observed_at, rise_hour, rise_min
+            )
+          end
+
+          def utc_set_time
+            return unless response.current
+            Utils::Time.utc_from_base_plus_local_time(
+              timezone, response.current.observed_at, set_hour, set_min
+            )
+          end
+
+          def rise_hour
+            payload.fetch('moon_phase', 'sunrise', 'hour')
+          end
+
+          def rise_min
+            payload.fetch('moon_phase', 'sunrise', 'minute')
+          end
+
+          def set_hour
+            payload.fetch('moon_phase', 'sunset', 'hour')
+          end
+
+          def set_min
+            payload.fetch('moon_phase', 'sunset', 'minute')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/barometer/weather_services/wunderground_v1/response/timezone.rb

@@ -0,0 +1,15 @@
+module Barometer
+  module WeatherService
+    class WundergroundV1
+      class Response
+        class TimeZone < WeatherService::Response::TimeZone
+          private
+
+          def time_zone
+            payload.using(/ (\w*)$/).fetch('local_time')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/barometer/weather_services/yahoo.rb

@@ -1,209 +1,27 @@
-module Barometer
-  #
-  # = Yahoo! Weather
-  # www.yahoo.com
-  #
-  # - key required: NO
-  # - registration required: NO
-  # - supported countries: US (by zipcode), International (by Yahoo Location ID)
-  #
-  # === performs geo coding
-  # - city: YES
-  # - coordinates: YES
-  #
-  # === time info
-  # - sun rise/set: YES (today only)
-  # - provides timezone: PARTIAL (just short code)
-  # - requires TZInfo: NO
-  #
-  # == resources
-  # - API: http://developer.yahoo.com/weather/
-  #
-  # === Possible queries:
-  # - http://weather.yahooapis.com/forecastrss?p=94089
-  # - http://weather.yahooapis.com/forecastrss?p=USCA1116
-  # - http://weather.yahooapis.com/forecastrss?p=FRXX0076&u=c
-  #
-  # where query can be:
-  # - zipcode (US)
-  # - Yahoo! Location ID [actually weather.com id] (International)
-  # - Yahoo! 'Where on Earth ID [WOEID] (International)
-  #
-  # = Yahoo! terms of use
-  # The feeds are provided free of charge for use by individuals and non-profit
-  # organizations for personal, non-commercial uses. We ask that you provide
-  # attribution to Yahoo! Weather in connection with your use of the feeds.
-  # If you provide this attribution in text, please use: "Yahoo! Weather." If you
-  # provide this attribution with a graphic, please use the Yahoo! Weather logo that
-  # we have included in the feed itself.
-  # We reserve all rights in and to the Yahoo! Weather logo, and your right to use
-  # the Yahoo! Weather logo is limited to providing attribution in connection with
-  # these RSS feeds. Yahoo! also reserves the right to require you to cease
-  # distributing these feeds at any time for any reason.
-  #
-  # == notes
-  # - the Yahoo! Location ID is a propreitary number (shared with weather.com)
-  # - the Yahoo! WOEID is only used by Yahoo!, and is a 32-bit number. Unfortunately
-  #   this number confilcts with US Zipcodes (ie the zipcode=90210 and the
-  #   WOEID=90210 cannot be destinguished and do not mean the same thing).  To
-  #   solve this, any 5 digit number will be dtected as a ZIPCODE.  To have a
-  #   5 digit query be detected as a WOEID, prepend it with a 'w' (ie: w90210).
-  #
-  class WeatherService::Yahoo < WeatherService
-
-    #########################################################################
-    # PRIVATE
-    # If class methods could be private, the remaining methods would be.
-    #
-
-    def self._source_name; :yahoo; end
-    def self._accepted_formats; [:zipcode, :weather_id, :woe_id]; end
-
-    def self._wet_icon_codes
-      codes = [1] + (3..18).to_a + [35] + (37..43).to_a + (45..47).to_a
-      codes.collect {|c| c.to_s}
-    end
-    def self._sunny_icon_codes
-      codes = (29..34).to_a + [36]
-      codes.collect {|c| c.to_s}
-    end
-
-   def self._build_extra(measurement, result, metric=true)
-     #raise ArgumentError unless measurement.is_a?(Data::Measurement)
-     #raise ArgumentError unless query.is_a?(Barometer::Query)
-
-     # use todays sun data for all future days
-     if measurement.forecast && measurement.current.sun
-       measurement.forecast.each do |forecast|
-         forecast.sun = measurement.current.sun
-       end
-     end
-     measurement
-   end
-
-    def self._build_timezone(data)
-      if data && data['item'] && data['item']['pubDate']
-        zone_match = data['item']['pubDate'].match(/ ([A-Z]*)$/)
-        Data::Zone.new(zone_match[1]) if zone_match
-      end
-    end
-
-    def self._build_links(data)
-      links = {}
-      if data["title"] && data["link"]
-        links[data["title"]] = data["link"]
-      end
-      links
-    end
+require_relative 'yahoo/api'
+require_relative 'yahoo/response'
 
-    def self._build_current(data, metric=true)
-      raise ArgumentError unless data.is_a?(Hash)
-      current = Measurement::Result.new(metric)
-      if data
-        if data['item'] && data['item']['condition']
-          condition_result = data['item']['condition']
-          current.updated_at = Data::LocalDateTime.parse(condition_result['date'])
-          current.icon = condition_result['code']
-          current.condition = condition_result['text']
-          current.temperature = Data::Temperature.new(metric)
-          current.temperature << condition_result['temp']
-        end
-        if data['atmosphere']
-          atmosphere_result = data['atmosphere']
-          current.humidity = atmosphere_result['humidity'].to_i
-          current.pressure = Data::Pressure.new(metric)
-          current.pressure << atmosphere_result['pressure']
-          current.visibility = Data::Distance.new(metric)
-          current.visibility << atmosphere_result['visibility']
-        end
-        if data['wind']
-          wind_result = data['wind']
-          current.wind = Data::Speed.new(metric)
-          current.wind << wind_result['speed']
-          current.wind.degrees = wind_result['degrees'].to_f
-          current.wind_chill = Data::Temperature.new(metric)
-          current.wind_chill << wind_result['chill']
-        end
+module Barometer
+  module WeatherService
+    class Yahoo
+      def self.call(query, config={})
+        Yahoo.new(query).measure!
       end
-      current
-    end
-
-    def self._build_forecast(data, metric=true)
-      raise ArgumentError unless data.is_a?(Hash)
-      forecasts = Measurement::ResultArray.new
-
-      if data && data['item'] && data['item']['forecast']
-         forecast_result = data['item']['forecast']
 
-        forecast_result.each do |forecast|
-          forecast_measurement = Measurement::Result.new
-          forecast_measurement.icon = forecast['code']
-          forecast_measurement.date = Date.parse(forecast['date'])
-          forecast_measurement.condition = forecast['text']
-          forecast_measurement.high = Data::Temperature.new(metric)
-          forecast_measurement.high << forecast['high'].to_f
-          forecast_measurement.low = Data::Temperature.new(metric)
-          forecast_measurement.low << forecast['low'].to_f
-          forecasts << forecast_measurement
-        end
+      def initialize(query)
+        @query = query
       end
-      forecasts
-    end
 
-    def self._build_location(data, geo=nil)
-      raise ArgumentError unless data.is_a?(Hash)
-      raise ArgumentError unless (geo.nil? || geo.is_a?(Data::Geo))
-      location = Data::Location.new
-      # use the geocoded data if available, otherwise get data from result
-      if geo
-        location.city = geo.locality
-        location.state_code = geo.region
-        location.country = geo.country
-        location.country_code = geo.country_code
-        location.latitude = geo.latitude
-        location.longitude = geo.longitude
-      else
-        if data && data['location']
-          location.city = data['location']['city']
-          location.state_code = data['location']['region']
-          location.country_code = data['location']['country']
-          if data['item']
-            location.latitude = data['item']['lat']
-            location.longitude = data['item']['long']
-          end
-        end
+      def measure!
+        api = Yahoo::Api.new(query)
+        Yahoo::Response.new.parse(api.get)
       end
-      location
-    end
 
-    def self._build_sun(data)
-      raise ArgumentError unless data.is_a?(Hash)
-      sun = nil
-      if data && data['astronomy'] && data['item']
-        local_rise = Data::LocalTime.parse(data['astronomy']['sunrise'])
-        local_set = Data::LocalTime.parse(data['astronomy']['sunset'])
-        sun = Data::Sun.new(local_rise, local_set)
-      end
-      sun || Data::Sun.new
-    end
+      private
 
-    # use HTTParty to get the current weather
-    def self._fetch(query, metric=true)
-      return unless query
-      puts "fetch yahoo: #{query.q}" if Barometer::debug?
-      options = {
-        :p => query.format == :woe_id ? nil : query.q,
-        :w => query.format == :woe_id ? query.q : nil,
-        :u => (metric ? 'c' : 'f')
-      }.delete_if {|k,v| v.nil? }
-      r = self.get(
-        "http://weather.yahooapis.com/forecastrss",
-        :query => options,
-        :format => :xml,
-        :timeout => Barometer.timeout
-      )
-      r['rss']['channel']
+      attr_reader :query
     end
-
   end
 end
+
+Barometer::WeatherService.register(:yahoo, Barometer::WeatherService::Yahoo)

data/lib/barometer/weather_services/yahoo/api.rb

@@ -0,0 +1,21 @@
+require_relative 'query'
+
+module Barometer
+  module WeatherService
+    class Yahoo
+      class Api < Utils::Api
+        def initialize(query)
+          @query = Yahoo::Query.new(query)
+        end
+
+        def url
+          'http://weather.yahooapis.com/forecastrss'
+        end
+
+        def unwrap_nodes
+          ['rss', 'channel']
+        end
+      end
+    end
+  end
+end

data/lib/barometer/weather_services/yahoo/query.rb

@@ -0,0 +1,42 @@
+require 'delegate'
+
+module Barometer
+  module WeatherService
+    class Yahoo
+      class Query < SimpleDelegator
+        attr_reader :converted_query
+
+        def self.accepted_formats
+          [:zipcode, :weather_id, :woe_id]
+        end
+
+        def initialize(query)
+          super
+          @converted_query = convert_query
+        end
+
+        def to_param
+          {u: unit_type}.merge(format_query)
+        end
+
+        private
+
+        def convert_query
+          convert!(*self.class.accepted_formats)
+        end
+
+        def format_query
+          if converted_query.format == :woe_id
+            { w: converted_query.q }
+          else
+            { p: converted_query.q }
+          end
+        end
+
+        def unit_type
+          converted_query.metric? ? 'c' : 'f'
+        end
+      end
+    end
+  end
+end

data/lib/barometer/weather_services/yahoo/response.rb

@@ -0,0 +1,39 @@
+require_relative 'response/timezone'
+require_relative 'response/location'
+require_relative 'response/current_weather'
+require_relative 'response/forecasted_weather'
+
+module Barometer
+  module WeatherService
+    class Yahoo
+      class Response
+        def initialize
+          @response = Barometer::Response.new
+        end
+
+        def parse(payload)
+          response.add_query(payload.query)
+
+          response.timezone = Yahoo::Response::TimeZone.new(payload).parse
+          response.location = Yahoo::Response::Location.new(payload).parse
+          response.current = Yahoo::Response::CurrentWeather.new(payload, timezone).parse
+          response.forecast = Yahoo::Response::ForecastedWeather.new(payload, timezone, current_sun).parse
+
+          response
+        end
+
+        private
+
+        attr_reader :response
+
+        def timezone
+          response.timezone
+        end
+
+        def current_sun
+          response.current.sun
+        end
+      end
+    end
+  end
+end

data/lib/barometer/weather_services/yahoo/response/current_weather.rb

@@ -0,0 +1,86 @@
+require_relative 'sun'
+require 'ostruct'
+
+module Barometer
+  module WeatherService
+    class Yahoo
+      class Response
+        class CurrentWeather
+          def initialize(payload, timezone)
+            @payload = payload
+            @timezone = timezone
+            @current = Barometer::Response::Current.new # needs query or metric
+          end
+
+          def parse
+            current.observed_at = observed_at, '%a, %d %b %Y %l:%M %P %Z'
+            current.stale_at = stale_at
+            current.condition = condition
+            current.icon = icon
+            current.temperature = temperature
+            current.humidity = humidity
+            current.pressure = pressure
+            current.visibility = visibility
+            current.wind_chill = wind_chill
+            current.wind = wind
+            current.sun = Yahoo::Response::Sun.new(payload, base_time).parse
+
+            current
+          end
+
+          private
+
+          attr_reader :payload, :timezone, :current
+
+          def units
+            payload.units
+          end
+
+          def base_time
+            OpenStruct.new(timezone: timezone, base: current.observed_at)
+          end
+
+          def observed_at
+            payload.fetch('item', 'pubDate')
+          end
+
+          def stale_at
+            (current.observed_at + (60 * 60 * 1)) if current.observed_at
+          end
+
+          def condition
+            payload.fetch('item', 'condition', '@text')
+          end
+
+          def icon
+            payload.fetch('item', 'condition', '@code')
+          end
+
+          def temperature
+            [units, payload.fetch('item', 'condition', '@temp')]
+          end
+
+          def humidity
+            payload.fetch('atmosphere', '@humidity')
+          end
+
+          def pressure
+            [units, payload.fetch('atmosphere', '@pressure')]
+          end
+
+          def visibility
+            [units, payload.fetch('atmosphere', '@visibility')]
+          end
+
+          def wind_chill
+            [units, payload.fetch('wind', '@chill')]
+          end
+
+          def wind
+            [units, payload.fetch('wind', '@speed'), payload.fetch('wind', '@direction').to_f]
+          end
+        end
+      end
+    end
+  end
+end