etracking 1.5.0 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2360bd868ffe30eb7d404d6bb5ab7b699fe03f6bc878b15245684e98a3646c86
-  data.tar.gz: 2b12b3adf780e19dfec64b77f00fcbbe395c5635dc79798a6735784e857c3c99
+  metadata.gz: 80134473b411b0b2319e448c0d8e3d8b0c9d0cba60177e3977464cd256491aeb
+  data.tar.gz: d8b1362d60036c377fe69a13eb75dad04b7464fa452d2a588847d18623de197c
 SHA512:
-  metadata.gz: 2a9ddb641b2e64a08e9f48fabc83765cdcaf267d49a89ca888531f7fde483d15a34d17671fe419b9ed2967dd6e0b4cb55bd8fbbeee9fd8fb6210f9579858ce58
-  data.tar.gz: 482033dd81e1abb6df332a5992e80b83800c42b0cc149d4d9c719ade75baa59909c08bc44d89607ab1fbb061c721feaa53e332e50c85efedda40330b1c084087
+  metadata.gz: e5e1423f8cc29d73f2ddbb0bdfcd2d183f6fa663d012e4ace8ed30ddbac85594e7ded9127dc39c3b61c48dd7d190186fa2ddc3d853ef4921924e5aa2c1001f30
+  data.tar.gz: a569f76714f8469a1b59202ddf4685e44f3c3fd2b4e2300764e52ab0ea9a3ba6a7126155dcae5e98653b51fee43435d4620f05d342c6b38156e2edcbecfad21e

data/lib/etracking/client.rb

@@ -1,5 +1,6 @@
-require 'rest-client'
-require 'securerandom'
+require 'uri'
+require 'net/http'
+require 'json' 
 
 module Etracking
 
@@ -13,7 +14,7 @@ module Etracking
   
   class Client
     #  @return [String]
-    attr_accessor :api_key, :key_secret, :language
+    attr_accessor :api_key, :key_secret, :language, :thailand_post_api_key
 
     # Initialize a new client.
     #
@@ -27,74 +28,77 @@ module Etracking
     end
 
     def endpoint
-      'http://165.22.52.6'
+      'https://etrackings.com/api/v2/tracks/'
     end
 
-    def rest_client_api(url, method, headers, payload)
-      response = RestClient::Request.new({
-        url: url,
-        method: method.to_sym,
-        headers: headers,
-        payload: payload.to_json
-      }).execute do |response, request, result|
-        return JSON.parse(response.to_str)
-      end
-    end
-
-    def headers
+    def headers(request)
       api_key_required
       key_secret_required
 
-      {
-        etracking_api_key: api_key,
-        etracking_key_secret: key_secret,
-        content_type: 'application/json', 
-        accept_language: language || 'TH'
-      }
+      request['etracking-api-key'] = api_key
+      request['etracking-key-secret'] = key_secret
+      request['accept-language'] =  language || 'TH'
+      request['content-type'] = 'application/json'
+
+      request
+    end
+
+    def rest_api(path, payload)
+      url = URI("#{endpoint}#{path}")
+
+      http = Net::HTTP.new(url.host, url.port);
+      request = Net::HTTP::Post.new(url)
+      request = headers(request)
+      request.body = payload.to_json
+
+      response = http.request(request)
+      JSON.parse(response.read_body, { symbolize_names: true } )
     end
 
-    def api(service, tracking_number)
-      rest_client_api(
-        "#{endpoint}/api/v2/tracks/#{service}", 
-        "post", 
-        headers, 
-        payload_tracking_number(tracking_number)
-      )
+    def track(service_name, tracking_number)
+      rest_api('/find', payload_with_service_and_tracking_number(service_name, tracking_number))
     end
 
     def dhl_express(tracking_number)
-      api('dhl_express', tracking_number)
+      rest_api('/dhl_express', payload_tracking_number(tracking_number))
     end
 
     def flash_express(tracking_number)
-      api('flash_express', tracking_number)
+      rest_api('/flash_express', payload_tracking_number(tracking_number))
     end
 
     def jt_express(tracking_number)
-      api('jt_express', tracking_number)
+      rest_api('/jt_express', payload_tracking_number(tracking_number))
     end
 
     def kerry_express(tracking_number)
-      api('kerry_express', tracking_number)
+      rest_api('/kerry_express', payload_tracking_number(tracking_number))
     end
     
     def lazada_express(tracking_number)
-      api('lazada_express', tracking_number)
+      rest_api('/lazada_express', payload_tracking_number(tracking_number))
     end
 
     def scg_express(tracking_number)
-      api('scg_express', tracking_number)
+      rest_api('/scg_express', payload_tracking_number(tracking_number))
     end
 
     def shopee_express(tracking_number)
-      api('shopee_express', tracking_number)
+      rest_api('/shopee_express', payload_tracking_number(tracking_number))
     end
 
-    # def thailand_post(tracking_number)
-    #   thailand_post_api_key
+    def thailand_post(tracking_number)
+      thailand_post_api_key
+
+      api('thailand_post', payload_tracking_number(tracking_number))
+    end
 
-    #   api('thailand_post', tracking_number)
-    # end
+    def payload_with_service_and_tracking_number(service_name, tracking_number)
+      {
+        service_name: service_name,
+        tracking_number: tracking_number
+      }
+    end
 
     def payload_tracking_number(tracking_number)
       {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etracking
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.3.8
 platform: ruby
 authors:
 - Saharak Manoo
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement