spbus 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 967e385a3d92d07dd853710b0188e3e3168c769f
-  data.tar.gz: a8d5298c3d4ca70a90174fc2cc3f55b6727a5bdc
+  metadata.gz: 7f63128061498523a2de0d0f08f42d12a6b18a32
+  data.tar.gz: 833ec14a34cb6db858fe91c3db826dbb466796ca
 SHA512:
-  metadata.gz: 57ce40a910a30b278c57b95ca747d47b0796037a8a70b9b595f63ad7c665f1132251fa4032fa7da8a8c09311c4b4bbad560ac51914c692eaad4f1713fda10cb4
-  data.tar.gz: 1961eef273d0887811e97fcc292d1f9ddcb19e2ec91ed37fe27b53b3f57b355a5b2851fb1788510b43df96389b5fe037354ed0eca1e231c05c0c5e1acccf4c0d
+  metadata.gz: 5f5fc8f1465d8c73d6e9524cd1e43e8ae8f13f048451d9f35b2e2baa28002589a38b4cfa9e4b05b8cf37346a72b0441585287c77bc22ff7ee570a33df2b5a239
+  data.tar.gz: 539481e90fb7e8b23909dc6f3866f7f9ded8bba84940ec284225a6bde2f6bf0814c7a76b2707adf544428576c1abddf69d838d1eb37044ea99d3e7a62aeb44bd

data/lib/spbus/request.rb

@@ -1,18 +1,12 @@
 module SpBus
   class Request
 
-    AUTH_URL = "http://olhovivo.sptrans.com.br/"
-
-    attr_writer :authenticated
-
     def initialize(url)
       @url = url
-      @authenticated = true
     end
 
     def get
       tries ||= 3
-      get_cookies if @authenticated
       open(@url, request_headers).read
     rescue Errno::ETIMEDOUT => e
       raise e if (tries -= 1) == 0
@@ -21,13 +15,9 @@ module SpBus
 
     private
 
-    def get_cookies
-      @cookies = open(AUTH_URL).meta["set-cookie"]
-    end
-
     def request_headers
       headers = {}
-      headers["Cookie"] = @cookies if @authenticated
+      headers["User-Agent"] = "SpBus/#{SpBus::VERSION}"
       headers
     end
   end

data/lib/spbus/scrapers/locations.rb

@@ -1,7 +1,7 @@
 module SpBus::Scrapers
   class Locations
 
-    URL = "http://olhovivo.sptrans.com.br/v0/Posicao"
+    URL = "http://200.189.189.54/InternetServices/PosicaoLinha"
 
     attr_reader :buses
 
@@ -11,7 +11,7 @@ module SpBus::Scrapers
 
     def fetch
       doc = SpBus::Request.new(url_with_params).get
-      @json = JSON.parse(doc, symbolize_names: true)
+      @json = JSON.parse(doc, symbolize_names: true)[:PosicaoLinhaResult]
 
       validate_response
 

data/lib/spbus/scrapers/route_details.rb

@@ -1,7 +1,7 @@
 module SpBus::Scrapers
   class RouteDetails
 
-    URL = "http://olhovivo.sptrans.com.br/v0/Linha/Buscar"
+    URL = "http://200.189.189.54/InternetServices/BuscaLinhasSIM"
 
     def initialize(route)
       @route = route
@@ -9,7 +9,7 @@ module SpBus::Scrapers
 
     def fetch
       doc = SpBus::Request.new(url_with_params).get
-      @json = JSON.parse(doc, symbolize_names: true)
+      @json = JSON.parse(doc, symbolize_names: true)[:BuscaLinhasSIMResult]
 
       validate_response
       build_route
@@ -35,7 +35,7 @@ module SpBus::Scrapers
          @json.size != 2 ||
          @json[0][:DenominacaoTSTP] != @json[1][:DenominacaoTSTP] ||
          @json[0][:DenominacaoTPTS] != @json[1][:DenominacaoTPTS]
-        raise SpBus::UnknownResponse
+        raise SpBus::InvalidRoute
       end
     end
 

data/lib/spbus/scrapers/routes.rb

@@ -26,8 +26,6 @@ module SpBus::Scrapers
 
     def make_request
       request = SpBus::Request.new(ALL_ROUTES_URL)
-      request.authenticated = false
-
       @doc = Nokogiri::HTML(request.get)
     end
 

data/lib/spbus/version.rb

@@ -1,3 +1,3 @@
 module SpBus
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/spbus.rb

@@ -34,7 +34,11 @@ module SpBus
 
         begin
           Scrapers::RouteDetails.new(route).fetch
-          true
+          if block_given?
+            yield route
+          else
+            true
+          end
         rescue InvalidRoute
           logger.warn "[INVALID ROUTE] #{route.number}"
           false