gares 2.0.0.pre.dev2 → 2.0.0.pre.dev3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a2068a77f7242decc42538c4b351e9f7310ae98
-  data.tar.gz: 75bea0e0b426c6bc6a690d15277b1c97dbb34e9f
+  metadata.gz: a13a56ca07337138e8c27caaeef89cd4ef6f4bf5
+  data.tar.gz: 0f0bd8cc2897185e17a06d0612df95dcb600db40
 SHA512:
-  metadata.gz: b9b23cdf24b6cf1c8479f677ebc209f16247fb4842d7cb4c992c6198e809cbda2729c791397e200b065d4136c42d985299b08f1ace78e4543ec54aebcc6724a8
-  data.tar.gz: 2222356832680a874edfaa2708ee832ecb6d3c04392a0262d55d4c0797e30827aca3639cf9c51209379079b336c1f1341c2f6409a2c833c08479de7e73d30ee1
+  metadata.gz: 8e552311ca4763dd804e95504c6e07876a51937e535afaf103424025ffee1b18d4a9f43b2c45aad32ffe2cc19a4bf1686642979097937d0b4b93cb56d49171b0
+  data.tar.gz: a91a6217481c551191637c6d38c0d8dd8b9304eaa8a57d1ab2422bbe0499e9deefa322f81269887802557ec5ff8f666218db0608a9f7e98afeb63b5ff1fe59ea

data/Guardfile

@@ -1,6 +1,6 @@
 group 'gem' do
   guard 'rspec', :cmd => "bundle exec rspec", :all_on_start => false, :all_after_pass => false, :failed_mode => :focus do
     watch(%r{^spec/.+_spec\.rb$})
-    watch(%r{^lib/(.+)\.rb$})                          { |m| "spec/gares/#{m[1]}_spec.rb" }
+    watch(%r{^lib/gares/(.+)\.rb$})                          { |m| "spec/gares/#{m[1]}_spec.rb" }
   end
 end

data/lib/gares/train.rb

@@ -42,19 +42,41 @@ module Gares
 
     private
 
+    def itinerary_available?
+      document.css('ul.itinerary-details').size > 0
+    end
+
     # Returns a new Nokogiri document for parsing.
     def document
-      @document ||= Nokogiri::HTML(self.class.request_sncf(@number, @date))
+      if !@document
+        @document = Nokogiri::HTML(self.class.request_sncf(@number, @date))
+        if !itinerary_available?
+          @document = Nokogiri::HTML(self.class.request_sncf_itinerary(0))
+        end
+      end
+      @document
     end
 
     def self.request_sncf(number, date)
       uri = URI.parse("http://www.sncf.com/sncf/train")
       response = Net::HTTP.post_form(uri, {"numeroTrain" => number, "date" => date.strftime("%d/%m/%Y")})
-      cookies = response.get_fields('Set-Cookie').map { |cookie| cookie.split(";").first }.join(";")
+      @cookies = response.get_fields('Set-Cookie').map { |cookie| cookie.split(";").first }.join(";")
 
       uri = URI.parse("http://www.sncf.com/en/horaires-info-trafic/train/resultats")
       req = Net::HTTP::Get.new(uri.path)
-      req.add_field("Cookie", cookies)
+      req.add_field("Cookie", @cookies)
+      Net::HTTP.new(uri.host, uri.port).start { |http| http.request(req) }.body
+    end
+
+    def self.request_sncf_itinerary(index)
+      uri = URI.parse("http://www.sncf.com/sncf/train/displayDetailTrain?idItineraire=#{index}")
+      req = Net::HTTP::Get.new(uri)
+      req.add_field("Cookie", @cookies) if @cookies
+      Net::HTTP.new(uri.host, uri.port).start { |http| http.request(req) }.body
+
+      uri = URI.parse("http://www.sncf.com/en/horaires-info-trafic/train/resultats?#{index}")
+      req = Net::HTTP::Get.new(uri)
+      req.add_field("Cookie", @cookies) if @cookies
       Net::HTTP.new(uri.host, uri.port).start { |http| http.request(req) }.body
     end
 

data/lib/gares/train_stop.rb

@@ -74,22 +74,22 @@ module Gares
       raw_name = node.at('td.stations div.station').inner_html.strip
       stations = Station.search(raw_name)
       @station = if stations.size > 1
-        raw_name.gsub!(/[ -]/, '.')
+        raw_name.gsub!(/[ -]/, '.*')
         exact_match  = /^#{raw_name}$/i
         begin_match  = /^#{raw_name}/i
         end_match    = /#{raw_name}$/
         middle_match = /#{raw_name}/i
         stations.find do |station|
-          station.name.match(exact_match)
+          station.name.to_ascii.match(exact_match)
         end ||
         stations.find do |station|
-          station.name.match(begin_match)
+          station.name.to_ascii.match(begin_match)
         end ||
         stations.find do |station|
-          station.name.match(end_match)
+          station.name.to_ascii.match(end_match)
         end ||
         stations.find do |station|
-          station.name.match(middle_match)
+          station.name.to_ascii.match(middle_match)
         end
       else
         stations.first

data/lib/gares/version.rb

@@ -1,3 +1,3 @@
 module Gares
-  VERSION = '2.0.0-dev2'
+  VERSION = '2.0.0-dev3'
 end

data/spec/fixtures/get-train-6815

@@ -1,8 +1,8 @@
 HTTP/1.1 200 OK
 Content-Type: text/html;charset=UTF-8
 X-UA-Compatible: IE=edge
-Date: Sat, 25 Apr 2015 18:27:40 GMT
-Content-Length: 21750
+Date: Sun, 26 Apr 2015 20:19:36 GMT
+Content-Length: 21606
 Connection: keep-alive
 Set-Cookie: SNC_city=SDN_PRD6; path=/; domain=.sncf.com
 
@@ -151,10 +151,10 @@ Modify your search          </a>
   <li class="itinerary-content ">
     <input type="hidden" name="heure-depart" value="1429971360000" />
     <input type="hidden" name="nb-correspondance" value="0" />
-    <input type="hidden" name="duree-trajet" value="386" />
+    <input type="hidden" name="duree-trajet" value="381" />
     <ul>
       <li class="itinerary-abstract">
-        <div class="cell duration">Duration <strong>6h26</strong></div>
+        <div class="cell duration">Duration <strong>6h21</strong></div>
         <div class="cell connection">
 Direct journey    	</div>
         <div class="cell itinerary-message ">
@@ -190,11 +190,11 @@ Timetables    		</th>
 							  <div class="train-number">no.<strong>6815</strong></div>
 							</td>
 							
-							<td class="info separator " >
+							<td class="info center " rowspan="2">
 								<span class="titre">
 										On time
 								</span>
-								<hr/>
+								
 							</td>
 						</tr>
 						<tr class="itinerary-end  last ">
@@ -204,11 +204,6 @@ Timetables    		</th>
 							<td class="stations">
 								<div class="station">NICE VILLE</div>
 							</td>
-						 	    <td class="info  disruption">								
-									<span class="titre">
-									 Delayed arrival 5MIN
-									</span>
-								</td>
 						</tr>
         </table>
           <a href="/sncf/train/displayDetailTrain?idItineraire=0" class="plus" action="train/displayDetailTrain?idItineraire=0">+</a>