strans-client 1.3.3 → 1.4.0
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.
- checksums.yaml +4 -4
 - data/lib/erro.rb +1 -1
 - data/lib/lazy-strans-client.rb +3 -3
 - data/lib/linha.rb +4 -3
 - data/lib/parada.rb +1 -1
 - data/lib/request.rb +2 -2
 - data/lib/response.rb +7 -7
 - data/lib/strans-client.rb +3 -3
 - data/lib/token.rb +1 -1
 - data/lib/veiculo.rb +1 -1
 - metadata +1 -1
 
    
        checksums.yaml
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            ---
         
     | 
| 
       2 
2 
     | 
    
         
             
            SHA1:
         
     | 
| 
       3 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       4 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 3 
     | 
    
         
            +
              metadata.gz: 685ecd1741bac6f99cbbc55438d990ac1b0b3991
         
     | 
| 
      
 4 
     | 
    
         
            +
              data.tar.gz: 3ee26e7ccbdda4ad4decc442b8fe8723990af919
         
     | 
| 
       5 
5 
     | 
    
         
             
            SHA512:
         
     | 
| 
       6 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       7 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 6 
     | 
    
         
            +
              metadata.gz: ef2bbb4dc83362a7d2c2a00cc2d9afda53cf852ab1ce68b661d2540f4ce8a098768b6d473346bf6a53df35ac9ad1b5bdcc08e980da2fe1fdfd078f46003b8ec6
         
     | 
| 
      
 7 
     | 
    
         
            +
              data.tar.gz: 436ac3e436d756ea96ee4f075eb369c5880e7a634be69f11ef97eadfd71235ad875a61a9ed1fda8ca0b6ee0068a8c4ac5fa853d49825b129753843564cad2c5c
         
     | 
    
        data/lib/erro.rb
    CHANGED
    
    
    
        data/lib/lazy-strans-client.rb
    CHANGED
    
    | 
         @@ -1,8 +1,8 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            require 'json'
         
     | 
| 
       2 
     | 
    
         
            -
            require ' 
     | 
| 
       3 
     | 
    
         
            -
            require 'parada'
         
     | 
| 
      
 2 
     | 
    
         
            +
            require 'erro'
         
     | 
| 
       4 
3 
     | 
    
         
             
            require 'strans-client'
         
     | 
| 
       5 
4 
     | 
    
         | 
| 
      
 5 
     | 
    
         
            +
             
     | 
| 
       6 
6 
     | 
    
         
             
            class LazyStransClient < StransClient
         
     | 
| 
       7 
7 
     | 
    
         | 
| 
       8 
8 
     | 
    
         
             
              RAIO_TERRA = 6378.137 #KM
         
     | 
| 
         @@ -15,7 +15,7 @@ class LazyStransClient < StransClient 
     | 
|
| 
       15 
15 
     | 
    
         
             
                @linhas_parada = {} # linhas de uma parada
         
     | 
| 
       16 
16 
     | 
    
         
             
                @linhas.each do |l|
         
     | 
| 
       17 
17 
     | 
    
         
             
                  paradas = get(:paradas_linha, l.codigoLinha)
         
     | 
| 
       18 
     | 
    
         
            -
                  if(!paradas.kind_of?( 
     | 
| 
      
 18 
     | 
    
         
            +
                  if(!paradas.kind_of?(ErroStrans))
         
     | 
| 
       19 
19 
     | 
    
         
             
                    @paradas_linha[l.codigoLinha] = paradas
         
     | 
| 
       20 
20 
     | 
    
         
             
                    paradas.each do |p|
         
     | 
| 
       21 
21 
     | 
    
         
             
                      @linhas_parada[p.codigoParada] = [] if !@linhas_parada.key?(p.codigoParada)
         
     | 
    
        data/lib/linha.rb
    CHANGED
    
    | 
         @@ -1,7 +1,8 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            require 'linha'
         
     | 
| 
       2 
2 
     | 
    
         
             
            require 'parada'
         
     | 
| 
      
 3 
     | 
    
         
            +
            require 'veiculo'
         
     | 
| 
       3 
4 
     | 
    
         | 
| 
       4 
     | 
    
         
            -
            class  
     | 
| 
      
 5 
     | 
    
         
            +
            class LinhaStrans
         
     | 
| 
       5 
6 
     | 
    
         | 
| 
       6 
7 
     | 
    
         
             
              attr_accessor :codigoLinha, :denomicao, :origem,
         
     | 
| 
       7 
8 
     | 
    
         
             
                            :retorno, :circular, :veiculos, :paradas
         
     | 
| 
         @@ -13,8 +14,8 @@ class Linha 
     | 
|
| 
       13 
14 
     | 
    
         
             
                  @origem       = fields['Origem']  || fields[:origem]
         
     | 
| 
       14 
15 
     | 
    
         
             
                  @retorno      = fields['Retorno'] || fields[:retorno]
         
     | 
| 
       15 
16 
     | 
    
         
             
                  @circular     = fields['Circular'] || fields[:circular]
         
     | 
| 
       16 
     | 
    
         
            -
                  @veiculos = load_objs(fields['Veiculos'],  
     | 
| 
       17 
     | 
    
         
            -
                  @paradas  = load_objs(fields['Paradas'],  
     | 
| 
      
 17 
     | 
    
         
            +
                  @veiculos = load_objs(fields['Veiculos'], VeiculoStrans)
         
     | 
| 
      
 18 
     | 
    
         
            +
                  @paradas  = load_objs(fields['Paradas'], ParadaStrans)
         
     | 
| 
       18 
19 
     | 
    
         
             
                end
         
     | 
| 
       19 
20 
     | 
    
         
             
              end
         
     | 
| 
       20 
21 
     | 
    
         | 
    
        data/lib/parada.rb
    CHANGED
    
    
    
        data/lib/request.rb
    CHANGED
    
    | 
         @@ -2,7 +2,7 @@ require 'json' 
     | 
|
| 
       2 
2 
     | 
    
         
             
            require 'response'
         
     | 
| 
       3 
3 
     | 
    
         
             
            require 'net/http'
         
     | 
| 
       4 
4 
     | 
    
         | 
| 
       5 
     | 
    
         
            -
            class  
     | 
| 
      
 5 
     | 
    
         
            +
            class RequestStrans
         
     | 
| 
       6 
6 
     | 
    
         | 
| 
       7 
7 
     | 
    
         
             
              URL_API = "https://api.inthegra.strans.teresina.pi.gov.br/v1"
         
     | 
| 
       8 
8 
     | 
    
         | 
| 
         @@ -32,7 +32,7 @@ class Request 
     | 
|
| 
       32 
32 
     | 
    
         
             
                if (params && method != :get)
         
     | 
| 
       33 
33 
     | 
    
         
             
                  req.body = params.to_json
         
     | 
| 
       34 
34 
     | 
    
         
             
                end
         
     | 
| 
       35 
     | 
    
         
            -
                 
     | 
| 
      
 35 
     | 
    
         
            +
                ResponseStrans.new(https.request(req))
         
     | 
| 
       36 
36 
     | 
    
         
             
              end
         
     | 
| 
       37 
37 
     | 
    
         | 
| 
       38 
38 
     | 
    
         
             
            end
         
     | 
    
        data/lib/response.rb
    CHANGED
    
    | 
         @@ -3,7 +3,7 @@ require 'linha' 
     | 
|
| 
       3 
3 
     | 
    
         
             
            require 'parada'
         
     | 
| 
       4 
4 
     | 
    
         
             
            require 'veiculo'
         
     | 
| 
       5 
5 
     | 
    
         | 
| 
       6 
     | 
    
         
            -
            class  
     | 
| 
      
 6 
     | 
    
         
            +
            class ResponseStrans
         
     | 
| 
       7 
7 
     | 
    
         | 
| 
       8 
8 
     | 
    
         
             
              def initialize(resp)
         
     | 
| 
       9 
9 
     | 
    
         
             
                @resp = resp
         
     | 
| 
         @@ -12,7 +12,7 @@ class Response 
     | 
|
| 
       12 
12 
     | 
    
         
             
              def model(path)
         
     | 
| 
       13 
13 
     | 
    
         
             
                @resp = JSON.parse(@resp.body)
         
     | 
| 
       14 
14 
     | 
    
         
             
                if(@resp.kind_of?(Hash) && @resp['code'] )
         
     | 
| 
       15 
     | 
    
         
            -
                    return  
     | 
| 
      
 15 
     | 
    
         
            +
                    return ErroStrans.new(@resp)
         
     | 
| 
       16 
16 
     | 
    
         
             
                end
         
     | 
| 
       17 
17 
     | 
    
         | 
| 
       18 
18 
     | 
    
         
             
                case path
         
     | 
| 
         @@ -36,29 +36,29 @@ class Response 
     | 
|
| 
       36 
36 
     | 
    
         
             
              end
         
     | 
| 
       37 
37 
     | 
    
         | 
| 
       38 
38 
     | 
    
         
             
              def linhas()
         
     | 
| 
       39 
     | 
    
         
            -
                @resp.map{|l|  
     | 
| 
      
 39 
     | 
    
         
            +
                @resp.map{|l| LinhaStrans.new(l) }
         
     | 
| 
       40 
40 
     | 
    
         
             
              end
         
     | 
| 
       41 
41 
     | 
    
         | 
| 
       42 
42 
     | 
    
         
             
              def veiculos()
         
     | 
| 
       43 
43 
     | 
    
         
             
                v = @resp.map do |node|
         
     | 
| 
       44 
     | 
    
         
            -
                  linha =  
     | 
| 
      
 44 
     | 
    
         
            +
                  linha = LinhaStrans.new(node['Linha'])
         
     | 
| 
       45 
45 
     | 
    
         
             
                  linha.veiculos
         
     | 
| 
       46 
46 
     | 
    
         
             
                end
         
     | 
| 
       47 
47 
     | 
    
         
             
                v.reduce(:concat)
         
     | 
| 
       48 
48 
     | 
    
         
             
              end
         
     | 
| 
       49 
49 
     | 
    
         | 
| 
       50 
50 
     | 
    
         
             
              def veiculos_linha()
         
     | 
| 
       51 
     | 
    
         
            -
                linha =  
     | 
| 
      
 51 
     | 
    
         
            +
                linha = LinhaStrans.new(@resp['Linha'])
         
     | 
| 
       52 
52 
     | 
    
         
             
                linha.veiculos
         
     | 
| 
       53 
53 
     | 
    
         
             
              end
         
     | 
| 
       54 
54 
     | 
    
         | 
| 
       55 
55 
     | 
    
         
             
              def paradas ()
         
     | 
| 
       56 
     | 
    
         
            -
                @resp.map{|p|  
     | 
| 
      
 56 
     | 
    
         
            +
                @resp.map{|p| ParadaStrans.new(p) }
         
     | 
| 
       57 
57 
     | 
    
         
             
              end
         
     | 
| 
       58 
58 
     | 
    
         | 
| 
       59 
59 
     | 
    
         
             
              def paradas_linha()
         
     | 
| 
       60 
60 
     | 
    
         
             
                @resp = @resp['Linha'].merge!('Paradas' => @resp['Paradas'])
         
     | 
| 
       61 
     | 
    
         
            -
                 
     | 
| 
      
 61 
     | 
    
         
            +
                LinhaStrans.new(@resp).paradas
         
     | 
| 
       62 
62 
     | 
    
         
             
              end
         
     | 
| 
       63 
63 
     | 
    
         | 
| 
       64 
64 
     | 
    
         
             
            end
         
     | 
    
        data/lib/strans-client.rb
    CHANGED
    
    | 
         @@ -18,11 +18,11 @@ class StransClient 
     | 
|
| 
       18 
18 
     | 
    
         
             
                @email = email
         
     | 
| 
       19 
19 
     | 
    
         
             
                @password = pass
         
     | 
| 
       20 
20 
     | 
    
         
             
                @key = key
         
     | 
| 
       21 
     | 
    
         
            -
                @token =  
     | 
| 
      
 21 
     | 
    
         
            +
                @token = TokenStrans.new(@key)
         
     | 
| 
       22 
22 
     | 
    
         
             
              end
         
     | 
| 
       23 
23 
     | 
    
         | 
| 
       24 
24 
     | 
    
         
             
              def get(path, busca = nil )
         
     | 
| 
       25 
     | 
    
         
            -
                @request =  
     | 
| 
      
 25 
     | 
    
         
            +
                @request = RequestStrans.new(@token)
         
     | 
| 
       26 
26 
     | 
    
         
             
                if(@token.valid?)
         
     | 
| 
       27 
27 
     | 
    
         
             
                  busca = busca.nil? ? {} :  {busca: busca}
         
     | 
| 
       28 
28 
     | 
    
         
             
                  @resp  = @request.send(:get, PATHS[path], busca)
         
     | 
| 
         @@ -38,7 +38,7 @@ class StransClient 
     | 
|
| 
       38 
38 
     | 
    
         
             
              def autentic
         
     | 
| 
       39 
39 
     | 
    
         
             
                credencials = { email:@email, password:@password }
         
     | 
| 
       40 
40 
     | 
    
         
             
                @resp = @request.send(:post, PATHS[:signin], credencials)
         
     | 
| 
       41 
     | 
    
         
            -
                @token =  
     | 
| 
      
 41 
     | 
    
         
            +
                @token = TokenStrans.new(@key, @resp.model(:signin))
         
     | 
| 
       42 
42 
     | 
    
         
             
              end
         
     | 
| 
       43 
43 
     | 
    
         | 
| 
       44 
44 
     | 
    
         
             
            end
         
     | 
    
        data/lib/token.rb
    CHANGED
    
    
    
        data/lib/veiculo.rb
    CHANGED