ndbc 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c327b8b1e574dd319fbbe18ee6b7969c170e1972
-  data.tar.gz: 00fd2e05111126f4d42bf52882c90861aeac5a52
+  metadata.gz: 798a2b4c6804dd746f2b8c8bb43ae3f03ddda398
+  data.tar.gz: d51b10530562554036cdd49c45a2b3c77c4ef0ac
 SHA512:
-  metadata.gz: 4400bc5f6f8744d3ebb650ff18ca31afa3c6e0a9f879d933a1af1a2f036df412a2b64ca4884391c2b4409c6fcce786dbf78e9ca4b97296d5c40f637847acdd91
-  data.tar.gz: b405800a562d9d3a276dca5cdaf829b4168077560747fbdda0ac4e30a0e907690a5dc2e33a8e9e73d7d5c610c58e043a170a969ab193ae003a46a11d80bb0fba
+  metadata.gz: 2f94a80a9ea4639a9aa11a0be4ae6461ed33dd37ea004ab3589bedb1bd08c1565b33bc73bf162df24aac3dc9842605114c526c4dbc1e0fdfb068ce3b558d0d79
+  data.tar.gz: bfd72cef81ca3e3c70bb6204b5a1d4a92645f34b5e624c5b0a1618f96eec83dbda96e8e5a085e5d3aa893762fe0e9e969a048196e05d8a0b95bc8f5bfb5fea0b

data/.ruby-version

@@ -0,0 +1 @@
+2.2.5

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.2.5
+script: 
+  - bundle exec rspec spec

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/ryanhertz/ndbc.svg?branch=master)](https://travis-ci.org/ryanhertz/ndbc)
+
 # NDBC
 
 A ruby gem for getting NDBC (National Data Buoy Center) data.

data/Rakefile

@@ -1,2 +1,7 @@
+require 'rspec/core/rake_task'
 require "bundler/gem_tasks"
 
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+

data/changelog.md

@@ -1,3 +1,6 @@
+v0.1.0
+- When attempting to access station data for a station that can't be found, a NDBC::StationNotFound exception will be raised. Previously, the error was rescued and no error was raised.
+
 v0.0.2
 - Added Station.all
 

data/lib/ndbc.rb

@@ -2,6 +2,7 @@ require "ndbc/version"
 require "ndbc/connection"
 require "ndbc/station_table"
 require "ndbc/station"
+require "ndbc/exceptions"
 
 module NDBC
 

data/lib/ndbc/exceptions.rb

@@ -0,0 +1,4 @@
+module NDBC
+  class StationNotFound < StandardError
+  end
+end

data/lib/ndbc/station.rb

@@ -13,7 +13,7 @@ module NDBC
 
     attr_accessor :id, :connection
     attr_reader :owner, :ttype, :hull, :name, :payload, :location, :timezone, :forecast, :note,
-                :active
+                :active, :tide_station_id
 
     alias_method :active?, :active
 
@@ -29,6 +29,7 @@ module NDBC
       @forecast = station_data[:forecast]
       @note = station_data[:note]
       @active = station_data[:active]
+      @tide_station_id = station_data[:tide_station_id]
       @connection = Connection.new
     end
 
@@ -37,7 +38,9 @@ module NDBC
     end
 
     def standard_meteorological_data
-      parse_observation_response get_data(NDBC.config[:urls][:observations] + id + ".txt")
+      @standard_meteorological_data ||= parse_observation_response(
+        get_data(NDBC.config[:urls][:observations] + id + ".txt")
+      )
     end
 
     def latest_standard_meteorological_data
@@ -45,7 +48,9 @@ module NDBC
     end
 
     def continuous_winds_data
-      parse_observation_response get_data(NDBC.config[:urls][:observations] + id + ".cwind")
+      @continuous_winds_data ||= parse_observation_response(
+        get_data(NDBC.config[:urls][:observations] + id + ".cwind")
+      )
     end
 
     def latest_continuous_winds_data
@@ -53,7 +58,9 @@ module NDBC
     end
 
     def spectral_wave_summaries
-      parse_observation_response get_data(NDBC.config[:urls][:observations] + id + ".spec")
+      @spectral_wave_summaries ||= parse_observation_response(
+        get_data(NDBC.config[:urls][:observations] + id + ".spec")
+      )
     end
 
     def latest_spectral_wave_summaries
@@ -61,7 +68,9 @@ module NDBC
     end
 
     def spectral_wave_forecasts
-      parse_prediction_response get_data(NDBC.config[:urls][:predictions] + "multi_1.#{id}.bull")
+      @spectral_wave_forecasts ||= parse_prediction_response(
+        get_data(NDBC.config[:urls][:predictions] + "multi_1.#{id}.bull")
+      )
     end
 
     def latest_spectral_wave_forecasts
@@ -111,7 +120,7 @@ module NDBC
     def get_data(path)
       connection.get(path)
     rescue NotFound => error
-      puts "Failed to get data for station #{id}"
+      raise NDBC::StationNotFound, "Could not find station #{id}"
     end
 
     def parse_observation_response(response)

data/lib/ndbc/station_table.rb

@@ -18,13 +18,19 @@ module NDBC
             time_zone:  station_parts[7],
             forecast:   station_parts[8],
             note:       station_parts[9],
-            active:     active?(station_parts)
+            active:     active?(station_parts),
+            tide_station_id: tide_station_id(station_parts[4])
           }
         end
       end
 
       private
 
+      def tide_station_id(name)
+        return '' unless name
+        name.match(/\d{7}/).to_s
+      end
+
       def cleanup_parts!(station_parts)
         station_parts.map! do |part|
           part = part.gsub(' ', ' ')

data/lib/ndbc/version.rb

@@ -1,3 +1,3 @@
 module NDBC
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/fixtures/vcr_cassettes/continuous_winds_data_station_not_found.yml

@@ -0,0 +1,87 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://www.ndbc.noaa.gov/data/realtime2/0.cwind
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Sun, 10 Sep 2017 14:09:37 GMT
+      Server:
+      - Apache
+      Vary:
+      - Accept-Encoding
+      Content-Length:
+      - '190'
+      Connection:
+      - close
+      Content-Type:
+      - text/html; charset=iso-8859-1
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head><body>
+        <h1>Not Found</h1>
+        <p>The requested URL /data/realtime2/0.cwind was not found on this server.</p>
+        </body></html>
+    http_version: 
+  recorded_at: Sun, 10 Sep 2017 14:09:37 GMT
+- request:
+    method: get
+    uri: http://www.ndbc.noaa.gov/data/realtime2/00000.cwind
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Sun, 10 Sep 2017 14:52:32 GMT
+      Server:
+      - Apache
+      Vary:
+      - Accept-Encoding
+      Content-Length:
+      - '192'
+      Connection:
+      - close
+      Content-Type:
+      - text/html; charset=iso-8859-1
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head><body>
+        <h1>Not Found</h1>
+        <p>The requested URL /data/realtime2/00000.cwind was not found on this server.</p>
+        </body></html>
+    http_version: 
+  recorded_at: Sun, 10 Sep 2017 14:52:32 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/spectral_wave_forecasts_station_not_found.yml

@@ -0,0 +1,91 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://polar.ncep.noaa.gov/waves/WEB/multi_1.latest_run/plots/multi_1.0.bull
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Sun, 10 Sep 2017 14:10:10 GMT
+      Server:
+      - Apache
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '247'
+      Content-Type:
+      - text/html; charset=iso-8859-1
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head><body>
+        <h1>Not Found</h1>
+        <p>The requested URL /waves/WEB/multi_1.latest_run/plots/multi_1.0.bull was not found on this server.</p>
+        </body></html>
+    http_version: 
+  recorded_at: Sun, 10 Sep 2017 14:10:10 GMT
+- request:
+    method: get
+    uri: http://polar.ncep.noaa.gov/waves/WEB/multi_1.latest_run/plots/multi_1.00000.bull
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Sun, 10 Sep 2017 14:52:53 GMT
+      Server:
+      - Apache
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '251'
+      Content-Type:
+      - text/html; charset=iso-8859-1
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head><body>
+        <h1>Not Found</h1>
+        <p>The requested URL /waves/WEB/multi_1.latest_run/plots/multi_1.00000.bull was not found on this server.</p>
+        </body></html>
+    http_version: 
+  recorded_at: Sun, 10 Sep 2017 14:52:53 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/spectral_wave_summaries_station_not_found.yml

@@ -0,0 +1,87 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://www.ndbc.noaa.gov/data/realtime2/0.spec
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Sun, 10 Sep 2017 14:09:53 GMT
+      Server:
+      - Apache
+      Vary:
+      - Accept-Encoding
+      Content-Length:
+      - '189'
+      Connection:
+      - close
+      Content-Type:
+      - text/html; charset=iso-8859-1
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head><body>
+        <h1>Not Found</h1>
+        <p>The requested URL /data/realtime2/0.spec was not found on this server.</p>
+        </body></html>
+    http_version: 
+  recorded_at: Sun, 10 Sep 2017 14:09:53 GMT
+- request:
+    method: get
+    uri: http://www.ndbc.noaa.gov/data/realtime2/00000.spec
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Sun, 10 Sep 2017 14:52:33 GMT
+      Server:
+      - Apache
+      Vary:
+      - Accept-Encoding
+      Content-Length:
+      - '191'
+      Connection:
+      - close
+      Content-Type:
+      - text/html; charset=iso-8859-1
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head><body>
+        <h1>Not Found</h1>
+        <p>The requested URL /data/realtime2/00000.spec was not found on this server.</p>
+        </body></html>
+    http_version: 
+  recorded_at: Sun, 10 Sep 2017 14:52:33 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/standard_meteorological_data_station_not_found.yml

@@ -0,0 +1,87 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://www.ndbc.noaa.gov/data/realtime2/0.txt
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Sun, 10 Sep 2017 14:09:37 GMT
+      Server:
+      - Apache
+      Vary:
+      - Accept-Encoding
+      Content-Length:
+      - '188'
+      Connection:
+      - close
+      Content-Type:
+      - text/html; charset=iso-8859-1
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head><body>
+        <h1>Not Found</h1>
+        <p>The requested URL /data/realtime2/0.txt was not found on this server.</p>
+        </body></html>
+    http_version: 
+  recorded_at: Sun, 10 Sep 2017 14:09:37 GMT
+- request:
+    method: get
+    uri: http://www.ndbc.noaa.gov/data/realtime2/00000.txt
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Sun, 10 Sep 2017 14:52:31 GMT
+      Server:
+      - Apache
+      Vary:
+      - Accept-Encoding
+      Content-Length:
+      - '190'
+      Connection:
+      - close
+      Content-Type:
+      - text/html; charset=iso-8859-1
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head><body>
+        <h1>Not Found</h1>
+        <p>The requested URL /data/realtime2/00000.txt was not found on this server.</p>
+        </body></html>
+    http_version: 
+  recorded_at: Sun, 10 Sep 2017 14:52:31 GMT
+recorded_with: VCR 2.9.3

data/spec/ndbc/station_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe NDBC::Station do
 
   subject(:station) { NDBC::Station.new(41009) }
+  
+  let(:not_found_station) { NDBC::Station.new('00000') }
 
   methods = %i(wdir wspd gst wvht dpd apd mwd pres atmp wtmp dewp vis ptdy tide dir spd gdr gsp
                gtime h0 wwh wwp wwd steepness avp swh swp swd swd owner ttype hull name payload
@@ -52,7 +54,14 @@ describe NDBC::Station do
     end
   end
 
-  shared_examples_for "station" do
+  shared_examples_for :results_format do |meth|
+
+    let(:result) do
+      VCR.use_cassette(meth) do
+        station.public_send(meth)
+      end
+    end
+    
     it "returns a hash with units and values" do
       expect(result[:units]).to be_a(Hash)
       expect(result[:values]).to be_a(Array)
@@ -87,68 +96,30 @@ describe NDBC::Station do
 
   end
 
-  describe "#standard_meteorological_data" do
-
-    let(:result) do
-      VCR.use_cassette("standard_meteorological_data") do
-        station.standard_meteorological_data
-      end
-    end
-
-    it_behaves_like "station"
-
-    context 'when the station is not found' do
-
-      let(:not_found_station) { NDBC::Station.new(00000) }
-
-      let(:not_found_result) do
-        VCR.use_cassette("standard_meteorological_data_not_found") do
-          not_found_station.standard_meteorological_data
-        end
+  shared_examples_for :station_not_found do |meth|
+    it "raises NDBC::StationNotFound when the station url can't be found" do
+      VCR.use_cassette("#{meth}_station_not_found") do
+        expect{not_found_station.public_send(meth)}.to raise_error(
+          NDBC::StationNotFound, "Could not find station #{not_found_station.id}")
       end
-
-      it "returns a hash with units and values" do
-        expect(not_found_result[:units]).to be_a(Hash)
-        expect(not_found_result[:values]).to be_a(Array)
-      end
-
     end
+  end
 
+  describe "#standard_meteorological_data" do
+    it_behaves_like :results_format, 'standard_meteorological_data'
+    it_behaves_like :station_not_found, 'standard_meteorological_data'
   end
 
   describe "#continuous_winds_data" do
-    let(:result) do
-      VCR.use_cassette("continuous_winds_data") do
-        station.continuous_winds_data
-      end
-    end
-
-    it_behaves_like "station"
+    it_behaves_like :results_format, 'continuous_winds_data'
+    it_behaves_like :station_not_found, 'continuous_winds_data'
   end
 
   describe "#spectral_wave_summaries" do
-    let(:result) do
-      VCR.use_cassette("spectral_wave_summaries") do
-        station.spectral_wave_summaries
-      end
-    end
-
-    it_behaves_like "station"
+    it_behaves_like :results_format, 'spectral_wave_summaries'
+    it_behaves_like :station_not_found, 'spectral_wave_summaries'
   end
 
-  describe "error handling" do
-
-    let(:not_found) do
-      NDBC::Station.new(00000)
-    end
-
-    it "catches 404's" do
-      VCR.use_cassette("station_not_found") do
-        expect{not_found.standard_meteorological_data}.not_to raise_error
-      end
-
-    end
-  end
 
   describe "#spectral_wave_forecasts" do
 
@@ -160,6 +131,8 @@ describe NDBC::Station do
       end
     end
 
+    it_behaves_like :station_not_found, 'spectral_wave_forecasts'
+
     it "makes a request" do
       expect(buoy.connection).to receive(:get).with("http://polar.ncep.noaa.gov/waves/WEB/multi_1.latest_run/plots/multi_1.41009.bull")
       buoy.spectral_wave_forecasts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndbc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Hertz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -139,16 +141,21 @@ files:
 - changelog.md
 - lib/ndbc.rb
 - lib/ndbc/connection.rb
+- lib/ndbc/exceptions.rb
 - lib/ndbc/station.rb
 - lib/ndbc/station_table.rb
 - lib/ndbc/version.rb
 - ndbc.gemspec
 - spec/fixtures/vcr_cassettes/continuous_winds_data.yml
+- spec/fixtures/vcr_cassettes/continuous_winds_data_station_not_found.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
 - spec/fixtures/vcr_cassettes/spectral_wave_forecasts.yml
+- spec/fixtures/vcr_cassettes/spectral_wave_forecasts_station_not_found.yml
 - spec/fixtures/vcr_cassettes/spectral_wave_summaries.yml
+- spec/fixtures/vcr_cassettes/spectral_wave_summaries_station_not_found.yml
 - spec/fixtures/vcr_cassettes/standard_meteorological_data.yml
 - spec/fixtures/vcr_cassettes/standard_meteorological_data_not_found.yml
+- spec/fixtures/vcr_cassettes/standard_meteorological_data_station_not_found.yml
 - spec/fixtures/vcr_cassettes/station_not_found.yml
 - spec/fixtures/vcr_cassettes/station_table.yml
 - spec/ndbc/connection_spec.rb
@@ -175,17 +182,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Get NDBC buoy data.
 test_files:
 - spec/fixtures/vcr_cassettes/continuous_winds_data.yml
+- spec/fixtures/vcr_cassettes/continuous_winds_data_station_not_found.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
 - spec/fixtures/vcr_cassettes/spectral_wave_forecasts.yml
+- spec/fixtures/vcr_cassettes/spectral_wave_forecasts_station_not_found.yml
 - spec/fixtures/vcr_cassettes/spectral_wave_summaries.yml
+- spec/fixtures/vcr_cassettes/spectral_wave_summaries_station_not_found.yml
 - spec/fixtures/vcr_cassettes/standard_meteorological_data.yml
 - spec/fixtures/vcr_cassettes/standard_meteorological_data_not_found.yml
+- spec/fixtures/vcr_cassettes/standard_meteorological_data_station_not_found.yml
 - spec/fixtures/vcr_cassettes/station_not_found.yml
 - spec/fixtures/vcr_cassettes/station_table.yml
 - spec/ndbc/connection_spec.rb