trafikanten-travel 0.2.2 → 0.2.3

data/CHANGES

@@ -1,3 +1,5 @@
+* 0.2.3
+  Found some more indicators that a route was not available
 * 0.2.0
   Route.new takes Station objects, not strings
   Route has a find class method for searching for routes

data/Gemfile

@@ -3,3 +3,11 @@ source 'http://gemcutter.org'
 
 gem 'nokogiri', '1.4.1'
 gem 'geoutm', '0.0.4'
+
+group :test do
+  gem 'rspec', '1.3.0'
+end
+
+group :development do
+  gem 'jeweler'
+end

data/README.rdoc

@@ -17,12 +17,13 @@ route:
 === Finding stations
 You query trafikanten.no by the name of the station and you receive an array of hits with information about each
 
+	require 'trafikanten_travel'
 	stations = Station.find_by_name 'Sthanshaugen'
 
 The station objects will have attributes for name, id, type, lat and lng. lat and lng might not be available, and are then set to nil.
 
 === Finding a route between stations
-Once you have the stations, you use their IDs to create a Route object:
+Once you have the stations, you use them to search for a Route:
 
 	from = stations[0]
 	to = stations[1]
@@ -31,13 +32,13 @@ Once you have the stations, you use their IDs to create a Route object:
 	# or specify a time
 	route = Route.find(from, to, a_time_object)
 
-This will query trafikanten.no for the first available route based on Time.now
-or the passed in time and parse the route it found, if any. The Route object
-will have a duration attribtue for the duration of the trip in minutes, and a
-steps array with a Step object for each leg of the journey. Each Step tells
-you its type (walk, wait, tram, subway, boat, train, bus), duration in
-minutes, and arrival and departure station names along with times for these.
-All these are attributes on the Step object.
+This will query trafikanten.no for the first available route between the
+stations based on Time.now or the passed in time and parse the route it found,
+if any. The Route object will have a duration attribute for the duration of
+the trip in minutes, and a steps array with a Step object for each leg of the
+journey. Each Step object tells you its type (walk, wait, tram, subway, boat,
+train, bus), duration in minutes, and arrival and departure station names
+along with times for these. All these are attributes on the Step object.
 
 == TODO
 * Also include 'area' stations, which are not actual stations but regions
@@ -46,20 +47,18 @@ All these are attributes on the Step object.
 * Let the depart and arrive stations in Step be actual Station objects
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
+* Add tests in spec/
 * Make your feature addition or bug fix.
-* Add tests for it in spec/
-* Commit, do not mess with Rakefile or VERSION.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
+* Commit, do not mess with Rakefile or VERSION. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Running tests
 
   rake
 
-If you get errors about missing gems - just install them.
+If you get errors about missing gems - `bundle install` should get you sorted.
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/trafikanten_travel/route.rb

@@ -8,6 +8,7 @@ module TrafikantenTravel
     include TrafikantenTravel::Utils
     attr_accessor :duration, :steps
     BASE_URL = 'http://m.trafikanten.no/BetRes.asp?'
+    NOTFOUND = /Ingen forbindelse funnet eller ingen stoppesteder funnet|Ingen turer ankommer ankomststed|Ingen turer utgår fra avgangsted/u
     
     # Searches and returns a Route object for the found trip
     def self.find(from, to, time = TrafikantenTravel::Utils.time_class.now)
@@ -23,20 +24,17 @@ module TrafikantenTravel
       @steps = []
     end
 
-    # Parse the received HTML. First try some error-checking.
+    # Parse the received HTML. First try some simple error-checking.
     def parse
       doc = TrafikantenTravel::Utils.fetch(BASE_URL + query_string)
       
-      if doc =~ /Ingen forbindelse funnet eller ingen stoppesteder funnet/
+      case doc
+      when NOTFOUND
         return {}
-      end
-      
-      if doc =~ /Trafikanten - Feilmelding/
+      when /Trafikanten - Feilmelding/
         doc =~ /<p>(.+)<\/p>/
         raise Error.new($1)
-      end
-      
-      if doc =~ /Microsoft VBScript runtime/
+      when /Microsoft VBScript runtime/
         raise BadRequest
       end
       

data/spec/trafikanten_travel/route_spec.rb

@@ -52,21 +52,21 @@ describe TrafikantenTravel::Route do
     context 'url generation' do
       # Test the whole thing
       it 'generates exactly this' do
-        route = TrafikantenTravel::Route.find(@from, @to )
+        route = TrafikantenTravel::Route.new(@from, @to)
         query = route.send(:query_string)
         query.should == "fra=1000013064%3A&DepType=2&date=#{Time.now.strftime("%d.%m.%Y")}&til=02350113%3A&arrType=1&Transport=2,%207,%205,%208,%201,%206,%204&MaxRadius=700&type=1&tid=#{Time.now.strftime("%H.%M")}"
       end
 
       # Test the parts in isolation
       it 'takles stations and their types' do
-        route = TrafikantenTravel::Route.find(@from, @to )
+        route = TrafikantenTravel::Route.new(@from, @to)
         query = route.send(:query_string)
         query.should =~ /fra=1000013064%3A&DepType=2/
         query.should =~ /til=02350113%3A&arrType=1/
       end
 
       it 'defaults to Time.now' do
-        route = TrafikantenTravel::Route.find(@from, @to )
+        route = TrafikantenTravel::Route.new(@from, @to)
         query = route.send(:query_string)
         query.should =~ /date=#{Time.now.strftime("%d.%m.%Y")}/
         query.should =~ /tid=#{Time.now.strftime("%H.%M")}/
@@ -103,14 +103,20 @@ describe TrafikantenTravel::Route do
         <link rel="stylesheet" href="m.css" type="text/css" />
         <title>Trafikanten - Feilmelding</title>
         <body>
-           <p>Ingen forbindelse funnet eller ingen stoppesteder funnet</p>
+           <p>%s</p>
         </body>
         </html>
 eos
 
-        TrafikantenTravel::Utils.stub(:fetch).and_return(missing)
-        route = TrafikantenTravel::Route.find(@from, @to)
-        route.steps.should == []
+        [
+          'Ingen turer ankommer ankomststed', 
+          'Ingen forbindelse funnet eller ingen stoppesteder funnet',
+          'Ingen turer utgår fra avgangsted'
+          ].each do |notfound|
+            TrafikantenTravel::Utils.stub(:fetch).and_return(missing % notfound)
+            route = TrafikantenTravel::Route.find(@from, @to)
+            route.steps.should == []
+          end
       end
 
       it 'it parses errors and raises them locally' do

data/trafikanten-travel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trafikanten-travel}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rune Botten"]
-  s.date = %q{2010-05-25}
+  s.date = %q{2010-05-30}
   s.description = %q{Query the travel planner at trafikanten.no with Ruby}
   s.email = %q{rbotten@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trafikanten-travel
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Rune Botten
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 +02:00
+date: 2010-05-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency