ns-yapi 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ns-yapi (0.2.0)
+    ns-yapi (0.2.1)
       httpclient
       nokogiri
       nori

data/lib/ns_client.rb

@@ -74,44 +74,83 @@ class NSClient
       raise InvalidStationNameError, message
     end
 
-    (xdoc/'/Storingen').each { |disruption|
+    (xdoc/'/Storingen').each do |disruption|
 
-      (disruption/'Ongepland/Storing').each { |unplanned|
+      (disruption/'Ongepland/Storing').each do |unplanned|
         unplanned_disruption = UnplannedDisruption.new
         unplanned_disruption.id = (unplanned/'./id').text
         unplanned_disruption.trip = (unplanned/'./Traject').text
         unplanned_disruption.reason = (unplanned/'./Reden').text
         unplanned_disruption.message = (unplanned/'./Bericht').text
         unplanned_disruption.datetime_string = (unplanned/'./Datum').text
+        unplanned_disruption.cause = (unplanned/'./Oorzaak').text
         result[:unplanned] << unplanned_disruption
-      }
+      end
 
-      (disruption/'Gepland/Storing').each { |planned|
+      (disruption/'Gepland/Storing').each do |planned|
         planned_disruption = PlannedDisruption.new
         planned_disruption.id = (planned/'./id').text
         planned_disruption.trip = (planned/'./Traject').text
         planned_disruption.reason = (planned/'./Reden').text
         planned_disruption.advice = (planned/'./Advies').text
         planned_disruption.message = (planned/'./Bericht').text
+        planned_disruption.cause = (planned/'./Oorzaak').text
         result[:planned] << planned_disruption
-      }
-    }
+      end
+    end
     result
   end
 
+  def prices (opts = {from: nil, to: nil, via: nil, date: nil})
+    date = opts[:date]
+    response = @client.get "http://@webservices.ns.nl/ns-api-prijzen-v2?from=#{opts[:from]}&to=#{opts[:to]}&via=#{opts[:via]}&date=#{date.strftime("%d%m%Y")}"
+    xdoc = Nokogiri.XML(response.content)
+    prices_response = PricesResponse.new
+    (xdoc/'/Producten').each do |products|
+      prices_response.tariff_units = (products/'./Tariefeenheden').text.to_i
+
+      (products/'Product').each do |product|
+        prices = []
+        (product/'Prijs').each do |price_element|
+          product_price = ProductPrice.new
+          product_price.amount = price_element.text
+          prices << product_price
+        end
+        name = product.attr('naam')
+        prices_response.products[name] = prices
+      end
+
+    end
+    prices_response
+  end
+
+
   def disruption_url(query)
     if query
       return "http://webservices.ns.nl/ns-api-storingen?station=#{query}"
     end
-    "http://webservices.ns.nl/ns-api-storingen?"
+    "http://webservices.ns.nl/ns-api-storingen?actual=true"
+  end
+
+  class PricesResponse
+    attr_accessor :tariff_units, :products
+
+    def initialize
+      @products = {}
+      @tariff_units = 0
+    end
+  end
+
+  class ProductPrice
+    attr_accessor :discount, :class, :amount
   end
 
   class UnplannedDisruption
-    attr_accessor :id, :trip, :reason, :message, :datetime_string
+    attr_accessor :id, :trip, :reason, :message, :datetime_string, :cause
   end
 
   class PlannedDisruption
-    attr_accessor :id, :trip, :reason, :advice, :message
+    attr_accessor :id, :trip, :reason, :advice, :message, :cause
   end
 
   class Station

data/ns.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "ns-yapi"
-  gem.version       = '0.2.0'
+  gem.version       = '0.2.1'
   gem.authors       = ["Stefan Hendriks"]
   gem.email         = ["stefanhen83@gmail.com"]
   gem.description   = %q{Yet Another (Ruby) NS API client}

data/spec/fixtures/disruptions.xml

@@ -6,6 +6,7 @@
       <Reden>beperkingen op last van de politie</Reden>
       <Bericht>Another test message</Bericht>
       <Datum>2010-12-16T11:16:00+0100</Datum>
+      <Oorzaak>oorzaak</Oorzaak>
     </Storing>
   </Ongepland>
   <Gepland>
@@ -18,6 +19,7 @@
         plaats van de trein tussen Almere Centrum en Lelystad Centrum rijden vier Sprinters per uur reis tussen Almere
         Muziekwijk en Naarden-Bussum via Weesp</Advies>
       <Bericht>Test message</Bericht>
+      <Oorzaak>oorzaak</Oorzaak>
     </Storing>
   </Gepland>
 </Storingen>

data/spec/ns_client_spec.rb

@@ -37,7 +37,7 @@ describe NSClient do
   context "Disruptions" do
 
     it "should retrieve planned and unplanned disruptions" do
-      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-storingen?", load_fixture('disruptions.xml')
+      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-storingen?actual=true", load_fixture('disruptions.xml')
       disruptions = @client.disruptions
       disruptions.size.should == 2
       disruptions[:planned].size.should == 1
@@ -45,7 +45,7 @@ describe NSClient do
     end
 
     it "should retrieve expected planned disruption" do
-      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-storingen?", load_fixture('disruptions.xml')
+      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-storingen?actual=true", load_fixture('disruptions.xml')
       disruptions = @client.disruptions
       disruptions.size.should == 2
       planned_disruption = disruptions[:planned].first
@@ -58,10 +58,11 @@ describe NSClient do
         plaats van de trein tussen Almere Centrum en Lelystad Centrum rijden vier Sprinters per uur reis tussen Almere
         Muziekwijk en Naarden-Bussum via Weesp"
       planned_disruption.message.should == "Test message"
+      planned_disruption.cause.should == "oorzaak"
     end
 
     it "should retrieve expected unplanned disruption" do
-      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-storingen?", load_fixture('disruptions.xml')
+      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-storingen?actual=true", load_fixture('disruptions.xml')
       disruptions = @client.disruptions
       disruptions.size.should == 2
       unplanned_disruption = disruptions[:unplanned].first
@@ -70,12 +71,13 @@ describe NSClient do
       unplanned_disruption.id.should == "prio-13345"
       unplanned_disruption.trip.should == "'s-Hertogenbosch-Nijmegen"
       unplanned_disruption.reason.should == "beperkingen op last van de politie"
+      unplanned_disruption.cause.should == "oorzaak"
       unplanned_disruption.message.should == "Another test message"
       unplanned_disruption.datetime_string == "2010-12-16T11:16:00+0100" #intentional, give raw data. Let user parse if needed.
     end
 
     it "should not return disruption when empty in response" do
-      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-storingen?", load_fixture('no_disruptions.xml')
+      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-storingen?actual=true", load_fixture('no_disruptions.xml')
       disruptions = @client.disruptions
       disruptions.size.should == 2
       disruptions[:planned].size.should == 0
@@ -103,7 +105,25 @@ describe NSClient do
   end
 
   context "Prices" do
-    xit "should retrieve prices for a trip"
+    it "should retrieve prices for a trip" do
+      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-prijzen-v2?from=Purmerend&to=Amsterdam&via=Zaandam&date=17062013", load_fixture('prices.xml')
+      date = Date.strptime('17-06-2013', '%d-%m-%Y')
+      response = @client.prices from: "Purmerend", to: "Amsterdam", via: "Zaandam", date: date
+      response.class.should == NSClient::PricesResponse
+      response.tariff_units.should == 10
+      response.products.size.should == 2
+
+      enkele_reis = response.products["Enkele reis"]
+      enkele_reis.size.should == 6
+    end
+
+    xit "should retrieve expected price data"
+
+    xit "assumes date is now, when not given"
+    xit "should treat via as optional parameter"
+    xit "should raise error when from is not given"
+    xit "should raise error when to is not given"
+
   end
 
   def stub_ns_client_request(url, response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ns-yapi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2729208027955836065
+      hash: -4220924222430246748
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2729208027955836065
+      hash: -4220924222430246748
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24