Modify the format of the air waybill number

Fix Exception Handling

Author: liaohanfei

README.md

@@ -38,6 +38,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 
 ```
@@ -94,6 +96,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 ```
 
@@ -106,6 +110,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 ```
 
@@ -119,6 +125,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 ```
 
@@ -134,6 +142,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 ```
 
@@ -146,6 +156,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 ```
 
@@ -159,6 +171,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 ```
 
@@ -171,6 +185,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 ```
 
@@ -183,6 +199,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 ```
 ## Air Waybill
@@ -195,6 +213,8 @@ begin
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+   puts "Caught Standard Error: #{e.message}"
 end
 ```
 

examples/air_waybill_example.rb

@@ -9,4 +9,6 @@
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
-end
+rescue StandardError => e
+  puts "Caught Standard Error: #{e.message}"
+end

examples/courier_example.rb

@@ -8,6 +8,8 @@
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+  puts "Caught Standard Error: #{e.message}"
 end
 
 
@@ -17,4 +19,6 @@
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+  puts "Caught Standard Error: #{e.message}"
 end

examples/tracking_example.rb

@@ -9,6 +9,8 @@
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+  puts "Caught Standard Error: #{e.message}"
 end
 
 begin
@@ -19,6 +21,8 @@
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+  puts "Caught Standard Error: #{e.message}"
 end
 
 begin
@@ -27,6 +31,8 @@
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+  puts "Caught Standard Error: #{e.message}"
 end
 
 begin
@@ -36,6 +42,8 @@
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+  puts "Caught Standard Error: #{e.message}"
 end
 
 begin
@@ -44,6 +52,8 @@
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+  puts "Caught Standard Error: #{e.message}"
 end
 
 begin
@@ -52,4 +62,6 @@
   puts response
 rescue TrackingMore::TrackingMoreException => e
   puts "Caught Custom Exception: #{e.message}"
+rescue StandardError => e
+  puts "Caught Standard Error: #{e.message}"
 end

lib/trackingmore/air_waybill.rb

@@ -6,7 +6,7 @@ def self.create_an_air_waybill(params = {})
       if params["awb_number"].to_s.empty?
         raise TrackingMore::TrackingMoreException.new(TrackingMore::Consts::ErrMissingAwbNumber)
       end
-      if params["awb_number"].length != 12
+      if !params['awb_number'].match(/^\d{3}[ -]?(\d{8})$/)
         raise TrackingMore::TrackingMoreException.new(TrackingMore::Consts::ErrInvalidAirWaybillFormat)
       end
       TrackingMore::Request.make_request('post',"awb",params)

lib/trackingmore/const.rb

@@ -7,6 +7,6 @@ class Consts
     ErrMissingAwbNumber           = 'Awb number cannot be empty';
     ErrMaxTrackingNumbersExceeded = 'Max. 40 tracking numbers create in one call';
     ErrEmptyId                    = 'Id cannot be empty';
-    ErrInvalidAirWaybillFormat    = 'The air waybill number format is invalid and can only be 12 digits in length';
+    ErrInvalidAirWaybillFormat    = 'The air waybill number format is invalid';
   end
 end