gull 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e31bf5dcc237447beaebab3385d8d87b2615d88
-  data.tar.gz: c123ff556c38b50041abd35bf2211406a4da70cc
+  metadata.gz: 499056dd7d0dfaf61fd26893aac65a8f8b2f802f
+  data.tar.gz: 989cda9df71c6d5fc5d31c3ae9c4ff6a26e7ff7b
 SHA512:
-  metadata.gz: 014efe76f247bbdcb3a2159617ce700c5b291b141071f6cb74a546ee93a8126264128f0858ba15d882f2bbdd05a1a7ddb976d6a7a4131367aabdf9138006901b
-  data.tar.gz: 21a3d3fe3471ff03773a6958ed6af9908f198d284259b809e77f89a6219f1d21c14216304eb36f3b96d96b182162acccd1a8ad208f1c58aab321b98068ce09e9
+  metadata.gz: 7b86f770036bbae32dd13ad68d793fc62043bbf199d3e980cdb92455e26c0498a952d1212a5af69ec26403377da32edce66ee2efdfa68d4e5249a6dc23a5ed35
+  data.tar.gz: ffe0a676c31958d1c51c25a50a1be6d13046ba88689f734ec4a82112062c4d87e4c5cc6ef6abb52751689e3879a14e15d5d0f4d7fdd532e125eade99e47ff140

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
-sudo: false
+sudo: true 
 rvm:
-- 2.2.3
-- 2.1.7
-- 2.0.0
+- 2.3.1
+- 2.2.5
 
 script: rspec spec

data/CHANGELOG.md

@@ -1,38 +1,53 @@
-#### 0.3.4 (12/16/2015)
-Fixed parser to handle empty geocode.
+0.4.0 (07/26/2016) - Merged pull request #2 from [schrockwell](https://github.com/schrockwell), which adds `to_wkt` to `Polygon` which formats the polygon points as Well-Known Text (WKT). Removed `centroid` method, use new `to_wkt` method with an external geospatial library instead.
 
-#### 0.3.3 (11/25/2015)
-Handle additional service failure scenarios.
 ***
-#### 0.3.2 (11/10/2015)
-Added BadResponseError to client error handling.
+
+0.3.4 (12/16/2015) - Fixed parser to handle empty geocode.
+
 ***
-#### 0.3.1 (6/25/2015)
-Added nested error handling for other HTTPClient errors. HttpError has original attribute exposing the root error.
+
+0.3.3 (11/25/2015) - Handle additional service failure scenarios.
+
 ***
-#### 0.3.0 (6/23/2015)
-Added Client class for error handling (bad entries accessed via errors array). Exposed option to turn on strict XML parsing for debugging. Alert.fetch uses new Client but is backwards compatible, however it doesn't give you access to errors array.
+
+0.3.2 (11/10/2015) - Added BadResponseError to client error handling.
+
 ***
-#### 0.2.13 (6/20/2015)
-Handle missing cap section
+
+0.3.1 (6/25/2015) - Added nested error handling for other HTTPClient errors. HttpError has original attribute exposing the root error.
+
+***
+
+0.3.0 (6/23/2015) - Added Client class for error handling (bad entries accessed via errors array). Exposed option to turn on strict XML parsing for debugging. Alert.fetch uses new Client but is backwards compatible, however it doesn't give you access to errors array.
+
+***
+
+0.2.13 (6/20/2015) - Handle missing cap section
+
 ***
-#### 0.2.12 (6/12/2015)
-Fix issue with missing link elements
+
+0.2.12 (6/12/2015) - Fix issue with missing link elements
+
 ***
-#### 0.2.11 (5/29/2015)
-Added method to get original polygon string
+
+0.2.11 (5/29/2015) -Added method to get original polygon string
+
 ***
-#### 0.2.10 (3/23/2015)
-Added option to override default alert service URI.
+
+0.2.10 (3/23/2015) - Added option to override default alert service URI.
+
 ***
-#### 0.2.1 (10/02/2014)
-Added static map image to polygons.
+
+0.2.1 (10/02/2014) - Added static map image to polygons.
+
 ***
-#### 0.2.0 (10/02/2014)
-Introduced Polygon type.
+
+0.2.0 (10/02/2014) - Introduced Polygon type.
+ 
 ***
-#### 0.1.1 (10/01/2014)
-Refactored and simplified alert processing.
+
+0.1.1 (10/01/2014) - Refactored and simplified alert processing.
+
 ***
-#### 0.1.0 (10/01/2014)
-Initial release, basic functionality of fetching and parsing alerts.
+
+0.1.0 (10/01/2014) - Initial release, basic functionality of fetching and parsing alerts.

data/Gemfile

@@ -2,8 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gull.gemspec
 gemspec
-
-gem 'coveralls', require: false
-gem 'guard'
-gem 'guard-rspec', require: false
-gem 'simplecov', require: false

data/README.md

@@ -1,12 +1,12 @@
 [![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)
+[![Coverage Status](https://coveralls.io/repos/sethdeckard/gull/badge.svg?branch=master)](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)
 [![security](https://hakiri.io/github/sethdeckard/gull/master.svg)](https://hakiri.io/github/sethdeckard/gull/master)
 # Gull
 
-Ruby client for parsing NOAA/NWS alerts, warnings, and watches. The name comes from the type of bird featured on the NOAA logo.
+Ruby client for parsing NOAA/NWS alerts, warnings, and watches. The name comes from the type of bird featured on the NOAA logo. Please read the Notes/Caveats section for limitations.
 
 ## Installation
 
@@ -68,24 +68,16 @@ Options can be passed for map to override defaults
 
 ```ruby
 options = { width: 600, height: 300, color: '0xfbf000', weight: 4,
-            fillcolor: '0xfbf00070', maptype: 'hybrid' } 
-alert.polygon.image_url 'YOUR_GOOGLE_API_KEY', options 
+            fillcolor: '0xfbf00070', maptype: 'hybrid' }
+alert.polygon.image_url 'YOUR_GOOGLE_API_KEY', options
 ```
 
-Get the centroid of the polygon (to display a map pin, etc.)
-
-```ruby
-alert.polygon.centroid
-
-=> [34.835, -91.205]
-```
-	
 ##Notes, Caveats
-This library provides a simplified/flattened model of the [Common Alerting Protocol](http://docs.oasis-open.org/emergency/cap/v1.2/CAP-v1.2-os.html) based only on the elements NWS utilizes in their public RSS feeds. If you need a complete CAP parser I suggest looking at [RCAP](https://github.com/farrel/RCAP).
+This library provides a simplified/flattened model of the [Common Alerting Protocol](http://docs.oasis-open.org/emergency/cap/v1.2/CAP-v1.2-os.html) based only on the elements NWS utilizes in their [public Atom feeds](http://alerts.weather.gov/). If you need a complete CAP parser I suggest looking at [RCAP](https://github.com/farrel/RCAP).
 
-The NWS will often cancel or update alerts before their expiration time. The public alert feed only provides current active alerts and does not include these separate update and cancellation CAP messages. If you're persisting these alerts you need to design for this scenario.
+The NWS will often cancel or update alerts before their expiration time. The public Atom feeds only provide current active alerts and do not include these separate update and cancellation CAP messages.
 
-The public RSS feeds are not always reliable, if you are using this for critical purposes then you should explore other options.
+The public Atom feeds have not always been reliable in terms of uptime and are often delayed by 2-3 minutes. If you are considering using this (or another gem/library that accesses the public Atom feeds) for mission critical purposes then you should explore other options.
 
 ### Urgency
 

data/gull.gemspec

@@ -19,10 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'httpclient'
-  spec.add_runtime_dependency 'nokogiri', '>= 1.6.2'
+  spec.add_runtime_dependency 'nokogiri', '>= 1.6.8'
 
-  spec.add_development_dependency 'bundler', '>= 1.6'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 3.0'
+  spec.add_development_dependency 'rspec', '>=3.0'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'guard'
   spec.add_development_dependency 'webmock'
 end

data/lib/gull/polygon.rb

@@ -3,31 +3,8 @@ module Gull
     attr_accessor :coordinates
 
     def initialize(polygon)
-      self.coordinates = polygon.split(' ').collect do |coords|
-        coords.split(',').collect(&:to_f)
-      end
-    end
-
-    def centroid
-      low_x = 0
-      low_y = 0
-      high_x = 0
-      high_y = 0
-
-      coordinates.each do |pair|
-        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)
-      center_y = low_y + ((high_y - low_y) / 2)
-
-      [center_x, center_y]
+      self.coordinates = polygon.split(' ')
+                                .map { |point| point.split(',').map(&:to_f) }
     end
 
     def image_url(api_key, options = {})
@@ -51,20 +28,17 @@ module Gull
       coordinates.map { |pair| pair.join(',') }.join(' ')
     end
 
-    private
-
-    def bounds(point, low, high)
-      if point < low || low == 0
-        low = point
-      elsif point > high || high == 0
-        high = point
-      end
-
-      [low, high]
+    # Returns well-known text (WKT) formatted polygon
+    def to_wkt
+      pairs = coordinates.map { |pair| "#{pair.last} #{pair.first}" }
+                         .join(', ')
+      "POLYGON((#{pairs}))"
     end
 
+    private
+
     def coordinates_piped
-      coordinates.collect { |pair| pair.join ',' }.join '|'
+      coordinates.map { |pair| pair.join ',' }.join '|'
     end
   end
 end

data/lib/gull/version.rb

@@ -1,3 +1,3 @@
 module Gull
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

data/spec/polygon_spec.rb

@@ -1,25 +1,6 @@
 require 'spec_helper'
 
 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
     polygon = Gull::Polygon.new '34.57,-97.56 34.77,-97.38 34.75,-97.17'
 
@@ -48,4 +29,17 @@ describe Gull::Polygon do
     polygon = Gull::Polygon.new text
     expect(polygon.to_s).to eq text
   end
+
+  it 'should output polygons in WKT format' do
+    text = '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'
+
+    wkt_text = 'POLYGON((-97.56 34.57, -97.38 34.77, -97.17 34.75,' \
+      ' -97.11 34.64, -97.14 34.64, -97.14 34.62, -97.2 34.62, -97.19 34.6,' \
+      ' -97.17 34.59, -97.17 34.57, -97.3 34.5, -97.56 34.51, -97.56 34.57))'
+
+    polygon = Gull::Polygon.new text
+    expect(polygon.to_wkt).to eq wkt_text
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gull
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Client for parsing NOAA/NWS alerts, warnings, and watches.