etracking 2.5.2 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da68f4499b11a56394f48267213c4cbdf8b70ee56750739b3f6f87067ffbfb05
-  data.tar.gz: 86d97a1e085700616c6feca8e05dee272c758068a1d124d7a7f028a385a76eca
+  metadata.gz: 435d179be9a3dbe643817af21fb02352d2ecb4d76f594d855188db1de1760f02
+  data.tar.gz: 0a3c0faa4f89b7c210ce1cb33586ac1efed09a7b4a71636039b941cbb81ea887
 SHA512:
-  metadata.gz: 31109b9f8dbd4c1eebe693da376df81fc27366d94a16387b17e49cf1e6c55238a35cff0f1b7a26cab3769fd0db4f1f49d11f3b5d24ba7fea01caec2ee6032db7
-  data.tar.gz: 15f042d8b37168b391d5b8fdb3fd6cc5bac9563de9b1e55a6bfa79fb97e645f8a25c76828eb2aa85529fc63656b88db0e1c4c43f25e3a22a2627ad78c6c2d734
+  metadata.gz: 4a946a6029a7f62fa15ef3a682462260dd18eab3d85608c8809b92207c2270203d9dbcf1e10c118cec2ee30e7bf3edde6f4c24badcbc76c6ccbf63a34aed93bd
+  data.tar.gz: 2e329800ddb8b8fa8f9d01462e4e4553347a54dc418a7c8739578ad3efea303dbd8683496057b68fb3f2752a5b354008e8d328fe33ec10e462e2d185b24df26e

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,33 +31,24 @@ 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'
+      url = URI("#{endpoint}#{path}")
 
-      request
-    end
+      https = Net::HTTP.new(url.host, url.port);
+      https.use_ssl = true
 
-    def rest_api(path, payload)
-      uri = URI.parse("#{endpoint}#{path}")
-      request = Net::HTTP::Post.new(uri)
-      request = headers(headers)
+      request = Net::HTTP::Post.new(url)
+      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)
 
-      req_options = {
-        use_ssl: uri.scheme == "https",
-      }
-
-      response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
-        http.request(request)
-      end
-
-      JSON.parse(response.body, { symbolize_names: true } )
+      JSON.parse(response.read_body, { symbolize_names: true } )
     end
 
     def track(service_name, tracking_number)
@@ -93,9 +84,7 @@ module Etracking
     end
 
     def thailand_post(tracking_number)
-      thailand_post_api_key
-
-      api('thailand_post', payload_tracking_number(tracking_number))
+      rest_api('/thailand_post', payload_tracking_number(tracking_number))
     end
 
     def payload_with_service_and_tracking_number(service_name, tracking_number)
@@ -120,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.2
+  version: 2.5.9
 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