ruby-irail 0.2.0 → 0.2.1

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

@@ -4,37 +4,35 @@ module IRail::API
     STATIONS_URI    = "stations/"
     CONNECTIONS_URI = "connections/"
 
-    def stations
-      @stations ||= get_stations
+    def stations(options = {})
+      station_list_url = build_station_list_url
+      xml_station_list = get_station_list(station_list_url, options)
+      IRail::NMBS::DocumentParser.parse_stations(xml_station_list)
     end
 
-    def connections(origin_station, destination_station)
+    def connections(origin_station, destination_station, options = {})
       connections_url = build_connections_url
-      xml_connections = get_connections(connections_url, origin_station, destination_station)
+      xml_connections = get_connections(connections_url, origin_station, destination_station, options)
       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)
+    def get_connections(connections_url, origin_station, destination_station, options = {})
+      options = build_connections_option_hash(origin_station, destination_station, options)
       IRail::Request.get(connections_url, options)
     end
 
-    def get_station_list(station_list_url)
-      IRail::Request.get(station_list_url)
+    def get_station_list(station_list_url, options = {})
+      options = { :query => options } if options.any?
+      IRail::Request.get(station_list_url, options)
     end
 
     private
-    def build_connections_option_hash(origin_station, destination_station)
+    def build_connections_option_hash(origin_station, destination_station, options = {})
       {
-        :query => {
+        :query => options.merge({
           :from => origin_station.name,
-          :to   => destination_station.name }
+          :to   => destination_station.name
+        })
       }
     end
 

data/lib/version.rb

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

data/spec/packages/nmbs/api_spec.rb

@@ -3,37 +3,13 @@ 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") }
+    let(:options)             { mock("Options") }
 
     before :each do
       irail.stub(:build_connections_url => connections_url)
@@ -47,8 +23,8 @@ describe IRail::API::NMBS do
     end
 
     it "gets the connections" do
-      irail.should_receive(:get_connections).with(connections_url, origin_station, destination_station)
-      irail.connections(origin_station, destination_station)
+      irail.should_receive(:get_connections).with(connections_url, origin_station, destination_station, options)
+      irail.connections(origin_station, destination_station, options)
     end
 
     it "returns the parsed connections" do
@@ -56,10 +32,11 @@ describe IRail::API::NMBS do
     end
   end
 
-  describe :get_stations do
+  describe :stations do
     let(:station_list_url) { mock("Url") }
     let(:xml_station_list) { mock("Xml station list") }
     let(:stations)         { mock("Stations") }
+    let(:options)          { mock("Options") }
 
     before :each do
       irail.stub(:build_station_list_url => station_list_url)
@@ -69,16 +46,16 @@ describe IRail::API::NMBS do
 
     it "builds the station list url" do
       irail.should_receive(:build_station_list_url)
-      irail.get_stations
+      irail.stations(options)
     end
 
     it "gets the xml station list" do
-      irail.should_receive(:get_station_list).with(station_list_url)
-      irail.get_stations
+      irail.should_receive(:get_station_list).with(station_list_url, options)
+      irail.stations(options)
     end
 
     it "returns the parsed stations" do
-      irail.get_stations.should eql stations
+      irail.stations(options).should eql stations
     end
   end
 
@@ -88,6 +65,7 @@ describe IRail::API::NMBS do
     let(:connections_url)     { mock("Connections url") }
     let(:options_hash)        { mock("Options hash") }
     let(:response)            { mock("Response") }
+    let(:options)             { mock("Oprions") }
 
     before :each do
       irail.stub(:build_connections_option_hash => options_hash)
@@ -95,8 +73,8 @@ describe IRail::API::NMBS do
     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)
+      irail.should_receive(:build_connections_option_hash).with(origin_station, destination_station, options)
+      irail.get_connections(connections_url, origin_station, destination_station, options)
     end
 
     it "calls the connections url through a get request" do
@@ -117,13 +95,31 @@ describe IRail::API::NMBS 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)
+    context "when there are no options" do
+      let(:options) { {} }
+
+      it "calls the station list url through a get request" do
+        IRail::Request.should_receive(:get).with(url, options)
+        irail.get_station_list(url, options)
+      end
+
+      it "returns the response" do
+        irail.get_station_list(url, options).should eql response
+      end
     end
 
-    it "returns the response" do
-      irail.get_station_list(url).should eql response
+    context "when there are options" do
+      let(:options) { {:a => 1} }
+
+      it "calls the station list url with query options" do
+        expected_options = { :query => options }
+        IRail::Request.should_receive(:get).with(url, expected_options)
+        irail.get_station_list(url, options)
+      end
+
+      it "returns the response" do
+        irail.get_station_list(url, options).should eql response
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-irail
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70337783379580 !ruby/object:Gem::Requirement
+  requirement: &70214013650340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337783379580
+  version_requirements: *70214013650340
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70337783379160 !ruby/object:Gem::Requirement
+  requirement: &70214013649860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337783379160
+  version_requirements: *70214013649860
 - !ruby/object:Gem::Dependency
   name: roxml
-  requirement: &70337783378700 !ruby/object:Gem::Requirement
+  requirement: &70214013649380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337783378700
+  version_requirements: *70214013649380
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70337783378280 !ruby/object:Gem::Requirement
+  requirement: &70214013648800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337783378280
+  version_requirements: *70214013648800
 description: IRail makes Belgian railway schedule easily available for anyone. This
   is a Ruby wrapper for their API.
 email: