ns-yapi 0.4.0 → 0.4.1

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.DS_Store
 
 # YARD artifacts
 .yardoc
@@ -19,3 +20,6 @@ doc/
 
 # IntelliJ IDEA / Rubymine IDEA
 .idea/
+
+# Ignore credentials
+spec/fixtures/credentials.yml

data/.ruby-gemset

@@ -0,0 +1 @@
+ns-api

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p194

data/Gemfile.lock

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

data/lib/ns_client.rb

@@ -42,10 +42,14 @@ end
 
 class NSClient
 
+  attr_accessor :last_received_raw_xml, :last_received_corrected_xml
+
   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")
+    @last_received_raw_xml = ""
+    @last_received_corrected_xml = ""
   end
 
   def stations
@@ -159,11 +163,20 @@ class NSClient
 
   def get_xml(url)
     response = @client.get url
-    Nokogiri.XML(remove_unwanted_whitespace(response.content))
+    @last_received_raw_xml = response.content
+    @last_received_corrected_xml = remove_unwanted_whitespace(@last_received_raw_xml)
+    begin
+      Nokogiri.XML(@last_received_corrected_xml) do |config|
+        config.options = Nokogiri::XML::ParseOptions::STRICT
+      end
+    rescue Nokogiri::XML::SyntaxError => e
+      raise UnparseableXMLError.new e
+    end
+
   end
 
   def remove_unwanted_whitespace content
-    content.gsub /<(\s+?)/, '<'
+    content.gsub /<\s*(\/?)\s*?([a-zA-Z0-9]*)\s*>/, '<\1\2>'
   end
 
   def disruption_url(query)
@@ -211,4 +224,7 @@ class NSClient
   class MissingParameter < StandardError
   end
 
+  class UnparseableXMLError < StandardError
+  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.4.0'
+  gem.version       = '0.4.1'
   gem.authors       = ["Stefan Hendriks"]
   gem.email         = ["stefanhen83@gmail.com"]
   gem.description   = %q{Yet Another (Ruby) NS API client}