barometer 0.9.2 → 0.9.3

data/README.md

@@ -86,7 +86,7 @@ The current available sources are:
 * Yahoo! Weather (:yahoo)
 * WeatherBug.com (:weather_bug) [requires key]
 * NOAA (:noaa)
-* Forecast.io (:forecast_io) [requires key]
+* Forecast.io (:forecast_io) [requires key + [barometer-forecast_io gem](https://github.com/attack/barometer-forecast_io)]
 
 ### Source Configuration
 

data/barometer.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'vcr'
+  s.add_development_dependency 'barometer-support'
 end

data/lib/barometer/query/base.rb

@@ -6,7 +6,6 @@ module Barometer
       def initialize(query, units=:metric)
         @q = query.dup
         @units = units
-        @geo = Data::Geo.new
         detect_format
         freeze_query
         @conversions = {}

data/lib/barometer/version.rb

@@ -1,3 +1,3 @@
 module Barometer
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/lib/barometer/weather_service.rb

@@ -38,4 +38,3 @@ require_relative 'weather_services/wunderground_v1'
 require_relative 'weather_services/yahoo'
 require_relative 'weather_services/weather_bug'
 require_relative 'weather_services/noaa'
-require_relative 'weather_services/forecast_io'

data/spec/spec_helper.rb

@@ -6,11 +6,10 @@ require 'cgi'
 require 'pry'
 require 'vcr'
 require 'webmock/rspec'
+require 'barometer/support'
 
 require_relative '../lib/barometer'
 
-Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
-
 WEATHERBUG_CODE = Barometer::Support::KeyFileParser.find(:weather_bug, :code) || 'weatherbug'
 FORECAST_IO_APIKEY = Barometer::Support::KeyFileParser.find(:forecast_io, :apikey) || 'forecastio'
 downcased_weatherbug_code = WEATHERBUG_CODE.to_s
@@ -31,6 +30,6 @@ end
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.include Barometer::Support::Matchers
+  config.include Barometer::Support::Factory
 end
-
-include Barometer::Matchers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barometer
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -219,6 +219,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: barometer-support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A multi API consuming weather forecasting superstar.
 email:
 - barometer@attackcorp.com
@@ -323,14 +339,6 @@ files:
 - lib/barometer/weather.rb
 - lib/barometer/weather_service.rb
 - lib/barometer/weather_services/base.rb
-- lib/barometer/weather_services/forecast_io.rb
-- lib/barometer/weather_services/forecast_io/api.rb
-- lib/barometer/weather_services/forecast_io/query.rb
-- lib/barometer/weather_services/forecast_io/response.rb
-- lib/barometer/weather_services/forecast_io/response/current_weather.rb
-- lib/barometer/weather_services/forecast_io/response/forecasted_weather.rb
-- lib/barometer/weather_services/forecast_io/response/location.rb
-- lib/barometer/weather_services/forecast_io/response/timezone.rb
 - lib/barometer/weather_services/noaa.rb
 - lib/barometer/weather_services/noaa/current_api.rb
 - lib/barometer/weather_services/noaa/current_query.rb
@@ -453,13 +461,6 @@ files:
 - spec/response/predicition_spec.rb
 - spec/response/prediction_collection_spec.rb
 - spec/spec_helper.rb
-- spec/support/key_file_parser.rb
-- spec/support/matchers/formats.rb
-- spec/support/matchers/have_data.rb
-- spec/support/matchers/have_field.rb
-- spec/support/matchers/have_forecast.rb
-- spec/support/matchers/path.rb
-- spec/support/query_factory.rb
 - spec/utils/address_spec.rb
 - spec/utils/config_reader_spec.rb
 - spec/utils/get_spec.rb
@@ -469,7 +470,6 @@ files:
 - spec/utils/time_spec.rb
 - spec/utils/versioned_registration_spec.rb
 - spec/weather_services/base_spec.rb
-- spec/weather_services/forecast_io_spec.rb
 - spec/weather_services/noaa/current_response_spec.rb
 - spec/weather_services/noaa/forecast_response_spec.rb
 - spec/weather_services/noaa_spec.rb
@@ -582,13 +582,6 @@ test_files:
 - spec/response/predicition_spec.rb
 - spec/response/prediction_collection_spec.rb
 - spec/spec_helper.rb
-- spec/support/key_file_parser.rb
-- spec/support/matchers/formats.rb
-- spec/support/matchers/have_data.rb
-- spec/support/matchers/have_field.rb
-- spec/support/matchers/have_forecast.rb
-- spec/support/matchers/path.rb
-- spec/support/query_factory.rb
 - spec/utils/address_spec.rb
 - spec/utils/config_reader_spec.rb
 - spec/utils/get_spec.rb
@@ -598,7 +591,6 @@ test_files:
 - spec/utils/time_spec.rb
 - spec/utils/versioned_registration_spec.rb
 - spec/weather_services/base_spec.rb
-- spec/weather_services/forecast_io_spec.rb
 - spec/weather_services/noaa/current_response_spec.rb
 - spec/weather_services/noaa/forecast_response_spec.rb
 - spec/weather_services/noaa_spec.rb

data/lib/barometer/weather_services/forecast_io.rb

@@ -1,36 +0,0 @@
-require_relative 'forecast_io/api'
-require_relative 'forecast_io/response'
-
-module Barometer
-  module WeatherService
-    class ForecastIo
-      def self.call(query, config={})
-        ForecastIo.new(query, config).measure!
-      end
-
-      def initialize(query, config={})
-        @query = query
-        @apikey = config[:keys][:api] if config[:keys]
-      end
-
-      def measure!
-        validate_key!
-
-        api = ForecastIo::Api.new(query, apikey)
-        ForecastIo::Response.new.parse(api.get)
-      end
-
-      private
-
-      attr_reader :query, :apikey
-
-      def validate_key!
-        unless apikey && !apikey.empty?
-          raise KeyRequired
-        end
-      end
-    end
-  end
-end
-
-Barometer::WeatherService.register(:forecast_io, Barometer::WeatherService::ForecastIo)

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

@@ -1,22 +0,0 @@
-require_relative 'query'
-
-module Barometer
-  module WeatherService
-    class ForecastIo
-      class Api < Utils::Api
-        def initialize(query, api_code)
-          @query = ForecastIo::Query.new(query)
-          @api_code = api_code
-        end
-
-        def url
-          "https://api.forecast.io/forecast/#{@api_code}/#{@query.to_param}"
-        end
-
-        def params
-          @query.units_param
-        end
-      end
-    end
-  end
-end

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

@@ -1,38 +0,0 @@
-require 'delegate'
-
-module Barometer
-  module WeatherService
-    class ForecastIo
-      class Query < SimpleDelegator
-        attr_reader :converted_query
-
-        def self.accepted_formats
-          [:coordinates]
-        end
-
-        def initialize(query)
-          super
-          @converted_query = convert_query
-        end
-
-        def to_param
-          @converted_query.q
-        end
-
-        def units_param
-          {units: unit_type}
-        end
-
-        private
-
-        def convert_query
-          convert!(*self.class.accepted_formats)
-        end
-
-        def unit_type
-          converted_query.metric? ? 'si' : 'us'
-        end
-      end
-    end
-  end
-end

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

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

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

@@ -1,78 +0,0 @@
-module Barometer
-  module WeatherService
-    class ForecastIo
-      class Response
-        class CurrentWeather
-          def initialize(payload)
-            @payload = payload
-            @current = Barometer::Response::Current.new
-          end
-
-          def parse
-            current.observed_at = observed_at
-            current.humidity = humidity
-            current.condition = condition
-            current.icon = icon
-            current.temperature = temperature
-            current.dew_point = dew_point
-            current.wind = wind
-            current.pressure = pressure
-            current.visibility = visibility
-
-            current
-          end
-
-          private
-
-          attr_reader :payload, :current
-
-          def units
-            payload.units
-          end
-
-          def observed_at
-            Time.at(payload.fetch('currently', 'time').to_i)
-          end
-
-          def humidity
-            payload.fetch('currently', 'humidity') * 100
-          end
-
-          def condition
-            payload.fetch('currently', 'summary')
-          end
-
-          def icon
-            payload.fetch('currently', 'icon')
-          end
-
-          def temperature
-            [units, payload.fetch('currently', 'temperature')]
-          end
-
-          def dew_point
-            [units, payload.fetch('currently', 'dewPoint')]
-          end
-
-          def wind
-            [units, convert_metre_per_second(payload.fetch('currently', 'windSpeed')), payload.fetch('currently', 'windBearing').to_i]
-          end
-
-          def pressure
-            [:metric, payload.fetch('currently', 'pressure')]
-          end
-
-          def visibility
-            [units, payload.fetch('currently', 'visibility')]
-          end
-
-          private
-
-          def convert_metre_per_second(value)
-            value.to_f * 60 * 60 / 1000
-          end
-        end
-      end
-    end
-  end
-end

data/lib/barometer/weather_services/forecast_io/response/forecasted_weather.rb

@@ -1,74 +0,0 @@
-module Barometer
-  module WeatherService
-    class ForecastIo
-      class Response
-        class ForecastedWeather
-          def initialize(payload)
-            @payload = payload
-            @predictions = Barometer::Response::PredictionCollection.new
-          end
-
-          def parse
-            each_prediction do |prediction, forecast_payload|
-              prediction.starts_at = starts_at(forecast_payload)
-              prediction.ends_at = Utils::Time.add_one_day(prediction.starts_at)
-              prediction.icon = icon(forecast_payload)
-              prediction.condition = condition(forecast_payload)
-              prediction.high = high(forecast_payload)
-              prediction.low = low(forecast_payload)
-              prediction.sun = sun(forecast_payload, prediction.starts_at, prediction.ends_at)
-            end
-
-            predictions
-          end
-
-          private
-
-          attr_reader :payload, :predictions
-
-          def units
-            payload.units
-          end
-
-          def each_prediction
-            payload.fetch_each('daily', 'data') do |forecast_payload|
-              predictions.build do |prediction|
-                yield prediction, forecast_payload
-              end
-            end
-          end
-
-          def starts_at(forecast_payload)
-            time(forecast_payload.fetch('time'))
-          end
-
-          def icon(forecast_payload)
-            forecast_payload.fetch('icon')
-          end
-
-          def condition(forecast_payload)
-            forecast_payload.fetch('summary')
-          end
-
-          def high(forecast_payload)
-            [units, forecast_payload.fetch('temperatureMax')]
-          end
-
-          def low(forecast_payload)
-            [units, forecast_payload.fetch('temperatureMin')]
-          end
-
-          def sun(forecast_payload, starts_at, ends_at)
-            utc_rise_time = time(forecast_payload.fetch('sunriseTime'))
-            utc_set_time = time(forecast_payload.fetch('sunsetTime'))
-            Data::Sun.new(rise: utc_rise_time, set: utc_set_time)
-          end
-
-          def time(timestamp)
-            Time.at(timestamp.to_i)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/barometer/weather_services/forecast_io/response/location.rb

@@ -1,19 +0,0 @@
-module Barometer
-  module WeatherService
-    class ForecastIo
-      class Response
-        class Location < WeatherService::Response::Location
-          private
-
-          def latitude
-            payload.fetch('latitude')
-          end
-
-          def longitude
-            payload.fetch('longitude')
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,25 +0,0 @@
-module Barometer
-  module WeatherService
-    class ForecastIo
-      class Response
-        class TimeZone
-          def initialize(payload)
-            @payload = payload
-          end
-
-          def parse
-            Data::Zone.new(time_zone)
-          end
-
-          private
-
-          attr_reader :payload
-
-          def time_zone
-            payload.fetch('timezone')
-          end
-        end
-      end
-    end
-  end
-end

data/spec/support/key_file_parser.rb

@@ -1,22 +0,0 @@
-module Barometer
-  KEY_FILE = File.expand_path(File.join('~', '.barometer'))
-
-  module Support
-    class KeyFileParser
-      def self.find(*paths)
-        if File.exists?(KEY_FILE)
-          keys = YAML.load_file(KEY_FILE)
-
-          paths.each do |path|
-            if keys && keys.has_key?(path.to_s)
-              keys = keys.fetch(path.to_s)
-            else
-              keys = nil
-            end
-          end
-          keys
-        end
-      end
-    end
-  end
-end

data/spec/support/matchers/formats.rb

@@ -1,36 +0,0 @@
-require 'rspec/expectations'
-
-module Barometer
-  module Matchers
-    module Formats
-      def is_of_format?(format, value)
-        value.match(_find_regex(format))
-      end
-
-      def _find_regex(format)
-        case format
-        when :time
-          /^\d{1,4}-\d{1,2}-\d{1,2} \d{2}:\d{2}:\d{2} [\-\+\d]{5}$/i
-        when :optional_string
-          /^[\w \.-]*$/i
-        when :string
-          /^[\w \.-]{2,}$/i
-        when :number
-          /^\d{1,3}$/i
-        when :float
-          /^[\d\.]{1,5}$/i
-        when :temperature
-          /^-?[0-9\.]{1,5}[ ]?[cfCF]?$/i
-        when :pressure
-          /^[0-9\.]{1,7}[ ]?[a-zA-Z]{0,3}$/i
-        when :vector
-          /^[0-9\.]{1,5} (?:mph|kph) (?:[nesw]{1,3}(?:orth|outh|t|ast)?|@ [0-9\.]{1,5} degrees)$/i
-        when :distance
-          /^[0-9\.]{1,5}[ ]?k?m?$/i
-        when Regexp
-          format
-        end
-      end
-    end
-  end
-end

data/spec/support/matchers/have_data.rb

@@ -1,46 +0,0 @@
-require_relative 'path'
-require_relative 'formats'
-
-module Barometer
-  module Matchers
-    def have_data(*paths)
-      HaveData.new(*paths)
-    end
-
-    class HaveData
-      include Barometer::Matchers::Formats
-
-      def initialize(*paths)
-        @paths = paths
-      end
-
-      def matches?(subject)
-        @result = Walker.new(subject).follow(@paths)
-
-        if @format
-          is_of_format?(@format, @result)
-        else
-          @result == @value || @result.to_f == @value
-        end
-      end
-
-      def failure_message
-        "expected that '#{@result}' matches '#{@value || @format}'"
-      end
-
-      def description
-        "have correct value for #{@paths.join('.')}"
-      end
-
-      def as_value(value)
-        @value = value
-        self
-      end
-
-      def as_format(format)
-        @format = format
-        self
-      end
-    end
-  end
-end

data/spec/support/matchers/have_field.rb

@@ -1,128 +0,0 @@
-require 'rspec/expectations'
-
-module Barometer
-  module Matchers
-    def have_field(field)
-      HaveField.new(field)
-    end
-
-    class HaveField
-      def initialize(field)
-        @field = field
-      end
-
-      def matches?(subject)
-        @subject = subject
-        has_field? &&
-          type_casts_as_type? &&
-          sets_value?
-      end
-
-      def failure_message
-        "Expected #{expectation} (#{@problem})"
-      end
-
-      def description
-        "have data field \"#{@field}\""
-      end
-
-      def of_type(type)
-        @type = type
-        self
-      end
-
-      protected
-
-      def has_field?
-        assert @subject.respond_to?(@field), "does not have field '#{@field}'"
-      end
-
-      def type_casts_as_type?
-        if type_is_time?
-          set_value "2013-01-01 10:15:30 am"
-        elsif type_is_sun?
-          rise = Time.utc(2013,1,1,10,15,30)
-          set = Time.utc(2013,1,1,18,14,56)
-          set_value Data::Sun.new(rise: rise, set: set)
-        else
-          set_value 10
-        end
-        assert value.is_a?(@type), "#{@field} does not typecast as #{@type}"
-      end
-
-      def sets_value?
-        if type_is_time?
-          set_value "10 15 30 2013 01 01 am", "%H %M %S %Y %m %d %p"
-          assert value.to_i == Time.utc(2013,01,01,10,15,30).to_i, "expected value of '2013-01-01 10:15:30 am', got '#{print_value}'"
-        elsif type_is_sun?
-          rise = Time.utc(2013,1,1,10,15,30)
-          set = Time.utc(2013,1,1,18,14,56)
-          set_value Data::Sun.new(rise: rise, set: set)
-          assert print_value == "rise: 10:15, set: 18:14", "expected value of 'rise: 10:15, set: 18:14'', got '#{print_value}'"
-        else
-          set_value 10
-          assert value.to_i == 10, "expected value of '10', got '#{value.to_i}'"
-        end
-      end
-
-      private
-
-      def value
-        @subject.send(@field)
-      end
-
-      def set_value(*value)
-        if type_is_time?
-          @subject.send("#{@field}=", value)
-        else
-          @subject.send("#{@field}=", *value)
-        end
-      end
-
-      def print_value
-        value.to_s
-      end
-
-      def metric_units
-        @type.send(:new, true).units
-      end
-
-      def imperial_units
-        @type.send(:new, false).units
-      end
-
-      def expectation
-        "\"#{@field}\" to be a #{@type}"
-      end
-
-      def value_responds_to_metric?
-        if type_is_time?
-          false
-        elsif @type == Float
-          # rubinius does not like Float.new being called on the next line
-          # so avoid it
-          false
-        else
-          @type.respond_to?(:new) && @type.new.respond_to?(:metric)
-        end
-      end
-
-      def type_is_time?
-        @type == Time
-      end
-
-      def type_is_sun?
-        @type == Data::Sun
-      end
-
-      def assert(test, failure_message)
-        if test
-          true
-        else
-          @problem = failure_message
-          false
-        end
-      end
-    end
-  end
-end

data/spec/support/matchers/have_forecast.rb

@@ -1,46 +0,0 @@
-require_relative 'path'
-require_relative 'formats'
-
-module Barometer
-  module Matchers
-    def have_forecast(*paths)
-      HaveForecast.new(*paths)
-    end
-
-    class HaveForecast
-      include Barometer::Matchers::Formats
-
-      def initialize(*paths)
-        @paths = paths
-      end
-
-      def matches?(subject)
-        @result = Walker.new(subject.forecast[0]).follow(@paths)
-
-        if @format
-          is_of_format?(@format, @result)
-        else
-          @result == @value || @result.to_f == @value
-        end
-      end
-
-      def failure_message
-        "expected that '#{@result}' matches '#{@value || @format}'"
-      end
-
-      def description
-        "have correct forecast value for #{@paths.join('.')}"
-      end
-
-      def as_value(value)
-        @value = value
-        self
-      end
-
-      def as_format(format)
-        @format = format
-        self
-      end
-    end
-  end
-end

data/spec/support/matchers/path.rb

@@ -1,23 +0,0 @@
-module Barometer
-  module Matchers
-    class Walker
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-
-      def follow(paths)
-        path_value = value
-        paths.each do |path|
-          path_value = path_value.send(path)
-        end
-        if path_value.respond_to?(:strftime)
-          path_value.strftime("%Y-%m-%d %H:%M:%S %z")
-        else
-          path_value.to_s
-        end
-      end
-    end
-  end
-end

data/spec/support/query_factory.rb

@@ -1,20 +0,0 @@
-module Barometer
-  module Support
-    module Factory
-      def build_query
-        double(
-          :query,
-          q: 'foo',
-          format: :unknown,
-          units: :metric,
-          geo: nil,
-          metric?: true
-        )
-      end
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.include Barometer::Support::Factory
-end

data/spec/weather_services/forecast_io_spec.rb

@@ -1,71 +0,0 @@
-require_relative '../spec_helper'
-
-describe Barometer::WeatherService::ForecastIo, vcr: {
-  cassette_name: "WeatherService::ForecastIo"
-} do
-
-  it "auto-registers this weather service as :forecast_io" do
-    Barometer::WeatherService.source(:forecast_io).should == Barometer::WeatherService::ForecastIo
-  end
-
-  describe ".call" do
-    context "when no keys provided" do
-      let(:query) { build_query }
-
-      it "raises error" do
-        expect {
-          Barometer::WeatherService::ForecastIo.call(query)
-        }.to raise_error(Barometer::WeatherService::KeyRequired)
-      end
-    end
-
-    context "when keys are provided" do
-      let(:converted_query) { Barometer::ConvertedQuery.new('42.7243,-73.6927', :coordinates, :metric) }
-      let(:query) { build_query.tap{|q|q.stub(:convert! => converted_query)} }
-      let(:config) { {keys: {api: FORECAST_IO_APIKEY}} }
-
-      subject { Barometer::WeatherService::ForecastIo.call(query, config) }
-
-      it "asks the query to convert to accepted formats" do
-        query.should_receive(:convert!).with(:coordinates)
-        subject
-      end
-
-      it "includes the expected data" do
-        subject.query.should == '42.7243,-73.6927'
-        subject.format.should == :coordinates
-        subject.should be_metric
-
-        should have_data(:current, :observed_at).as_format(:time)
-        # should have_data(:current, :stale_at).as_format(:time)
-
-        should have_data(:current, :humidity).as_format(:float)
-        should have_data(:current, :condition).as_format(:string)
-        should have_data(:current, :icon).as_format(:string)
-        should have_data(:current, :temperature).as_format(:temperature)
-        should have_data(:current, :dew_point).as_format(:temperature)
-        should have_data(:current, :wind).as_format(:vector)
-        should have_data(:current, :pressure).as_format(:pressure)
-        should have_data(:current, :visibility).as_format(:distance)
-        # should have_data(:current, :sun, :rise).as_format(:time)
-        # should have_data(:current, :sun, :set).as_format(:time)
-
-        should have_data(:location, :latitude).as_value(42.7243)
-        should have_data(:location, :longitude).as_value(-73.6927)
-
-        should have_data(:timezone, :to_s).as_value('America/New_York')
-        should have_data(:timezone, :code).as_format(/^E[DS]T$/i)
-
-        subject.forecast.size.should == 8
-        should have_forecast(:starts_at).as_format(:time)
-        should have_forecast(:ends_at).as_format(:time)
-        should have_forecast(:icon).as_format(:string)
-        should have_forecast(:condition).as_format(:string)
-        should have_forecast(:high).as_format(:temperature)
-        should have_forecast(:low).as_format(:temperature)
-        should have_forecast(:sun, :rise).as_format(:time)
-        should have_forecast(:sun, :set).as_format(:time)
-      end
-    end
-  end
-end