buoy_data 1.0.0.beta.0 → 1.0.0.beta.1

data/VERSION

@@ -1 +1 @@
-1.0.0.beta.0
+1.0.0.beta.1

data/buoy_data.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buoy_data}
-  s.version = "1.0.0.beta.0"
+  s.version = "1.0.0.beta.1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Weller"]
-  s.date = %q{2011-03-20}
+  s.date = %q{2011-04-17}
   s.description = %q{The goal of this gem is to provide marine buoy data from a variety of sources}
   s.email = %q{minch@trazzler.com}
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "lib/buoy_data/noaa_buoy_list.rb",
      "lib/buoy_data/noaa_buoy_observation.rb",
      "lib/buoy_data/noaa_buoy_reading.rb",
+     "lib/buoy_data/noaa_station.rb",
      "spec/noaa_buoy_forecast_spec.rb",
      "spec/noaa_buoy_list_spec.rb",
      "spec/noaa_buoy_observation_spec.rb",

data/lib/buoy_data/buoy_list.rb

@@ -6,17 +6,21 @@ module BuoyData
     def get
       stats = {
         :stations => [],
-        :errors => [] 
+        :station_count => 0,
+        :errors => [],
+        :error_count => 0
       }
       @doc = doc
       @station_list = stations doc
 
-      @station_list.each do |s|
+      @station_list.each do |station_url|
         begin
-          h = scrape_station s
+          h = scrape_station(station_url)
           stats[:stations].push h
+          stats[:station_count] += 1
         rescue => e
-          stats[:errors].push({ :url => s, :error => e })
+          stats[:error_count] += 1
+          stats[:errors].push({ :url => s, :error => e.backtrace })
         end
       end
 
@@ -39,28 +43,5 @@ module BuoyData
 
     def scrape_station(url)
     end
-
-    def lat_lng_from(text)
-      text = text.sub(/ \(.*$/, '')
-      matches = /([0-9\.]+ ?[NESW]) ([0-9\.]+ ?[NESW])/.match(text)
-
-      matches && matches.size == 3 ? [ $1, $2 ] : []
-    end
-
-    def normal_lat(lat)
-      lat, dir = lat.split(/ /)
-      lat = lat.to_f
-      lat = -lat if dir == 'S'
-
-      lat
-    end
-
-    def normal_lng(lng)
-      lng, dir = lng.split(/ /)
-      lng = lng.to_f
-      lng = -lng if dir == 'W'
-
-      lng
-    end
   end
 end

data/lib/buoy_data/noaa_buoy_list.rb

@@ -17,33 +17,8 @@ module BuoyData
     end
 
     def scrape_station(url)
-      url = [base_url, url].join('/')
-      doc = Nokogiri::HTML(open(url))  
-      h = {}
-      xpath = "//h1"
-
-      # Title, Station Id and Description
-      title = doc.xpath(xpath).text
-      h[:url] = url
-      h[:title] = title
-      station_id, description = title.split(/ - /)
-      station_id = station_id.sub(/station ?/i, '')
-      h[:station_id] = station_id
-      h[:description] = description
-
-      # Lat and Lng
-      xpath += "/following-sibling::table/tr/td/p/b"
-      elements = doc.xpath(xpath)
-      elements = elements.map(&:text)
-      element = elements.find{|e| /\d{2,3}\.\d{2,3}/.match(e)}
-      latlng = lat_lng_from element
-
-      unless latlng.empty?
-        h[:lat] = normal_lat latlng.first
-        h[:lng] = normal_lng latlng.last
-      end
-
-      h
+      url = [ base_url, url ].join('/')
+      NoaaStation.new.scrape(url)
     end
   end
 end

data/lib/buoy_data/noaa_station.rb

@@ -0,0 +1,105 @@
+module BuoyData
+  require 'open-uri'
+  require 'nokogiri'
+
+  class NoaaStation
+    def scrape(url)
+      h = {}
+      xpath = "//h1"
+
+      doc = Nokogiri::HTML(open(url))  
+
+      # Title, Station Id and Description
+      title = doc.xpath(xpath).first.text
+      title = title.rstrip
+      h[:url] = url
+      h[:title] = title
+      station_id, description = title.split(/ - /)
+      station_id = station_id.sub(/station ?/i, '')
+      station_id = /[A-Z0-9]+/.match(station_id).to_s rescue nil
+      h[:station_id] = station_id
+      h[:description] = description
+
+      # Lat and Lng
+      xpath += "/following-sibling::table/tr/td/p/b"
+      elements = doc.xpath(xpath)
+      elements = elements.map(&:text)
+      element = elements.find{|e| /\d{2,3}\.\d{2,3}/.match(e)}
+      latlng = lat_lng_from element
+
+      unless latlng.empty?
+        h[:lat] = normal_lat latlng.first
+        h[:lng] = normal_lng latlng.last
+      end
+
+      # Latest reading
+      xpath = "//table/caption[@class='titleDataHeader'][text()[contains(.,'Conditions')]]"
+      xpath += "/../tr"
+      elements = doc.xpath xpath
+
+      current_reading = {}
+      unless elements.empty?
+        elements.each do |element|
+          reading = scrape_condition_from_element(element)  
+          current_reading.merge! reading unless reading.blank?
+        end
+      end
+
+      # If we couldn't get a water temp from this station then it's not of use
+      return {} unless valid_reading? current_reading
+      h.merge! current_reading
+
+      h
+    end
+
+    private
+    # No water temp (wtmp) is our filter
+    def valid_reading?(reading)
+      !reading.blank? && reading.keys.include?(:wtmp)
+    end
+
+    def scrape_condition_from_element(element)
+      reading = {}
+      # (include units)
+      #regexp = /\(([A-Z]+)\):\n\t ?(.*)\n$/
+      # (no units)
+      regexp = /\(([A-Z]+)\):\n\t ?([0-9.-]+).*\n$/
+      text = element.text
+
+      if regexp.match(text)
+        key = $1
+        return reading unless key
+        key = key.downcase.to_sym
+        value = $2
+        return reading unless value
+        value = value.lstrip.rstrip.to_f
+        reading = { key => value }
+      end
+
+      reading
+    end
+
+    def lat_lng_from(text)
+      text = text.sub(/ \(.*$/, '')
+      matches = /([0-9\.]+ ?[NESW]) ([0-9\.]+ ?[NESW])/.match(text)
+
+      matches && matches.size == 3 ? [ $1, $2 ] : []
+    end
+
+    def normal_lat(lat)
+      lat, dir = lat.split(/ /)
+      lat = lat.to_f
+      lat = -lat if dir == 'S'
+
+      lat
+    end
+
+    def normal_lng(lng)
+      lng, dir = lng.split(/ /)
+      lng = lng.to_f
+      lng = -lng if dir == 'W'
+
+      lng
+    end
+  end
+end

data/lib/buoy_data.rb

@@ -2,6 +2,7 @@ require 'httparty'
 require 'buoy_data/buoy_list'
 require 'buoy_data/buoy_reading'
 require 'buoy_data/noaa_buoy_reading'
+require 'buoy_data/noaa_station'
 require 'buoy_data/noaa_buoy_list'
 require 'buoy_data/noaa_buoy_observation'
 require 'buoy_data/noaa_buoy_forecast'

data/spec/noaa_buoy_list_spec.rb

@@ -7,13 +7,24 @@ describe BuoyData::NoaaBuoyList do
     it "should get buoy list" do
       buoy_list.should be
       buoy_list.stub(:stations).and_return(stubbed_station_list)
-      stations = buoy_list.get
 
-      stations.should_not be_empty
+      results = buoy_list.get
+      results.should_not be_empty
+      results[:errors].should be_empty
+      stations = results[:stations]
+      stations.compact.should_not be_empty
+      station = stations.first
+
+      # Verify we have water temp value
+      wtmp = station[:wtmp]
+      wtmp.should be_kind_of Float
     end
   end
 
   def stubbed_station_list
-    [ "station_page.php?station=41012", "station_page.php?station=sauf1" ]
+    [
+      "station_page.php?station=41012",
+      "station_page.php?station=sauf1"
+    ]
   end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 0
-  version: 1.0.0.beta.0
+  - 1
+  version: 1.0.0.beta.1
 platform: ruby
 authors: 
 - Adam Weller
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 -04:00
+date: 2011-04-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - lib/buoy_data/noaa_buoy_list.rb
 - lib/buoy_data/noaa_buoy_observation.rb
 - lib/buoy_data/noaa_buoy_reading.rb
+- lib/buoy_data/noaa_station.rb
 - spec/noaa_buoy_forecast_spec.rb
 - spec/noaa_buoy_list_spec.rb
 - spec/noaa_buoy_observation_spec.rb