janio_api 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec588d4ddedcb71c4d1038732fe2db5864cacc915b2d4f0e257feedafd5916d7
-  data.tar.gz: ccb59b3ec045bcd86029fbd301e909a2919a94c000f1e098f780a9e99ccf53f2
+  metadata.gz: 91d85f8a1ab6814c4c4b8eb6ec69b436330384f45b788ff833387fb11d44d174
+  data.tar.gz: e098b9a86980679c69d5a697b9e0978cdf20c129dc00b6cc7228a9d222144523
 SHA512:
-  metadata.gz: 868e7843a0cfdfa019f48fc2eaf0df991e2aeb0369e012aa2cb2407c53cc3865b1fc5f83f6fae8ac6b42e00ee945edf8014be90b00a5ada8f41adc9740549857
-  data.tar.gz: d946eca197b5186140ba4741cd90cbdbd15b44b66da94d2ceb54edf4be9d7a5a2013551a8d476d3f5cd55e1db87e572781e19bbb443ac37e44eb672dd23d3fe9
+  metadata.gz: c25cb39853f1566b4abdc8570e6f534dbd77157eeae20479de9ce62d1b77022dd5759aedd0e4c6db644ba8ed4b30a504d787ab03ba19920fd83d77eff37b7ad8
+  data.tar.gz: 93a94c79dd8f34efb86fc9bffed84915455028161ca06deb1401131d40e6e95212b5291b88d6e18a0731e8ee2cac90f6e890bda7320ab55d22dec67d09ff56cd

data/Gemfile.lock

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

data/lib/janio_api/resources/order.rb

@@ -17,6 +17,7 @@ module JanioAPI
 
     SUPPORTED_PICKUP_COUNTRIES = SERVICES.map { |s| s[:pickup_country] }.uniq.freeze
     SUPPORTED_CONSIGNEE_COUNTRIES = SERVICES.map { |s| s[:consignee_country] }.uniq.freeze
+    PICKUP_DATE_ACCEPTED_COUNTRIES = ["Singapore"]
 
     POSTAL_EXCLUDED_COUNTRIES = ["Hong Kong", "Vietnam", "Brunei"].freeze
     VALID_PAYMENT_TYPES = ["cod", "prepaid"].freeze
@@ -59,7 +60,10 @@ module JanioAPI
 
     validates :service_id, :order_length, :order_width, :order_height, :order_weight,
       :consignee_name, :consignee_country, :consignee_address, :consignee_state, :consignee_email,
-      :pickup_contact_name, :pickup_country, :pickup_address, :pickup_state, :pickup_date, presence: true
+      :pickup_contact_name, :pickup_country, :pickup_address, :pickup_state, presence: true
+
+    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,
@@ -129,11 +133,22 @@ module JanioAPI
     end
 
     def initialize(attributes = {}, persisted = false)
+      if attributes[:pickup_date].is_a?(ActiveSupport::TimeWithZone)
+        attributes[:pickup_date] = attributes[:pickup_date].strftime("%Y-%-m-%-d")
+      end
       attributes = DEFAULT_ATTRS.merge(attributes)
       super
       set_service_id
     end
 
+    def pickup_date=(date)
+      @attributes[:pickup_date] = if date.is_a?(ActiveSupport::TimeWithZone)
+        date.strftime("%Y-%-m-%-d")
+      else
+        date
+      end
+    end
+
     def get_service_id(service_category = "pickup")
       # only check with services offering pickup by default
       SERVICES.find do |s|
@@ -234,7 +249,7 @@ module JanioAPI
       elsif JanioAPI.config.api_token
         JanioAPI.config.api_token
       else
-        throw ArgumentError.new("JanioAPI api_token is missing, please set it in the config.")
+        raise ArgumentError, "JanioAPI api_token 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.4"
+  VERSION = "0.3.5"
 end

metadata

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