etracking 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a248623470f75303225b4e4318b94699a01281ed578b7301e3c9fe17f7c5c536
-  data.tar.gz: 1aa03d94cdcd1a7ab03e18694eb3cb0cee12ffee67a51b260867d5b80470f805
+  metadata.gz: c91a1106dcd22d8b1ae2484aabeed1a4e277993c1c867d09c8a2b1a6a4222703
+  data.tar.gz: b768ce43c9ce8b9ad05d4d859fe7e108f1296a1de8e1c173c761bc91f1aec0d1
 SHA512:
-  metadata.gz: f052947144188d98847b9c6b3ab3b3e498b6816a2b3458c69ada62e995659b74dadcb258b98a6d0f6d9ccfe5c9da51dc662d0e1031cb98efe51b9acac9526935
-  data.tar.gz: 3eca73e2b7e9e0a96825c2c92c13b15fa23584f0fbdda6f252dd1e73a597f642c1a9a652b96de37886fdaf488a712baae81d241d77fc8e36967ec00852f2ad3d
+  metadata.gz: 221c42cc2e20bad4025fb1d4976957a30a71bed637c62f5cae06951b010d1db3a78f9a1258d417a5759f1c421d5d491d2ed883b5e52308e435b75b9db4aeb770
+  data.tar.gz: 04f0a4521e262848134a03d68ac748b1c1045c3cbff0dfdefc29820dc024589a7cf8ce4a87301c902c8a84cbbcb813e0e4daf2c2ec4efbab20ccc1deaa6f08bc

data/lib/etracking/client.rb

@@ -31,53 +31,39 @@ module Etracking
       'https://etrackings.com/api/v2/tracks'
     end
 
-    def endpoint_api
-      'http://165.22.52.6/api/v2/tracks'
-    end
-
-    def rest_api(path, payload, is_https = true)
+    def rest_api(path, payload)
       api_key_required
       key_secret_required
 
-      url_endpoint = is_https ? endpoint : endpoint_api
-      url = URI("#{endpoint_api}#{path}")
-
-      https = Net::HTTP.new(url.host, url.port);
-      https.use_ssl = true
-
-      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"]
+      uri = URI.parse("#{endpoint}#{path}")
+      request = Net::HTTP::Post.new(uri)
+      request.content_type = "application/json"
+      request["Etracking-Api-Key"] = api_key
+      request["Etracking-Key-Secret"] = key_secret
+      request["Accept-Language"] = language || 'th'
       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.read_body, { symbolize_names: true } )
+      JSON.parse(response.body, { symbolize_names: true } )
     end
 
     def auto_detect(tracking_number)
-      begin
-        rest_api('/auto_detect', payload_tracking_number(tracking_number))
-      rescue
-        rest_api('/auto_detect', payload_tracking_number(tracking_number), false)
-      end
+      rest_api('/auto_detect', payload_tracking_number(tracking_number))
     end
 
     def tracks(courier, tracking_numbers = [])
-      begin
-        rest_api('', payload_with_courier_and_tracking_numbers(courier, tracking_number))
-      rescue
-        rest_api('', payload_with_courier_and_tracking_numbers(courier, tracking_number), false)
-      end
+      rest_api('', payload_with_courier_and_tracking_numbers(courier, tracking_number))
     end
 
     def track(courier, tracking_number)
-      begin
-        rest_api('/find', payload_with_courier_and_tracking_number(courier, tracking_number))
-      rescue
-        rest_api('/find', payload_with_courier_and_tracking_number(courier, tracking_number), false)
-      end
+      rest_api('/find', payload_with_courier_and_tracking_number(courier, tracking_number))
     end
 
     def dhl_express(tracking_number)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etracking
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Saharak Manoo