spbus 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ca7dae44b502aa40c4e71c960147be430435d7
-  data.tar.gz: 643b83405b7deb7231f966b01853818c3239c222
+  metadata.gz: 223522ae47c316b251c39002868035c5a10f0894
+  data.tar.gz: 8316188c0e34cbe96f2f276ee1d3b13648527180
 SHA512:
-  metadata.gz: f3553382bfaaf6635602253c3ae313adaab8bd32819e4ea89dbfa94f7b95396f61e13a94064f1c877f75617a26666b2da8dc872630577799d6a3d351944a1d79
-  data.tar.gz: 042caf114ba9b096d978c29989ffac2f7907e16ba888535828892c40a8da170952a20b040cc450e343a3537b2ce3767a63955d40b81f7e3bdfae876f18fb2b52
+  metadata.gz: 1805270572c03a5ad144939f34bb61eb015aaafd6682161a126f22715bf55a509ac49e15b041f7686d78d24a84c89d8d6dd9d67d613295ef1d2da3fb5fed156a
+  data.tar.gz: dbf6f8f066d15f7166cd231b3253c2564631e8a4a1e9423be8c6c2a024cc9e37fb44c15510411a26214c3003570c806436d5264caf91459b48a94b6a6af2237f

data/lib/spbus/route.rb

@@ -11,10 +11,6 @@ module SpBus
     def one_way?
       !!@one_way
     end
-
-    def fetch_details
-      Scrapers::RouteDetails.new(self).fetch
-    end
   end
 end
 

data/lib/spbus/scrapers/route_details.rb

@@ -15,6 +15,12 @@ module SpBus::Scrapers
       build_route
 
       true
+    rescue OpenURI::HTTPError => e
+      if e.io && e.io.status.first.to_i == 500
+        raise SpBus::InvalidRoute
+      else
+        raise e
+      end
     end
 
     private

data/lib/spbus/version.rb

@@ -1,3 +1,3 @@
 module SpBus
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/spbus.rb

@@ -1,6 +1,7 @@
 require "nokogiri"
 require "open-uri"
 require "json"
+require "logger"
 
 require "spbus/route"
 require "spbus/bus"
@@ -14,18 +15,38 @@ require "spbus/version"
 module SpBus
 
   class UnknownResponse < StandardError ; end
+  class InvalidRoute < StandardError ; end
 
-  def self.fetch_routes
-    scraper = Scrapers::Routes.new
-    scraper.fetch
-    scraper.routes.each(&:fetch_details)
-    scraper.routes
-  end
+  class << self
+
+    attr_writer :logger
+
+    def logger
+      @logger ||= Logger.new(STDOUT)
+    end
+
+    def fetch_routes
+      scraper = Scrapers::Routes.new
+      scraper.fetch
+
+      scraper.routes.select do |route|
+        logger.info "Fetching details for route #{route.number}..."
+
+        begin
+          Scrapers::RouteDetails.new(route).fetch
+          true
+        rescue InvalidRoute
+          logger.warn "[INVALID ROUTE] #{route.number}"
+          false
+        end
+      end
+    end
 
-  def self.fetch_buses(destination_id)
-    scraper = Scrapers::Locations.new(destination_id)
-    scraper.fetch
-    scraper.buses
+    def fetch_buses(destination_id)
+      scraper = Scrapers::Locations.new(destination_id)
+      scraper.fetch
+      scraper.buses
+    end
   end
 end
 

data/spec/scrapers/route_details_scraper_spec.rb

@@ -13,7 +13,7 @@ describe SpBus::Scrapers::RouteDetails do
       it "raises an error" do
         expect {
           subject.fetch
-        }.to raise_error
+        }.to raise_error(SpBus::InvalidRoute)
       end
     end
 

data/spec/spbus_spec.rb

@@ -10,17 +10,33 @@ describe SpBus do
     let(:route2) { SpBus::Route.new("6450-10") }
     let(:scraper) { double.as_null_object }
 
-    it "fetch route details for every route" do
+    before do
       allow_any_instance_of(SpBus::Scrapers::Routes).to receive(:fetch)
-      allow_any_instance_of(SpBus::Scrapers::Routes).to receive(:routes).and_return([route1, route2])
+      allow_any_instance_of(SpBus::Scrapers::Routes).to receive(:routes)
+        .and_return([route1, route2])
+    end
+
+    it "fetch route details for every route" do
+      expect(SpBus::Scrapers::RouteDetails).to receive(:new).with(route1)
+        .and_return(scraper)
 
-      expect(SpBus::Scrapers::RouteDetails).to receive(:new).with(route1).and_return(scraper)
-      expect(SpBus::Scrapers::RouteDetails).to receive(:new).with(route2).and_return(scraper)
+      expect(SpBus::Scrapers::RouteDetails).to receive(:new).with(route2)
+        .and_return(scraper)
 
       expect(scraper).to receive(:fetch).twice
 
       expect(subject.fetch_routes).to eql([route1, route2])
     end
+
+    it "does not return an invalid route" do
+      allow(SpBus::Scrapers::RouteDetails).to receive(:new)
+        .with(anything).and_return(scraper)
+
+      expect(scraper).to receive(:fetch).ordered.and_raise(SpBus::InvalidRoute)
+      expect(scraper).to receive(:fetch).ordered
+
+      expect(subject.fetch_routes).to eql([route2])
+    end
   end
 
   describe ".fetch_buses" do

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require "spbus"
 require "vcr"
 
+SpBus.logger = Logger.new("/dev/null")
+
 VCR.configure do |c|
   c.cassette_library_dir = "spec/cassettes"
   c.hook_into :webmock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spbus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Lenon Marcel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A gem to easily retrieve information about São Paulo bus routes, numbers,