janio_api 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91d85f8a1ab6814c4c4b8eb6ec69b436330384f45b788ff833387fb11d44d174
-  data.tar.gz: e098b9a86980679c69d5a697b9e0978cdf20c129dc00b6cc7228a9d222144523
+  metadata.gz: 318f3d3a08f7f85b5b3f658b6ab54644f748f05eaeb0a4c13ab214375a79be0d
+  data.tar.gz: feb8eaa1e12ef20c0dc222a87e53faec9b147748578b2d00735a428436ffa25a
 SHA512:
-  metadata.gz: c25cb39853f1566b4abdc8570e6f534dbd77157eeae20479de9ce62d1b77022dd5759aedd0e4c6db644ba8ed4b30a504d787ab03ba19920fd83d77eff37b7ad8
-  data.tar.gz: 93a94c79dd8f34efb86fc9bffed84915455028161ca06deb1401131d40e6e95212b5291b88d6e18a0731e8ee2cac90f6e890bda7320ab55d22dec67d09ff56cd
+  metadata.gz: 4cb07c9fc3dd6f6fbc4077e06031b02adf5c6ee9ef85979e83661ebe6454a2b513ef035c34fd5f92fb1a86eb9c191565c9750697546a54d798a88f910443cca4
+  data.tar.gz: 7322287b9ccba118c513a3ceac69eafadbaa96b83c73c071ca28957066da6ae034e187c377bd1d1e5e65ef40af04427b2f911a45f2643617dace35f02a548045

data/.gitignore

@@ -6,8 +6,10 @@
 /pkg/
 /spec/reports/
 /tmp/
+/Gemfile.lock
+/.vscode
 
 # rspec failure tracking
 .rspec_status
 .env
-.pryrc
+.pryrc

data/janio_api.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activeresource"
-  spec.add_dependency "countries"
-  spec.add_dependency "phonelib"
+  spec.add_dependency "activeresource", "~> 5.0"
+  spec.add_dependency "countries", "~> 3.0"
+  spec.add_dependency "phonelib", "~> 0.6"
 
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "dotenv"

data/lib/dev/zeitwerk_loader.rb

@@ -10,6 +10,7 @@ loader.collapse("./lib/janio_api/resources")
 loader.ignore("#{__dir__}/config.rb")
 loader.ignore("./lib/janio_api/exceptions.rb")
 loader.ignore("./lib/janio_api/services_list.rb")
+loader.ignore("./lib/janio_api/postal_code_regex.rb")
 loader.enable_reloading
 # loader.log!
 loader.setup

data/lib/janio_api.rb

@@ -6,6 +6,7 @@ module JanioAPI
   require "countries"
 
   require "janio_api/services_list"
+  require "janio_api/postal_code_regex_list"
 
   require "janio_api/configuration"
 

data/lib/janio_api/postal_code_regex_list.rb

