trafikanten-travel 0.2.3 → 0.2.4

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.3
1
+ 0.2.4
@@ -86,7 +86,8 @@ module TrafikantenTravel
86
86
  'T-bane' => :subway,
87
87
  'Sporvogn' => :tram,
88
88
  'Båt' => :boat,
89
- 'Buss' => :bus
89
+ 'Buss' => :bus,
90
+ 'Flytog' => :airport_express_train
90
91
  }
91
92
 
92
93
  def self.from_html(time, html)
@@ -0,0 +1,141 @@
1
+
2
+
3
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4
+
5
+ <html xmlns="http://www.w3.org/1999/xhtml" >
6
+ <head><title>
7
+ Trafikkavvik
8
+ </title><link href="TrafikantenNew.css" rel="stylesheet" type="text/css" /></head>
9
+ <body>
10
+ <form name="form1" method="post" action="ShowDeviation.aspx?id=1639" id="form1">
11
+ <div>
12
+ <input type="hidden" name="__VIEWSTATE" id="__VIEWSTATE" value="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" />
13
+ </div>
14
+
15
+ <div>
16
+
17
+ <input type="hidden" name="__VIEWSTATEENCRYPTED" id="__VIEWSTATEENCRYPTED" value="" />
18
+ </div>
19
+ <div>
20
+ <table width="620" cellpadding="3">
21
+
22
+ <tr>
23
+
24
+ <td style="background-color:White;">
25
+
26
+ <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse;">
27
+ <tr>
28
+ <td>
29
+ <table width="100%" border="0" cellpadding="5" cellspacing="0">
30
+ <tr>
31
+ <td height="182" valign="top" bgcolor="#ffffff"><table width="100%" border="0" cellspacing="0" cellpadding="0">
32
+ <tr>
33
+ <td colspan="2" class="headingbox"><table width="100%" border="0" cellspacing="2" cellpadding="2">
34
+ <tr>
35
+ <td valign="top" class="heading"><div align="center"><span id="DataList1_ctl00_HeaderLabel">Buss 435, 843, 845, 848 og 885.Omkjøring i Lillestrøm fra 27.7.09</span></div></td>
36
+ </tr>
37
+ </table></td>
38
+ </tr>
39
+ </table>
40
+ <br />
41
+
42
+ <span id="DataList1_ctl00_Label2"></span><br />
43
+ <br />
44
+ <strong><span id="DataList1_ctl00_LeadLabel">Mandag 27. juli starter ombyggingen av Alexander Kiellands gate i Lillestrøm, og gaten stenges i anleggsperioden. Arbeidene vil pågå frem til slutten av 2010.<br /><br />I denne perioden blir traseen for linjene 435, 843, 845, 848 og 855 lagt om. Bussene vil kjøre Storgata i stedet for Alexander Kiellands gate. <br /><br />Holdeplassene Stortorget, St. Magnus plass og Åråsen vil ikke bli betjent av de nevnte linjene.Nærmeste holdeplass til Åråsen blir Vestbygata eller Mosesvingen vest.<br /><br />Floraveien og Mosesvingen øst vil ikke blir betjent av linjene 435, 845, 848 og 855.<br /><br />Linje 843 vil stoppe på Floraveien og Mosesvingen øst.<br /><br />Les plakat med kart her: <a href="http://www.trafikanten.no/090727_lillestrom.pdf" target="_blank">http://www.trafikanten.no/090727_lillestrom.pdf</a></span></strong><br /><br />
45
+ <span id="DataList1_ctl00_BodyLabel"></span><br />
46
+
47
+ <dl>
48
+ <dt>Gyldig fra:</dt>
49
+ <dd><span id="DataList1_ctl00_ValidFromLabel">27.07.2009 03:00</span></dd><br />
50
+ <dt>Gyldig til:</dt>
51
+ <dd><span id="DataList1_ctl00_ValidToLabel">31.12.2010 23:59</span></dd><br />
52
+ <dt>Sist oppdatert:</dt>
53
+ <dd><span id="DataList1_ctl00_LastUpdatedLabel">17.08.2009 10:20</span>
54
+ </dd><br />
55
+ </dl>
56
+ <br />
57
+ <img id="DataList1_ctl00_Image2" src="plan.gif" style="border-width:0px;" />
58
+ <span id="DataList1_ctl00_PlannedLabel">Dette er et planlagt avvik.</span><br />
59
+
60
+
61
+ <br />
62
+ </td>
63
+ </tr>
64
+ </table>
65
+
66
+
67
+
68
+
69
+ <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse;">
70
+ <tr>
71
+ <td>
72
+ <dt>Gjelder stoppestedene:</dt>
73
+ </td>
74
+ </tr><tr>
75
+ <td>
76
+ <dd><span id="DataList2_ctl01_StopNameLabel">Åråsen (Skedsmo)</span></dd>
77
+ </td>
78
+ </tr><tr>
79
+ <td>
80
+ <dd><span id="DataList2_ctl02_StopNameLabel">St. Magnus plass (Skedsmo)</span></dd>
81
+ </td>
82
+ </tr><tr>
83
+ <td>
84
+ <dd><span id="DataList2_ctl03_StopNameLabel">Stortorget Lillestrøm (Skedsmo)</span></dd>
85
+ </td>
86
+ </tr><tr>
87
+ <td>
88
+ <dd><span id="DataList2_ctl04_StopNameLabel">Floraveien (Skedsmo)</span></dd>
89
+ </td>
90
+ </tr><tr>
91
+ <td>
92
+ <dd><span id="DataList2_ctl05_StopNameLabel">Mosesvingen øst (Skedsmo)</span></dd>
93
+ </td>
94
+ </tr>
95
+ </table>
96
+
97
+
98
+
99
+
100
+ <table id="DataList3" cellspacing="0" border="0" style="border-collapse:collapse;">
101
+ <tr>
102
+ <td>
103
+ <dt>Gjelder linjene:</dt>
104
+ </td>
105
+ </tr><tr>
106
+ <td>
107
+ <dd><span id="DataList3_ctl01_LineNameLabel">435</span></dd>
108
+ </td>
109
+ </tr><tr>
110
+ <td>
111
+ <dd><span id="DataList3_ctl02_LineNameLabel">843</span></dd>
112
+ </td>
113
+ </tr><tr>
114
+ <td>
115
+ <dd><span id="DataList3_ctl03_LineNameLabel">845</span></dd>
116
+ </td>
117
+ </tr><tr>
118
+ <td>
119
+ <dd><span id="DataList3_ctl04_LineNameLabel">848</span></dd>
120
+ </td>
121
+ </tr><tr>
122
+ <td>
123
+ <dd><span id="DataList3_ctl05_LineNameLabel">855</span></dd>
124
+ </td>
125
+ </tr>
126
+ </table>
127
+
128
+ </td>
129
+ </tr>
130
+
131
+ </table>
132
+ <br />
133
+ &nbsp;
134
+ <br />
135
+ <dl>
136
+ &nbsp; &nbsp;
137
+ </dl>
138
+ </div>
139
+ </form>
140
+ </body>
141
+ </html>
@@ -0,0 +1,53 @@
1
+
2
+ <!--++++++++++++-->
3
+ <!-- ASP code -->
4
+ <!--++++++++++++-->
5
+
6
+ <html>
7
+ <head>
8
+ <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no" />
9
+ <link rel="stylesheet" href="m.css" type="text/css" />
10
+ <title>Trafikanten - din reise</title>
11
+ </head>
12
+ <body>
13
+
14
+ <p>
15
+
16
+ <p>
17
+ Buss 855 Jessheim
18
+ <br/>Avg: Oslo Airport Hotel (Clarion) 11.17
19
+
20
+ <br/>Ank:Gardermoen flyterminal (n. plan) 11.26 <br/><div style='background-color:#ffffa0; border-style:ridge; padding:2; border-width:thin; border-color:#ffff33'><a href='http://devi.trafikanten.no/public/ShowDeviation.aspx?id=1639'>Buss 435, 843, 845, 848 og 885.Omkjøring i Lillestrøm fra 27.7.09</a><br/></div></p>
21
+ <p>
22
+ Gå fra Gardermoen flyterminal (n. plan) til Gardermoen flyplass [tog] ca. 4 minutter.
23
+ </p>
24
+ <p>
25
+
26
+ Vent 6 minutter<br/><br/>Flytog FT Drammen
27
+ <br/>Avg: Gardermoen flyplass [tog] 11.36
28
+
29
+ <br/>Ank:Oslo Sentralstasjon [tog] 11.58 <br/><div style='background-color:#ffffa0; border-style:ridge; padding:2; border-width:thin; border-color:#ffff33'><a href='http://devi.trafikanten.no/public/ShowDeviation.aspx?id=6102'>Flytoget: Buss erstatter flytog Drammen-Asker 20.6.-10.7.2010</a><br/></div></p>
30
+
31
+ <br/>Tot. reisetid 41 minutter<br/>
32
+
33
+ Maks gangavstand er satt til ca. 10 min eller 700 meter.
34
+ <br/>
35
+ <br/>
36
+
37
+ <a title="Forrige avgang" href="BetRes.asp?fra=02350308%3A&amp;DepType=1&amp;date=05.07.2010&amp;til=03010010%3A&amp;ArrType=1&amp;transport=2, 7, 5, 8, 1, 6, 4&amp;MaxRadius=700&amp;type=2&amp;tid=11.57">Forrige avgang</a>
38
+ <br/>
39
+ <a title="Neste avgang" href="BetRes.asp?fra=02350308%3A&amp;DepType=1&amp;date=05.07.2010&amp;til=03010010%3A&amp;ArrType=1&amp;transport=2, 7, 5, 8, 1, 6, 4&amp;MaxRadius=700&amp;type=1&amp;tid=11.18">Neste avgang</a>
40
+
41
+
42
+
43
+
44
+
45
+
46
+ <br/>
47
+ <a href="default.asp">Hjem</a>
48
+ <br/>
49
+
50
+ </small>
51
+ </p>
52
+ </body>
53
+ </html>
@@ -49,6 +49,12 @@ describe TrafikantenTravel::Route do
49
49
  }
50
50
  end
51
51
 
52
+ it 'knows about the Airport Express train' do
53
+ str = "Flytog FT Drammen Avg: Gardermoen flyplass [tog] 11.36 Ank:Oslo Sentralstasjon [tog] 11.58"
54
+ result = TrafikantenTravel::Route::Step.from_html(Time.now, str)
55
+ result.type.should == :airport_express_train
56
+ end
57
+
52
58
  context 'url generation' do
53
59
  # Test the whole thing
54
60
  it 'generates exactly this' do
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{trafikanten-travel}
8
- s.version = "0.2.3"
8
+ s.version = "0.2.4"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Rune Botten"]
12
- s.date = %q{2010-05-30}
12
+ s.date = %q{2010-07-05}
13
13
  s.description = %q{Query the travel planner at trafikanten.no with Ruby}
14
14
  s.email = %q{rbotten@gmail.com}
15
15
  s.extra_rdoc_files = [
@@ -28,8 +28,10 @@ Gem::Specification.new do |s|
28
28
  "lib/trafikanten_travel/route.rb",
29
29
  "lib/trafikanten_travel/station.rb",
30
30
  "lib/trafikanten_travel/utils.rb",
31
+ "spec/fixtures/deviation.html",
31
32
  "spec/fixtures/route.html",
32
33
  "spec/fixtures/route_search.html",
34
+ "spec/fixtures/route_with_deviation.html",
33
35
  "spec/options",
34
36
  "spec/spec.opts",
35
37
  "spec/trafikanten_travel/route_spec.rb",
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trafikanten-travel
3
3
  version: !ruby/object:Gem::Version
4
- hash: 17
4
+ hash: 31
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 2
9
- - 3
10
- version: 0.2.3
9
+ - 4
10
+ version: 0.2.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Rune Botten
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-05-30 00:00:00 +02:00
18
+ date: 2010-07-05 00:00:00 +02:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -87,8 +87,10 @@ files:
87
87
  - lib/trafikanten_travel/route.rb
88
88
  - lib/trafikanten_travel/station.rb
89
89
  - lib/trafikanten_travel/utils.rb
90
+ - spec/fixtures/deviation.html
90
91
  - spec/fixtures/route.html
91
92
  - spec/fixtures/route_search.html
93
+ - spec/fixtures/route_with_deviation.html
92
94
  - spec/options
93
95
  - spec/spec.opts
94
96
  - spec/trafikanten_travel/route_spec.rb