gares 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4702068cf0cdbfaa09688c6d7ca85b761c7ee3f3
-  data.tar.gz: 77b3f7296d478e7c508843910e5fe8e367bf9334
+  metadata.gz: 5b7f08cfd31cca43ba9a05d17d103d8a092a9d50
+  data.tar.gz: 11d1b1eb72fff644d1f0fe67a59cc68edf273072
 SHA512:
-  metadata.gz: cfbb732a4c47ed9fa44439e45d3a05cbaa2c0134422154a7a63f332d73dd0316c98f5d1042ff5afc3fe142293dd8003a4fcaab1e56022321c991fc7295dddade
-  data.tar.gz: 9263b6f9f0d56f0f7062c5dac8a70fface1ed59f3d6a1b81554483c21170faa97826004809b2bcf4cb8ea1cde4dd21bb8f4b80b21a9e25aba9db02d65dd36f6e
+  metadata.gz: 7c18477831fa2520b08ad6d1bd1fcbbf2f2271ed68cf21c23e7d3e0a9bd5b7f1317d2b24d7efede154875d772d43e73cb46c8221c705abd0398c50fe2c43cc0d
+  data.tar.gz: a4fb97957f8c1aac0f7e9a8140148eff784c0f7fa9307178f89ee146d669b36d733bbec45efe6469edddcad020f414977d83898abe297b68d5664ff239a8aa6f

data/README.md

@@ -32,10 +32,10 @@ Gares currently features the following:
     [g.latitude, g.longitude]
     #=> [45.760568, 4.859991]
 
-    g.departuring_trains.first
+    g.departing_trains.first
     #=> #<Gares::Train heure="05:50" num=9852 type="TGV" origdest=#<Gares::Station name="Bruxelles" ...> ...>
 
