strans-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2f3edb1e916f3b63d86d2d02818669217b84cc1
-  data.tar.gz: ef0936f9c63e5f88d95251fe9056b1a1fc4b2543
+  metadata.gz: fba9d2d2452214246d583bfe10be1c97efc86c69
+  data.tar.gz: 567a4c52548db9e38229d4841d0fca5247515917
 SHA512:
-  metadata.gz: 1699064a738e96fc6bbe37672e7bd80058d6f6155a5d2972e9b8686787201c66d3ccd5f8098c40189155726f65f41f7a2abb6198eb3e014f4dd00598864e9815
-  data.tar.gz: ccf8b1a7ae3942f5109f8600c7580856c94d08fc3172a731d04abdc367c1e8a7e9924fad12c515c69febb2f8e573a0de6561c89cd1455cb13578c53b43b1b63f
+  metadata.gz: 11d80eefc6d837a19bfd2b8ac2ed36fa691f5ec512c70b701bfe1c39fd1866f43fc9d56b645530fa93f35c8440846e68621821fb79e9af3f0283788eabd775a0
+  data.tar.gz: e75e1c362ecabe084a3a2aa64cea7fbddd16f8255ad9e77041e37f07d814742bda9a5fe304f82fc94d9d9dd8c0b452b5c96f8ddbfc96042ca57cce4f1dc172d1

data/lib/linha.rb

@@ -1,33 +1,28 @@
 
 class Linha
 
-  def initialize(fields)
-    load_atts(fields)
-  end
-
   attr_accessor :codigoLinha, :denomicao, :origem,
                 :retorno, :circular, :veiculos, :paradas
 
-  def load_atts(fields)
+  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']||fields[:veiculos], Veiculo)
-    @paradas  = load_objs(fields['Paradas']||fields[:paradas], Parada)
+    @veiculos = load_objs(fields['Veiculos'], Veiculo)
+    @paradas  = load_objs(fields['Paradas'], Parada)
   end
 
-
-  def load_objs(objs, klass)
+  def load_objs(objs, k)
     if objs.is_a?(Array)
-      objs = objs.map do |o|
-          o = klass.new(o)
-          o.linha = self
-          o
+      map = objs.map do |o|
+        o = k.new(o)
+        o.linha = self
+        o
       end
     end
-    return objs
+    return map
   end
 
 end

data/lib/request.rb

@@ -0,0 +1,36 @@
+require 'json'
+
+class Request
+
+  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
+    Response.new(https.request(req))
+  end
+
+end

data/lib/response.rb

@@ -0,0 +1,64 @@
+
+
+class Response
+
+  def initialize(resp)
+    @resp = resp
+  end
+
+  def model(path)
+    #
+    @resp = JSON.parse(@resp.body)
+
+    if(@resp.respond_to?('has_key') && @resp.has_key?('code'))
+      raise @resp['message']
+    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| 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()
+    puts @resp
+    linha = Linha.new(@resp['Linha'])
+    linha.veiculos
+  end
+
+  def paradas ()
+    @resp.map{|p| Parada.new(p) }
+  end
+
+  def paradas_linha()
+    @resp = @resp['Linha'].merge!('Paradas' => @resp['Paradas'])
+    Linha.new(@resp).paradas
+  end
+
+end

data/lib/strans-client.rb

@@ -1,100 +1,46 @@
 require 'net/http'
 require 'json'
 require 'linha'
+require 'token'
 
 class StransClient
 
-  VERB_MAP = {
-    :get    => Net::HTTP::Get,
-    :post   => Net::HTTP::Post,
-    :put    => Net::HTTP::Put,
-    :delete => Net::HTTP::Delete
+  PATHS = {
+    :signin  => '/signin',
+    :linhas => '/linhas',
+    :veiculos => '/veiculos',
+    :veiculos_linha => '/veiculosLinha',
+    :paradas => '/paradas',
+    :paradas_linha => '/paradasLinha',
   }
 
-  URL_API = "https://api.inthegra.strans.teresina.pi.gov.br/v1"
-
   def initialize( email, pass, key)
     @email = email
     @password = pass
     @key = key
-  end
-
-  def date_in_format()
-    today = Time.now
-    today.strftime("%a, %d %b %Y %H:%M:%S GMT")
-  end
-
-  def encode_path_params(path, params)
-    encoded = URI.encode_www_form(params)
-    [path, encoded].join("?")
-  end
-
-  def headers
-    head ={
-     'Content-Type' => "application/json",
-     'Accept-Language' => "en",
-     'Date' => date_in_format(),
-     'X-Api-Key' => @key
-    }
-    head['X-Auth-Token'] = @token if(@token)
-    head
-  end
-
-  def create_request ( 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)
+    @token = Token.new(@key)
+  end
+
+  def get(path, busca = nil )
+    @request = Request.new(@token)
+    if(@token.valid?)
+      puts '#2'
+      busca = busca.nil? ? {} :  {busca: busca}
+      @resp  = @request.send(:get, PATHS[path], busca)
+      @resp.model(path)
+    else
+      puts '#1'
+      autentic()
+      get(path, busca)
     end
-    req = VERB_MAP[method].new(uri, headers())
-    if (params && method != :get)
-      req.body = params.to_json
-    end
-    https.request(req)
   end
 
-  def autentic
-    body = { email: @email , password:  @password }
-    res = create_request( :post, "/signin", body)
-    if(res.code == '200')
-      body = JSON.parse(res.body)
-      @token = body["token"]
-    end
-    !@token.nil?
-  end
-
-  def linhas( busca = nil)
-    params = busca.nil? ? nil :  {busca: busca}
-    res = create_request( :get, "/linhas", params)
-    JSON.parse(res.body).map{|l| Linha.new(l) }
-  end
-
-  def veiculos()
-    res = create_request( :get, "/veiculos")
-    veiculos = JSON.parse(res.body).map do |node|
-      linha = Linha.new(node['Linha'])
-      linha.veiculos
-    end
-    veiculos.reduce(:concat)
-  end
+  private
 
-  def veiculos_linha(num_linha)
-    res = create_request( :get, "/veiculosLinha", {busca: num_linha})
-    JSON.parse(res.body)
-  end
-
-  def paradas (busca = nil)
-    params = busca.nil? ? nil :  {busca: busca}
-    res = create_request( :get, "/paradas", params)
-    JSON.parse(res.body).map{|p| Parada.new(p) }
-  end
-
-  def paradas_linha(num_linha)
-    res = create_request( :get, "/paradasLinha", {busca: num_linha})
-    result = JSON.parse(res.body)
-    result = result['Linha'].merge!( 'Paradas' => result['Paradas'])
-    Linha.new(result).paradas
+  def autentic
+    credencials = { email:@email, password:@password }
+    @resp = @request.send(:post, PATHS[:signin], credencials)
+    @token = Token.new(@key, @resp.model(:signin))
   end
 
 end

data/lib/token.rb

@@ -0,0 +1,32 @@
+
+class Token
+
+  def initialize (key, fields={})
+
+      @key = key
+      @create_at = Time.now
+      @minute_validate = fields[:minutes]
+      @token = fields['token']
+  end
+
+  def date_in_format()
+    today = Time.now
+    today.strftime("%a, %d %b %Y %H:%M:%S GMT")
+  end
+
+  def header
+    head ={}
+    head['Accept-Language'] = "en"
+    head['Content-Type'] = "application/json"
+    head['X-Auth-Token'] = @token if @token
+    head['X-Api-Key'] = @key
+    head['Date'] = date_in_format()
+    head
+  end
+
+  def valid?
+    puts  @token
+    !@token.nil? && (Time.now - 10 * 60) <= @create_at
+  end
+
+end

data/lib/veiculo.rb

@@ -1,16 +1,12 @@
 class Veiculo
 
   def initialize(fields)
-    load_atts(fields)
-  end
-
-  attr_accessor :codigoVeiculo, :hora, :lat, :long, :linha
-
-  def load_atts(fields)
     @codigoVeiculo  = fields['CodigoVeiculo'] || fields[:codigoVeiculo]
     @hora           = fields['Hora'] || fields[:hora]
     @lat            = fields['Lat']  || fields[:lat]
     @long           = fields['Long'] || fields[:long]
   end
 
+  attr_accessor :codigoVeiculo, :hora, :lat, :long, :linha
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strans-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Luan Pontes
@@ -18,7 +18,10 @@ extra_rdoc_files: []
 files:
 - lib/linha.rb
 - lib/parada.rb
+- lib/request.rb
+- lib/response.rb
 - lib/strans-client.rb
+- lib/token.rb
 - lib/veiculo.rb
 homepage: https://github.com/tOOlmaker-equalsp/ruby-apiStransTHE
 licenses:
@@ -40,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: strans-client