strans-client 1.4.4 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e572de493315b28703f86c457142b8835629832a
-  data.tar.gz: 055bdbed6ebcd45a227ad447ad742549a89e18c9
+  metadata.gz: 9dc18e4662e5ba59fb22d29b605077b2d862f3a4
+  data.tar.gz: 7ebbdc3e507c8790ee7b20718e36b6812520787d
 SHA512:
-  metadata.gz: f64555ad23e23b227a9f2b432173859592b99eef24fa2551c94cfbfa682b52cd2b261f2047374a633ccfda45b510662f9c4a1534af0df833920930a3859b8917
-  data.tar.gz: cd576961ff585838dbd89a7c08f6d114d3cdc13687c9808fdfb08329a5ab299932caebc2b734d1fbec7f49878adcc3b3d21cb884d2e40c3f195f5edeb693661d
+  metadata.gz: 71ee7320d3ebcf4e3253b36533eedfce056a017f9e4b2e7ac3610c1c17bb03cd7b623c5cb6b3e2ead5e8616b35712aa9bfe11987104d9b9530cc9ea422762c10
+  data.tar.gz: b9675a7ebf5aed517a310e3383df95728ad5b6c84591c3221084816b4012ee4cc562332b5612f59f8b7e80a9a90ee17bf9ec0766be374f3d06af2486a22ab2e6

data/lib/erro.rb

@@ -0,0 +1,18 @@
+
+# Encapsula um erro de requisicao
+class Erro
+  def initialize(fields)
+    @code = fields[:code] || fields['code']
+    @message = fields[:message] || fields['message']
+  end
+
+  def to_json
+    map.to_json
+  end
+
+  def map
+    error = {}
+    error[:code] = @error if @error
+    error[:message] = @message if @message
+  end
+end

data/lib/lazy-strans-client.rb

@@ -1,8 +1,6 @@
-require 'json'
-require 'erro_strans'
-require 'strans-client'
-
+require_relative 'strans-client'
 
+# cliente com alguns servicos facilitadores
 class LazyStransClient < StransClient
 
   RAIO_TERRA = 6378.137 #KM
@@ -11,18 +9,19 @@ class LazyStransClient < StransClient
   # Estaticas da api.
   def load
     @linhas = get(:linhas)
+    return @linhas if @linhas.is_a? Erro
     @paradas_linha = {} # paradas de uma linha
     @linhas_parada = {} # linhas de uma parada
     @linhas.each do |l|
       paradas = get(:paradas_linha, l.codigoLinha)
-      if(!paradas.kind_of?(ErroStrans))
-        @paradas_linha[l.codigoLinha] = paradas
-        paradas.each do |p|
-          @linhas_parada[p.codigoParada] = [] if !@linhas_parada.key?(p.codigoParada)
-          @linhas_parada[p.codigoParada] << p.linha
-        end
+      next if paradas.is_a? Erro
+      @paradas_linha[l.codigoLinha] = paradas
+      paradas.each do |p|
+      @linhas_parada[p.codigoParada] = [] unless @linhas_parada.key?(p.codigoParada)
+      @linhas_parada[p.codigoParada] << p.linha
       end
     end
+    @linhas_parada
   end
 
   #pega as paradas com distancia máxima

data/lib/{linha_strans.rb → linha.rb}

@@ -1,21 +1,20 @@
-require 'linha_strans'
-require 'parada_strans'
-require 'veiculo_strans'
+require 'json'
+require_relative 'veiculo'
 
-class LinhaStrans
+class Linha
 
-  attr_accessor :codigoLinha, :denomicao, :origem,
+  attr_accessor :codigoLinha, :denominacao, :origem,
                 :retorno, :circular, :veiculos, :paradas
 
   def initialize(fields)
     if(fields)
       @codigoLinha  = fields['CodigoLinha'] || fields[:codigoLinha]
-      @denomicao    = fields['Denomicao'] || fields[:denomicao]
+      @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)
+      @veiculos = load_objs(fields['Veiculos'], Veiculo)
+      @paradas  = load_objs(fields['Paradas'], Parada)
     end
   end
 

data/lib/{parada_strans.rb → parada.rb}

@@ -1,6 +1,6 @@
 require 'json'
 
-class ParadaStrans
+class Parada
 
   def initialize(fields)
     load_atts(fields)
@@ -10,7 +10,7 @@ class ParadaStrans
 
   def load_atts(fields)
     @codigoParada   = fields['CodigoParada'] || fields[:codigoParada]
-    @denomicao      = fields['Denomicao'] || fields[:denomicao]
+    @denominacao    = fields['Denomicao'] || fields[:denomicao]
     @endereco       = fields['Endereco'] || fields[:endereco]
     @lat            = (fields['Lat']  || fields[:lat]).to_f
     @long           = (fields['Long'] || fields[:long]).to_f
@@ -19,7 +19,7 @@ class ParadaStrans
   def to_json(*a)
       serialized = Hash.new
       serialized[:codigoParada] = @codigoParada if(@codigoParada)
-      serialized[:denominacao] = @denominacao if(@denomincao)
+      serialized[:denominacao] = @denominacao if(@denominacao)
       serialized[:endereco] = @endereco if(@endereco)
       serialized[:lat] = @lat if(@lat)
       serialized[:long] = @long if(@long)

data/lib/request.rb

@@ -0,0 +1,47 @@
+require 'json'
+require 'net/http'
+require_relative 'response'
+require_relative 'erro'
+require 'byebug'
+
+# Representa uma requisicao
+class Request
+  URL_API = 'https://api.inthegra.strans.teresina.pi.gov.br/v1'.freeze
+
+  VERB_MAP = {
+    get: Net::HTTP::Get,
+    post: Net::HTTP::Post,
+    put:   Net::HTTP::Put,
+    delete: Net::HTTP::Delete
+  }.freeze
+
+  def initialize(token)
+    @token = token
+  end
+
+  def send(method, path, params = nil)
+    uri = URI.parse(URL_API + path)
+    Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |https|
+      req = build_request(method, uri, params)
+      build_response(https.request(req))
+    end
+  end
+
+  private
+
+  def build_request(method, uri, params)
+    uri.query = URI.encode_www_form(params) if method == :get && params
+    req = VERB_MAP[method].new(uri, @token.header)
+    req.body = params.to_json if params && method != :get
+    req
+  end
+
+  def build_response(resp_http)
+    case resp_http
+    when Net::HTTPSuccess then
+      Response.new(resp_http)
+    else
+      Erro.new(code: resp_http.code, message: resp_http.message)
+    end
+  end
+end

data/lib/response.rb

@@ -0,0 +1,57 @@
+require_relative 'Linha'
+require_relative 'Parada'
+
+class Response
+
+  def initialize(resp)
+    @resp = resp
+  end
+
+  def model(path)
+    @resp = JSON.parse(@resp.body)
+    case path
+    when :signin
+      token
+    when :linhas
+      linhas
+    when :veiculos
+      veiculos
+    when :veiculos_linha
+      veiculos_linha
+    when :paradas
+      paradas
+    when :paradas_linha
+      paradas_linha
+    end
+  end
+
+  def token
+    @resp
+  end
+
+  def linhas
+    @resp.map{ |l| Linha.new(l) }
+  end
+
+  def veiculos
+    v = @resp.map do |node|
+      linha = Linha.new(node['Linha'])
+      linha.veiculos
+    end
+    v.reduce(:concat)
+  end
+
+  def veiculos_linha
+    linha = Linha.new(@resp['Linha'])
+    linha.veiculos
+  end
+
+  def paradas
+    @resp.map{|p| Parada.new(p) }
+  end
+
+  def paradas_linha
+    @resp.map{|p| Parada.new(p) }
+  end
+
+end

data/lib/strans-client.rb

@@ -1,36 +1,38 @@
 require 'json'
-require 'request_strans'
-require 'response_strans'
-require 'token_strans'
+require_relative 'Request'
+require_relative 'Response'
+require_relative 'Token'
+require_relative 'Erro'
 
 class StransClient
 
   PATHS = {
-    :signin  => '/signin',
-    :linhas => '/linhas',
-    :veiculos => '/veiculos',
-    :veiculos_linha => '/veiculosLinha',
-    :paradas => '/paradas',
-    :paradas_linha => '/paradasLinha',
-  }
+    signin: '/signin',
+    linhas: '/linhas',
+    veiculos: '/veiculos',
+    veiculos_linha: '/veiculosLinha',
+    paradas: '/paradas',
+    paradas_linha: '/paradas'
+  }.freeze
 
-  def initialize( email, pass, key)
+  def initialize(email, pass, key)
     @email = email
     @password = pass
     @key = key
-    @token = TokenStrans.new(@key)
+    @token = Token.new(@key)
   end
 
-  def get(path, busca = nil )
-    @request = RequestStrans.new(@token)
-    if(@token.valid?)
-      busca = busca.nil? ? {} :  {busca: busca}
-      @resp  = @request.send(:get, PATHS[path], busca)
-      @resp.model(path)
+  def get(path, busca = nil)
+    @request = Request.new(@token)
+    if @token.valid?
+      busca = busca.nil? ? {} : {busca: busca}
+      @resp = @request.send(:get, PATHS[path], busca)
+      @resp = @resp.model(path) if @resp.is_a? Response
     else
-      autentic()
-      get(path, busca)
+      @resp = autentic
+      get(path, busca) if @token.valid?
     end
+    @resp
   end
 
   private
@@ -38,7 +40,8 @@ class StransClient
   def autentic
     credencials = { email:@email, password:@password }
     @resp = @request.send(:post, PATHS[:signin], credencials)
-    @token = TokenStrans.new(@key, @resp.model(:signin))
+    @token = Token.new(@key, @resp.model(:signin)) unless @resp.is_a? Erro
+    @resp
   end
 
 end

data/lib/{token_strans.rb → token.rb}

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

data/lib/{veiculo_strans.rb → veiculo.rb}

@@ -1,6 +1,4 @@
-require 'json'
-
-class VeiculoStrans
+class Veiculo
 
   attr_accessor :codigoVeiculo, :hora, :lat, :long, :linha
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strans-client
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.6.1
 platform: ruby
 authors:
 - Luan Pontes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies: []
 description: A simple client for Api strans from Teresina.
 email: luapontes2@gmail.com
@@ -16,15 +16,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/erro_strans.rb
+- lib/erro.rb
 - lib/lazy-strans-client.rb
-- lib/linha_strans.rb
-- lib/parada_strans.rb
-- lib/request_strans.rb
-- lib/response_strans.rb
+- lib/linha.rb
+- lib/parada.rb
+- lib/request.rb
+- lib/response.rb
 - lib/strans-client.rb
-- lib/token_strans.rb
-- lib/veiculo_strans.rb
+- lib/token.rb
+- lib/veiculo.rb
 homepage: https://github.com/tOOlmaker-equalsp/ruby-apiStransTHE
 licenses:
 - MIT
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: strans-client

data/lib/erro_strans.rb

@@ -1,17 +0,0 @@
-require 'json'
-
-class ErroStrans
-
-  def initialize(fields)
-    @code = fields['code']
-    @message = fields['message']
-  end
-
-  def to_json(*a)
-    error = Hash.new
-    error[:code] = @error if @error
-    error[:message] = @message if @message
-    error.to_json
-  end
-
-end

data/lib/request_strans.rb

@@ -1,38 +0,0 @@
-require 'json'
-require 'response_strans'
-require 'net/http'
-
-class RequestStrans
-
-  URL_API = "https://api.inthegra.strans.teresina.pi.gov.br/v1"
-
-  VERB_MAP = {
-    :get    => Net::HTTP::Get,
-    :post   => Net::HTTP::Post,
-    :put    => Net::HTTP::Put,
-    :delete => Net::HTTP::Delete
-  }
-  def initialize(token)
-    @token = token
-  end
-
-  def encode_path_params(path, params)
-    encoded = URI.encode_www_form(params)
-    [path, encoded].join("?")
-  end
-
-  def send( method, path, params = nil )
-    uri = URI.parse(URL_API+path)
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    if(method == :get)
-      uri.query = URI.encode_www_form(params) if (params)
-    end
-    req = VERB_MAP[method].new(uri, @token.header)
-    if (params && method != :get)
-      req.body = params.to_json
-    end
-    ResponseStrans.new(https.request(req))
-  end
-
-end

data/lib/response_strans.rb

@@ -1,65 +0,0 @@
-require 'json'
-require 'linha_strans'
-require 'parada_strans'
-require 'veiculo_strans'
-require 'erro_strans'
-
-class ResponseStrans
-
-  def initialize(resp)
-    @resp = resp
-  end
-
-  def model(path)
-    @resp = JSON.parse(@resp.body)
-    if(@resp.kind_of?(Hash) && @resp['code'] )
-        return ErroStrans.new(@resp)
-    end
-
-    case path
-    when :signin
-      token()
-    when :linhas
-      linhas()
-    when :veiculos
-      veiculos()
-    when :veiculos_linha
-      veiculos_linha()
-    when :paradas
-      paradas()
-    when :paradas_linha
-      paradas_linha()
-    end
-  end
-
-  def token()
-    @resp
-  end
-
-  def linhas()
-    @resp.map{|l| LinhaStrans.new(l) }
-  end
-
-  def veiculos()
-    v = @resp.map do |node|
-      linha = LinhaStrans.new(node['Linha'])
-      linha.veiculos
-    end
-    v.reduce(:concat)
-  end
-
-  def veiculos_linha()
-    linha = LinhaStrans.new(@resp['Linha'])
-    linha.veiculos
-  end
-
-  def paradas ()
-    @resp.map{|p| ParadaStrans.new(p) }
-  end
-
-  def paradas_linha()
-    @resp = @resp['Linha'].merge!('Paradas' => @resp['Paradas'])
-    LinhaStrans.new(@resp).paradas
-  end
-
-end