traffic 0.0.4 → 0.0.5

data/README.md

@@ -13,6 +13,8 @@ Usage Examples
 
 	info = Traffic.from(:file_index)
 	
+	info = Traffic.from(:file_index, File.read("/tmp/archive.xml"))
+	
 	puts info.count
 	 #=> 15
 	puts "#{info.size} km"

data/lib/traffic/providers/anwb.rb

@@ -6,6 +6,10 @@ module Traffic
     class Anwb
       HTML_FEED = "http://flitsapp.nl/ios/anwb/"
       
+      def initialize(archived_data=nil)
+        @data = Nokogiri::HTML::Document.parse(archived_data) if archived_data
+      end
+      
       def traffic
         !(count_info[0].text =~ /Totaal aantal meldingen: 0/)
       end

data/lib/traffic/providers/file_index.rb

@@ -5,6 +5,10 @@ module Traffic
     class FileIndex
       RSS_FEED = "http://www.fileindex.nl/rss.php"
       
+      def initialize(archived_data=nil)
+        @data = Feedzirra::Feed.parse(archived_data) if archived_data
+      end
+      
       def traffic
         !(rss.description =~ /Er zijn geen files./)
       end
@@ -30,7 +34,7 @@ module Traffic
           item.to = data[3]
           item.length = data[4].to_f
 
-          data = entry.summary.match /\b(.+)\b tussen \b(.+)\b( door (.*))? HMP([\d\.]+) .+ HMP([\d\.]+)\s*(.*)/
+          data = entry.summary.match /(.+) tussen (.+?)( door (.+))? HMP([\d\.]+) .+ HMP([\d\.]+)\s*(.*)/
           if data.nil?
             item.description = entry.summary
           else

data/lib/traffic/version.rb

@@ -1,3 +1,3 @@
 module Traffic
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/traffic.rb

@@ -3,8 +3,8 @@ require File.expand_path("../traffic/provider", __FILE__)
 require File.expand_path("../traffic/info", __FILE__)
 
 module Traffic
-  def self.from(provider_name)
-    provider = Provider(provider_name).new
+  def self.from(provider_name, archived_data=nil)
+    provider = Provider(provider_name).new(archived_data)
     info = Info.new
     
     MAIN_ATTRIBUTES.each do |attr|

data/spec/fixtures/file_index/apostrophe_in_description.xml

@@ -0,0 +1,3 @@
+
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/"><channel><title>Fileindex.nl actuele files 25-jan-2012 11:34:26</title><link>http://www.fileindex.nl/meldingenRSS.aspx</link><description>Er is 1 file met een totale lengte van  km.</description><language>en-us</language><item><title>A58 van Vlissingen richting Bergen op Zoom 0 km                   
+        </title><description>Afgesloten tussen 's-Gravenpolder en Rilland door Veiligheidsincident HMP144.7 --&gt; HMP144.7</description></item></channel></rss>

data/spec/providers/anwb_spec.rb

@@ -14,6 +14,20 @@ describe Traffic do
       HTTPClient.any_instance.stubs(:get).returns(stub)
     end
 
+    context "with data from archive" do
+      it "should not connect to the page to fetch data" do
+        lambda { Traffic.from(:anwb, File.read(File.expand_path("../../fixtures/anwb/traffic.html", __FILE__))) }.should_not raise_error
+      end
+      
+      it "should be able to parse the archived data" do
+        info = Traffic.from(:anwb, File.read(File.expand_path("../../fixtures/anwb/traffic.html", __FILE__)))
+        info.traffic.should be_true
+        info.timestamp.strftime("%H:%M").should == "17:50"
+        info.items.first.description.should == "A1 Amersfoort richting Amsterdam tussen Amersfoort-Noord en Eembrugge 2 km, Filelengte neemt toe"
+        info.items.first.length.should == 2.0
+      end
+    end
+
     context "when there is no traffic" do
       before :each do
         stub_html "anwb/empty.html"

data/spec/providers/file_index_spec.rb

@@ -13,6 +13,20 @@ describe Traffic do
       Feedzirra::Feed.stubs(:fetch_and_parse).returns(stub)
     end
     
+    context "with data from archive" do
+      it "should not connect to the feed to fetch data" do
+        lambda { Traffic.from(:file_index, File.read(File.expand_path("../../fixtures/file_index/rss.xml", __FILE__))) }.should_not raise_error
+      end
+      
+      it "should be able to parse the archived data" do
+        info = Traffic.from(:file_index, File.read(File.expand_path("../../fixtures/file_index/rss.xml", __FILE__)))
+        info.traffic.should be_true
+        info.timestamp.strftime("%H:%M").should == "17:51"
+        info.items.first.description.should == "Langzaam rijdend verkeer"
+        info.items.first.length.should == 2.2
+      end
+    end
+    
     context "when there is no traffic" do
       before :each do
         stub_feed "file_index/empty_rss.xml"
@@ -31,6 +45,19 @@ describe Traffic do
       info_item.description.should == "weird description"
     end
     
+    it "should be able to handle an in apostrophe in the descriptions" do
+      stub_feed "file_index/apostrophe_in_description.xml"
+      info = Traffic.from(:file_index)
+      info_item = info.items.first
+      info_item.location.should == "'s-Gravenpolder en Rilland"
+      info_item.description.should == "Afgesloten"
+      info_item.cause.should == "Veiligheidsincident"
+      info_item.from.should == "Vlissingen"
+      info_item.to.should == "Bergen op Zoom"
+      info_item.from_location.should == 144.7
+      info_item.to_location.should == 144.7
+    end
+    
     context "when there is traffic" do
       before :each do
         stub_feed "file_index/rss.xml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traffic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70318563874100 !ruby/object:Gem::Requirement
+  requirement: &70103555463260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70318563874100
+  version_requirements: *70103555463260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70318563873240 !ruby/object:Gem::Requirement
+  requirement: &70103555462260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70318563873240
+  version_requirements: *70103555462260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70318563871960 !ruby/object:Gem::Requirement
+  requirement: &70103555461220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70318563871960
+  version_requirements: *70103555461220
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70318563871440 !ruby/object:Gem::Requirement
+  requirement: &70103555460020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70318563871440
+  version_requirements: *70103555460020
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70318563870880 !ruby/object:Gem::Requirement
+  requirement: &70103555459520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70318563870880
+  version_requirements: *70103555459520
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70318563870240 !ruby/object:Gem::Requirement
+  requirement: &70103555458980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70318563870240
+  version_requirements: *70103555458980
 - !ruby/object:Gem::Dependency
   name: feedzirra
-  requirement: &70318563869440 !ruby/object:Gem::Requirement
+  requirement: &70103555458360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70318563869440
+  version_requirements: *70103555458360
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70318563893980 !ruby/object:Gem::Requirement
+  requirement: &70103555457400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70318563893980
+  version_requirements: *70103555457400
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70318563893400 !ruby/object:Gem::Requirement
+  requirement: &70103555479980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70318563893400
+  version_requirements: *70103555479980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70318563892820 !ruby/object:Gem::Requirement
+  requirement: &70103555479280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70318563892820
+  version_requirements: *70103555479280
 description: Traffic is a gem that supplies traffic information from multiple data
   providers
 email:
@@ -142,6 +142,7 @@ files:
 - lib/traffic/version.rb
 - spec/fixtures/anwb/empty.html
 - spec/fixtures/anwb/traffic.html
+- spec/fixtures/file_index/apostrophe_in_description.xml
 - spec/fixtures/file_index/empty_rss.xml
 - spec/fixtures/file_index/rss.xml
 - spec/fixtures/file_index/weird_description.xml
@@ -179,6 +180,7 @@ summary: ! 'Traffic: the traffic information gem'
 test_files:
 - spec/fixtures/anwb/empty.html
 - spec/fixtures/anwb/traffic.html
+- spec/fixtures/file_index/apostrophe_in_description.xml
 - spec/fixtures/file_index/empty_rss.xml
 - spec/fixtures/file_index/rss.xml
 - spec/fixtures/file_index/weird_description.xml