noaaer 0.0.5 → 0.0.6

data/lib/noaaer/forecast.rb

@@ -24,7 +24,7 @@ module Noaaer
     # The number of days provided by the forecast
     #
     def length
-      @length ||= @doc.find(%q{/dwml/data/time-layout[@summarization='24hourly'][1]/start-valid-time}).length
+      @length ||= @doc.xpath(%q{/dwml/data/time-layout[@summarization='24hourly'][1]/start-valid-time}).length
     end
 
     # 
@@ -58,37 +58,37 @@ module Noaaer
     end
 
     def starts
-      @starts ||= @doc.find(%q{/dwml/data/time-layout[@summarization='24hourly'][1]/start-valid-time/text()}).map do |node|
+      @starts ||= @doc.xpath(%q{/dwml/data/time-layout[@summarization='24hourly'][1]/start-valid-time/text()}).map do |node|
         Time.parse(node.to_s)
       end
     end
 
     def ends
-      @ends ||= @doc.find(%q{/dwml/data/time-layout[@summarization='24hourly'][1]/end-valid-time/text()}).map do |node|
+      @ends ||= @doc.xpath(%q{/dwml/data/time-layout[@summarization='24hourly'][1]/end-valid-time/text()}).map do |node|
         Time.parse(node.to_s)
       end
     end
 
     def maxima
-      @maxima ||= @doc.find(%q{/dwml/data/parameters[1]/temperature[@type='maximum'][@units='Fahrenheit'][1]/value/text()}).map do |node|
+      @maxima ||= @doc.xpath(%q{/dwml/data/parameters[1]/temperature[@type='maximum'][@units='Fahrenheit'][1]/value/text()}).map do |node|
         node.to_s.to_i
       end
     end
 
     def minima
-      @minima ||= @doc.find(%q{/dwml/data/parameters[1]/temperature[@type='minimum'][@units='Fahrenheit'][1]/value/text()}).map do |node|
+      @minima ||= @doc.xpath(%q{/dwml/data/parameters[1]/temperature[@type='minimum'][@units='Fahrenheit'][1]/value/text()}).map do |node|
         node.to_s.to_i
       end
     end
 
     def weather_summaries
-      @weather_summaries ||= @doc.find(%q{/dwml/data/parameters[1]/weather[1]/weather-conditions}).map do |node|
+      @weather_summaries ||= @doc.xpath(%q{/dwml/data/parameters[1]/weather[1]/weather-conditions}).map do |node|
         node['weather-summary'].to_s
       end
     end
 
     def image_urls
-      @image_urls ||= @doc.find(%q{/dwml/data/parameters[1]/conditions-icon/icon-link/text()}).map do |node|
+      @image_urls ||= @doc.xpath(%q{/dwml/data/parameters[1]/conditions-icon/icon-link/text()}).map do |node|
         node.to_s
       end
     end
@@ -100,7 +100,7 @@ module Noaaer
     end
 
     def precipitation_probabilities
-      @precipitation_probabilities ||= @doc.find(%q{/dwml/data/parameters[1]/probability-of-precipitation[1]/value/text()}).map do |node|
+      @precipitation_probabilities ||= @doc.xpath(%q{/dwml/data/parameters[1]/probability-of-precipitation[1]/value/text()}).map do |node|
         node.to_s.to_i
       end
     end

data/lib/noaaer/http_service.rb

@@ -7,15 +7,15 @@ module Noaaer
     end
 
     def get_current_conditions(station_id)
-      @HTTP.get(URI.parse("http://www.weather.gov/xml/current_obs/#{station_id}.xml"))
+      Nokogiri::XML.parse(@HTTP.get(URI.parse("http://www.weather.gov/xml/current_obs/#{station_id}.xml")))
     end
 
     def get_forecast(num_days, lat, lng)
-      @HTTP.get(URI.parse("http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdBrowserClientByDay.php?lat=#{lat}&lon=#{lng}&format=24+hourly&numDays=#{num_days}"))
+      Nokogiri::XML.parse(@HTTP.get(URI.parse("http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdBrowserClientByDay.php?lat=#{lat}&lon=#{lng}&format=24+hourly&numDays=#{num_days}")))
     end
 
     def get_station_list
-      @HTTP.get(URI.parse("http://www.weather.gov/xml/current_obs/index.xml"))
+      doc = Nokogiri::XML(@HTTP.get(URI.parse("http://www.weather.gov/xml/current_obs/index.xml")))
     end
   end
 end

data/lib/noaaer/station_writer.rb

@@ -1,11 +1,11 @@
-module Noaeer
+module Noaaer
   class StationWriter
     def initialize(doc)
       @doc = doc
     end
 
     def write(io)
-      YAML.dump(@doc.find('/wx_station_index/station').map { |node| node_to_hash(node) }, io)
+      YAML.dump(@doc.xpath('/wx_station_index/station').map { |node| node_to_hash(node) }, io)
     end
 
     private
@@ -20,7 +20,7 @@ module Noaeer
     end
 
     def node_value(node, element)
-      node.find("./#{element}/text()").first.to_s
+      node.xpath("./#{element}/text()").first.to_s
     end
   end
 end

data/lib/noaaer/version.rb

@@ -1,3 +1,3 @@
 module Noaaer
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -2,7 +2,7 @@
 name: noaaer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Cody Swann, Gunner Technology