ruby-irail 0.1.0 → 0.2.0

data/README.md

@@ -2,6 +2,8 @@
 
 IRail makes Belgian railway schedule easily available for anyone.
 
+Check it out on [http://project.irail.be/](http://project.irail.be/) or [http://data.irail.be/](http://data.irail.be/)
+
 There are already several wrappers available in different languages. This is a Ruby wrapper for their API.
 
 ## Installation
@@ -21,11 +23,23 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-# get a list of all belgian train stations
-
 require "ruby-irail"
-irail = IRail::API.new
+
+# get a list of all mivb/stib stations in brussels
+
+irail = IRail::API.new(:stib) # use :mivb symbol instead of :stib if you want
 irail.stations
+
+# get a list of all belgian train stations
+
+irail          = IRail::API.new # by default it takes the nmbs/sncb provider but you can also use :sncb or :nmbs symbols
+train_stations = irail.stations
+
+# get train trips from one station to another
+
+origin      = train_stations.first
+destination = train_stations.last
+irail.connections(origin, destination)
 ```
 
 ## Contributing
@@ -41,7 +55,7 @@ irail.stations
 All tests are in the specs folder. To run them simply run the following from the root folder of your fork:
 
 ```ruby
-rspec specs
+rspec
 ```
 
 ### Contributors

data/lib/ruby-irail/api.rb

@@ -1,25 +1,19 @@
-API_URL      = "http://api.irail.be"
-STATIONS_URI = "stations/"
-
 module IRail
-  class API
-    def stations
-      @stations ||= get_stations
-    end
-
-    def get_stations
-      station_list_url = build_station_list_url
-      xml_station_list = get_station_list(station_list_url)
-      IRail::DocumentParser.parse_stations(xml_station_list)
-    end
+  module API
+    SUPPORTED_APIS = {
+      :nmbs => "NMBS",
+      :sncb => "NMBS",
+      :stib => "MIVBSTIB",
+      :mivb => "MIVBSTIB"
+    }
 
-    def get_station_list(station_list_url)
-      IRail::Request.get(station_list_url)
+    def self.new(provider = :nmbs)
+      klass = api_name_for_provider(provider)
+      const_get(klass).new
     end
 
-    private
-    def build_station_list_url
-      [API_URL, STATIONS_URI].join('/')
+    def self.api_name_for_provider(provider)
+      SUPPORTED_APIS[provider]
     end
   end
 end

data/lib/ruby-irail/http/request.rb

@@ -1,7 +1,7 @@
 module IRail
   module Request
-    def self.get(url)
-      request = HTTParty.get(url)
+    def self.get(url, options = {})
+      request = HTTParty.get(url, options)
       request.response.body
     end
   end

data/lib/ruby-irail/packages/mivbstib/api.rb

@@ -0,0 +1,28 @@
+module IRail::API
+  class MIVBSTIB
+    API_URL       = "http://data.irail.be"
+    PACKAGE_ID    = "MIVBSTIB"
+    STATIONS_URI  = "Stations"
+    PARSER_FORMAT = "xml"
+
+    def stations
+      @stations ||= get_stations
+    end
+
+    def get_stations
+      station_list_url = build_station_list_url
+      xml_station_list = get_station_list(station_list_url)
+      IRail::MIVBSTIB::DocumentParser.parse_stations(xml_station_list)
+    end
+
+    def get_station_list(station_list_url)
+      IRail::Request.get(station_list_url)
+    end
+
+    private
+    def build_station_list_url
+      base_url = [API_URL, PACKAGE_ID, STATIONS_URI].join('/')
+      [base_url, PARSER_FORMAT].join('.')
+    end
+  end
+end

data/lib/ruby-irail/{models → packages/mivbstib/models}/station.rb

@@ -1,13 +1,12 @@
 require "virtus"
 
-module IRail
+module IRail::MIVBSTIB
   class Station
     include Virtus
 
-    attribute :id, String
+    attribute :id, Integer
     attribute :latitude, Float
     attribute :longitude, Float
-    attribute :standard_name, String
     attribute :name, String
   end
 end

data/lib/ruby-irail/{parser → packages/mivbstib/parser}/document_parser.rb

@@ -1,13 +1,13 @@
-module IRail
+module IRail::MIVBSTIB
   class DocumentParser
-    STATION_XPATH = "//station"
+    STATION_XPATH = "//Stations"
 
     def self.parse_stations(xml_string)
       xml_payload  = Nokogiri::XML(xml_string)
       xml_stations = xml_payload.xpath(STATION_XPATH)
       xml_stations.inject([]) do |stations, xml_station|
-        attributes = StationParser.parse(xml_station)
-        stations << Station.new(attributes)
+        attributes = IRail::MIVBSTIB::StationParser.parse(xml_station)
+        stations << IRail::MIVBSTIB::Station.new(attributes)
       end
     end
   end

data/lib/ruby-irail/{parser → packages/mivbstib/parser}/station_parser.rb

@@ -1,33 +1,27 @@
-module IRail
+module IRail::MIVBSTIB
   class StationParser
     def self.parse(xml_payload)
       id            = parse_station_id(xml_payload)
       latitude      = parse_station_latitude(xml_payload)
       longitude     = parse_station_longitude(xml_payload)
-      standard_name = parse_station_standard_name(xml_payload)
       name          = parse_station_name(xml_payload)
-      {:id => id, :latitude => latitude, :longitude => longitude,
-       :standard_name => standard_name, :name => name}
+      {id: id, latitude: latitude, longitude: longitude, name: name}
     end
 
     def self.parse_station_id(xml_payload)
-      xml_payload.attr('id')
+      xml_payload.xpath('id').text.strip
     end
 
     def self.parse_station_latitude(xml_payload)
-      xml_payload.attr('locationX')
+      xml_payload.xpath('latitude').text.strip
     end
 
     def self.parse_station_longitude(xml_payload)
-      xml_payload.attr('locationY')
-    end
-
-    def self.parse_station_standard_name(xml_payload)
-      xml_payload.attr('standardname')
+      xml_payload.xpath('longitude').text.strip
     end
 
     def self.parse_station_name(xml_payload)
-      xml_payload.content
+      xml_payload.xpath('name').text.strip
     end
   end
 end

data/lib/ruby-irail/packages/nmbs/api.rb

@@ -0,0 +1,49 @@
+module IRail::API
+  class NMBS
+    API_URL         = "http://api.irail.be"
+    STATIONS_URI    = "stations/"
+    CONNECTIONS_URI = "connections/"
+
+    def stations
+      @stations ||= get_stations
+    end
+
+    def connections(origin_station, destination_station)
+      connections_url = build_connections_url
+      xml_connections = get_connections(connections_url, origin_station, destination_station)
+      IRail::NMBS::DocumentParser.parse_connections(xml_connections)
+    end
+
+    def get_stations
+      station_list_url = build_station_list_url
+      xml_station_list = get_station_list(station_list_url)
+      IRail::NMBS::DocumentParser.parse_stations(xml_station_list)
+    end
+
+    def get_connections(connections_url, origin_station, destination_station)
+      options = build_connections_option_hash(origin_station, destination_station)
+      IRail::Request.get(connections_url, options)
+    end
+
+    def get_station_list(station_list_url)
+      IRail::Request.get(station_list_url)
+    end
+
+    private
+    def build_connections_option_hash(origin_station, destination_station)
+      {
+        :query => {
+          :from => origin_station.name,
+          :to   => destination_station.name }
+      }
+    end
+
+    def build_station_list_url
+      [API_URL, STATIONS_URI].join('/')
+    end
+
+    def build_connections_url
+      [API_URL, CONNECTIONS_URI].join('/')
+    end
+  end
+end

data/lib/ruby-irail/packages/nmbs/models/connection.rb

@@ -0,0 +1,16 @@
+require "roxml"
+require_relative "./step.rb"
+require_relative "./trip.rb"
+
+module IRail::NMBS
+  class Connection
+    include ROXML
+
+    xml_accessor :id,        :as   => Integer, :from => "@id"
+    xml_accessor :departure, :as   => Step,    :from => "departure"
+    xml_accessor :arrival,   :as   => Step,    :from => "arrival"
+    xml_accessor :duration,  :as   => Integer, :from => "duration"
+    xml_accessor :delay,     :from => "duration[@delay]"
+    xml_accessor :trip,      :as   => Trip
+  end
+end

data/lib/ruby-irail/packages/nmbs/models/platform.rb

@@ -0,0 +1,10 @@
+require "roxml"
+
+module IRail::NMBS
+  class Platform
+    include ROXML
+
+    xml_accessor :number,  :from => :content
+    xml_accessor :normal?, :from => "@normal"
+  end
+end

data/lib/ruby-irail/packages/nmbs/models/station.rb

@@ -0,0 +1,13 @@
+require "roxml"
+
+module IRail::NMBS
+  class Station
+    include ROXML
+
+    xml_accessor :id,            :from => "@id"
+    xml_accessor :latitude,      :from => "@locationY", :as => Float
+    xml_accessor :longitude,     :from => "@locationX", :as => Float
+    xml_accessor :standard_name, :from => "@standardname"
+    xml_accessor :name,          :from => :content
+  end
+end

data/lib/ruby-irail/packages/nmbs/models/step.rb

@@ -0,0 +1,18 @@
+require "roxml"
+require_relative "./station.rb"
+require_relative "./unix_time.rb"
+require_relative "./vehicle.rb"
+require_relative "./platform.rb"
+
+module IRail::NMBS
+  class Step
+    include ROXML
+
+    xml_accessor :delay,     :from => "@delay", :as => Integer
+    xml_accessor :station,   :as   => Station
+    xml_accessor :unix_time, :as   => UnixTime
+    xml_accessor :vehicle,   :as   => Vehicle
+    xml_accessor :platform,  :as   => Platform
+    xml_accessor :direction, :as   => Station
+  end
+end

data/lib/ruby-irail/packages/nmbs/models/stopover.rb

@@ -0,0 +1,20 @@
+require "roxml"
+require_relative "./vehicle.rb"
+require_relative "./station.rb"
+require_relative "./step.rb"
+
+module IRail::NMBS
+  class Stopover
+    include ROXML
+
+    xml_name "via"
+
+    xml_accessor :id,        :from => "@id", :as => Integer
+    xml_accessor :station,   :as   => Station
+    xml_accessor :vehicle,   :as   => Vehicle
+    xml_accessor :arrival,   :as   => Step, :from => "arrival"
+    xml_accessor :departure, :as   => Step, :from => "departure"
+    xml_accessor :direction, :as   => Station
+    xml_reader   :wait_time, :from => "timeBetween", :as => Integer
+  end
+end

data/lib/ruby-irail/packages/nmbs/models/trip.rb

@@ -0,0 +1,13 @@
+require "roxml"
+require_relative "./stopover.rb"
+
+module IRail::NMBS
+  class Trip
+    include ROXML
+
+    xml_name 'vias'
+
+    xml_accessor :stopover_count, :from => "@number", :as => Integer
+    xml_accessor :stopovers,      :as   => [Stopover]
+  end
+end

data/lib/ruby-irail/packages/nmbs/models/unix_time.rb

@@ -0,0 +1,12 @@
+require "roxml"
+
+module IRail::NMBS
+  class UnixTime
+    include ROXML
+
+    xml_name "time"
+
+    xml_accessor :format, :from => "@formatted"
+    xml_accessor :time,   :from => :content
+  end
+end

data/lib/ruby-irail/packages/nmbs/models/vehicle.rb

@@ -0,0 +1,9 @@
+require "roxml"
+
+module IRail::NMBS
+  class Vehicle
+    include ROXML
+
+    xml_accessor :id, :from => :content
+  end
+end

data/lib/ruby-irail/packages/nmbs/parser/document_parser.rb

@@ -0,0 +1,28 @@
+module IRail::NMBS
+  class DocumentParser
+    STATION_XPATH    = "//station"
+    CONNECTION_XPATH = "//connection"
+
+    def self.parse_stations(xml_string)
+      xml_stations(xml_string).inject([]) do |stations, xml_station|
+        stations << IRail::NMBS::Station.from_xml(xml_station.to_s)
+      end
+    end
+
+    def self.parse_connections(xml_string)
+      xml_connections(xml_string).inject([]) do |connections, xml_connection|
+        connections << IRail::NMBS::Connection.from_xml(xml_connection.to_s)
+      end
+    end
+
+    def self.xml_stations(xml_string)
+      xml_payload = Nokogiri::XML(xml_string)
+      xml_payload.xpath(STATION_XPATH)
+    end
+
+    def self.xml_connections(xml_string)
+      xml_payload = Nokogiri::XML(xml_string)
+      xml_payload.xpath(CONNECTION_XPATH)
+    end
+  end
+end

data/lib/ruby-irail.rb

@@ -1,11 +1,5 @@
 require "httparty"
 require "nokogiri"
+require "roxml"
 
-require File.join(File.dirname(__FILE__), 'ruby-irail', 'api')
-require File.join(File.dirname(__FILE__), 'ruby-irail', 'http', 'request')
-require File.join(File.dirname(__FILE__), 'ruby-irail', 'models', 'station')
-require File.join(File.dirname(__FILE__), 'ruby-irail', 'parser', 'document_parser')
-require File.join(File.dirname(__FILE__), 'ruby-irail', 'parser', 'station_parser')
-
-module IRail
-end
+Dir.glob(File.join(File.dirname(__FILE__), "**", "*.rb")).each{ |file| require file }

data/lib/version.rb

@@ -1,3 +1,3 @@
 module IRail
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/ruby-irail.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = IRail::VERSION
   gem.add_development_dependency "rspec"
   gem.add_dependency "httparty"
-  gem.add_dependency "virtus"
+  gem.add_dependency "roxml"
   gem.add_dependency "nokogiri"
 end

data/spec/http/request_spec.rb

@@ -9,6 +9,7 @@ describe IRail::Request do
     let(:request)  { mock("Request") }
     let(:response) { mock("Response") }
     let(:body)     { mock("Body") }
+    let(:options)  { mock("Options") }
 
     before :each do
       HTTParty.stub(:get => request)
@@ -16,11 +17,16 @@ describe IRail::Request do
       response.stub(:body => body)
     end
 
-    it "calls the get method of HTTParty with the url as param" do
-      HTTParty.should_receive(:get).with(url)
+    it "calls the get method of HTTParty with the url as param and an empty default hash as options" do
+      HTTParty.should_receive(:get).with(url, {})
       IRail::Request.get(url)
     end
 
+    it "calls the get method of HTTParty with the url asa param and an option hash when one is passed as parameter" do
+      HTTParty.should_receive(:get).with(url, options)
+      IRail::Request.get(url, options)
+    end
+
     it "gets the body from the response" do
       response.should_receive(:body)
       IRail::Request.get(url)

data/spec/{irail_spec.rb → packages/mivbstib/api_spec.rb}

@@ -1,7 +1,7 @@
-require_relative "../lib/ruby-irail/api.rb"
+require_relative "../../../lib/ruby-irail/packages/mivbstib/api.rb"
 
-describe IRail::API do
-  let(:irail) { IRail::API.new }
+describe IRail::API::MIVBSTIB do
+  let(:irail) { IRail::API::MIVBSTIB.new }
 
   describe :stations do
     let(:stations)         { mock("Stations") }
@@ -36,7 +36,7 @@ describe IRail::API do
     before :each do
       irail.stub(:build_station_list_url => station_list_url)
       irail.stub(:get_station_list => xml_station_list)
-      IRail::DocumentParser.stub(:parse_stations => stations)
+      IRail::MIVBSTIB::DocumentParser.stub(:parse_stations => stations)
     end
 
     it "builds the station list url" do

data/spec/packages/mivbstib/models/station_spec.rb

@@ -0,0 +1,21 @@
+require_relative '../../../../lib/ruby-irail/packages/mivbstib/models/station.rb'
+
+describe IRail::MIVBSTIB::Station do
+  let(:station) { IRail::MIVBSTIB::Station.new }
+
+  it "has an id" do
+    station.should respond_to(:id)
+  end
+
+  it "has an latitude" do
+    station.should respond_to(:latitude)
+  end
+
+  it "has an longitude" do
+    station.should respond_to(:longitude)
+  end
+
+  it "has a name" do
+    station.should respond_to(:name)
+  end
+end

data/spec/{parser → packages/mivbstib/parser}/document_parser_spec.rb

@@ -1,15 +1,15 @@
-require_relative "../../lib/ruby-irail/parser/document_parser.rb"
+require_relative "../../../../lib/ruby-irail/packages/mivbstib/parser/document_parser.rb"
 
-describe IRail::DocumentParser do
+describe IRail::MIVBSTIB::DocumentParser do
   module Nokogiri
     module XML
     end
   end
 
-  class StationParser
+  class IRail::MIVBSTIB::StationParser
   end
 
-  class Station
+  class IRail::MIVBSTIB::Station
   end
 
   describe :'self.parse_stations' do
@@ -21,35 +21,35 @@ describe IRail::DocumentParser do
     before :each do
       Nokogiri.stub(:XML => xml_payload)
       xml_payload.stub(:xpath => stations)
-      IRail::StationParser.stub(:parse => attributes)
+      IRail::MIVBSTIB::StationParser.stub(:parse => attributes)
     end
 
     it "gets the xml payload from the string passed as parameter" do
       Nokogiri.should_receive(:XML).with(xml_string)
-      IRail::DocumentParser.parse_stations(xml_string)
+      IRail::MIVBSTIB::DocumentParser.parse_stations(xml_string)
     end
 
     it "extracts the stations from the xml payload" do
-      xml_payload.should_receive(:xpath).with(IRail::DocumentParser::STATION_XPATH)
-      IRail::DocumentParser.parse_stations(xml_string)
+      xml_payload.should_receive(:xpath).with(IRail::MIVBSTIB::DocumentParser::STATION_XPATH)
+      IRail::MIVBSTIB::DocumentParser.parse_stations(xml_string)
     end
 
     it "parses the attributes of all stations" do
       stations.each do |xml_station|
-        IRail::StationParser.should_receive(:parse).with(xml_station)
+        IRail::MIVBSTIB::StationParser.should_receive(:parse).with(xml_station)
       end
-      IRail::DocumentParser.parse_stations(xml_string)
+      IRail::MIVBSTIB::DocumentParser.parse_stations(xml_string)
     end
 
     it "creates a new station for all parsed station attributes" do
       stations.each do |station|
-        IRail::Station.should_receive(:new).with(attributes)
+        IRail::MIVBSTIB::Station.should_receive(:new).with(attributes)
       end
-      IRail::DocumentParser.parse_stations(xml_string)
+      IRail::MIVBSTIB::DocumentParser.parse_stations(xml_string)
     end
 
     it "returns as many stations as in the xml payload" do
-      IRail::DocumentParser.parse_stations(xml_string).size.should eql stations.size
+      IRail::MIVBSTIB::DocumentParser.parse_stations(xml_string).size.should eql stations.size
     end
   end
 end

data/spec/packages/mivbstib/parser/station_parser_spec.rb

@@ -0,0 +1,43 @@
+require_relative "../../../../lib/ruby-irail/packages/mivbstib/parser/station_parser.rb"
+
+describe IRail::MIVBSTIB::StationParser do
+  describe :'self.parse' do
+    let(:xml_payload)   { mock("Xml Payload") }
+    let(:id)            { mock("Station Id") }
+    let(:latitude)      { mock("Latitude") }
+    let(:longitude)     { mock("Longitude") }
+    let(:name)          { mock("Name") }
+
+    before :each do
+      IRail::MIVBSTIB::StationParser.stub(parse_station_id: id)
+      IRail::MIVBSTIB::StationParser.stub(parse_station_latitude: latitude)
+      IRail::MIVBSTIB::StationParser.stub(parse_station_longitude: longitude)
+      IRail::MIVBSTIB::StationParser.stub(parse_station_name: name)
+    end
+
+    it "parses the id" do
+      IRail::MIVBSTIB::StationParser.should_receive(:parse_station_id).with(xml_payload)
+      IRail::MIVBSTIB::StationParser.parse(xml_payload)
+    end
+
+    it "parses the latitude" do
+      IRail::MIVBSTIB::StationParser.should_receive(:parse_station_latitude).with(xml_payload)
+      IRail::MIVBSTIB::StationParser.parse(xml_payload)
+    end
+
+    it "parses the longitude" do
+      IRail::MIVBSTIB::StationParser.should_receive(:parse_station_longitude).with(xml_payload)
+      IRail::MIVBSTIB::StationParser.parse(xml_payload)
+    end
+
+    it "parses the name" do
+      IRail::MIVBSTIB::StationParser.should_receive(:parse_station_name).with(xml_payload)
+      IRail::MIVBSTIB::StationParser.parse(xml_payload)
+    end
+
+    it "returns a hash containing the parsed attributes" do
+      expected = { id: id, latitude: latitude, longitude: longitude, name: name}
+      IRail::MIVBSTIB::StationParser.parse(xml_payload).should eql expected
+    end
+  end
+end

data/spec/packages/nmbs/api_spec.rb

@@ -0,0 +1,129 @@
+require_relative "../../../lib/ruby-irail/packages/nmbs/api.rb"
+
+describe IRail::API::NMBS do
+  let(:irail) { IRail::API::NMBS.new }
+
+  describe :stations do
+    let(:stations)         { mock("Stations") }
+    let(:fetched_stations) { mock("Fetched stations") }
+
+    before :each do
+      irail.stub(:get_stations => fetched_stations)
+    end
+
+    it "returns the stations when they were already fetched" do
+      irail.instance_variable_set(:@stations, stations)
+      irail.stations.should eql stations
+    end
+
+    context "when stations have not been fetched yet" do
+      it "fetches them" do
+        irail.should_receive(:get_stations)
+        irail.stations
+      end
+
+      it "returns them" do
+        irail.stations.should eql fetched_stations
+      end
+    end
+  end
+
+  describe :connections do
+    let(:origin_station)      { mock("Origin station") }
+    let(:destination_station) { mock("Destination station") }
+    let(:connections_url)     { mock("Connections url") }
+    let(:xml_connections)     { mock("Xml connections") }
+    let(:connections)         { mock("Connections") }
+
+    before :each do
+      irail.stub(:build_connections_url => connections_url)
+      irail.stub(:get_connections => xml_connections)
+      IRail::NMBS::DocumentParser.stub(:parse_connections => connections)
+    end
+
+    it "builds the connections url" do
+      irail.should_receive(:build_connections_url)
+      irail.connections(origin_station, destination_station)
+    end
+
+    it "gets the connections" do
+      irail.should_receive(:get_connections).with(connections_url, origin_station, destination_station)
+      irail.connections(origin_station, destination_station)
+    end
+
+    it "returns the parsed connections" do
+      irail.connections(origin_station, destination_station).should eql connections
+    end
+  end
+
+  describe :get_stations do
+    let(:station_list_url) { mock("Url") }
+    let(:xml_station_list) { mock("Xml station list") }
+    let(:stations)         { mock("Stations") }
+
+    before :each do
+      irail.stub(:build_station_list_url => station_list_url)
+      irail.stub(:get_station_list => xml_station_list)
+      IRail::NMBS::DocumentParser.stub(:parse_stations => stations)
+    end
+
+    it "builds the station list url" do
+      irail.should_receive(:build_station_list_url)
+      irail.get_stations
+    end
+
+    it "gets the xml station list" do
+      irail.should_receive(:get_station_list).with(station_list_url)
+      irail.get_stations
+    end
+
+    it "returns the parsed stations" do
+      irail.get_stations.should eql stations
+    end
+  end
+
+  describe :get_connections do
+    let(:origin_station)      { mock("Origin station") }
+    let(:destination_station) { mock("Destination station") }
+    let(:connections_url)     { mock("Connections url") }
+    let(:options_hash)        { mock("Options hash") }
+    let(:response)            { mock("Response") }
+
+    before :each do
+      irail.stub(:build_connections_option_hash => options_hash)
+      IRail::Request.stub(:get => response)
+    end
+
+    it "builds the options hash" do
+      irail.should_receive(:build_connections_option_hash).with(origin_station, destination_station)
+      irail.get_connections(connections_url, origin_station, destination_station)
+    end
+
+    it "calls the connections url through a get request" do
+      IRail::Request.should_receive(:get).with(connections_url, options_hash)
+      irail.get_connections(connections_url, origin_station, destination_station)
+    end
+
+    it "returns the response" do
+      irail.get_connections(connections_url, origin_station, destination_station).should eql response
+    end
+  end
+
+  describe :get_station_list do
+    let(:url)      { mock("Url") }
+    let(:response) { mock("Response") }
+
+    before :each do
+      IRail::Request.stub(:get => response)
+    end
+
+    it "calls the station list url through a get request" do
+      IRail::Request.should_receive(:get).with(url)
+      irail.get_station_list(url)
+    end
+
+    it "returns the response" do
+      irail.get_station_list(url).should eql response
+    end
+  end
+end

data/spec/packages/nmbs/models/connection_spec.rb

@@ -0,0 +1,29 @@
+require_relative '../../../../lib/ruby-irail/packages/nmbs/models/connection.rb'
+
+describe IRail::NMBS::Connection do
+  let(:connection) { IRail::NMBS::Connection.new }
+
+  it "has an id" do
+    connection.should respond_to(:id)
+  end
+
+  it "has a departure" do
+    connection.should respond_to(:departure)
+  end
+
+  it "has an arrival" do
+    connection.should respond_to(:arrival)
+  end
+
+  it "has a trip" do
+    connection.should respond_to(:trip)
+  end
+
+  it "has a duration in seconds" do
+    connection.should respond_to(:duration)
+  end
+
+  it "says if there is a delay" do
+    connection.should respond_to(:delay)
+  end
+end

data/spec/packages/nmbs/models/platform_spec.rb

@@ -0,0 +1,13 @@
+require_relative '../../../../lib/ruby-irail/packages/nmbs/models/platform.rb'
+
+describe IRail::NMBS::Platform do
+  let(:platform) { IRail::NMBS::Platform.new }
+
+  it "has an id" do
+    platform.should respond_to(:number)
+  end
+
+  it "gives information wether the platform is normal or not" do
+    platform.should respond_to(:normal?)
+  end
+end

data/spec/{models → packages/nmbs/models}/station_spec.rb

@@ -1,7 +1,7 @@
-require_relative '../../lib/ruby-irail/models/station.rb'
+require_relative '../../../../lib/ruby-irail/packages/nmbs/models/station.rb'
 
-describe IRail::Station do
-  let(:station) { IRail::Station.new }
+describe IRail::NMBS::Station do
+  let(:station) { IRail::NMBS::Station.new }
 
   it "has an id" do
     station.should respond_to(:id)

data/spec/packages/nmbs/models/step_spec.rb

@@ -0,0 +1,29 @@
+require_relative '../../../../lib/ruby-irail/packages/nmbs/models/step.rb'
+
+describe IRail::NMBS::Step do
+  let(:step) { IRail::NMBS::Step.new }
+
+  it "has a delay in seconds" do
+    step.should respond_to(:delay)
+  end
+
+  it "has a station" do
+    step.should respond_to(:station)
+  end
+
+  it "has a unix time" do
+    step.should respond_to(:unix_time)
+  end
+
+  it "has a vehicle" do
+    step.should respond_to(:vehicle)
+  end
+
+  it "has a platform" do
+    step.should respond_to(:platform)
+  end
+
+  it "has a direction station" do
+    step.should respond_to(:direction)
+  end
+end

data/spec/packages/nmbs/models/stopover_spec.rb

@@ -0,0 +1,33 @@
+require_relative '../../../../lib/ruby-irail/packages/nmbs/models/stopover.rb'
+
+describe IRail::NMBS::Stopover do
+  let(:stopover) { IRail::NMBS::Stopover.new }
+
+  it "has an id" do
+    stopover.should respond_to(:id)
+  end
+
+  it "has a station" do
+    stopover.should respond_to(:station)
+  end
+
+  it "has a vehicle" do
+    stopover.should respond_to(:vehicle)
+  end
+
+  it "has an arrival" do
+    stopover.should respond_to(:arrival)
+  end
+
+  it "has a departure" do
+    stopover.should respond_to(:departure)
+  end
+
+  it "has a direction station" do
+    stopover.should respond_to(:direction)
+  end
+
+  it "has a wait time in seconds" do
+    stopover.should respond_to(:wait_time)
+  end
+end

data/spec/packages/nmbs/models/trip_spec.rb

@@ -0,0 +1,13 @@
+require_relative '../../../../lib/ruby-irail/packages/nmbs/models/trip.rb'
+
+describe IRail::NMBS::Trip do
+  let(:trip) { IRail::NMBS::Trip.new }
+
+  it "has a count of stopovers" do
+    trip.should respond_to(:stopover_count)
+  end
+
+  it "has stopovers" do
+    trip.should respond_to(:stopovers)
+  end
+end

data/spec/packages/nmbs/models/unix_time_spec.rb

@@ -0,0 +1,13 @@
+require_relative '../../../../lib/ruby-irail/packages/nmbs/models/unix_time.rb'
+
+describe IRail::NMBS::UnixTime do
+  let(:unix_time) { IRail::NMBS::UnixTime.new }
+
+  it "has a format" do
+    unix_time.should respond_to(:format)
+  end
+
+  it "has a unixtime" do
+    unix_time.should respond_to(:time)
+  end
+end

data/spec/packages/nmbs/models/vehicle_spec.rb

@@ -0,0 +1,9 @@
+require_relative '../../../../lib/ruby-irail/packages/nmbs/models/vehicle.rb'
+
+describe IRail::NMBS::Vehicle do
+  let(:vehicle) { IRail::NMBS::Vehicle.new }
+
+  it "has an id" do
+    vehicle.should respond_to(:id)
+  end
+end

data/spec/packages/nmbs/parser/document_parser_spec.rb

@@ -0,0 +1,80 @@
+require_relative "../../../../lib/ruby-irail/packages/nmbs/parser/document_parser.rb"
+
+describe IRail::NMBS::DocumentParser do
+  module Nokogiri
+    module XML
+    end
+  end
+
+  class IRail::NMBS::Station
+  end
+
+  class IRail::NMBS::Connection
+  end
+
+  describe :'self.parse_stations' do
+    let(:xml_string)  { mock("Xml string") }
+    let(:xml_payload) { mock("Xml payload") }
+    let(:stations)    { [ mock("Station"), mock("Station"), mock("Station") ] }
+
+    before :each do
+      Nokogiri.stub(:XML => xml_payload)
+      xml_payload.stub(:xpath => stations)
+      IRail::NMBS::Station.stub(:from_xml)
+    end
+
+    it "gets the xml payload from the string passed as parameter" do
+      Nokogiri.should_receive(:XML).with(xml_string)
+      IRail::NMBS::DocumentParser.parse_stations(xml_string)
+    end
+
+    it "extracts the stations from the xml payload" do
+      xml_payload.should_receive(:xpath).with(IRail::NMBS::DocumentParser::STATION_XPATH)
+      IRail::NMBS::DocumentParser.parse_stations(xml_string)
+    end
+
+    it "creates a new station for all parsed station attributes" do
+      stations.each do |station|
+        IRail::NMBS::Station.should_receive(:from_xml).with(station.to_s)
+      end
+      IRail::NMBS::DocumentParser.parse_stations(xml_string)
+    end
+
+    it "returns as many stations as in the xml payload" do
+      IRail::NMBS::DocumentParser.parse_stations(xml_string).size.should eql stations.size
+    end
+  end
+
+  describe :'self.parse_connections' do
+    let(:xml_string)  { mock("Xml string") }
+    let(:xml_payload) { mock("Xml payload") }
+    let(:connections) { [ mock("Connection"), mock("Connection"), mock("Connection") ] }
+
+    before :each do
+      Nokogiri.stub(:XML => xml_payload)
+      xml_payload.stub(:xpath => connections)
+      IRail::NMBS::Connection.stub(:from_xml)
+    end
+
+    it "gets the xml payload from the string passed as parameter" do
+      Nokogiri.should_receive(:XML).with(xml_string)
+      IRail::NMBS::DocumentParser.parse_connections(xml_string)
+    end
+
+    it "extracts the connections from the xml payload" do
+      xml_payload.should_receive(:xpath).with(IRail::NMBS::DocumentParser::CONNECTION_XPATH)
+      IRail::NMBS::DocumentParser.parse_connections(xml_string)
+    end
+
+    it "creates a new connection for all parsed connection attributes" do
+      connections.each do |connection|
+        IRail::NMBS::Connection.should_receive(:from_xml).with(connection.to_s)
+      end
+      IRail::NMBS::DocumentParser.parse_connections(xml_string)
+    end
+
+    it "returns as many connections as in the xml payload" do
+      IRail::NMBS::DocumentParser.parse_connections(xml_string).size.should eql connections.size
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-irail
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000Z
+date: 2012-07-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70309396504580 !ruby/object:Gem::Requirement
+  requirement: &70337783379580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309396504580
+  version_requirements: *70337783379580
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70309396504160 !ruby/object:Gem::Requirement
+  requirement: &70337783379160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309396504160
+  version_requirements: *70337783379160
 - !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: &70309396503740 !ruby/object:Gem::Requirement
+  name: roxml
+  requirement: &70337783378700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309396503740
+  version_requirements: *70337783378700
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70309396503320 !ruby/object:Gem::Requirement
+  requirement: &70337783378280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309396503320
+  version_requirements: *70337783378280
 description: IRail makes Belgian railway schedule easily available for anyone. This
   is a Ruby wrapper for their API.
 email:
@@ -73,16 +73,37 @@ files:
 - lib/ruby-irail.rb
 - lib/ruby-irail/api.rb
 - lib/ruby-irail/http/request.rb
-- lib/ruby-irail/models/station.rb
-- lib/ruby-irail/parser/document_parser.rb
-- lib/ruby-irail/parser/station_parser.rb
+- lib/ruby-irail/packages/mivbstib/api.rb
+- lib/ruby-irail/packages/mivbstib/models/station.rb
+- lib/ruby-irail/packages/mivbstib/parser/document_parser.rb
+- lib/ruby-irail/packages/mivbstib/parser/station_parser.rb
+- lib/ruby-irail/packages/nmbs/api.rb
+- lib/ruby-irail/packages/nmbs/models/connection.rb
+- lib/ruby-irail/packages/nmbs/models/platform.rb
+- lib/ruby-irail/packages/nmbs/models/station.rb
+- lib/ruby-irail/packages/nmbs/models/step.rb
+- lib/ruby-irail/packages/nmbs/models/stopover.rb
+- lib/ruby-irail/packages/nmbs/models/trip.rb
+- lib/ruby-irail/packages/nmbs/models/unix_time.rb
+- lib/ruby-irail/packages/nmbs/models/vehicle.rb
+- lib/ruby-irail/packages/nmbs/parser/document_parser.rb
 - lib/version.rb
 - ruby-irail.gemspec
 - spec/http/request_spec.rb
-- spec/irail_spec.rb
-- spec/models/station_spec.rb
-- spec/parser/document_parser_spec.rb
-- spec/parser/station_parser_spec.rb
+- spec/packages/mivbstib/api_spec.rb
+- spec/packages/mivbstib/models/station_spec.rb
+- spec/packages/mivbstib/parser/document_parser_spec.rb
+- spec/packages/mivbstib/parser/station_parser_spec.rb
+- spec/packages/nmbs/api_spec.rb
+- spec/packages/nmbs/models/connection_spec.rb
+- spec/packages/nmbs/models/platform_spec.rb
+- spec/packages/nmbs/models/station_spec.rb
+- spec/packages/nmbs/models/step_spec.rb
+- spec/packages/nmbs/models/stopover_spec.rb
+- spec/packages/nmbs/models/trip_spec.rb
+- spec/packages/nmbs/models/unix_time_spec.rb
+- spec/packages/nmbs/models/vehicle_spec.rb
+- spec/packages/nmbs/parser/document_parser_spec.rb
 homepage: https://github.com/mlainez/ruby-irail
 licenses: []
 post_install_message: 
@@ -109,7 +130,17 @@ specification_version: 3
 summary: Ruby Irail is a wrapper around IRail API.
 test_files:
 - spec/http/request_spec.rb
-- spec/irail_spec.rb
-- spec/models/station_spec.rb
-- spec/parser/document_parser_spec.rb
-- spec/parser/station_parser_spec.rb
+- spec/packages/mivbstib/api_spec.rb
+- spec/packages/mivbstib/models/station_spec.rb
+- spec/packages/mivbstib/parser/document_parser_spec.rb
+- spec/packages/mivbstib/parser/station_parser_spec.rb
+- spec/packages/nmbs/api_spec.rb
+- spec/packages/nmbs/models/connection_spec.rb
+- spec/packages/nmbs/models/platform_spec.rb
+- spec/packages/nmbs/models/station_spec.rb
+- spec/packages/nmbs/models/step_spec.rb
+- spec/packages/nmbs/models/stopover_spec.rb
+- spec/packages/nmbs/models/trip_spec.rb
+- spec/packages/nmbs/models/unix_time_spec.rb
+- spec/packages/nmbs/models/vehicle_spec.rb
+- spec/packages/nmbs/parser/document_parser_spec.rb

data/spec/parser/station_parser_spec.rb

@@ -1,50 +0,0 @@
-require_relative "../../lib/ruby-irail/parser/station_parser.rb"
-
-describe IRail::StationParser do
-  describe :'self.parse' do
-    let(:xml_payload)   { mock("Xml Payload") }
-    let(:id)            { mock("Station Id") }
-    let(:latitude)      { mock("Latitude") }
-    let(:longitude)     { mock("Longitude") }
-    let(:standard_name) { mock("Standard Name") }
-    let(:name)          { mock("Name") }
-
-    before :each do
-      IRail::StationParser.stub(parse_station_id: id)
-      IRail::StationParser.stub(parse_station_latitude: latitude)
-      IRail::StationParser.stub(parse_station_longitude: longitude)
-      IRail::StationParser.stub(parse_station_standard_name: standard_name)
-      IRail::StationParser.stub(parse_station_name: name)
-    end
-
-    it "parses the id" do
-      IRail::StationParser.should_receive(:parse_station_id).with(xml_payload)
-      IRail::StationParser.parse(xml_payload)
-    end
-
-    it "parses the latitude" do
-      IRail::StationParser.should_receive(:parse_station_latitude).with(xml_payload)
-      IRail::StationParser.parse(xml_payload)
-    end
-
-    it "parses the longitude" do
-      IRail::StationParser.should_receive(:parse_station_longitude).with(xml_payload)
-      IRail::StationParser.parse(xml_payload)
-    end
-
-    it "parses the standard name" do
-      IRail::StationParser.should_receive(:parse_station_standard_name).with(xml_payload)
-      IRail::StationParser.parse(xml_payload)
-    end
-
-    it "parses the name" do
-      IRail::StationParser.should_receive(:parse_station_name).with(xml_payload)
-      IRail::StationParser.parse(xml_payload)
-    end
-
-    it "returns a hash containing the parsed attributes" do
-      expected = { id: id, latitude: latitude, longitude: longitude, standard_name: standard_name, name: name}
-      IRail::StationParser.parse(xml_payload).should eql expected
-    end
-  end
-end