ns-yapi 0.4.2 → 0.4.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cea7f72750a0a8d079579025fcc8cbcd02084149
+  data.tar.gz: 858eebcce69e1fac3d84fed99621e35038baaad0
+SHA512:
+  metadata.gz: 70447d1d9c34a7494c1c758bbb6fec97d5bc60ce5a69aadb7f9719005135863ef83b092a29715dacd797e82fbc229f40024cea2bb9f6287e272248e4e2cac402
+  data.tar.gz: 6efd6d32c0c045dab8df034230ee80a0623422b8a499c1a63df928b653e1a90f54fc32ce600ac8623b59142edaa5040d5812f602c5b5e9a00503747b0ea8c2ea

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p194
+2.1.2

data/README.md

@@ -1,4 +1,8 @@
-Yet Another NS API [![Build Status](https://travis-ci.org/stefanhendriks/ns-api.png?branch=master)](https://travis-ci.org/stefanhendriks/ns-api) [![Coverage Status](https://coveralls.io/repos/stefanhendriks/ns-api/badge.png)](https://coveralls.io/r/stefanhendriks/ns-api)
+Yet Another NS API
+
+[![Build Status](https://travis-ci.org/zilverline/ns-api.svg?branch=master)](https://travis-ci.org/zilverline/ns-api)
+[![Coverage Status](https://coveralls.io/repos/zilverline/ns-api/badge.svg?branch=master)](https://coveralls.io/r/zilverline/ns-api?branch=master)
+
 ==================
 A Ruby client for the NS API.
 
@@ -135,4 +139,4 @@ enkelereis_prices = prices.enkelereis
 Copyright
 ---------
 Copyright (c) 2013 Zilverline / Stefan Hendriks.
-See [LICENSE](https://github.com/zilverline/ns-api/blob/master/LICENSE.mkd) for details.
+See [LICENSE](https://github.com/zilverline/ns-api/blob/master/LICENSE.mkd) for details.

data/lib/ns_client.rb

@@ -3,9 +3,7 @@ require 'pathname'
 require 'time'
 require 'nori'
 require 'nokogiri'
-
 require 'httpclient'
-
 require "addressable/uri"
 
 this = Pathname.new(__FILE__).realpath
@@ -47,7 +45,7 @@ class NSClient
   def initialize(username, password)
     @client = HTTPClient.new
     @client.set_auth("http://webservices.ns.nl", username, password)
-    @prices_url = PricesUrl.new("http://webservices.ns.nl/ns-api-prijzen-v2")
+    @prices_url = PricesUrl.new("http://webservices.ns.nl/ns-api-prijzen-v3")
     @last_received_raw_xml = ""
     @last_received_corrected_xml = ""
   end
@@ -70,6 +68,8 @@ class NSClient
     raise MissingParameter, "from and to station is required" if (opts[:from] == nil && opts[:to] == nil)
     raise MissingParameter, "from station is required" unless opts[:from]
     raise MissingParameter, "to station is required" unless opts[:to]
+    raise SameDestinationError,
+      "from (#{opts[:from]}) and to (#{opts[:to]}) parameters should not be equal" if opts[:from] == opts[:to]
     response_xml = get_xml(@prices_url.url(opts))
     raise_error_when_response_is_error(response_xml)
     parse_prices(response_xml)
@@ -77,19 +77,23 @@ class NSClient
 
   def parse_prices(response_xml)
     prices_response = PricesResponse.new
-    (response_xml/'/Producten').each do |products|
-      prices_response.tariff_units = (products/'./Tariefeenheden').text.to_i
+    (response_xml/'/VervoerderKeuzes/VervoerderKeuze').each do |transporter|
+      prices_response.tariff_units = (transporter/'./Tariefeenheden').text.to_i
 
-      (products/'Product').each do |product|
+      (transporter/'ReisType').each do |travel_type|
         prices = []
-        (product/'Prijs').each do |price_element|
-          product_price = ProductPrice.new
-          product_price.type = price_element.attr("korting")
-          product_price.train_class = price_element.attr("klasse")
-          product_price.amount = price_element.text.gsub(",", ".").to_f
-          prices << product_price
+
+        (travel_type/'ReisKlasse').each do |travel_class|
+          (travel_class/'Korting/Kortingsprijs').each do |price_element|
+            product_price = ProductPrice.new
+            product_price.discount = price_element.attr("name")
+            product_price.train_class = travel_class.attr("klasse")
+            product_price.amount = price_element.attr("prijs").gsub(",", ".").to_f
+            prices << product_price
+          end
         end
-        name = product.attr('naam')
+
+        name = travel_type.attr('name')
         prices_response.products[name] = prices
       end
 
@@ -197,13 +201,21 @@ class NSClient
     end
 
     def dagretour
-      products["Dagretour"]
+      products["Retour"]
     end
 
   end
 
   class ProductPrice
-    attr_accessor :type, :train_class, :amount
+    attr_accessor :discount, :train_class, :amount
+    DISCOUNT_MAP ||= {
+      "20% korting" => "reductie_20",
+      "40% korting" => "reductie_40"
+    }.freeze
+
+    def type
+      DISCOUNT_MAP.fetch(discount, discount)
+    end
   end
 
   class UnplannedDisruption
@@ -227,4 +239,7 @@ class NSClient
   class UnparseableXMLError < StandardError
   end
 
+  class SameDestinationError < StandardError
+  end
+
 end

data/ns.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "ns-yapi"
-  gem.version       = '0.4.2'
-  gem.authors       = ["Stefan Hendriks"]
+  gem.version       = '0.4.3'
+  gem.authors       = ["Stefan Hendriks", "Derek Kraan", "Bob Forma"]
   gem.email         = ["stefanhen83@gmail.com"]
   gem.description   = %q{Yet Another (Ruby) NS API client}
   gem.summary       = %q{A Ruby client for the NS (Dutch Railways) API}
-  gem.homepage      = "https://github.com/stefanhendriks/ns-api"
+  gem.homepage      = "https://github.com/zilverline/ns-api"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -19,5 +19,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'httpclient'
   gem.add_dependency 'nori'
   gem.add_dependency 'nokogiri'
-
 end

data/spec/fixtures/prices.xml

@@ -1,20 +1,46 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Producten>
-  <Tariefeenheden>10</Tariefeenheden>
-  <Product naam="Enkele reis">
-    <Prijs korting="vol tarief" klasse="2">2,40</Prijs>
-    <Prijs korting="reductie_20" klasse="2">1,90</Prijs>
-    <Prijs korting="reductie_40" klasse="2">1,40</Prijs>
-    <Prijs korting="vol tarief" klasse="1">4,10</Prijs>
-    <Prijs korting="reductie_20" klasse="1">3,30</Prijs>
-    <Prijs korting="reductie_40" klasse="1">2,50</Prijs>
-  </Product>
-  <Product naam="Dagretour">
-    <Prijs korting="vol tarief" klasse="2">4,80</Prijs>
-    <Prijs korting="reductie_20" klasse="2">3,80</Prijs>
-    <Prijs korting="reductie_40" klasse="2">2,80</Prijs>
-    <Prijs korting="vol tarief" klasse="1">8,20</Prijs>
-    <Prijs korting="reductie_20" klasse="1">6,60</Prijs>
-    <Prijs korting="reductie_40" klasse="1">5,00</Prijs>
-  </Product>
-</Producten>
+<?xml version="1.0" encoding="UTF-8"?>
+<VervoerderKeuzes>
+  <VervoerderKeuze naam="GEEN_KEUZE">
+    <Tariefeenheden>205</Tariefeenheden>
+    <ReisType name="Enkele reis">
+      <ReisKlasse klasse="1">
+        <Prijsdeel vervoerder="NS" prijs="41,50" naar="RTD" van="GBR"/>
+        <Totaal>41,50</Totaal>
+        <Korting>
+          <Kortingsprijs name="vol tarief" prijs="41,50"/>
+          <Kortingsprijs name="20% korting" prijs="33,20"/>
+          <Kortingsprijs name="40% korting" prijs="24,90"/>
+        </Korting>
+      </ReisKlasse>
+      <ReisKlasse klasse="2">
+        <Prijsdeel vervoerder="NS" prijs="24,40" naar="RTD" van="GBR"/>
+        <Totaal>24,40</Totaal>
+        <Korting>
+          <Kortingsprijs name="vol tarief" prijs="24,40"/>
+          <Kortingsprijs name="20% korting" prijs="19,50"/>
+          <Kortingsprijs name="40% korting" prijs="14,60"/>
+        </Korting>
+      </ReisKlasse>
+    </ReisType>
+    <ReisType name="Retour">
+      <ReisKlasse klasse="1">
+        <Prijsdeel vervoerder="NS" prijs="83,00" naar="RTD" van="GBR"/>
+        <Totaal>83,00</Totaal>
+        <Korting>
+          <Kortingsprijs name="vol tarief" prijs="83,00"/>
+          <Kortingsprijs name="20% korting" prijs="66,40"/>
+          <Kortingsprijs name="40% korting" prijs="49,80"/>
+        </Korting>
+      </ReisKlasse>
+      <ReisKlasse klasse="2">
+        <Prijsdeel vervoerder="NS" prijs="48,80" naar="RTD" van="GBR"/>
+        <Totaal>48,80</Totaal>
+        <Korting>
+          <Kortingsprijs name="vol tarief" prijs="48,80"/>
+          <Kortingsprijs name="20% korting" prijs="39,00"/>
+          <Kortingsprijs name="40% korting" prijs="29,20"/>
+        </Korting>
+      </ReisKlasse>
+    </ReisType>
+  </VervoerderKeuze>
+</VervoerderKeuzes>

data/spec/ns_client_spec.rb

@@ -188,11 +188,11 @@ describe NSClient do
   context "Prices" do
 
     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')
+      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-prijzen-v3?from=Rotterdam&to=Glanerbrug&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 = client.prices from: "Rotterdam", to: "Glanerbrug", date: date
       response.class.should == NSClient::PricesResponse
-      response.tariff_units.should == 10
+      response.tariff_units.should == 205
       response.products.size.should == 2
 
       response.enkele_reis.size.should == 6
@@ -200,19 +200,19 @@ describe NSClient do
     end
 
     it "should retrieve expected price data" 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')
+      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-prijzen-v3?from=Rotterdam&to=Glanerbrug&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 = client.prices from: "Rotterdam", to: "Glanerbrug", date: date
       response.class.should == NSClient::PricesResponse
-      response.tariff_units.should == 10
+      response.tariff_units.should == 205
       response.products.size.should == 2
 
-      assert_price(response.enkele_reis[0], "vol tarief", "2", 2.4)
-      assert_price(response.enkele_reis[1], "reductie_20", "2", 1.90)
-      assert_price(response.enkele_reis[2], "reductie_40", "2", 1.40)
-      assert_price(response.enkele_reis[3], "vol tarief", "1", 4.10)
-      assert_price(response.enkele_reis[4], "reductie_20", "1", 3.3)
-      assert_price(response.enkele_reis[5], "reductie_40", "1", 2.5)
+      assert_price(response.enkele_reis[0], "vol tarief", "1", 41.5)
+      assert_price(response.enkele_reis[1], "reductie_20", "1", 33.2)
+      assert_price(response.enkele_reis[2], "reductie_40", "1", 24.9)
+      assert_price(response.enkele_reis[3], "vol tarief", "2", 24.4)
+      assert_price(response.enkele_reis[4], "reductie_20", "2", 19.5)
+      assert_price(response.enkele_reis[5], "reductie_40", "2", 14.6)
     end
 
     it "should raise error when from is not given" do
@@ -223,7 +223,7 @@ describe NSClient do
 
     it "should raise an error when from is not a valid station name" do
       date = Date.strptime('17-06-2013', '%d-%m-%Y')
-      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-prijzen-v2?from=Amsterdam&to=Purmerend&date=17062013", load_fixture('prices_invalid_station_name.xml')
+      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-prijzen-v3?from=Amsterdam&to=Purmerend&date=17062013", load_fixture('prices_invalid_station_name.xml')
       expect {
         client.prices from: "Amsterdam", to: "Purmerend", date: date
       }.to raise_error(NSClient::InvalidStationNameError, "'Amsterdam' is not a valid station name")
@@ -241,6 +241,12 @@ describe NSClient do
       }.to raise_error(NSClient::MissingParameter, "from and to station is required")
     end
 
+    it "should raise an error when from and to are the same" do
+      expect {
+        client.prices from: 'AMA', to: 'AMA'
+      }.to raise_error(NSClient::SameDestinationError, "from (AMA) and to (AMA) parameters should not be equal")
+    end
+
   end
 
   def assert_price(element, expected_type, expected_train_class, expected_amount)

metadata

@@ -1,62 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ns-yapi
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.4.3
 platform: ruby
 authors:
 - Stefan Hendriks
+- Derek Kraan
+- Bob Forma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nori
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Yet Another (Ruby) NS API client
@@ -66,10 +61,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.mkd
@@ -93,35 +88,28 @@ files:
 - spec/ns_client_spec.rb
 - spec/nsyapi_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/stefanhendriks/ns-api
+homepage: https://github.com/zilverline/ns-api
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3423485013195934807
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3423485013195934807
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby client for the NS (Dutch Railways) API
 test_files:
 - spec/fixtures/disruption_invalid_station_name.xml