janio_api 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5a4f0c3a8d908fb97aaa1619d6bbf3e8d7cc8ad9128c6691800e3c7d3601f7
-  data.tar.gz: 9c5a2cf08df7e220a5a098babc783c04d031cd41628b9899f29f09aa32654067
+  metadata.gz: 6f2e5b733830dbef549108d5c13cf4393e74c82e50183728f3f553bdf4434a99
+  data.tar.gz: c0f92b02cdc5d0d0df9ed0b7dab082695488928697c948fe61a01e7ca36191b8
 SHA512:
-  metadata.gz: 29b90689b835150963c56944d25b1aca6a0370ad79c5f0dee34cd0f0062ba4587aba356c939f5716edc1f8435c0b5001a8dc3c2f61e44e57d1e9db49e6cf8584
-  data.tar.gz: cb6f23615af5fcde865da4b1ca0a862652537be167e05d3a93eedae0bc86f912d430ab80202f929568d1858ac48074ce6cb594ea1a4bc39b7bea69203ba23699
+  metadata.gz: 8b2a4c8145c67f5b2e082881c044ff48b4c95fb39de9b5e77800c140c77b3fc0ab35acf88d1fc1a278383269fadcfe68326ced6c3c19caf6fe30f17bf050f025
+  data.tar.gz: 5a2fa08310d2cd3968dcf81df2211d3f3075262af22e339f54163b3e878e7220827fe266f9a0afe2bae1b155e241adcd6de80885683c46b9943129dac18d3082

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    janio_api (0.1.11)
+    janio_api (0.2.0)
       activeresource
 
 GEM

data/bin/console

@@ -5,10 +5,7 @@ require "janio_api"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
-JanioAPI.configure do |config|
-  config.api_host = ENV["API_HOST"]
-  config.api_token = ENV["API_TOKEN"]
-end
+require "dev_config"
 
 # (If you use this, don't forget to add pry to your Gemfile!)
 require "pry"

data/lib/dev_config.rb

@@ -0,0 +1,7 @@
+def set_config
+  JanioAPI.configure do |config|
+    config.api_host = ENV["API_HOST"]
+    config.api_token = ENV["API_TOKEN"]
+  end
+end
+set_config

data/lib/janio_api/resources/order.rb

@@ -15,29 +15,71 @@ module JanioAPI
 
     self.collection_parser = Collection
 
-    SUPPORTED_COUNTRIES = ["Australia", "Brunei", "China", "Hong Kong", "Indonesia", "Italy", "Japan", "Malaysia", "Philippines", "Saudi Arabia",
-                           "Singapore", "South Korea", "Spain", "Taiwan", "Thailand", "UAE", "UK", "US", "Vietnam"].freeze
+    SUPPORTED_PICKUP_COUNTRIES = ["Singapore", "China", "Hong Kong", "Indonesia", "Malaysia", "Philippines", "Thailand"].freeze
+    SUPPORTED_CONSIGNEE_COUNTRIES = ["Indonesia", "Singapore", "Thailand", "Malaysia", "Philippines", "China", "Hong Kong", "Taiwan", "Brunei", "South Korea", "Japan", "Vietnam"].freeze
 
     POSTAL_EXCLUDED_COUNTRIES = ["Hong Kong", "Vietnam"].freeze
     VALID_PAYMENT_TYPES = ["cod", "prepaid"].freeze
 