@@ -0,0 +1,190 @@
+module JanioAPI
+  POSTAL_CODE_REGEX = {
+    AC: "^(ASCN 1ZZ)$",
+    AD: "^(?:AD)*(\\d{3})$",
+    AF: "^(\\d{4})$",
+    AG: "^(\\d{5})$",
+    AI: "^(AI-2640)$",
+    AL: "^(\\d{4})$",
+    AM: "^(\\d{4})$",
+    AQ: "^(7151)$",
+    AR: "^([A-Z]\\d{4}[A-Z]{3})|([A-Z]?\\d{4})$",
+    AS: "^(\\d{5})$",
+    AT: "^(\\d{4})$",
+    AU: "^(\\d{4})$",
+    AW: "^(0000 AW)$",
+    AX: "^(\\d{5})$",
+    AZ: "^(AZ) (\\d{4})$",
+    BA: "^(\\d{5})$",
+    BB: "^(?:BB)*(\\d{5})$",
+    BD: "^(\\d{4})$",
+    BE: "^(\\d{4})$",
+    BG: "^(\\d{4})$",
+    BH: "^(\\d{3}\\d?)$",
+    BL: "^(\\d{5})$",
+    BM: "^([A-Z]{2} \\d{2})$",
+    BN: "^([A-Z]{2}\\d{4})$",
+    BQ: "^(0000 BQ)$",
+    BR: "^[0-9]{5}-[0-9]{3}$",
+    BT: "^(\\d{5})$",
+    BY: "^(\\d{6})$",
+    CA: "^(?!.*[DFIOQU])[A-VXY][0-9][A-Z] +?[0-9][A-Z][0-9]$",
+    CC: "^(6799 W3)$",
+    CH: "^(\\d{4})$",
+    CL: "^(\\d{7})$",
+    CN: "^(\\d{6})$",
+    CO: "^(\\d{6})$",
+    CR: "^(\\d{5})$",
+    CU: "^(?:CP)*(\\d{5})$",
+    CV: "^(\\d{4})$",
+    CW: "^(0000 CW)$",
+    CX: "^(6978)$",
+    CY: "^(\\d{4})$",
+    CZ: "^[0-9]{3} [0-9]{2}$",
+    DE: "^(\\d{5})$",
+    DK: "^(\\d{4})$",
+    DO: "^(\\d{5})$",
+    DZ: "^(\\d{5})$",
+    EC: "^(\\d{6})$",
+    EE: "^(\\d{5})$",
+    EG: "^(\\d{5})$",
+    EH: "^(\\d{5})$",
+    ES: "^(\\d{5})$",
+    ET: "^(\\d{4})$",
+    FI: "^(?:FI)*(\\d{5})$",
+    FK: "^(FIQQ 1ZZ)$",
+    FM: "^(\\d{5})$",
+    FO: "^(?:FO)*(\\d{3})$",
+    FR: "^(\\d{5})$",
+    GB: "^(((([A-PR-UWYZ][0-9][0-9A-HJKS-UW]?)|([A-PR-UWYZ][A-HK-Y][0-9][0-9ABEHMNPRV-Y]?))\\s{0,2}[0-9]([ABD-HJLNP-UW-Z]{2}))|(GIR\\s{0,2}0AA))$",
+    GE: "^(\\d{4})$",
+    GF: "^((973)\\d{2})$",
+    GG: "((GY)([0-9][0-9A-HJKPS-UW]?|[A-HK-Y][0-9][0-9ABEHMNPRV-Y]?) [0-9][ABD-HJLNP-UW-Z]{2})",
+    GI: "^(GX11 1AA)$",
+    GL: "^(\\d{4})$",
+    GN: "^(\\d{3})$",
+    GP: "^((971)[0-9][0-0])$",
+    GR: "^(\\d{3}) \\d{2}$",
+    GS: "^(SIQQ 1ZZ)$",
+    GT: "^(\\d{5})$",
+    GU: "^((969)[1-3][0-2])$",
+    GW: "^(\\d{4})$",
+    HK: "^(999077)$",
+    HM: "^(7151)$",
+    HN: "^(\\d{5})$",
+    HR: "^(?:HR)*(\\d{5})$",
+    HT: "^(?:HT)*(\\d{4})$",
+    HU: "^(\\d{4})$",
+    ID: "^(\\d{5})$",
+    IE: "^[A-NP-Z\\d]{3}\\s[A-NP-Z\\d]{4}",
+    IL: "^(\\d{5})$",
+    IM: "((IM)([0-9][0-9A-HJKPS-UW]?|[A-HK-Y][0-9][0-9ABEHMNPRV-Y]?) [0-9][ABD-HJLNP-UW-Z]{2})",
+    IN: "^(\\d{6})$",
+    IO: "^(BB9D 1ZZ)$",
+    IQ: "^(\\d{5})$",
+    IR: "^\\d{5}([\\-]\\d{5})?$",
+    IS: "^(\\d{3})$",
+    IT: "^(\\d{5})$",
+    JE: "(JE)([0-9]\\d{1})",
+    JM: "^((JM)[A-Z]{3,3}\\d{2,2})$",
+    JO: "^(\\d{5})$",
+    JP: "^(\\d{3}-\\d{4})$",
+    KE: "^(\\d{5})$",
+    KG: "^(\\d{6})$",
+    KH: "^(\\d{5})$",
+    KR: "^(\\d{3}[-]\\d{3})$",
+    KW: "^(\\d{5})$",
+    KY: "^[K][Y][0-9]{1}[-]([0-9]){4}$",
+    KZ: "^(\\d{6})$",
+    LA: "^(\\d{5})$",
+    LB: "^(\\d{4}(\\d{4})?)$",
+    LI: "^(\\d{4})$",
+    LK: "^(\\d{5})$",
+    LR: "^(\\d{4})$",
+    LS: "^(\\d{3})$",
+    LT: "^(?:LT)*(\\d{5})$",
+    LU: "^(\\d{4})$",
+    LV: "^[L]{1}[V]{1}[-]([0-9]){4}$",
+    LY: "^(\\d{5})$",
+    MA: "^(\\d{5})$",
+    MC: "^(\\d{5})$",
+    MD: "^(?:MD)*(\\d{4})$",
+    ME: "^(\\d{5})$",
+    MF: "^(\\d{5})$",
+    MG: "^(\\d{3})$",
+    MH: "^((969)[6-7][0-9])$",
+    MK: "^(\\d{4})$",
+    MM: "^(\\d{5})$",
+    MN: "^(\\d{5})$",
+    MP: "^(\\d{5})$",
+    MQ: "^(\\d{5})$",
+    MT: "^[A-Z]{3} [0-9]{4}$",
+    MU: "^([0-9A-Z]\\d{4})$",
+    MV: "^(\\d{5})$",
+    MX: "^(\\d{5})$",
+    MY: "^(\\d{5})$",
+    MZ: "^(\\d{4})$",
+    NC: "^(\\d{5})$",
+    NE: "^(\\d{4})$",
+    NF: "^(2899)$",
+    NG: "^(\\d{6})$",
+    NI: "^(\\d{5})$",
+    NL: "[0-9]{4} ?[A-Z]{2}",
+    NO: "^(\\d{4})$",
+    NP: "^(\\d{5})$",
+    NZ: "^(\\d{4})$",
+    OM: "^(\\d{3})$",
+    PE: "^(\\d{5})$",
+    PF: "^((987)\\d{2})$",
+    PG: "^(\\d{3})$",
+    PH: "^(\\d{4})$",
+    PK: "^(\\d{5})$",
+    PL: "^[0-9]{2}[-]([0-9]){3}$",
+    PM: "^(\\d{5})$",
+    PN: "^(PCR9 1ZZ)$",
+    PR: "^\\d{5}((-|\\s)?\\d{4})?$",
+    PS: "^(\\d{5})$",
+    PT: "^\\d{4}((-|\\s)?\\d{3})?$",
+    PW: "^(96940)$",
+    PY: "^(\\d{4})$",
+    RE: "[9]{1}[7|8][4|7|8]\\d{2}",
+    RO: "^(\\d{6})$",
+    RS: "^(\\d{5})$",
+    RU: "^(\\d{6})$",
+    SA: "^(\\d{5})$",
+    SD: "^(\\d{5})$",
+    SE: "^(\\d{3} \\d{2})$",
+    SG: "^(\\d{6})$",
+    SH: "^[A-Z]{4} (1ZZ)$",
+    SI: "^(\\d{4})$",
+    SJ: "^(\\d{4})$",
+    SK: "^(\\d{3} \\d{2})$",
+    SM: "^(4789\\d)$",
+    SN: "^(\\d{5})$",
+    SS: "^(\\d{5})$",
+    SV: "^(01101)$",
+    SX: "^(0000 AA)$",
+    SZ: "^([A-Z]\\d{3})$",
+    TC: "^(TKCA 1ZZ)$",
+    TD: "^(\\d{5})$",
+    TF: "^((984)\\d{2})$",
+    TH: "^(\\d{5})$",
+    TJ: "^(\\d{3})$",
+    TM: "^(\\d{6})$",
+    TN: "^(\\d{4})$",
+    TR: "^(\\d{5})$",
+    TW: "^(\\d{3} \\d{2})|(\\d{3})$",
+    UA: "^(\\d{5})$",
+    US: "^\\d{5}([\\-]\\d{4})?$",
+    UY: "^(\\d{5})$",
+    UZ: "^(\\d{6})$",
+    VC: "(VC)(\\d{4})",
+    VE: "^(\\d{4})$",
+    VG: "^(VG11)[0-6][0]$",
+    VI: "^(\\d{5})$",
+    VN: "^(\\d{6})$",
+    YT: "^(\\d{5})$",
+    ZA: "^(\\d{4})$",
+    ZM: "^(\\d{5})$"
+  }
+end

data/lib/janio_api/resources/order.rb

@@ -64,7 +64,6 @@ module JanioAPI
 
     validates :pickup_date, presence: true, if: -> { PICKUP_DATE_ACCEPTED_COUNTRIES.include?(pickup_country) }
     validates :pickup_date, absence: true, if: -> { !PICKUP_DATE_ACCEPTED_COUNTRIES.include?(pickup_country) }
-
     validates :pickup_country, inclusion: {
       in: SUPPORTED_PICKUP_COUNTRIES,
       message: "%{value} is not a supported pickup country, supported countries are #{SUPPORTED_PICKUP_COUNTRIES.join(", ")}"
@@ -73,14 +72,14 @@ module JanioAPI
       in: SUPPORTED_CONSIGNEE_COUNTRIES,
       message: "%{value} is not a supported consignee country, supported countries are #{SUPPORTED_CONSIGNEE_COUNTRIES.join(", ")}"
     }
-    validates :consignee_postal, presence: true, unless: -> { POSTAL_EXCLUDED_COUNTRIES.include?(consignee_country) }
-    validates :pickup_postal, presence: true, unless: -> { POSTAL_EXCLUDED_COUNTRIES.include?(pickup_country) }
     validates :payment_type, inclusion: {
       in: VALID_PAYMENT_TYPES,
       message: "%{value} is not a valid payment type, valid payment types are #{VALID_PAYMENT_TYPES.join(", ")}"
     }
     validates :cod_amount_to_collect, presence: true, if: -> { payment_type == "cod" }
     validates :items, length: {minimum: 1, message: "are required. Please add at least one."}
+    validate :pickup_postal_valid?, unless: -> { POSTAL_EXCLUDED_COUNTRIES.include?(pickup_country) }
+    validate :consignee_postal_valid?, unless: -> { POSTAL_EXCLUDED_COUNTRIES.include?(consignee_country) }
     validate :pickup_contact_number_country_matched?
     validate :consignee_number_country_matched?
     validate :items_validation
@@ -183,22 +182,42 @@ module JanioAPI
 
     private
 
+    def pickup_country_code
+      ISO3166::Country.find_country_by_name(pickup_country)&.alpha2
+    end
+
+    def consignee_country_code
+      ISO3166::Country.find_country_by_name(consignee_country)&.alpha2
+    end
+
+    def pickup_postal_valid?
+      if pickup_country_code
+        regex = Regexp.new(POSTAL_CODE_REGEX[pickup_country_code.to_sym])
+        errors.add(:pickup_postal, "is invalid, must match #{regex.inspect}") unless regex.match(pickup_postal)
+      end
+    end
+
+    def consignee_postal_valid?
+      if consignee_country_code && POSTAL_CODE_REGEX[consignee_country_code.to_sym]
+        regex = Regexp.new(POSTAL_CODE_REGEX[consignee_country_code.to_sym])
+        errors.add(:consignee_postal, "is invalid, must match #{regex.inspect}") unless regex.match(consignee_postal)
+      end
+    end
+
     def pickup_contact_number_country_matched?
-      country_code = ISO3166::Country.find_country_by_name(pickup_country)&.alpha2
-      if Phonelib.invalid_for_country? pickup_contact_number, country_code
+      if Phonelib.invalid_for_country?(pickup_contact_number, pickup_country_code)
         errors.add(
           :pickup_contact_number,
-          "is invalid, please make sure the phone's country code matches the pickup address's country"
+          "is invalid, please make sure the phone is valid and phone's country code matches the pickup address's country"
         )
       end
     end
 
     def consignee_number_country_matched?
-      country_code = ISO3166::Country.find_country_by_name(consignee_country)&.alpha2
-      if Phonelib.invalid_for_country? consignee_number, country_code
+      if Phonelib.invalid_for_country?(consignee_number, consignee_country_code)
         errors.add(
           :consignee_number,
-          "is invalid, please make sure the phone's country code matches the consignee address's country"
+          "is invalid, please make sure the phone is valid and phone's country code matches the consignee address's country"
         )
       end
     end

data/lib/janio_api/version.rb

@@ -1,3 +1,3 @@
 module JanioAPI
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: janio_api
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Andy Chong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: phonelib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -148,6 +147,7 @@ files:
 - lib/janio_api.rb
 - lib/janio_api/configuration.rb
 - lib/janio_api/connection.rb
+- lib/janio_api/postal_code_regex_list.rb
 - lib/janio_api/redirect_fetcher.rb
 - lib/janio_api/resources/base.rb
 - lib/janio_api/resources/item.rb

data/Gemfile.lock

@@ -1,113 +0,0 @@
-PATH
-  remote: .
-  specs:
-    janio_api (0.3.5)
-      activeresource
-      countries
-      phonelib
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activemodel-serializers-xml (1.0.2)
-      activemodel (> 5.x)
-      activesupport (> 5.x)
-      builder (~> 3.1)
-    activeresource (5.1.0)
-      activemodel (>= 5.0, < 7)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 7)
-    activesupport (6.0.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    builder (3.2.4)
-    byebug (11.1.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    countries (3.0.0)
-      i18n_data (~> 0.8.0)
-      sixarm_ruby_unaccent (~> 1.1)
-      unicode_utils (~> 1.4)
-    diff-lcs (1.3)
-    dotenv (2.7.5)
-    ffi (1.12.2)
-    formatador (0.2.5)
-    guard (2.16.2)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    i18n_data (0.8.0)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.4)
-    method_source (1.0.0)
-    minitest (5.14.0)
-    nenv (0.3.0)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    phonelib (0.6.43)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (12.3.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    shellany (0.0.1)
-    sixarm_ruby_unaccent (1.2.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode_utils (1.4.0)
-    zeitwerk (2.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  dotenv
-  guard-rspec
-  janio_api!
-  pry
-  pry-byebug
-  rake (~> 12.3)
-  rspec (~> 3.2)
-
-BUNDLED WITH
-   2.1.4