janio_api 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 318f3d3a08f7f85b5b3f658b6ab54644f748f05eaeb0a4c13ab214375a79be0d
-  data.tar.gz: feb8eaa1e12ef20c0dc222a87e53faec9b147748578b2d00735a428436ffa25a
+  metadata.gz: 2eb551722b7d734da79c0c34f59c6f14c8866e2656562b0fd25bdba9bcdc3fb3
+  data.tar.gz: 487e7b65437e433546c116aba987176b41ad937d4c6937bcf5270c7995ab2907
 SHA512:
-  metadata.gz: 4cb07c9fc3dd6f6fbc4077e06031b02adf5c6ee9ef85979e83661ebe6454a2b513ef035c34fd5f92fb1a86eb9c191565c9750697546a54d798a88f910443cca4
-  data.tar.gz: 7322287b9ccba118c513a3ceac69eafadbaa96b83c73c071ca28957066da6ae034e187c377bd1d1e5e65ef40af04427b2f911a45f2643617dace35f02a548045
+  metadata.gz: a8dc69b4891a6d07f6a7d78a47a518e69819bbfe6b78b86784bc557fb4433e547160da13bf355efd1e36cb9a17c8b808f8a95e09039777cb11082922e1c83329
+  data.tar.gz: '075582cc9cf498238a20f37a5e5107fc89644651526ab42b8c53450f5bd6e27db04e573342ba8ba3b9eb12467371b42b3c067e32c4fe4e6111862cb52f711067'

data/lib/dev/zeitwerk_loader.rb

@@ -10,7 +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.ignore("./lib/janio_api/postal_code_regex_list.rb")
 loader.enable_reloading
 # loader.log!
 loader.setup

data/lib/janio_api/resources/base.rb

@@ -4,6 +4,19 @@ module JanioAPI
     self.include_format_in_path = false
     self.connection_class = JanioAPI::Connection
 
+    def initialize(attributes = {}, persisted = false)
+      # check if config host and api token is set
+      unless JanioAPI.config.api_tokens || JanioAPI.config.api_token
+        raise ArgumentError, "JanioAPI api_token/api_tokens is missing, please set it in the config."
+      end
+
+      unless JanioAPI.config.api_host
+        raise ArgumentError, "JanioAPI api_host is missing, please set it in the config."
+      end
+
+      super
+    end
+
     class << self
       def headers
         if _headers_defined?

data/lib/janio_api/resources/order.rb

@@ -117,15 +117,27 @@ module JanioAPI
       # Track one or more tracking nos
       #
       # Check http://apidocs.janio.asia/track for more information
-      def track(tracking_nos)
-        raise ArgumentError, "tracking_nos not an array" unless tracking_nos.is_a?(Array)
+      def track(tracking_nos, secret_key = nil)
+        raise ArgumentError, "tracking_nos must be an array" unless tracking_nos.is_a?(Array)
 
         body = {
           get_related_updates: true,
-          flatten_data: true,
+          flatten_data: false,
           tracking_nos: tracking_nos
         }
-        response = connection.post(tracking_path, body.to_json, headers)
+
+        headers[:secret_key] = secret_key unless secret_key.nil?
+
+        raise ArgumentError, "secret_key can't be blank" unless headers[:secret_key].present?
+
+        retries = 0
+        begin
+          retries += 1
+          response = connection.post(tracking_path, body.to_json, headers)
+        rescue ActiveResource::ConnectionError => e
+          retry unless retries <= 5
+          raise e
+        end
 
         self.format.decode(response.body)
       end
@@ -141,7 +153,7 @@ module JanioAPI
     end
 
     def pickup_date=(date)
-      @attributes[:pickup_date] = if date.is_a?(ActiveSupport::TimeWithZone)
+      @attributes[:pickup_date] = if date.is_a?(ActiveSupport::TimeWithZone) || date.is_a?(Time)
         date.strftime("%Y-%-m-%-d")
       else
         date
@@ -170,6 +182,7 @@ module JanioAPI
         flatten_data: true,
         tracking_nos: [@attributes[:tracking_no]]
       }
+
       response = connection.post(self.class.tracking_path, body.to_json, self.class.headers)
       self.class.format.decode(response.body)[0]
     end
@@ -268,7 +281,7 @@ module JanioAPI
       elsif JanioAPI.config.api_token
         JanioAPI.config.api_token
       else
-        raise ArgumentError, "JanioAPI api_token is missing, please set it in the config."
+        raise ArgumentError, "JanioAPI api_token/api_tokens is missing, please set it in the config."
       end
     end
 

data/lib/janio_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: janio_api
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Andy Chong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource