ullr 0.1.2 → 0.1.3

data/History.txt

@@ -10,3 +10,7 @@
 
 * fix typo in readme
 * fix bug for daytime snow accumulation estimates
+
+== 0.1.2 / 2011-12-28
+
+* now uses proper min/max values from feed instead of regex matches in forecast text

data/lib/ullr/forecast.rb

@@ -2,7 +2,7 @@ module Ullr
   class Forecast
     require 'open-uri'
     require 'ostruct'
-    attr_accessor :lat, :lon, :forecast_string, :noaa_endpoint, :data, :socket_error
+    attr_accessor :lat, :lon, :forecast_string, :noaa_endpoint, :data, :socket_error, :parsed_forecast
     NOAA_ENDPOINT = "http://forecast.weather.gov/MapClick.php?lat={{lat}}&lon={{lon}}&FcstType=dwml"
 
     def initialize(options={})
@@ -14,6 +14,22 @@ module Ullr
       @noaa_endpoint = NOAA_ENDPOINT.gsub("{{lat}}",@lat.to_s).gsub("{{lon}}",@lon.to_s)
     end
 
+    def parse_temps
+      temps = {:minimum => [], :maximum => []}
+      @parsed_forecast.parameters.temperatures.each do |temp_data|
+        time_layout = @parsed_forecast.time_layouts.find{|t| t.layout_key =~ /#{temp_data.time_layout}/ }
+        temp_data.values.each_with_index do |temperature, i|
+          data = OpenStruct.new
+          time = time_layout.start_valid_times[i]
+          data.temperature = temperature.value
+          data.start_time = time.period_start
+          data.period_name = time.period_name
+          temps[temp_data.type.to_sym] << data
+        end
+      end
+      return temps
+    end
+
     def get_noaa_forecast
       @socket_error = false
       @data = []
@@ -26,19 +42,23 @@ module Ullr
       if !@socket_error
         data = Ullr::NOAA::Data.parse(@forecast_string)
         forecast = data.find{|o| o.type == 'forecast'}
+        @parsed_forecast = forecast
         if forecast
           time_layout = forecast.time_layouts.find{|t| t.layout_key =~ /k-p12h/ }
+          temperature_data = parse_temps
           time_layout.start_valid_times.each_with_index do |time,i|
             params = forecast.parameters
             word = params.worded_forecast.texts[i]
+            min_temp = temperature_data ? temperature_data[:minimum].find{|t| t.period_name =~ /#{time.period_name}/} : false
+            max_temp = temperature_data ? temperature_data[:maximum].find{|t| t.period_name =~ /#{time.period_name}/} : false
             point = OpenStruct.new
             point.start_time = time.period_start
             point.name = time.period_name
             point.pop = params.pops.values[i].value
             point.text = word.value
             point.snow = word.has_snow?
-            point.high_temperature = word.high_temperature
-            point.low_temperature = word.low_temperature
+            point.high_temperature = max_temp ? max_temp.temperature : nil
+            point.low_temperature = min_temp ? min_temp.temperature : nil
             point.wind_direction = word.wind_direction
             point.wind_speeds = word.wind_speeds
             point.snow_estimate = word.snow_estimate

data/spec/ullr_spec.rb

@@ -474,6 +474,61 @@ describe Ullr do
         @forecast.get_noaa_forecast
         @forecast.socket_error.should be_true
       end
+
+      it "should store parsed forecast" do
+        @forecast.should_receive(:open).with(@forecast.noaa_endpoint).and_return(@noaa_fixture)
+        @forecast.get_noaa_forecast
+        @forecast.should respond_to(:parsed_forecast)
+        @forecast.parsed_forecast.should be_an_instance_of(Ullr::NOAA::Data)
+      end
+
+      it "should call parse_temps" do
+        @forecast.should_receive(:open).with(@forecast.noaa_endpoint).and_return(@noaa_fixture)
+        @forecast.should_receive(:parse_temps)
+        @forecast.get_noaa_forecast
+      end
+
+      context 'parse_temps' do
+        before do
+          @forecast.should_receive(:open).with(@forecast.noaa_endpoint).and_return(@noaa_fixture)
+          @forecast.get_noaa_forecast
+        end
+
+        it "should respond to parse_temps" do
+          @forecast.should respond_to(:parse_temps)
+        end
+
+        it "should return a hash" do
+          @forecast.parse_temps.should be_an_instance_of(Hash)
+        end
+
+        context 'min max values' do
+          before do
+            @temps = @forecast.parse_temps
+          end
+          it "should have an array of min temps" do
+            @temps[:minimum].should be_an_instance_of(Array)
+          end
+
+          it "should have an array of max temps" do
+            @temps[:maximum].should be_an_instance_of(Array)
+          end
+
+          it "should decoreate an object with correct min temp data" do
+            @min = @temps[:minimum].first
+            @min.temperature.should eql('25')
+            @min.start_time.should eql(DateTime.parse('2011-12-18T18:00:00-08:00'))
+            @min.period_name.should eql('Tonight')
+          end
+
+          it "should decoreate an object with correct max temp data" do
+            @max = @temps[:maximum].first
+            @max.temperature.should eql('39')
+            @max.start_time.should eql(DateTime.parse('2011-12-18T12:00:00-08:00'))
+            @max.period_name.should eql('This Afternoon')
+          end
+        end
+      end
     end
 
   end

data/version.txt

@@ -1 +1 @@
-0.1.2
+0.1.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ullr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000Z
+date: 2011-12-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: happymapper
-  requirement: &70367029133460 !ruby/object:Gem::Requirement
+  requirement: &70173084964980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70367029133460
+  version_requirements: *70173084964980
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &70367029167180 !ruby/object:Gem::Requirement
+  requirement: &70173084963640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *70367029167180
+  version_requirements: *70173084963640
 description: ullr is a little gem that consumes NOAA weather xml for a given lat/long,
   and returns an array of data with 12 hour forecasts along with some sugar to let
   you know if any sugar will be falling from the sky.