+    SERVICE_ID_MAP = [
+      {id: 1, from: "Singapore", to: "Indonesia"},
+      {id: 6, from: "China", to: "Indonesia"},
+      {id: 5, from: "China", to: "Singapore"},
+      {id: 7, from: "China", to: "Thailand"},
+      {id: 11, from: "Hong Kong", to: "Indonesia"},
+      {id: 37, from: "Hong Kong", to: "Malaysia"},
+      {id: 33, from: "Hong Kong", to: "Philippines"},
+      {id: 13, from: "Hong Kong", to: "Singapore"},
+      {id: 12, from: "Hong Kong", to: "Thailand"},
+      {id: 41, from: "Indonesia", to: "China"},
+      {id: 41, from: "Indonesia", to: "Hong Kong"},
+      {id: 41, from: "Indonesia", to: "Taiwan"},
+      {id: 41, from: "Indonesia", to: "Brunei"},
+      {id: 41, from: "Indonesia", to: "Philippines"},
+      {id: 41, from: "Indonesia", to: "Malaysia"},
+      {id: 3, from: "Indonesia", to: "Indonesia"},
+      {id: 47, from: "Indonesia", to: "Philippines"},
+      {id: 54, from: "Indonesia", to: "Philippines"},
+      {id: 20, from: "Indonesia", to: "Singapore"},
+      {id: 48, from: "Indonesia", to: "Singapore"},
+      {id: 22, from: "Indonesia", to: "South Korea"},
+      {id: 22, from: "Indonesia", to: "Japan"},
+      {id: 22, from: "Indonesia", to: "Vietnam"},
+      {id: 4, from: "Malaysia", to: "Indonesia"},
+      {id: 40, from: "Malaysia", to: "Malaysia"},
+      {id: 36, from: "Philippines", to: "Philippines"},
+      {id: 2, from: "Singapore", to: "China"},
+      {id: 2, from: "Singapore", to: "Taiwan"},
+      {id: 2, from: "Singapore", to: "South Korea"},
+      {id: 2, from: "Singapore", to: "Brunei"},
+      {id: 2, from: "Singapore", to: "Vietnam"},
+      {id: 2, from: "Singapore", to: "Hong Kong"},
+      {id: 2, from: "Singapore", to: "Japan"},
+      {id: 26, from: "Singapore", to: "Malaysia"},
+      {id: 10, from: "Singapore", to: "Singapore"},
+      {id: 17, from: "Singapore", to: "Thailand"},
+      {id: 34, from: "Thailand", to: "Indonesia"},
+      {id: 35, from: "Thailand", to: "Singapore"}
+    ].freeze
+
     self.prefix = "/api/order/orders/"
     self.element_name = ""
 
     has_many :items, class_name: "JanioAPI::Item"
 
-    validates :service_id, :order_length, :order_width, :order_height, :order_weight,
-      :cod_amount_to_collect, :consignee_name, :consignee_number, :consignee_country, :consignee_address, :consignee_state,
-      :consignee_city, :consignee_province, :consignee_email, :pickup_contact_name, :pickup_contact_number, :pickup_country, :pickup_address,
-      :pickup_state, :pickup_city, :pickup_province, :pickup_date, :pickup_notes, presence: true
+    validates :service_id, :order_length, :order_width, :order_height, :order_weight, :cod_amount_to_collect, :consignee_name, :consignee_number, :consignee_country,
+      :consignee_address, :consignee_state, :consignee_email, :pickup_contact_name, :pickup_contact_number, :pickup_country, :pickup_address,
+      :pickup_state, :pickup_date, presence: true
 
-    validates :pickup_country, :consignee_country, inclusion: {in: SUPPORTED_COUNTRIES, message: "%{value} is not a supported country, supported countries are #{SUPPORTED_COUNTRIES.join(", ")}"}
+    validates :pickup_country, inclusion: {in: SUPPORTED_PICKUP_COUNTRIES, message: "%{value} is not a supported pickup country, supported countries are #{SUPPORTED_PICKUP_COUNTRIES.join(", ")}"}
+    validates :consignee_country, inclusion: {in: SUPPORTED_CONSIGNEE_COUNTRIES, message: "%{value} is not a supported consignee country, supported countries are #{SUPPORTED_CONSIGNEE_COUNTRIES.join(", ")}"}
     validates :pickup_postal, :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 :items_validation
+    validate :route_supported?
 
     class << self
       def tracking_path
