tcat 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a34a4165a334cea5fc3e1297f49265cff8cff2099aa8ea6ea0912d953798a1
-  data.tar.gz: 72cd8a878a16a17829ffbb0dfbe6588c04828ed1e72de0799f3fe66460b9451b
+  metadata.gz: ac88c04a17a00b5b457a86bcf3bad081ac0fb48886351c1033fd1b89e2ebe399
+  data.tar.gz: 4adfbb15946f3f42b2b655911f2501824e401aa08d22635aafb01cb73f9adb85
 SHA512:
-  metadata.gz: 96960dd54febe02718c8fb068206b3d1b0d23ca45ddb65b4097920cdf58d87b5bba346e2fce0bcc3ef11109b67d78c6a00d6ad84d8d1899358ee094e4245f863
-  data.tar.gz: d5a1a0ee708bb6179d62b8596af30137ecd0965f146bb6f009a3ac9b834242fe61046e553f6620a457e215c99f13375306c13bddbb7b011bf217614b1683f961
+  metadata.gz: 34d8e04435756d743116aa0da37132d5c7f695a6f835690d4f616cba78aaacf15c1661c8e6802524c903b0dcaaf0f89ee9803d654b702865c2cdd438b90426d4
+  data.tar.gz: fb274000955f0ba2f3f68d2d6564fbd930656f792993b7be394861afb1c6df2d76f0ccffb7ef6b68dd3b4d646da9a8a8c7b58250db85bfe420c5ea0643c77828

data/lib/tcat/query.rb

@@ -64,33 +64,43 @@ module Tcat
     end
 
     def parse_response(xml)
-      result = Ox.load(xml, mode: :hash, with_cdata: true)
-
-      return if result[:Result][:Status] != '0'
-
-      statuses =
-        if result[:Result][:Content][:Item].is_a?(Hash)
-          [result[:Result][:Content][:Item][:Status].force_encoding('UTF-8')]
-        elsif result[:Result][:Content][:Item].is_a?(Array)
-          result[:Result][:Content][:Item].map do |item|
-            item[:Status].force_encoding('UTF-8')
-          end
-        end
-      parse_status_message(statuses.uniq)
+      begin
+        result = Ox.load(xml, mode: :hash, with_cdata: true)
+        return :error unless result.dig(:Result, :Status) == '0'
+
+        delivery_items = result.dig(:Result, :Content, :Item)
+        delivery_statuses = extract_delivery_statuses(delivery_items)
+        
+        parse_status_message(delivery_statuses.uniq)
+      rescue StandardError => e
+        Rails.logger.error("Error parsing T-Cat response: #{e.message}")
+        :error
+      end
     end
 
-    def parse_status_message(statuses)
-      if statuses.include?('順利送達')
-        :done
-      elsif statuses.include?('配送中')
-        :delivering
-      elsif statuses.include?('已集貨')
-        :collected
-      elsif statuses.include?('轉運中')
-        :in_transit
+    def extract_delivery_statuses(items)
+      case items
+      when Hash
+        [items[:Status].force_encoding('UTF-8')]
+      when Array
+        items.map { |item| item[:Status].force_encoding('UTF-8') }
       else
-        :unknown
+        []
+      end
+    end
+
+    STATUS_MAPPINGS = {
+      '順利送達' => :done,
+      '配送中' => :delivering,
+      '已集貨' => :collected,
+      '轉運中' => :in_transit
+    }.freeze
+
+    def parse_status_message(statuses)
+      STATUS_MAPPINGS.each do |status_text, status_symbol|
+        return status_symbol if statuses.include?(status_text)
       end
+      :unknown
     end
   end
 end

data/lib/tcat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tcat
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tcat
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Zac