gull 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6866c03cf869ea252749ada87f38b4c2763b5ee0
-  data.tar.gz: daf6fca66ec3829783b66037383ffcbb6b97a042
+  metadata.gz: 5f8ba1e8fee402da22e749c1bad3a124fc651a2f
+  data.tar.gz: 8f70d1c10a8d43c881fc8dea2dd72e2eb8f330b4
 SHA512:
-  metadata.gz: 6ab8bd8205650ed746e2da93f8eba5ac037732e2c7dd4f9bd58ef9bad2d3e269270508116e4292844b747c6ded882925505be2ec275772023ed1695b7e98ab88
-  data.tar.gz: 1209ae73e604144d862b13363b69998b90914ab18a24e835e0e3c5669b4bde3122de8cd58ff806655a0036d389d7d522efdc74b563c60c91c280cd30c4ef73a2
+  metadata.gz: 4e6c4d5e252999784b82543286207c000ad73cda7e09f74528eb77323526707e636d1e5443f25e210c53ce47381d55bdc46c4604b501889feece09ba2579d33c
+  data.tar.gz: dc89faa462d182d3fbcc45da46c63d9e58ff6d7d6303d9e813778c152c8cfbb9e35aac23bd5b6a56bf2715c8ae141b6f1784327c561d862c5e26083549f3af56

data/.travis.yml

@@ -3,6 +3,5 @@ rvm:
 - 2.0.0
 - 1.9.3
 - jruby-19mode
-- rbx-2
 
 script: rspec spec

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gull.gemspec
-gemspec
+gemspec
+
+gem 'coveralls', require: false

data/README.md

@@ -1,5 +1,8 @@
 [![Gem Version](https://badge.fury.io/rb/gull.svg)](http://badge.fury.io/rb/gull)
 [![Build Status](https://travis-ci.org/sethdeckard/gull.svg?branch=master)](https://travis-ci.org/sethdeckard/gull)
+[![Coverage Status](https://coveralls.io/repos/sethdeckard/gull/badge.png)](https://coveralls.io/r/sethdeckard/gull)
+[![Code Climate](https://codeclimate.com/github/sethdeckard/gull/badges/gpa.svg)](https://codeclimate.com/github/sethdeckard/gull)
+[![Dependency Status](https://gemnasium.com/sethdeckard/gull.svg)](https://gemnasium.com/sethdeckard/gull)
 # Gull
 
 Ruby client for parsing NOAA/NWS alerts, warnings, and watches. The name comes from the type of bird featured on the NOAA logo.

data/lib/gull/alert.rb

@@ -3,8 +3,8 @@ require 'nokogiri'
 
 module Gull
   class Alert
-    attr_accessor :id, :title, :summary, :alert_type, :polygon, :area, :effective_at, :expires_at,
-      :urgency, :severity, :certainty, :geocode
+    attr_accessor :id, :title, :summary, :link, :alert_type, :polygon, :area, :effective_at, 
+      :expires_at, :updated_at, :published_at, :urgency, :severity, :certainty, :geocode, :vtec
 
     def initialize
       self.geocode = Geocode.new
@@ -17,40 +17,69 @@ module Gull
       self.process document.css('feed/entry')
     end
 
+    def parse element
+      self.id = element.css('id').inner_text
+      self.title = element.css('title').inner_text
+      self.summary = element.css('summary').inner_text
+      self.link = element.css('link').first.attributes["href"].value
+      self.alert_type = element.xpath('cap:event').inner_text
+      self.area = element.xpath('cap:areaDesc').inner_text
+
+      parse_times element
+      parse_categories element
+
+      parse_polygon element.xpath('cap:polygon').inner_text
+      parse_geocode element.xpath('cap:geocode')
+      parse_vtec element.xpath('cap:parameter')
+    end
+
     private
 
     def self.process entries
       alerts = []
       entries.each do |entry|
-        alert = Alert.new
-        alert.id = entry.css('id').inner_text
-        alert.alert_type = entry.xpath('cap:event').inner_text
-        alert.title = entry.css('title').inner_text
-        alert.summary = entry.css('summary').inner_text
-
-        polygon = entry.xpath('cap:polygon').inner_text
-        unless polygon.empty?
-          alert.polygon = Polygon.new polygon
-        end
-        
-        alert.area = entry.xpath('cap:areaDesc').inner_text
-        alert.effective_at = Time.parse(entry.xpath('cap:effective').inner_text).utc
-        alert.expires_at = Time.parse(entry.xpath('cap:expires').inner_text).utc
-        alert.urgency = code_to_symbol entry.xpath('cap:urgency').inner_text
-        alert.severity = code_to_symbol entry.xpath('cap:severity').inner_text
-        alert.certainty = code_to_symbol entry.xpath('cap:certainty').inner_text
-
-        geocode = entry.xpath('cap:geocode')
-        alert.geocode.fips6 = geocode.children.css('value').first.inner_text
-        alert.geocode.ugc = geocode.children.css('value').last.inner_text
-
-        alerts.push alert
+        alerts.push create_instance entry
       end
 
       alerts
     end
 
-    def self.code_to_symbol code
+    def self.create_instance entry
+      alert = Alert.new
+      alert.parse entry
+      alert
+    end
+
+    def parse_times element
+      self.updated_at = Time.parse(element.css('updated').inner_text).utc
+      self.published_at = Time.parse(element.css('published').inner_text).utc
+      self.effective_at = Time.parse(element.xpath('cap:effective').inner_text).utc
+      self.expires_at = Time.parse(element.xpath('cap:expires').inner_text).utc
+    end
+
+    def parse_categories element
+      self.urgency = code_to_symbol element.xpath('cap:urgency').inner_text
+      self.severity = code_to_symbol element.xpath('cap:severity').inner_text
+      self.certainty = code_to_symbol element.xpath('cap:certainty').inner_text
+    end
+
+    def parse_polygon text
+      unless text.empty?
+        self.polygon = Polygon.new text
+      end
+    end
+
+    def parse_geocode element
+      self.geocode.fips6 = element.children.css('value').first.inner_text
+      self.geocode.ugc = element.children.css('value').last.inner_text
+    end
+
+    def parse_vtec element
+      value = element.children.css('value').inner_text
+      self.vtec = value.empty? ? nil : value
+    end
+
+    def code_to_symbol code
       code.gsub(' ','_').downcase.to_sym
     end
 

data/lib/gull/polygon.rb

@@ -7,22 +7,19 @@ module Gull
     end
 
     def centroid
-      low_x, low_y, high_x, high_y = 0, 0, 0, 0
+      low_x = 0 
+      low_y = 0
+      high_x = 0 
+      high_y = 0
 
       coordinates.each do |pair|
-        latitude = pair.first
-        if latitude < low_x or low_x == 0
-          low_x = latitude
-        elsif latitude > high_x or high_x == 0
-          high_x = latitude
-        end
-
-        longitude = pair.last
-        if longitude < low_y or low_y == 0
-          low_y = longitude
-        elsif longitude > high_y or high_y == 0
-          high_y = longitude
-        end
+        x_bounds = bounds pair.first, low_x, high_x
+        low_x = x_bounds.first
+        high_x = x_bounds.last
+
+        y_bounds = bounds pair.last, low_y, high_y
+        low_y = y_bounds.first
+        high_y = y_bounds.last
       end
 
       center_x = low_x + ((high_x - low_x) / 2)
@@ -48,6 +45,16 @@ module Gull
 
     private 
 
+    def bounds point, low, high
+      if point < low or low == 0
+        low = point
+      elsif point > high or high == 0
+        high = point
+      end
+
+      [low, high]
+    end
+
     def coordinates_piped
       coordinates.collect {|pair| pair.join "," }.join "|"
     end

data/lib/gull/version.rb

@@ -1,3 +1,3 @@
 module Gull
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/alert_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe Gull::Alert do
+  it "should initialize with geocode" do
+    alert = Gull::Alert.new
+    expect(alert.geocode).not_to be_nil
+  end
+
   it "should fetch parsed alerts" do
     xml = File.read "spec/alerts.xml"
 
@@ -13,6 +18,7 @@ describe Gull::Alert do
 
     first = alerts.first
     expect(first.id).to eq "http://alerts.weather.gov/cap/wwacapget.php?x=CA125171381DD0.HeatAdvisory"
+    expect(first.link).to eq "http://alerts.weather.gov/cap/wwacapget.php?x=CA125171381DD0.HeatAdvisory"
     expect(first.alert_type).to eq "Heat Advisory"
     expect(first.title).to eq "Heat Advisory issued October 01 at 8:40AM PDT until October 03 at 9:00PM PDT by NWS"
     expect(first.summary).to eq "SUMMARY TEXT"
@@ -23,6 +29,9 @@ describe Gull::Alert do
     
     expect(first.effective_at).to eq Time.parse("2014-10-01T08:40:00-07:00")
     expect(first.expires_at).to eq Time.parse("2014-10-03T21:00:00-07:00")
+    expect(first.updated_at).to eq Time.parse("2014-10-01T08:40:00-07:05")
+    expect(first.published_at).to eq Time.parse("2014-10-01T08:40:00-07:06")
+
     expect(first.area).to eq "Southern Salinas Valley, Arroyo Seco and Lake San Antonio"
     expect(first.urgency).to eq :expected
     expect(first.severity).to eq :minor
@@ -31,7 +40,13 @@ describe Gull::Alert do
     expect(first.geocode.fips6).to eq "006001 006013 006041 006053 006055 006069 006075 006081 006085 006087 006097"
     expect(first.geocode.ugc).to eq "CAZ006 CAZ505 CAZ506 CAZ507 CAZ508 CAZ509 CAZ510 CAZ511 CAZ512"
 
+    expect(first.vtec).to eq "/O.NEW.KMTR.HT.Y.0002.141002T1900Z-141004T0400Z/"
+
     second = alerts[1]
     expect(second.polygon).to be_nil
+    expect(second.vtec).to be_nil
+
+    third = alerts[2]
+    expect(third.vtec).to be_nil
   end
 end

data/spec/alerts.xml

@@ -30,13 +30,13 @@ xmlns:ha = 'http://www.alerting.net/namespace/index_1.0'
 
 	<entry>
 	<id>http://alerts.weather.gov/cap/wwacapget.php?x=CA125171381DD0.HeatAdvisory</id>
-	<updated>2014-10-01T08:40:00-07:00</updated>
-	<published>2014-10-01T08:40:00-07:00</published>
+	<updated>2014-10-01T08:40:00-07:05</updated>
+	<published>2014-10-01T08:40:00-07:06</published>
 	<author>
 	<name>w-nws.webmaster@noaa.gov</name>
 	</author>
 	<title>Heat Advisory issued October 01 at 8:40AM PDT until October 03 at 9:00PM PDT by NWS</title>
-	<link href='http://alerts.weather.gov/cap/wwacapget.php?x=CA125171381DD0.HeatAdvisory.125171642740CA.MTRNPWMTR.64d60221994d798a87b4862623e0d63c'/>
+	<link href='http://alerts.weather.gov/cap/wwacapget.php?x=CA125171381DD0.HeatAdvisory'/>
 	<summary>SUMMARY TEXT</summary>
 	<cap:event>Heat Advisory</cap:event>
 	<cap:effective>2014-10-01T08:40:00-07:00</cap:effective>
@@ -61,7 +61,6 @@ xmlns:ha = 'http://www.alerting.net/namespace/index_1.0'
 	</cap:parameter>
 	</entry>
 	
-
 		<entry>
 	<id>http://alerts.weather.gov/cap/wwacapget.php?x=CA125171381DD0.HeatAdvisory.125171642740CA.MTRNPWMTR.64d60221994d798a87b4862623e0d63c</id>
 	<updated>2014-10-01T08:40:00-07:00</updated>
@@ -90,8 +89,6 @@ xmlns:ha = 'http://www.alerting.net/namespace/index_1.0'
 	<value>CAZ006 CAZ505 CAZ506 CAZ507 CAZ508 CAZ509 CAZ510 CAZ511 CAZ512 CAZ513 CAZ516 CAZ517 CAZ518 CAZ528 CAZ529 CAZ530</value>
 	</cap:geocode>
 	<cap:parameter>
-	<valueName>VTEC</valueName>
-	<value>/O.NEW.KMTR.HT.Y.0002.141002T1900Z-141004T0400Z/</value>
 	</cap:parameter>
 	</entry>
 
@@ -122,9 +119,5 @@ xmlns:ha = 'http://www.alerting.net/namespace/index_1.0'
 	<valueName>UGC</valueName>
 	<value>CAZ006 CAZ505 CAZ506 CAZ507 CAZ508 CAZ509 CAZ510 CAZ511 CAZ512 CAZ513 CAZ516 CAZ517 CAZ518 CAZ528 CAZ529 CAZ530</value>
 	</cap:geocode>
-	<cap:parameter>
-	<valueName>VTEC</valueName>
-	<value>/O.NEW.KMTR.HT.Y.0002.141002T1900Z-141004T0400Z/</value>
-	</cap:parameter>
 	</entry>
 </feed>

data/spec/polygon_spec.rb

@@ -4,8 +4,13 @@ describe Gull::Polygon do
   it "should return centroid of polygon" do
     polygon = Gull::Polygon.new "34.57,-97.56 34.77,-97.38 34.75,-97.17 34.64,-97.11 34.64,-97.14 " + 
     "34.62,-97.14 34.62,-97.2 34.6,-97.19 34.59,-97.17 34.57,-97.17 34.5,-97.3 34.51,-97.56 34.57,-97.56"
-
     expect(polygon.centroid).to eq [34.635000000000005, -97.33500000000001]
+
+    polygon = Gull::Polygon.new "30.71,-86.4 30.78,-86.04 30.27,-86.01 30.35,-86.28 30.37,-86.4 30.39,-86.4 30.4,-86.4 30.4,-86.34 30.43,-86.32 30.4,-86.29 30.43,-86.25 30.39,-86.16 30.39,-86.13 30.47,-86.21 30.48,-86.26 30.46,-86.4 30.71,-86.4"
+    expect(polygon.centroid).to eq [30.525, -86.20500000000001]
+
+    polygon = Gull::Polygon.new "30.39,-86.59 30.38,-86.8 30.79,-86.72 30.78,-86.38 30.45,-86.39 30.44,-86.42 30.48,-86.46 30.45,-86.49 30.42,-86.59 30.4,-86.58 30.4,-86.53 30.42,-86.49 30.42,-86.44 30.41,-86.4 30.38,-86.39 30.37,-86.4 30.39,-86.59"
+    expect(polygon.centroid).to eq [30.58, -86.59]
   end
 
   it "should return static map image url" do

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ require 'gull/polygon'
 require 'gull/geocode'
 require 'webmock/rspec'
 
+require 'coveralls'
+Coveralls.wear!
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gull
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient