tide 0.1.2 → 0.1.3

data/README.rdoc

@@ -2,10 +2,12 @@
 
 Tide class fetches and returns Canadian tide prediction data from waterlevels.gc.ca
 
-Accepts options for tide zone, tide region, tide station, date and timezone. Defaults to 7 days of tide prediction data (starting from today) for Sydney, Nova Scotia in Atlantic time.
+Accepts options for tide station, date and timezone. Defaults to 7 days of tide prediction data (starting from today) for Sydney, Nova Scotia in Atlantic time.
 
 Outputs a comma separated list of tides (date, time, height in meters) with Tide.new.to_csv or a formatted html table with Tide.new.to_html.
 
+Alphabetical ist of station IDs can be found here: http://www.waterlevels.gc.ca/cgi-bin/tide-shc.cgi?queryType=showIndex&language=english&letter=A
+
 == Example Output
 
 ===Tide.new.to_csv

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/kenzie/tide"
   gem.license = "MIT"
   gem.summary = %Q{Tide class fetches and returns Canadian tide prediction data from waterlevels.gc.ca}
-  gem.description = %Q{Tide class fetches and returns Canadian tide prediction data from waterlevels.gc.ca. Accepts options for tide zone, tide region, tide station, date and timezone. Defaults to 7 days of tide prediction data (starting from today) for Sydney, Nova Scotia in Atlantic time. Outputs a comma separated list of tides (date, time, height in meters) with Tide.new.to_csv or a formatted html table with Tide.new.to_html.}
+  gem.description = %Q{Tide class fetches and returns Canadian tide prediction data from waterlevels.gc.ca. Accepts options for tide station, date and timezone. Defaults to 7 days of tide prediction data (starting from today) for Sydney, Nova Scotia in Atlantic time. Outputs a comma separated list of tides (date, time, height in meters) with Tide.new.to_csv or a formatted html table with Tide.new.to_html.}
   gem.email = "kenzie@route19.com"
   gem.authors = ["Kenzie Campbell"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/tide.rb

@@ -6,23 +6,21 @@ class Tide
 
   POST_URL      = 'http://www.waterlevels.gc.ca/cgi-bin/tide-shc.cgi'
   TIDE_REGEX    = /#\sDate;Time;Height<br>(.*)<br><\/p><\/td>/
-  STATION_REGEX = /# Station : (.*) \(\d+\).*/
-  INIT_DEFAULTS = { :zone => 27, :region => 5, :station => 610, :timezone => 'AST', :date => Time.now }
+  STATION_REGEX = /#\sStation\s:\s(.*)\s\(\d+\).*/
+  INIT_DEFAULTS = { :station => 610, :timezone => 'AST', :date => Time.now }
 
   attr_reader :location
 
   # Create new tide table.
   def initialize(options = {})
     options     = INIT_DEFAULTS.merge(options)
-    @zone       = options[:zone]
-    @region     = options[:region]
     @station    = options[:station]
     @timezone   = options[:timezone]
     @date       = options[:date]
     @location   = data.match(STATION_REGEX)[1]
   end
 
-  # Downlaod raw data
+  # Download raw data
   def data
     @data ||= download_tide_data
   end
@@ -44,8 +42,6 @@ private
     res = Net::HTTP.post_form(
     URI.parse(POST_URL),
       {
-        'zone'      => @zone,
-        'region'    => @region,
         'station'   => @station,
         'year'      => @date.year,
         'month'     => @date.month,

data/test/test_tide.rb

@@ -6,8 +6,8 @@ class TideTest < Test::Unit::TestCase
   # TODO fake web requests
 
   def test_location
-    @tide = Tide.new(:zone => 27, :region => 5, :station => 610)
-    assert_match "Sydney", @tide.location
+    @tide = Tide.new(:station => 9)
+    assert_match "Garnet Point", @tide.location
   end
 
   def test_to_csv

data/tide.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tide}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kenzie Campbell}]
   s.date = %q{2011-06-09}
-  s.description = %q{Tide class fetches and returns Canadian tide prediction data from waterlevels.gc.ca. Accepts options for tide zone, tide region, tide station, date and timezone. Defaults to 7 days of tide prediction data (starting from today) for Sydney, Nova Scotia in Atlantic time. Outputs a comma separated list of tides (date, time, height in meters) with Tide.new.to_csv or a formatted html table with Tide.new.to_html.}
+  s.description = %q{Tide class fetches and returns Canadian tide prediction data from waterlevels.gc.ca. Accepts options for tide station, date and timezone. Defaults to 7 days of tide prediction data (starting from today) for Sydney, Nova Scotia in Atlantic time. Outputs a comma separated list of tides (date, time, height in meters) with Tide.new.to_csv or a formatted html table with Tide.new.to_html.}
   s.email = %q{kenzie@route19.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "lib/.gitignore",
     "lib/tide.rb",
     "test/helper.rb",
     "test/test_tide.rb",

metadata

@@ -2,7 +2,7 @@
 name: tide
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kenzie Campbell
@@ -56,7 +56,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id004
-description: Tide class fetches and returns Canadian tide prediction data from waterlevels.gc.ca. Accepts options for tide zone, tide region, tide station, date and timezone. Defaults to 7 days of tide prediction data (starting from today) for Sydney, Nova Scotia in Atlantic time. Outputs a comma separated list of tides (date, time, height in meters) with Tide.new.to_csv or a formatted html table with Tide.new.to_html.
+description: Tide class fetches and returns Canadian tide prediction data from waterlevels.gc.ca. Accepts options for tide station, date and timezone. Defaults to 7 days of tide prediction data (starting from today) for Sydney, Nova Scotia in Atlantic time. Outputs a comma separated list of tides (date, time, height in meters) with Tide.new.to_csv or a formatted html table with Tide.new.to_html.
 email: kenzie@route19.com
 executables: []
 
@@ -73,7 +73,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/.gitignore
 - lib/tide.rb
 - test/helper.rb
 - test/test_tide.rb
@@ -91,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 284270415400974549
+      hash: -3486769737923497974
       segments: 
       - 0
       version: "0"

data/lib/.gitignore

@@ -1 +0,0 @@
-rdoc/