janio_api 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa093e0f5ad7e07588aaf0c058fea09ef6ee4fbfa7e44044557e0fa313dc15cd
-  data.tar.gz: da73f1b6206dc12d175a71fbf6c73b43562eb4ec0c99b36dd5579c8bebf35863
+  metadata.gz: 7ead05593ce47d76a8f18f547f61d7c84783554909b4eb4f1d80b5c9d21f29dc
+  data.tar.gz: 4db668fd55a9019167d52534243578802eda8ee2766a1a589abe139162bdfe15
 SHA512:
-  metadata.gz: 934f2a7a98afd7dec8d84212fb4233484c7f31521812e4b2ca2e91060dff3f87a35f49c35e60b73f103de6257accaaafab0f079978f3809534f19fad2a4b3f3f
-  data.tar.gz: 569852e237c4db83f14c3092604ecfd27f1edd01aef5ac72ec93ed3021c810c816167c19bb2bf3bb25aeb7f4bd867afa7a86e463bcc85ced8696343f94f1fbe1
+  metadata.gz: a67d8337c5d5e0ddcc4b45ba0a299eacae6010cab7fb4c4e7654b04f5116b62a111c0c9e77f6bbbdf16b22b1f7c12c5b1e9284ae93da8c609a541dd280cc094c
+  data.tar.gz: ced2968fb2fbf5b4dc438c8543d3e8cc342a349d5db65c61b6c3d4db7cbc9131896b1931c6c03c4f727b3f805f9ae1ed3542b58e80183a8e641b2777fc011fdb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    janio_api (0.2.1)
+    janio_api (0.3.2)
       activeresource
       countries
       phonelib

data/README.md

@@ -1,5 +1,7 @@
 # JanioAPI
 
+[![Gem Version](https://badge.fury.io/rb/janio_api.svg)](https://badge.fury.io/rb/janio_api)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,10 +24,18 @@ Or install it yourself as:
 
 1. Create a file under the `initializers` folder.
 2. Set the `api_host` and `api_token` as following sample:
+
    ```ruby
    JanioAPI.configure do |config|
      config.api_host = ENV["API_HOST"]
+
      config.api_token = ENV["API_TOKEN"]
+     # or
+     # api_tokens will take over api_token if set in config
+     config.api_tokens = {
+       MY: ENV["MALAYSIA_JANIO_API_TOKEN"],
+       SG: ENV["SINGAPORE_JANIO_API_TOKEN"],
+     }
    end
    ```
 

data/lib/dev/config.rb

@@ -3,6 +3,10 @@ require "dotenv/load"
 def set_config
   JanioAPI.configure do |config|
     config.api_host = ENV["API_HOST"]
-    config.api_token = ENV["API_TOKEN"]
+    # config.api_token = ENV["API_TOKEN"]
+    config.api_tokens = {
+      MY: ENV["MY_API_TOKEN"],
+      SG: ENV["SG_API_TOKEN"]
+    }
   end
 end

data/lib/janio_api/configuration.rb

@@ -1,6 +1,6 @@
 module JanioAPI
   class Configuration
-    attr_accessor :api_host, :api_token
+    attr_accessor :api_host, :api_token, :api_tokens
   end
 
   def self.config

data/lib/janio_api/resources/base.rb

@@ -3,5 +3,17 @@ module JanioAPI
     self.include_root_in_json = false
     self.include_format_in_path = false
     self.connection_class = JanioAPI::Connection
+
+    class << self
+      def headers
+        if _headers_defined?
+          _headers
+        elsif superclass != Object && superclass.headers
+          superclass.headers
+        else
+          _headers ||= {}
+        end
+      end
+    end
   end
 end

data/lib/janio_api/resources/order.rb

@@ -220,13 +220,24 @@ module JanioAPI
     def reformat_before_save(blocking)
       attributes = @attributes.dup
       @attributes.clear
-      @attributes[:secret_key] = JanioAPI.config.api_token
+      @attributes[:secret_key] = retrieve_api_token
       # set blocking until label generated
       @attributes[:blocking] = blocking
       # reformat attributes
       @attributes[:orders] = [attributes]
     end
 
+    def retrieve_api_token
+      if JanioAPI.config.api_tokens
+        country_code_sym = ISO3166::Country.find_country_by_name(@attributes[:pickup_country])&.alpha2&.to_sym
+        JanioAPI.config.api_tokens[country_code_sym]
+      elsif JanioAPI.config.api_token
+        JanioAPI.config.api_token
+      else
+        throw ArgumentError.new("JanioAPI api_token is missing, please set it in the config.")
+      end
+    end
+
     def reset_attributes_format
       attributes = @attributes.dup
       @attributes.clear

data/lib/janio_api/version.rb

@@ -1,3 +1,3 @@
 module JanioAPI
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: janio_api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Andy Chong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby object based Janio API wrapper.