strans-client 1.6.1 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc18e4662e5ba59fb22d29b605077b2d862f3a4
-  data.tar.gz: 7ebbdc3e507c8790ee7b20718e36b6812520787d
+  metadata.gz: 26b8599143e453d75ed217a9ad5b00898bde6231
+  data.tar.gz: a353c62b50ed9c428e29884ba1eca641c36c4a19
 SHA512:
-  metadata.gz: 71ee7320d3ebcf4e3253b36533eedfce056a017f9e4b2e7ac3610c1c17bb03cd7b623c5cb6b3e2ead5e8616b35712aa9bfe11987104d9b9530cc9ea422762c10
-  data.tar.gz: b9675a7ebf5aed517a310e3383df95728ad5b6c84591c3221084816b4012ee4cc562332b5612f59f8b7e80a9a90ee17bf9ec0766be374f3d06af2486a22ab2e6
+  metadata.gz: 5db25b460cfa1218fd6320b5b7876638ebe199e99ccea9cfdfc1a465295947a83b939e567efe6993edcd1dc7b7820c19ecee01a77d7cb26290021cf5e6d8b6b4
+  data.tar.gz: ef6db3fc06a2ea74cad808db82a05b5a243b870ef410f71e042207b6d75a3844ca4884df9f2c2e293f04e571d998a82a376e546d20c8d23e483a1fd6c268d774

data/lib/erro.rb

@@ -1,6 +1,6 @@
 
 # Encapsula um erro de requisicao
-class Erro
+class ErroStrans
   def initialize(fields)
     @code = fields[:code] || fields['code']
     @message = fields[:message] || fields['message']

data/lib/lazy-strans-client.rb

@@ -14,7 +14,7 @@ class LazyStransClient < StransClient
     @linhas_parada = {} # linhas de uma parada
     @linhas.each do |l|
       paradas = get(:paradas_linha, l.codigoLinha)
-      next if paradas.is_a? Erro
+      next if paradas.is_a? ErroStrans
       @paradas_linha[l.codigoLinha] = paradas
       paradas.each do |p|
       @linhas_parada[p.codigoParada] = [] unless @linhas_parada.key?(p.codigoParada)

data/lib/linha.rb

@@ -1,21 +1,20 @@
 require 'json'
 require_relative 'veiculo'
+require 'byebug'
 
-class Linha
+class LinhaStrans
 
   attr_accessor :codigoLinha, :denominacao, :origem,
                 :retorno, :circular, :veiculos, :paradas
 
   def initialize(fields)
-    if(fields)
-      @codigoLinha  = fields['CodigoLinha'] || fields[:codigoLinha]
-      @denominacao  = fields['Denomicao'] || fields[:denomicao]
-      @origem       = fields['Origem']  || fields[:origem]
-      @retorno      = fields['Retorno'] || fields[:retorno]
-      @circular     = fields['Circular'] || fields[:circular]
-      @veiculos = load_objs(fields['Veiculos'], Veiculo)
-      @paradas  = load_objs(fields['Paradas'], Parada)
-    end
+    @codigoLinha = fields['CodigoLinha'] || fields[:codigoLinha] 
+    @denominacao  = fields['Denomicao'] || fields[:denomicao]
+    @origem       = fields['Origem']  || fields[:origem]
+    @retorno      = fields['Retorno'] || fields[:retorno]
+    @circular     = fields['Circular'] || fields[:circular]
+    @veiculos = load_objs(fields['Veiculos'], VeiculoStrans)
+    @paradas  = load_objs(fields['Paradas'], ParadaStrans)
   end
 
   def load_objs(objs, k)
@@ -26,18 +25,18 @@ class Linha
         o
       end
     end
-    return map
+    map
   end
 
   def to_json(*a)
-    serialized = Hash.new
-    serialized[:codigoLinha] = @codigoLinha if(@codigoLinha)
-    serialized[:denominacao] = @denominacao if(@denominacao)
-    serialized[:origem] = @origem if(@denominacao)
-    serialized[:retorno] = @retorno if(@retorno)
-    serialized[:Circular] = @circular if(@circular)
-    serialized[:veiculos] = @veiculos if(@veiculos)
-    serialized[:paradas] = @paradas if(@paradas)
-    serialized.to_json(*a)
+    serialized = {}
+    serialized[:codigoLinha] = @codigo if @codigo
+    serialized[:denominacao] = @denominacao if @denominacao
+    serialized[:origem] = @origem if @denominacao
+    serialized[:retorno] = @retorno if @retorno
+    serialized[:Circular] = @circular if @circular
+    serialized[:veiculos] = @veiculos if @veiculos
+    serialized[:paradas] = @paradas if @paradas
+    serialized.to_json *a
   end
 end

data/lib/parada.rb

@@ -1,6 +1,6 @@
 require 'json'
 
-class Parada
+class ParadaStrans
 
   def initialize(fields)
     load_atts(fields)
@@ -17,13 +17,13 @@ class Parada
   end
 
   def to_json(*a)
-      serialized = Hash.new
-      serialized[:codigoParada] = @codigoParada if(@codigoParada)
-      serialized[:denominacao] = @denominacao if(@denominacao)
-      serialized[:endereco] = @endereco if(@endereco)
-      serialized[:lat] = @lat if(@lat)
-      serialized[:long] = @long if(@long)
-      serialized[:dist] = @dist if(@dist)
+      serialized = {}
+      serialized[:codigoParada] = @codigoParada if @codigoParada
+      serialized[:denominacao] = @denominacao if @denominacao
+      serialized[:endereco] = @endereco if @endereco
+      serialized[:lat] = @lat if @lat
+      serialized[:long] = @long if @long
+      serialized[:dist] = @dist if @dist
       serialized.to_json(*a)
   end
 

data/lib/request.rb

@@ -2,7 +2,6 @@ require 'json'
 require 'net/http'
 require_relative 'response'
 require_relative 'erro'
-require 'byebug'
 
 # Representa uma requisicao
 class Request
@@ -41,7 +40,7 @@ class Request
     when Net::HTTPSuccess then
       Response.new(resp_http)
     else
-      Erro.new(code: resp_http.code, message: resp_http.message)
+      ErroStrans.new(code: resp_http.code, message: resp_http.message)
     end
   end
 end

data/lib/response.rb

@@ -30,28 +30,28 @@ class Response
   end
 
   def linhas
-    @resp.map{ |l| Linha.new(l) }
+    @resp.map{ |l| LinhaStrans.new(l) }
   end
 
   def veiculos
     v = @resp.map do |node|
-      linha = Linha.new(node['Linha'])
+      linha = LinhaStrans.new(node['Linha'])
       linha.veiculos
     end
     v.reduce(:concat)
   end
 
   def veiculos_linha
-    linha = Linha.new(@resp['Linha'])
+    linha = LinhaStrans.new(@resp['Linha'])
     linha.veiculos
   end
 
   def paradas
-    @resp.map{|p| Parada.new(p) }
+    @resp.map{|p| ParadaStrans.new(p) }
   end
 
   def paradas_linha
-    @resp.map{|p| Parada.new(p) }
+    @resp.map{|p| ParadaStrans.new(p) }
   end
 
 end

data/lib/strans-client.rb

@@ -1,8 +1,8 @@
 require 'json'
-require_relative 'Request'
-require_relative 'Response'
-require_relative 'Token'
-require_relative 'Erro'
+require_relative 'request'
+require_relative 'response'
+require_relative 'token'
+require_relative 'erro'
 
 class StransClient
 
@@ -19,7 +19,7 @@ class StransClient
     @email = email
     @password = pass
     @key = key
-    @token = Token.new(@key)
+    @token = TokenStrans.new(@key)
   end
 
   def get(path, busca = nil)
@@ -40,7 +40,7 @@ class StransClient
   def autentic
     credencials = { email:@email, password:@password }
     @resp = @request.send(:post, PATHS[:signin], credencials)
-    @token = Token.new(@key, @resp.model(:signin)) unless @resp.is_a? Erro
+    @token = TokenStrans.new(@key, @resp.model(:signin)) unless @resp.is_a? ErroStrans
     @resp
   end
 

data/lib/token.rb

@@ -1,6 +1,6 @@
 
 
-class Token
+class TokenStrans
 
   def initialize (key, fields={})
       @key = key

data/lib/veiculo.rb

@@ -1,4 +1,4 @@
-class Veiculo
+class VeiculoStrans
 
   attr_accessor :codigoVeiculo, :hora, :lat, :long, :linha
 
@@ -12,13 +12,12 @@ class Veiculo
   end
 
   def to_json(*a)
-    att()
-    serialized = Hash.new
-    serialized[:codigoVeiculo] = @codigoVeiculo if(@codigoVeiculo)
-    serialized[:hora] = @hora if(@hora)
-    serialized[:lat] = @lat if(@lat)
-    serialized[:long] = @long if(@long)
-    serialized.to_json(*a)
+    serialized = {}
+    serialized[:codigoVeiculo] = @codigoVeiculo if @codigoVeiculo
+    serialized[:hora] = @hora if @hora
+    serialized[:lat] = @lat if @lat
+    serialized[:long] = @long if @long
+    serialized.to_json *a
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strans-client
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.4
 platform: ruby
 authors:
 - Luan Pontes