noaa-weather 0.1.4 → 0.1.5

data/bin/noaa-weather

@@ -11,12 +11,12 @@ OptionParser.new do |opts|
     options[:site] = s
   end
 
-  opts.on(:REQUIRED,"-lat","--lattitude","find weather by lat/lng (requires -lng)") do |lt|
-    options[:lat]=lt
+  opts.on(:REQUIRED,"-t","--lattitude","find weather by lat/lng (requires -b)") do |t|
+    options[:lat]=t
   end
 
-  opts.on(:REQUIRED,"-lng","--longititude","find wather by lat/lng (requires -lat)") do |lg|
-    options[:lng]=lg
+  opts.on(:REQUIRED,"-g","--longititude","find wather by lat/lng (requires -t)") do |g|
+    options[:lng]=g
   end
   
 end.parse!

data/lib/noaa-weather.rb

@@ -55,8 +55,8 @@ class CachedGeocode
 end
 
 class Noaaweather < CachedGeocode
-  VERSION = '0.1.4'
-  attr_accessor :lattitude,:longitude, :start_time
+  VERSION = '0.1.5'
+  attr_accessor :lattitude,:longitude, :start_time, :conditions
   
   def initialize(site,as_address=false)
     
@@ -88,12 +88,28 @@ class Noaaweather < CachedGeocode
   
   def current_conditions(ashash=false)
 
-    self.fetch unless @fetched
-    _c = @doc.find('/dwml/data/parameters/weather/weather-conditions/value')[0]
-    if ashash
-      {:coverage => _c['coverage'],:weathertype => _c['weather-type']} 
+    self.forecast if self.conditions.nil?
+    if Time.now.strftime("%H").to_i < 6 or Time.now.strftime("%H").to_i > 18
+      if ashash
+        self.forecast['Tonight']
+      else
+        @ccond ||= sprintf("%s, High of %i, Low of %i and %s",'Tonight',self.forecast['Tonight'][:high],
+                           self.forecast['Tonight'][:low], self.forecast['Tonight'][:conditions])
+      end
+    elsif Time.now.strftime("%H").to_i < 18
+      if ashash
+        self.forecast['Today']
+      else
+        @ccond ||= sprintf("%s, High of %i, Low of %i and %s",'Today',self.forecast['Today'][:high],
+                           self.forecast['Today'][:low], self.forecast['Today'][:conditions])
+      end
     else
-      @ccond ||= sprintf("%s %s",_c['coverage'],_c['weather-type'])
+      if ashash
+        self.forecast['Today']
+      else
+        @ccond ||= sprintf("%s, High of %i, Low of %i and %s",'Today',self.forecast['Today'][:high],
+                           self.forecast['Today'][:low], self.forecast['Today'][:conditions])
+      end        
     end
   end
 
@@ -110,6 +126,24 @@ class Noaaweather < CachedGeocode
     @doc = fetch_from_noaa
   end
 
+  def forecast
+    @forecast = fetch_forecast_from_noaa
+    @forecast.find('/dwml/data/time-layout')
+    _when = @forecast.find('/dwml/data/time-layout')[2].find('start-valid-time').collect {|x| x['period-name'] }[0..5]
+    _daily_maxt = @forecast.find('/dwml/data/parameters/temperature')[0].find('value').collect {|x| x.content }[0..2]
+    _daily_mint = @forecast.find('/dwml/data/parameters/temperature')[1].find('value').collect {|x| x.content }[0..2]
+    _weather = @forecast.find('/dwml/data/parameters/weather/weather-conditions').collect {|x| x['weather-summary'] }[0..5]
+    count = 0
+    sub_count = 0
+    _dat = {}
+    while count < 6
+      _dat[_when[count]] = {:high => _daily_maxt[sub_count.floor], :low => _daily_mint[sub_count.floor], :conditions => _weather[count] }
+      count += 1
+      sub_count += 0.5
+    end
+    self.conditions = _dat
+  end
+
   private
   def fetch_from_noaa
     
@@ -125,11 +159,28 @@ class Noaaweather < CachedGeocode
     par = XML::Parser.string(_dat)
     @doc = par.parse
   end
+  
+  def fetch_forecast_from_noaa
+    _dat = if File.exists?("/tmp/forecast-#{@site}") && (File.ctime("/tmp/forecast-#{@site}") > (Time.now - (3600 * 8)))
+             f = open("/tmp/forecast-#{@site}")
+             f.read()
+           else
+             @soap ||= SOAP::WSDLDriverFactory.new('http://www.weather.gov/forecasts/xml/DWMLgen/wsdl/ndfdXML.wsdl').create_rpc_driver
+             _res = @soap.NDFDgenByDay(self.lattitude,self.longitude,self.start_time,7,'12 hourly')
+             f = open("/tmp/forecast-#{@site}","w")
+             f.write(_res.to_s)
+             f.close()
+             _res
+           end
+    par = XML::Parser.string(_dat)
+    @doc = par.parse
+  end
 
   def cache_to_file(dat)
     f = open("/tmp/weatherfile-#{@site}",'w')
     f.write(dat.to_s)
     f.close()
   end
+
   
 end

data/spec/noaa-weather.spec

@@ -57,8 +57,9 @@ describe Noaaweather do
 	it "should report the current conditions as a hash with attributes when passed true" do
 	   @w.current_conditions(true).should_not be_nil
 	   @w.current_conditions(true).should be_an_instance_of(Hash)
-	   @w.current_conditions(true)[:coverage].should_not be_nil
-	   @w.current_conditions(true)[:weathertype].should_not be_nil
+	   @w.current_conditions(true)[:high].should_not be_nil
+	   @w.current_conditions(true)[:low].should_not be_nil
+	   @w.current_conditions(true)[:conditions].should_not be_nil
 	end
 	
 	it "should report if the data is from a cached store or not" do
@@ -78,4 +79,10 @@ describe Noaaweather do
 	   @w.should respond_to(:fetch)
 	   @w.fetch.should_not be_nil
 	end
+
+	it "should respond to forecast and return a Hash" do
+	   @w.should respond_to(:forecast)
+	   @w.forecast.should_not be_empty
+	   @w.forecast.should be_an_instance_of(Hash)
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: noaa-weather
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - kognate
@@ -30,7 +30,7 @@ cert_chain:
   M36Zgg==
   -----END CERTIFICATE-----
 
-date: 2009-03-23 00:00:00 -04:00
+date: 2009-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency