etracking 2.0.1 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b4d3ef501d6093f59e405e5679c1c06c4a1eb82b92169a6cea4f07b7bf695e
-  data.tar.gz: 00e339835442a1ad7f59ba57cd72a13d8dcc569624af777f9a5f10277d8b0305
+  metadata.gz: 7d9fb869409fc70154935c0c892387b7291dd8514c6e1e2dd362d73e43786efa
+  data.tar.gz: 2a1e390e1b8b9263c2be3db48de9a22750e8b9af99c200a5a9d5dbcb476908f1
 SHA512:
-  metadata.gz: d79ac8582413562699b3be6297fc9778c6208e64814daddaa67c53eda59dac57b8f33017fe9b2e792b12519283c9ce8fcf4a13f867a1f0cdf12628f6ade6b627
-  data.tar.gz: 27bc4fae30506bb623e7c658b95b1b84f524a59141f965de8418865b5411b45994edb3a5791d3ad1d56a3f8473a372882cd21059ed8d951cd2990383e2d11d5d
+  metadata.gz: 8c92ed8ad920783438338eabd6392666b07f63376032e78c7b67ab9c16c543b3a862a3a74a5e301ddc8cf752b87146cf2f7a3b1d385961e6f24b4b373c2812b8
+  data.tar.gz: 71aa3df5a4e3cf30fc018224c6580740b0dd5f8cb919194e13e81b741c03e15ed7ae9d549cbe01f86c4de49308f0a589f81569526c715a2bfd8e4b87859ecbfc

data/lib/etracking/client.rb

@@ -1,5 +1,6 @@
-require 'rest-client'
-require 'securerandom'
+require 'uri'
+require 'net/http'
+require 'json' 
 
 module Etracking
 
@@ -27,73 +28,65 @@ module Etracking
     end
 
     def endpoint
-      'http://etrackings.com/api/v2/tracks/'
+      'http://165.22.52.6/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 api(service, tracking_number)
-      rest_client_api(
-        "#{endpoint}#{service}", 
-        "post", 
-        headers, 
-        payload_tracking_number(tracking_number)
-      )
+    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 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
 
-    #   api('thailand_post', tracking_number)
+    #   api('thailand_post', payload_tracking_number(tracking_number))
     # end
 
     def payload_tracking_number(tracking_number)
@@ -112,8 +105,8 @@ module Etracking
       raise ArgumentError, '`key_secret` is not configured' unless key_secret
     end
 
-    def thailand_post_api_key_required
-      raise ArgumentError, '`thailand_post_api_key` is not configured' unless thailand_post_api_key
-    end
+    # def thailand_post_api_key_required
+    #   raise ArgumentError, '`thailand_post_api_key` is not configured' unless thailand_post_api_key
+    # end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etracking
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.3.1
 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