-    g.departuring_trains.first.platform
+    g.departing_trains.first.platform
     #=> "K"
 
 See the [`Gares::Base` class documentation](http://www.rubydoc.info/github/paulrbr/gares/master/Gares/Base) for all available data on a station.

data/lib/gares/base.rb

@@ -87,7 +87,8 @@ module Gares
 
     def tvs
       if uic8_sncf
-        @tvs ||= self.class.open_data_sncf(uic8_sncf, :tvs).split(" ").first
+        @raw_tvs ||= self.class.open_data_sncf(uic8_sncf, :tvs)
+        @raw_tvs.split(" ").first if @raw_tvs
       end
     end
 
@@ -98,6 +99,8 @@ module Gares
         all_trains = raw_trains.map do |raw_train|
           raw_train[:num] = raw_train[:num].to_i
           raw_train[:date] = Time.now
+          key = direction == :departure ? :orig : :dest
+          raw_train[key] = self
           Gares::Train.new(raw_train)
         end
         instance_variable_set(variable, all_trains)

data/lib/gares/train.rb

@@ -4,7 +4,8 @@ require "uri"
 module Gares
   # Represents a train from http://www.sncf.com/fr/horaires-info-trafic/train
   class Train < Hashie::Dash
-    property :origdest
+    property :orig
+    property :dest
     property :num, required: true
     property :date, required: true
     property :type
@@ -24,11 +25,15 @@ module Gares
     # will be performed when a new object is created. An HTTP request is made
     # Only when you use an accessor that needs remote data.
     def initialize(*arguments)
-      fail "Please provide a train number" unless arguments.first[:num].is_a?(Integer)
-      fail "Please provide a departure date" unless arguments.first[:date].is_a?(Time)
+      attributes = arguments.first
 
-      if arguments.first[:origdest]
-        arguments.first[:origdest] = Gares::Station.search(arguments.first[:origdest]).first
+      fail "Please provide a train number" unless attributes[:num].is_a?(Integer)
+      fail "Please provide a departure date" unless attributes[:date].is_a?(Time)
+
+      if attributes[:origdest]
+        @origdest = attributes[:orig].nil? ? :orig : :dest
+        attributes[@origdest] = Gares::Station.search(attributes[:origdest]).first
+        attributes.delete(:origdest)
       end
 
       super(*arguments)
@@ -39,9 +44,13 @@ module Gares
       num
     end
 
-    # @return [TrainStop] The departure point of the train
+    # @return [Station] The departure station of the train
     def departure
-      @departure ||= TrainStop.new(document.at('tr.itinerary-start'), date)
+      if orig
+        orig
+      else
+        @departure ||= TrainStop.new(document.at('tr.itinerary-start'), date)
+      end
     end
 
     # @return [Array<TrainStop>] A list of all stops between departure and arrival stations.
@@ -49,9 +58,19 @@ module Gares
       @stops ||= document.css('tr.itinerary-stop').map { |stop| TrainStop.new(stop, date) }
     end
 
-    # @return [TrainStop] The arrival point of the train
+    # @return [Station] The arrival station of the train
     def arrival
-      @arrival ||= TrainStop.new(document.at('tr.itinerary-end'), date)
+      if dest
+        dest
+      else
+        @arrival ||= TrainStop.new(document.at('tr.itinerary-end'), date)
+      end
+    end
+
+    # @deprecated
+    def origdest
+      warn("[DEPRECATED] Warning: This method is deprecated, please use `orig` or `dest` instead of `origdest`")
+      send(@origdest)
     end
 
     def delayed?

data/lib/gares/version.rb

@@ -1,3 +1,3 @@
 module Gares
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

data/spec/fixtures/88140010.json

@@ -0,0 +1,21 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Sat, 09 May 2015 14:06:47 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+X-RateLimit-Remaining: 4898
+Access-Control-Allow-Headers: Authorization, X-Requested-With, Origin, ODS-API-Analytics-App, ODS-Widgets-Version
+Content-Language: fr
+Access-Control-Max-Age: 1000
+Expires: Fri, 01 Jan 1990 00:00:00 GMT
+Vary: Accept-Language, Cookie, Host
+X-RateLimit-Limit: 5000
+Pragma: no-cache
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Access-Control-Allow-Origin: *
+Access-Control-Allow-Methods: POST, GET, OPTIONS
+X-RateLimit-Reset: 1431216000
+X-UA-Compatible: IE=edge
+
+{"nhits": 0, "parameters": {"dataset": ["referentiel-gares-voyageurs"], "timezone": "UTC", "q": "0088140010", "rows": 10, "format": "json"}, "records": []}

data/spec/gares/station_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 # This test uses "Lyon Part-Dieu" as a testing sample:
@@ -35,16 +36,20 @@ describe Gares::Station do
 
     it 'has a list of departure trains' do
       expect(subject.departures.size).to eq(20)
-      expect(subject.departures.first.origdest.name).to eq('Bruxelles')
+      expect(subject.departures.first.arrival.name).to eq('Bruxelles')
       expect(subject.departures.first.heure).to eq('05:50')
       expect(subject.departures.first.type).to eq('TGV')
+      # Still supports deprecated field
+      expect(subject.departures.first.origdest.name).to eq('Bruxelles')
     end
 
     it 'has a list of arrivals' do
-      expect(subject.arrivals.last.origdest.name).to eq('Chambéry Challes-les-Eaux')
+      expect(subject.arrivals.last.departure.name).to eq('Chambéry Challes-les-Eaux')
       expect(subject.arrivals.last.voie).to eq('')
       expect(subject.arrivals.last.platform).to eq(subject.arrivals.last.voie)
       expect(subject.arrivals.last.num).to eq(18542)
+      # Still supports deprecated field
+      expect(subject.arrivals.last.origdest.name).to eq('Chambéry Challes-les-Eaux')
     end
 
     context 'Station of Agde' do
@@ -63,9 +68,19 @@ describe Gares::Station do
         Gares::Station.find_by_sncf_id('frpno')
       end
 
-      describe 'a gare with a BLS' do
+      describe 'its TVS number' do
         it { expect(subject.send(:tvs)).to eq("PNO") }
       end
     end
-  end
+
+    context 'A station which has no TVS from SNCF open data - Bruxelles-midi' do
+      subject do
+        Gares::Station.find_by_sncf_id('bebmi')
+      end
+
+      describe 'a gare with no TVS' do
+        it { expect(subject.send(:tvs)).to be_nil }
+      end
+    end
+ end
 end

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ GARES_SAMPLES = {
   'https://raw.githubusercontent.com/paulrbr/stations/stations-with-bls/stations.csv' => 'bls.csv',
   'https://ressources.data.sncf.com/api/records/1.0/search?dataset=referentiel-gares-voyageurs&q=0087723197' => '87723197.json', # Lyon Part-Dieu
   'https://ressources.data.sncf.com/api/records/1.0/search?dataset=referentiel-gares-voyageurs&q=0087271007' => '87271007.json', # Paris Gare-du-Nord
+  'https://ressources.data.sncf.com/api/records/1.0/search?dataset=referentiel-gares-voyageurs&q=0088140010' => '88140010.json', # Bruxelles Midi
   'http://www.gares-sncf.com/fr/train-times/arrival/LYD/gl' => 'LYD-arrivals.json',
   'http://www.gares-sncf.com/fr/train-times/departure/LYD/gl' => 'LYD-departures.json'
 }

metadata

@@ -1,209 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: gares
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Paul Bonaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: smarter_csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: unidecoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: trie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gokdok
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Easily use Ruby or the command line to find information on gares-sncf.com
@@ -214,11 +214,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .rubocop_todo.yml
+- .travis.yml
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -238,6 +238,7 @@ files:
 - lib/string_extensions.rb
 - spec/fixtures/87271007.json
 - spec/fixtures/87723197.json
+- spec/fixtures/88140010.json
 - spec/fixtures/LYD-arrivals.json
 - spec/fixtures/LYD-departures.json
 - spec/fixtures/bls.csv
@@ -273,19 +274,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: gares
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Easily access the publicly available information on gares-sncf.com and sncf.com.
 test_files: []
-has_rdoc: