strans-client 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 205ee5efc7f0e6ca09934a8109439527c0c43bc8
-  data.tar.gz: c5e438fcb38fdedcbed940fdc94b024108980167
+  metadata.gz: e0af28f3e39d5cccca4929deb3a0f136653caf91
+  data.tar.gz: 5c10fe18328b93b8ea1969e29de29868aaf28457
 SHA512:
-  metadata.gz: f4b0f20868cbf783e742caa6497d1c384cef2594808003f61f8fa75648041fdca8976a686907038c148d9bfda8368c90dca1db9f6c15c8cfd126eadc91073508
-  data.tar.gz: e7f0abddbb17df2dfeb58c6790a7786406abe5b6436d989dda871bd6147904a0ead30afb29b31674265f800a3a15ce754b44d1071cf7e79f1ea33f1d19e32857
+  metadata.gz: 711ac8a3396984ce49953cbd963dc2df53f89537fae73b5c89e8c3342fb6aebee8e63e6a705b4a43ee123063696f8f20d8501e6c5420cbcc9ffdc37a3b9133e9
+  data.tar.gz: 83de6a6874e6a261b1e97c29da647a3707f4f1043c4ceb8168346bf90db72b85e601c8d90b552a2b8b59ef47621e07e40e5b9a04723bb8c7d1f0079e3f4ce8d4

data/lib/linha.rb

@@ -6,13 +6,15 @@ class Linha
                 :retorno, :circular, :veiculos, :paradas
 
   def initialize(fields)
-    @codigoLinha  = fields['CodigoLinha'] || fields[:codigoLinha]
-    @denomicao    = 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)
+    if(fields)
+      @codigoLinha  = fields['CodigoLinha'] || fields[:codigoLinha]
+      @denomicao    = 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
   end
 
   def load_objs(objs, k)
@@ -26,4 +28,15 @@ class Linha
     return map
   end
 
+  def to_json(*a)
+    {
+     'codigoLinha' => @codigoLinha,
+     'denomicao' => @denominacao,
+     'origem' => @origem,
+     'retorno' => @retorno,
+     'Circular' => @circular,
+     'veiculos' => @veiculos,
+     'paradas' => @paradas
+   }.to_json(*a)
+  end
 end

data/lib/parada.rb

@@ -16,4 +16,15 @@ class Parada
     @long           = fields['Long'] || fields[:long]
   end
 
+  def to_json(*a)
+    {
+      'codigoParada' => @codigoParada,
+      'denominacao' => @denominacao,
+      'endereco' => @endereco,
+      'lat' => @lat,
+      'long' => @long
+    }.to_json(*a)
+  end
+
+
 end

data/lib/response.rb

@@ -7,11 +7,9 @@ class Response
   end
 
   def model(path)
-    #
     @resp = JSON.parse(@resp.body)
-
-    if(@resp.respond_to?('has_key') && @resp.has_key?('code'))
-      raise @resp['message']
+    if(@resp[0] == 'code')
+      raise @resp[1]
     end
 
     case path
@@ -47,7 +45,6 @@ class Response
   end
 
   def veiculos_linha()
-    puts @resp
     linha = Linha.new(@resp['Linha'])
     linha.veiculos
   end

data/lib/token.rb

@@ -28,4 +28,11 @@ class Token
     !@token.nil? && (Time.now - 10 * 60) <= @create_at
   end
 
+  def to_json
+    {
+      'key' => @key,
+      'token' => @token,
+      'minute_validate' => @minute_validate
+    }.to_json
+  end
 end

data/lib/veiculo.rb

@@ -2,6 +2,8 @@ require 'require_models'
 
 class Veiculo
 
+  attr_accessor :codigoVeiculo, :hora, :lat, :long, :linha
+
   def initialize(fields)
     @codigoVeiculo  = fields['CodigoVeiculo'] || fields[:codigoVeiculo]
     @hora           = fields['Hora'] || fields[:hora]
@@ -9,6 +11,14 @@ class Veiculo
     @long           = fields['Long'] || fields[:long]
   end
 
-  attr_accessor :codigoVeiculo, :hora, :lat, :long, :linha
+  #def to_json()
+  def to_json(*a)
+    {
+      'codigoVeiculo' => @codigoVeiculo,
+      'hora' => @hora,
+      'lat'  => @lat,
+      'long' => @long,
+    }.to_json(*a)
+  end
 
 end

metadata

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