etracking 2.5.1 → 2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0bfd1dbc18e5566b5a244f560dff89b926551cdc182b71eb405d6a4717b7b8
-  data.tar.gz: d0e2b389d3e4d3ffb3cba27e0d2f4311ed3435f6758e503f980342bd37ea4bcf
+  metadata.gz: c323d863e78cdf8d4961bf39b816df27e536cdc63b8673887677664d74b31038
+  data.tar.gz: 440374ce60df086774823216ce1bb2d00471540b34c6600da3be690324d18285
 SHA512:
-  metadata.gz: 59182fbc5e233aaca243a3062e318741b1afae2a7934b3390d8e00d79506b56f04162b655abd70744150ff27234cb3a992f853f5c23e4e158af4a2826ae74607
-  data.tar.gz: ad3848e60d27a17949847825d83e8cc91def38ff27a5cfac1a12a71b7eaccf904fbe1476e27f848678cc589a16318f563be4262101caaed07df4cd1d756a8efc
+  metadata.gz: 9e4db5cf947315b4c85fb0dd6ca5256006e719c10fdbec17045ac56f3bbf536b2d2ef2a38547da2e2a6912fa4e97f3c9cb48198b97ee704b73ab656459892c86
+  data.tar.gz: fb7eb722e54a26c7214cf649e9eef16c0e16d104e7cffc02bce30c89c13fd0e62f1c336fc3db4594de0d01995dc5f7a337b574b4118e4c616bcc10ee7e016ff4

data/lib/etracking/client.rb

@@ -14,7 +14,7 @@ module Etracking
   
   class Client
     #  @return [String]
-    attr_accessor :api_key, :key_secret, :language, :thailand_post_api_key
+    attr_accessor :api_key, :key_secret, :language
 
     # Initialize a new client.
     #
@@ -31,27 +31,23 @@ module Etracking
       'https://etrackings.com/api/v2/tracks/'
     end
 
-    def headers(request)
+    def rest_api(path, payload)
       api_key_required
       key_secret_required
 
-      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);
+      https = Net::HTTP.new(url.host, url.port);
+      https.use_ssl = true
+
       request = Net::HTTP::Post.new(url)
-      request = headers(request)
+      request["etracking-api-key"] = api_key
+      request["etracking-key-secret"] = key_secret
+      request["accept-language"] = language || 'th'
+      request["content-type"] = ["application/json", "text/plain"]
       request.body = payload.to_json
+      response = https.request(request)
 
-      response = http.request(request)
       JSON.parse(response.read_body, { symbolize_names: true } )
     end
 
@@ -88,9 +84,7 @@ module Etracking
     end
 
     def thailand_post(tracking_number)
-      thailand_post_api_key
-
-      api('thailand_post', payload_tracking_number(tracking_number))
+      api('/thailand_post', payload_tracking_number(tracking_number))
     end
 
     def payload_with_service_and_tracking_number(service_name, tracking_number)
@@ -115,9 +109,5 @@ module Etracking
     def key_secret_required
       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
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etracking
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.8
 platform: ruby
 authors:
 - Saharak Manoo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable