janio_api 0.3.13 → 0.3.15

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ddfa87484ab8f4d0a852761221de302fd11002d0ddf9371e4604417721291f12
4
- data.tar.gz: 040ac781689e424b2dc4427a9cede1d505854ad9e8b8c578b78da5cb7e4bed5d
3
+ metadata.gz: 06a2cf7c65cbe7a0d247787636da36ec71f45c83a6667e8f9f61d5f89bad5ff6
4
+ data.tar.gz: 994f1011a70b467574b7f7adbdc3e921bb25f78f81ba79d569e78f8f92b37a43
5
5
  SHA512:
6
- metadata.gz: c0538a78ffd409409a5493375ca1dbcf1a14e8ed377eaac8733097596cda0bf403b270f5aea5727822c3a6f09cc973dd32ca1790023c8cec3d18593f46fe331f
7
- data.tar.gz: 6d40f6880bc10290454b1a97a15d615c9764cacca00337fb8efe7f61208e97f0ded4abefa1f181cf0d0cf3708312699c5d626533d4b07bbb6c3a08ab29a740ea
6
+ metadata.gz: 1ed812b3a111d216f180f5450dfe328bdcae0842afa50300e96a5f216f27df38cc5cbe3f2d133fd9ab48f620213b31c0a1592a20f1d826836eab1981a5cdb176
7
+ data.tar.gz: c00150aec436f169d4068f9831741e9e8c1c1e02603b28afcc565ee46f004ebc4b429f78aaf3dcb353db11d9c07d3c461f7bcf2af854634e4fdd31110ef0f74c
data/janio_api.gemspec CHANGED
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.require_paths = ["lib"]
28
28
 
29
29
  spec.add_dependency "activeresource", ">= 4.1.0"
30
- spec.add_dependency "countries", "~> 3.0"
30
+ spec.add_dependency "countries", "~> 5.0"
31
31
  spec.add_dependency "phonelib", "~> 0.6"
32
32
 
33
33
  spec.add_development_dependency "zeitwerk", "~> 2.1", ">= 2.1.8"
@@ -180,7 +180,9 @@ module JanioAPI
180
180
  end
181
181
 
182
182
  def set_service_id(service_category = "pickup")
183
- @attributes[:service_id] = get_service_id(service_category) if @attributes[:service_id].nil?
183
+ return true unless @attributes[:service_id].nil?
184
+
185
+ @attributes[:service_id] = get_service_id(service_category)
184
186
  end
185
187
 
186
188
  # Tracks the current order
@@ -206,11 +208,11 @@ module JanioAPI
206
208
  private
207
209
 
208
210
  def pickup_country_code
209
- ISO3166::Country.find_country_by_name(pickup_country)&.alpha2
211
+ ISO3166::Country.find_country_by_any_name(pickup_country)&.alpha2
210
212
  end
211
213
 
212
214
  def consignee_country_code
213
- ISO3166::Country.find_country_by_name(consignee_country)&.alpha2
215
+ ISO3166::Country.find_country_by_any_name(consignee_country)&.alpha2
214
216
  end
215
217
 
216
218
  def pickup_postal_valid?
@@ -286,7 +288,7 @@ module JanioAPI
286
288
 
287
289
  def retrieve_api_token(country)
288
290
  if JanioAPI.config.api_tokens
289
- country_code_sym = ISO3166::Country.find_country_by_name(country)&.alpha2&.to_sym
291
+ country_code_sym = ISO3166::Country.find_country_by_any_name(country)&.alpha2&.to_sym
290
292
  JanioAPI.config.api_tokens[country_code_sym]
291
293
  elsif JanioAPI.config.api_token
292
294
  JanioAPI.config.api_token
@@ -1,3 +1,3 @@
1
1
  module JanioAPI
2
- VERSION = "0.3.13"
2
+ VERSION = "0.3.15"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: janio_api
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.13
4
+ version: 0.3.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andy Chong
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-12-13 00:00:00.000000000 Z
11
+ date: 2023-12-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activeresource
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '3.0'
33
+ version: '5.0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '3.0'
40
+ version: '5.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: phonelib
43
43
  requirement: !ruby/object:Gem::Requirement