ns-yapi 0.3.0 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ns-yapi (0.3.0)
+    ns-yapi (0.4.0)
       httpclient
       nokogiri
       nori
@@ -26,7 +26,7 @@ GEM
     mini_portile (0.5.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.6)
+    multi_json (1.7.7)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     nori (2.2.0)

data/lib/ns_client.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'pathname'
 require 'time'
 require 'nori'
@@ -158,7 +159,11 @@ class NSClient
 
   def get_xml(url)
     response = @client.get url
-    Nokogiri.XML(response.content)
+    Nokogiri.XML(remove_unwanted_whitespace(response.content))
+  end
+
+  def remove_unwanted_whitespace content
+    content.gsub /<(\s+?)/, '<'
   end
 
   def disruption_url(query)
@@ -206,4 +211,4 @@ class NSClient
   class MissingParameter < StandardError
   end
 
-end
+end

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.3.0'
+  gem.version       = '0.4.0'
   gem.authors       = ["Stefan Hendriks"]
   gem.email         = ["stefanhen83@gmail.com"]
   gem.description   = %q{Yet Another (Ruby) NS API client}

data/spec/fixtures/stations_list_with_invalid_new_lines.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Stations>
+
+	<Station>
+		<Code>LC</Code>
+		<Type>stoptreinstation</Type>
+		<Namen>		
+		  <Kort>Lochem</Kort>
+		  <
+Middel>Lochem</Middel>
+		  <Lang>Lochem</Lang>
+		</Namen>
+		<Land>NL</Land>
+		<UICCode>8400399</UICCode>
+		<Lat>52.166668</Lat>
+		<Lon>6.4263887</Lon>
+		<Synoniemen>
+			
+		</Synoniemen>
+	</Station>
+
+	<Station>
+		<Code>HT</Code>
+		<Type>intercitystation</Type>
+		<Namen>
+		  <Kort>Den Bosch</Kort>
+		  <Middel>'s-Hertogenbosch</Middel>
+		  <Lang>'s-Hertogenbosch</Lang>
+		</Namen>
+		<Land>NL</Land>
+		<UICCode>12</UICCode>
+		<Lat>52.166668</Lat>
+		<Lon>6.4263887</Lon>
+		<Synoniemen>
+
+		</Synoniemen>
+	</Station>
+
+
+</Stations>

data/spec/ns_client_spec.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'spec_helper'
 
 describe NSClient do
@@ -8,36 +9,52 @@ describe NSClient do
 
   context "Stations" do
 
-    before :each do
-      stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-stations-v2", load_fixture('stations.xml')
-    end
+    context "with valid xml" do
 
-    it "should return all stations" do
-      stations = @client.stations
-      stations.size.should == 620
-    end
+      before :each do
+        stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-stations-v2", load_fixture('stations.xml')
+      end
 
-    it "should return expected first station from list" do
-      stations = @client.stations
-      first_station = stations.first
-      first_station.class.should == NSClient::Station
-      first_station.type.should == "knooppuntIntercitystation"
-      first_station.code.should == "HT"
-      first_station.short_name.should == "H'bosch"
-      first_station.name.should == "'s-Hertogenbosch"
-      first_station.long_name.should == "'s-Hertogenbosch"
-      first_station.country.should == "NL"
-      first_station.uiccode.should == "8400319"
-      first_station.lat.should == "51.69048"
-      first_station.long.should == "5.29362"
-    end
+      it "should return all stations" do
+        stations = @client.stations
+        stations.size.should == 620
+      end
+
+      it "should return expected first station from list" do
+        stations = @client.stations
+        first_station = stations.first
+        first_station.class.should == NSClient::Station
+        first_station.type.should == "knooppuntIntercitystation"
+        first_station.code.should == "HT"
+        first_station.short_name.should == "H'bosch"
+        first_station.name.should == "'s-Hertogenbosch"
+        first_station.long_name.should == "'s-Hertogenbosch"
+        first_station.country.should == "NL"
+        first_station.uiccode.should == "8400319"
+        first_station.lat.should == "51.69048"
+        first_station.long.should == "5.29362"
+      end
+
+      it "should retrieve a convenient hash with usable station names and codes for prices usage" do
+        stations = @client.stations_short
+        stations.size.should == 620
+        stations["HT"].should == ["'s-Hertogenbosch", "NL"]
+      end
 
-    it "should retrieve a convenient hash with usable station names and codes for prices usage" do
-      stations = @client.stations_short
-      stations.size.should == 620
-      stations["HT"].should == ["'s-Hertogenbosch", "NL"]
     end
 
+    describe "invalid stations xml" do
+
+      before :each do
+        stub_ns_client_request "http://username:password@webservices.ns.nl/ns-api-stations-v2", load_fixture('stations_list_with_invalid_new_lines.xml')
+      end
+
+      it "should return all stations" do
+        stations = @client.stations
+        stations.size.should == 2
+      end
+
+    end
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ns-yapi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -84,6 +84,7 @@ files:
 - spec/fixtures/prices.xml
 - spec/fixtures/prices_invalid_station_name.xml
 - spec/fixtures/stations.xml
+- spec/fixtures/stations_list_with_invalid_new_lines.xml
 - spec/model/prices_url_spec.rb
 - spec/ns_client_spec.rb
 - spec/nsyapi_spec.rb
@@ -102,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1397451197090581967
+      hash: -1576565984611129262
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1397451197090581967
+      hash: -1576565984611129262
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -126,6 +127,7 @@ test_files:
 - spec/fixtures/prices.xml
 - spec/fixtures/prices_invalid_station_name.xml
 - spec/fixtures/stations.xml
+- spec/fixtures/stations_list_with_invalid_new_lines.xml
 - spec/model/prices_url_spec.rb
 - spec/ns_client_spec.rb
 - spec/nsyapi_spec.rb