etracking 2.5.0 → 2.5.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/etracking/client.rb +11 -21
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d1eccb43bc574f41a7d43e5e136123b471cea86258661388beceeb4d59f658b2
4
- data.tar.gz: 84cffda918c59cdb56e55ca8160427ae608c7711022e21f3e5d98818f00ef829
3
+ metadata.gz: 884fcde37863a4c6dc732cafe3cc48361a9a037955a67f38aa5ec32adf219c5a
4
+ data.tar.gz: ef92466e6a162f2a8a7b3b28bdab38ee372ec1aa0f6c8fc667317158be8373f1
5
5
  SHA512:
6
- metadata.gz: a24f0559ab2e2abf60279ed5860c38a993b91e8acadbfdcf0108b5c86801dae8d708ce0c4bd9e912589181b7152c7246f446b9cbbb665522a2b986a63d27de91
7
- data.tar.gz: a3c9c38ca8985a0eccc8888df6d23e7b68ce005d342be0b8a5b94e1c905bfb632aba5ae3691063415af69be00370a76f37f1db417a1c078ef20546dfea9c95b6
6
+ metadata.gz: 856de2b9c82b11191722e18a0f450ed0d582f93e072271f1d1c6e21f2c01cb3566a2058163a797f9f5dcad7e1bcedb72ec4a6848bcb5555f617b4acef65826c9
7
+ data.tar.gz: c9b38ae0b6418fc633c5468b41ee26aa3e673c33ba9f08a8be40f753eea4924e0c51852412ac68fe9b0bc70f6d638e566f0062f35e13cf69c5accc64400c2084
@@ -14,7 +14,7 @@ module Etracking
14
14
 
15
15
  class Client
16
16
  # @return [String]
17
- attr_accessor :api_key, :key_secret, :language, :thailand_post_api_key
17
+ attr_accessor :api_key, :key_secret, :language
18
18
 
19
19
  # Initialize a new client.
20
20
  #
@@ -31,27 +31,23 @@ module Etracking
31
31
  'https://etrackings.com/api/v2/tracks/'
32
32
  end
33
33
 
34
- def headers(request)
34
+ def rest_api(path, payload)
35
35
  api_key_required
36
36
  key_secret_required
37
37
 
38
- request['etracking-api-key'] = api_key
39
- request['etracking-key-secret'] = key_secret
40
- request['accept-language'] = language || 'TH'
41
- request['content-type'] = 'application/json'
42
-
43
- request
44
- end
45
-
46
- def rest_api(path, payload)
47
38
  url = URI("#{endpoint}#{path}")
48
39
 
49
- http = Net::HTTP.new(url.host, url.port);
40
+ https = Net::HTTP.new(url.host, url.port);
41
+ https.use_ssl = true
42
+
50
43
  request = Net::HTTP::Post.new(url)
51
- request = headers(request)
44
+ request["etracking-api-key"] = api_key
45
+ request["etracking-key-secret"] = key_secret
46
+ request["accept-language"] = language || 'th'
47
+ request["content-type"] = ["application/json", "text/plain"]
52
48
  request.body = payload.to_json
49
+ response = https.request(request)
53
50
 
54
- response = http.request(request)
55
51
  JSON.parse(response.read_body, { symbolize_names: true } )
56
52
  end
57
53
 
@@ -88,9 +84,7 @@ module Etracking
88
84
  end
89
85
 
90
86
  def thailand_post(tracking_number)
91
- thailand_post_api_key
92
-
93
- api('thailand_post', payload_tracking_number(tracking_number))
87
+ api('/thailand_post', payload_tracking_number(tracking_number))
94
88
  end
95
89
 
96
90
  def payload_with_service_and_tracking_number(service_name, tracking_number)
@@ -115,9 +109,5 @@ module Etracking
115
109
  def key_secret_required
116
110
  raise ArgumentError, '`key_secret` is not configured' unless key_secret
117
111
  end
118
-
119
- def thailand_post_api_key_required
120
- raise ArgumentError, '`thailand_post_api_key` is not configured' unless thailand_post_api_key
121
- end
122
112
  end
123
113
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: etracking
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0
4
+ version: 2.5.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Saharak Manoo
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-28 00:00:00.000000000 Z
11
+ date: 2020-04-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: addressable