RubyGems - traffic - Versions diffs - 0.0.1 → 0.0.2 - Mend

traffic 0.0.1 → 0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

data/lib/traffic/info.rb +1 -1
data/lib/traffic/providers/anwb.rb +59 -0
data/lib/traffic/providers/file_index.rb +1 -1
data/lib/traffic/version.rb +1 -1
data/spec/fixtures/anwb/empty.html +18 -0
data/spec/fixtures/anwb/traffic.html +39 -0
data/spec/providers/anwb_spec.rb +99 -0
data/spec/providers/file_index_spec.rb +110 -0
data/spec/spec_helper.rb +0 -7
data/spec/traffic/info_spec.rb +8 -0
data/spec/traffic_spec.rb +0 -88
data/traffic.gemspec +3 -1
metadata +48 -17

data/lib/traffic/info.rb CHANGED

@@ -2,7 +2,7 @@ module Traffic
   MAIN_ATTRIBUTES = [:timestamp, :count, :size, :traffic]
   Info = Struct.new(*MAIN_ATTRIBUTES) do
     def traffic?
-      !traffic
+      traffic
     end
     def items

data/lib/traffic/providers/anwb.rb ADDED

@@ -0,0 +1,59 @@
+require 'httpclient'
+require 'nokogiri'
+module Traffic
+  module Providers
+    class Anwb
+      HTML_FEED = "http://flitsapp.nl/ios/anwb/"
+      def traffic
+        !(count_info[0].text =~ /Totaal aantal meldingen: 0/)
+      end
+      def timestamp
+        Time.parse(count_info[2].text[/Laatste update: (.+) uur/, 1])
+      end
+      def count
+        count_info[0].text[/Totaal aantal meldingen: (.+)/, 1].to_i
+      end
+      def size
+        count_info[1].text[/Totale lengte: (.+) km/, 1].to_i
+      end
+      def each_item(&block)
+        html.css(".message").each do |entry|
+          item = Struct.new(*ITEM_ATTRIBUTES).new
+          item.road = entry.css("span.roadnumber_a,span.roadnumber_n").text
+          data = entry.css("strong.desc_short").text
+          item.from = data[/(.*) - (.*)/, 1]
+          item.to = data[/(.*) - (.*)/, 2]
+          item.description = entry.css("p.desc_long").children.first.text
+          hmp = entry.css("p.desc_long span.hmp")
+          item.from_location = hmp[1].text.to_f
+          item.to_location = hmp[0].text.to_f
+          unless entry["class"].include?("roadworks")
+            item.length = entry.css("span.km").text.to_f
+          else
+            item.length = (hmp[1].text.to_f - hmp[0].text.to_f).abs.round(1)
+          end
+          yield item
+        end
+      end
+      private
+        def count_info
+          html.css("#count").children.select(&:text?)
+        end
+        def html
+          @data ||= Nokogiri::HTML::Document.parse(HTTPClient.new.get(HTML_FEED).content)
+        end
+    end
+  end
+end

data/lib/traffic/providers/file_index.rb CHANGED

@@ -6,7 +6,7 @@ module Traffic
       RSS_FEED = "http://www.fileindex.nl/rss.php"
       def traffic
-        rss.description =~ /Er zijn geen files./
+        !(rss.description =~ /Er zijn geen files./)
       end
       def timestamp

data/lib/traffic/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Traffic
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fixtures/anwb/empty.html ADDED

@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
+<html>
+    <head>
+        <title>File overzicht</title>
+        <link rel="stylesheet" type="text/css" href="style.css">
+        <meta name="format-detection" content="telephone=no">
+        <meta name="viewport" content="user-scalable=no">
+    </head>
+    <body>
+        <a name="top"></a>
+                <div id='count'>
+            Totaal aantal meldingen: 0<br />
+Totale lengte: 0 km<br />
+Laatste update: 11:45 uur
+        </div>
+                <p class='source'>Bron:<br /><a href='http://www.anwb.nl/' target='_blank'><img src='anwb.png' width='160' border='0' /><br />ANWB Verkeersinformatie</a></p>
+    </body>
+</html>

data/spec/fixtures/anwb/traffic.html ADDED

@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
+<html>
+    <head>
+        <title>File overzicht</title>
+        <link rel="stylesheet" type="text/css" href="style.css">
+        <meta name="format-detection" content="telephone=no">
+        <meta name="viewport" content="user-scalable=no">
+    </head>
+    <body>
+        <a name="top"></a>
+                <div id='count'>
+            Totaal aantal meldingen: 3<br />
+Totale lengte: 5 km<br />
+Laatste update: 11:20 uur
+        </div>
+        <div id="anchors"><a href="#A20" class="roadnumber_a">A20</a></div><a name="A20"></a>                <a href='#top'>
+                    <div id='msg_1541548' class='message roadworks'>
+                        <span class='roadnumber_a'>A20</span>
+                                                <strong class='desc_short'>Gouda - Hoek van Holland</strong>
+                        <p class='desc_long'>A20 Gouda richting Hoek van Holland bij Spaanse Polder is de rechterrijstrook dicht, door een ongeluk.<br /><span class="hmp">27.0</span><span class="hmp">27.9</span></p>
+                    </div>
+                </a>
+                                <a href='#top'>
+                    <div id='msg_1541552' class='message'>
+                        <span class='roadnumber_a'>A20</span>
+                        <span class='km'>3 km</span>                        <strong class='desc_short'>Gouda - Hoek van Holland</strong>
+                        <p class='desc_long'>A20 Gouda richting Hoek van Holland tussen knp. Terbregseplein en Rotterdam-Centrum 3 km, Filelengte neemt toe<br /><span class="hmp">30.3</span><span class="hmp">36.5</span></p>
+                    </div>
+                </a>
+                                <a href='#top'>
+                    <div id='msg_1541547' class='message'>
+                        <span class='roadnumber_a'>A20</span>
+                        <span class='km'>2 km</span>                        <strong class='desc_short'>Gouda - Hoek van Holland</strong>
+                        <p class='desc_long'>A20 Gouda richting Hoek van Holland tussen Rotterdam-Centrum en Spaanse Polder 2 km, door een ongeluk.<br /><span class="hmp">27.0</span><span class="hmp">31.1</span></p>
+                    </div>
+                </a>
+                        <p class='source'>Bron:<br /><a href='http://www.anwb.nl/' target='_blank'><img src='anwb.png' width='160' border='0' /><br />ANWB Verkeersinformatie</a></p>
+    </body>
+</html>

data/spec/providers/anwb_spec.rb ADDED

@@ -0,0 +1,99 @@
+require File.expand_path('../../spec_helper', __FILE__)
+describe Traffic do
+  describe ".from(:anwb)" do
+    before :each do
+      Feedzirra::Feed.stubs(:fetch_and_parse).raises("do not connect to feed, stub this method")
+      HTTPClient.any_instance.stubs(:get).raises("do not connect to net, stub this method")
+    end
+    def stub_html(fixture)
+      stub = mock(:content => File.read(File.expand_path("../../fixtures/#{fixture}", __FILE__)))
+      HTTPClient.any_instance.stubs(:get).returns(stub)
+    end
+    context "when there is no traffic" do
+      before :each do
+        stub_html "anwb/empty.html"
+        @info = Traffic.from(:anwb)
+      end
+      it "should indicate that there is no traffic" do
+        @info.traffic.should_not be_true
+      end
+    end
+    context "when there is traffic" do
+      before :each do
+        stub_html "anwb/traffic.html"
+        @info = Traffic.from(:anwb)
+      end
+      it "should indicate that there is traffic" do
+        @info.traffic.should be_true
+      end
+      it "should return a timestamp" do
+        @info.timestamp.strftime("%H:%M").should == "11:20"
+      end
+      it "should return an info object" do
+        @info.class.should == Traffic::Info
+      end
+      it "should be able to return the total size" do
+        @info.size.should == 5
+      end
+      it "should be able to return the total count" do
+        @info.count.should == 3
+      end
+      it "should return a list with info items with the same length as count" do
+        @info.items.size.should == @info.count
+      end
+      it "should return a list with info items" do
+        @info.items.each { |i| i.class.should == Traffic::InfoItem }
+      end
+      context "the info items in the list" do
+        before :each do
+          @info_item = @info.items.first
+        end
+        it "should include a from" do
+          @info_item.from.should == "Gouda"
+        end
+        it "should include a to" do
+          @info_item.to.should == "Hoek van Holland"
+        end
+        it "should include a road number" do
+          @info_item.road.should == "A20"
+        end
+        it "should include a length in km" do
+          @info_item.length.should == 0.9
+        end
+        it "should include a description" do
+          @info_item.description.should == "A20 Gouda richting Hoek van Holland bij Spaanse Polder is de rechterrijstrook dicht, door een ongeluk."
+        end
+        it "should include a from location (hecto markers)" do
+          @info_item.from_location.should == 27.9
+        end
+        it "should include a to location" do
+          @info_item.to_location.should == 27.0
+        end
+      end
+    end
+  end
+end

data/spec/providers/file_index_spec.rb ADDED

@@ -0,0 +1,110 @@
+require File.expand_path('../../spec_helper', __FILE__)
+describe Traffic do
+  describe ".from(:file_index)" do
+    before :each do
+      Feedzirra::Feed.stubs(:fetch_and_parse).raises("do not connect to feed, stub this method")
+    end
+    def stub_feed(fixture)
+      stub = Feedzirra::Feed.parse(File.read(File.expand_path("../../fixtures/#{fixture}", __FILE__)))
+      Feedzirra::Feed.stubs(:fetch_and_parse).returns(stub)
+    end
+    context "when there is no traffic" do
+      before :each do
+        stub_feed "file_index/empty_rss.xml"
+        @info = Traffic.from(:file_index)
+      end
+      it "should indicate that there is no traffic" do
+        @info.traffic.should_not be_true
+      end
+    end
+    context "when there is traffic" do
+      before :each do
+        stub_feed "file_index/rss.xml"
+        @info = Traffic.from(:file_index)
+      end
+      it "should indicate that there is traffic" do
+        @info.traffic.should be_true
+      end
+      it "should return a timestamp" do
+        @info.timestamp.strftime("%H:%M").should == "16:15"
+      end
+      it "should return an info object" do
+        @info.class.should == Traffic::Info
+      end
+      it "should be able to return the total size" do
+        @info.size.should == 45
+      end
+      it "should be able to return the total count" do
+        @info.count.should == 14
+      end
+      it "should return a list with info items with the same length as count" do
+        @info.items.size.should == @info.count
+      end
+      it "should return a list with info items" do
+        @info.items.each { |i| i.class.should == Traffic::InfoItem }
+      end
+      context "the info items in the list" do
+        before :each do
+          @info_item = @info.items.first
+        end
+        it "should include a from" do
+          @info_item.from.should == "Amsterdam"
+        end
+        it "should include a to" do
+          @info_item.to.should == "Amersfoort"
+        end
+        it "should include a road number" do
+          @info_item.road.should == "A1"
+        end
+        it "should include a length in km" do
+          @info_item.length.should == 2.6
+        end
+        it "should include a description" do
+          @info_item.description.should == "Langzaam rijdend verkeer"
+        end
+        it "should include a location" do
+          @info_item.location.should == "Eemnes en Eembrugge"
+        end
+        it "should include a cause" do
+          @info_item.cause.should == "Ongeval(len)"
+        end
+        it "should include a status" do
+          @info_item.status.should == "Deze file wordt langer."
+        end
+        it "should include a from location (hecto markers)" do
+          @info_item.from_location.should == 30.2
+        end
+        it "should include a to location" do
+          @info_item.to_location.should == 32.8
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb CHANGED

@@ -14,14 +14,7 @@ RSpec.configure do |config|
   config.before :each do
     FakeWeb.allow_net_connect = false
-    Feedzirra::Feed.stubs(:fetch_and_parse).raises("do not connect to feed, stub this method")
   end
 end
-def stub_feed(fixture)
-  stub = Feedzirra::Feed.parse(File.read(File.expand_path("../fixtures/#{fixture}", __FILE__)))
-  Feedzirra::Feed.stubs(:fetch_and_parse).returns(stub)
-end
 load File.expand_path('../../lib/traffic.rb', __FILE__)

data/spec/traffic/info_spec.rb CHANGED

@@ -1,6 +1,14 @@
 require File.expand_path('../../spec_helper', __FILE__)
 describe Traffic do
+  describe "Info" do
+    it "should have a traffic presence tester" do
+      item = Traffic::Info.new
+      item.traffic = true
+      item.traffic?.should be_true
+    end
+  end
   describe "InfoItem" do
     it "should have presence testers" do

data/spec/traffic_spec.rb CHANGED

@@ -30,94 +30,6 @@ describe Traffic do
       end
       lambda { Traffic.from(:empty_provider) }.should raise_error
     end
-    context "when there is no traffic" do
-      before :each do
-        stub_feed "file_index/empty_rss.xml"
-        @info = Traffic.from(:file_index)
-      end
-      it "should indicate that there is no traffic" do
-        @info.should_not be_traffic
-      end
-    end
-    context "when there is traffic" do
-      before :each do
-        stub_feed "file_index/rss.xml"
-        @info = Traffic.from(:file_index)
-      end
-      it "should indicate that there is traffic" do
-        @info.should be_traffic
-      end
-      it "should return an info object" do
-        @info.class.should == Traffic::Info
-      end
-      it "should be able to return the total size" do
-        @info.size.should == 45
-      end
-      it "should be able to return the total count" do
-        @info.count.should == 14
-      end
-      it "should return a list with info items with the same length as count" do
-        @info.items.size.should == @info.count
-      end
-      it "should return a list with info items" do
-        @info.items.each { |i| i.class.should == Traffic::InfoItem }
-      end
-      context "the info items in the list" do
-        before :each do
-          @info_item = @info.items.first
-        end
-        it "should include a from" do
-          @info_item.from.should == "Amsterdam"
-        end
-        it "should include a to" do
-          @info_item.to.should == "Amersfoort"
-        end
-        it "should include a road number" do
-          @info_item.road.should == "A1"
-        end
-        it "should include a length in km" do
-          @info_item.length.should == 2.6
-        end
-        it "should include a description" do
-          @info_item.description.should == "Langzaam rijdend verkeer"
-        end
-        it "should include a location" do
-          @info_item.location.should == "Eemnes en Eembrugge"
-        end
-        it "should include a cause" do
-          @info_item.cause.should == "Ongeval(len)"
-        end
-        it "should include a status" do
-          @info_item.status.should == "Deze file wordt langer."
-        end
-        it "should include a from location (hecto markers)" do
-          @info_item.from_location.should == 30.2
-        end
-        it "should include a to location" do
-          @info_item.to_location.should == 32.8
-        end
-      end
-    end
   end
 end

data/traffic.gemspec CHANGED

@@ -22,5 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('mocha', '~> 0.10')
   s.add_development_dependency('simplecov', '~> 0.5')
   s.add_development_dependency('fakeweb', '~> 1.3')
-  s.add_dependency('feedzirra', '~> 0.1.1')
+  s.add_dependency('feedzirra', '~> 0.1')
+  s.add_dependency('httpclient', '~> 2.2')
+  s.add_dependency('nokogiri', '~> 1.4')
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traffic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70310037002700 !ruby/object:Gem::Requirement
+  requirement: &70206768921240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70310037002700
+  version_requirements: *70206768921240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70310037001620 !ruby/object:Gem::Requirement
+  requirement: &70206768920680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70310037001620
+  version_requirements: *70206768920680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70310037000800 !ruby/object:Gem::Requirement
+  requirement: &70206768920140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70310037000800
+  version_requirements: *70206768920140
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70310036999020 !ruby/object:Gem::Requirement
+  requirement: &70206768919580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70310036999020
+  version_requirements: *70206768919580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70310036998040 !ruby/object:Gem::Requirement
+  requirement: &70206768918960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70310036998040
+  version_requirements: *70206768918960
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70310036997360 !ruby/object:Gem::Requirement
+  requirement: &70206768918320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,18 +76,40 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70310036997360
+  version_requirements: *70206768918320
 - !ruby/object:Gem::Dependency
   name: feedzirra
-  requirement: &70310036996600 !ruby/object:Gem::Requirement
+  requirement: &70206768917600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70310036996600
+  version_requirements: *70206768917600
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &70206768916920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70206768916920
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70206768915980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70206768915980
 description: Traffic is a gem that supplies traffic information from multiple data
   providers
 email:
@@ -104,10 +126,15 @@ files:
 - lib/traffic.rb
 - lib/traffic/info.rb
 - lib/traffic/provider.rb
+- lib/traffic/providers/anwb.rb
 - lib/traffic/providers/file_index.rb
 - lib/traffic/version.rb
+- spec/fixtures/anwb/empty.html
+- spec/fixtures/anwb/traffic.html
 - spec/fixtures/file_index/empty_rss.xml
 - spec/fixtures/file_index/rss.xml
+- spec/providers/anwb_spec.rb
+- spec/providers/file_index_spec.rb
 - spec/spec_helper.rb
 - spec/traffic/info_spec.rb
 - spec/traffic/providers_spec.rb
@@ -138,8 +165,12 @@ signing_key:
 specification_version: 3
 summary: ! 'Traffic: the traffic information gem'
 test_files:
+- spec/fixtures/anwb/empty.html
+- spec/fixtures/anwb/traffic.html
 - spec/fixtures/file_index/empty_rss.xml
 - spec/fixtures/file_index/rss.xml
+- spec/providers/anwb_spec.rb
+- spec/providers/file_index_spec.rb
 - spec/spec_helper.rb
 - spec/traffic/info_spec.rb
 - spec/traffic/providers_spec.rb