lib/barometer/weather_services/google.rb in barometer-0.6.1 vs lib/barometer/weather_services/google.rb in barometer-0.6.2

@@ -50,11 +50,11 @@
       %w(sunny mostly_sunny partly_cloudy)
     end
 
     def self._build_current(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
-      current = Measurement::Current.new
+      current = Measurement::Result.new
 
       if data['current_conditions']
         data = data['current_conditions']
         if data['icon']
           icon_match = data['icon']['data'].match(/.*\/([A-Za-z_]*)\.png/)
@@ -79,19 +79,19 @@
     end
     
     def self._build_forecast(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
 
-      forecasts = Measurement::ForecastArray.new
+      forecasts = Measurement::ResultArray.new
       return forecasts unless data && data['forecast_information'] &&
                               data['forecast_information']['forecast_date']
       start_date = Date.parse(data['forecast_information']['forecast_date']['data'])
       data = data['forecast_conditions'] if data['forecast_conditions']
 
       # go through each forecast and create an instance
       d = 0
       data.each do |forecast|
-        forecast_measurement = Measurement::Forecast.new
+        forecast_measurement = Measurement::Result.new
         if forecast['icon']
           icon_match = forecast['icon']['data'].match(/.*\/([A-Za-z_]*)\.png/)
           forecast_measurement.icon = icon_match[1] if icon_match
         end
         forecast_measurement.condition = forecast['condition']['data'] if forecast['condition']
\ No newline at end of file