@@ -119,6 +161,15 @@ module JanioAPI
       }
       attributes = default_attrs.merge(attributes)
       super
+      set_service_id
+    end
+
+    def get_service_id
+      SERVICE_ID_MAP.find { |route| route[:from] == pickup_country && route[:to] == consignee_country }&.dig(:id)
+    end
+
+    def set_service_id
+      @attributes[:service_id] = get_service_id
     end
 
     # Tracks the current order
@@ -128,7 +179,7 @@ module JanioAPI
       body = {
         get_related_updates: true,
         flatten_data: true,
-        tracking_nos: [@attributes["tracking_no"]]
+        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]
@@ -142,6 +193,12 @@ module JanioAPI
 
     private
 
+    def route_supported?
+      unless set_service_id
+        errors.add(:route, "not supported, if new route not available in service_id_map, please contact gem author.")
+      end
+    end
+
     def items_validation
       items&.each_with_index do |item, index|
         item.errors.full_messages.each { |msg| errors.add("item_#{index}".to_sym, msg) } unless item.valid?
@@ -168,11 +225,11 @@ module JanioAPI
     def reformat_before_save(blocking)
       attributes = @attributes.dup
       @attributes.clear
-      @attributes["secret_key"] = JanioAPI.config.api_token
+      @attributes[:secret_key] = JanioAPI.config.api_token
       # set blocking until label generated
-      @attributes["blocking"] = blocking
+      @attributes[:blocking] = blocking
       # reformat attributes
-      @attributes["orders"] = [attributes]
+      @attributes[:orders] = [attributes]
     end
 
     def reset_attributes_format

data/lib/janio_api/version.rb

@@ -1,3 +1,3 @@
 module JanioAPI
-  VERSION = "0.1.11"
+  VERSION = "0.2.0"
 end

data/lib/janio_api.rb

@@ -2,7 +2,7 @@ require "janio_api/version"
 require "active_resource"
 require "dotenv/load"
 require_relative "zeitwerk_loader" if ENV["JANIO_API_GEM_ENV"] == "development"
-
+require_relative "patch_exception"
 module JanioAPI
   require "janio_api/configuration"
 

data/lib/patch_exception.rb

@@ -0,0 +1,18 @@
+module ActiveResource
+  class ConnectionError < StandardError # :nodoc:
+    attr_reader :response
+
+    def initialize(response, message = nil)
+      @response = response
+      @message = message
+    end
+
+    def to_s
+      message = "Failed.".dup
+      message << "  Response code = #{response.code}." if response.respond_to?(:code)
+      message << "  Response message = #{response.message}." if response.respond_to?(:message)
+      message << "  Response body = #{response.body}." if response.respond_to?(:body)
+      message
+    end
+  end
+end

data/lib/zeitwerk_loader.rb

@@ -5,11 +5,15 @@ loader.inflector.inflect(
   "janio_api" => "JanioAPI"
 )
 loader.collapse("./lib/janio_api/resources")
+loader.ignore("#{__dir__}/dev_config.rb")
 loader.enable_reloading
-loader.tag = "janio_api_gem"
 # loader.log!
 loader.setup
+
 $__janio_api_loader__ = loader
+
 def reload!
   $__janio_api_loader__.reload
+  set_config
+  true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: janio_api
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors:
 - Andy Chong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -99,6 +99,7 @@ files:
 - bin/console
 - bin/setup
 - janio_api.gemspec
+- lib/dev_config.rb
 - lib/janio_api.rb
 - lib/janio_api/configuration.rb
 - lib/janio_api/connection.rb
@@ -107,6 +108,7 @@ files:
 - lib/janio_api/resources/item.rb
 - lib/janio_api/resources/order.rb
 - lib/janio_api/version.rb
+- lib/patch_exception.rb
 - lib/zeitwerk_loader.rb
 homepage: https://github.com/PostCo/janio_api
 licenses: