admiral_stats_parser 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a532fc6d719dca51bff3ac91ee7e8bb9897ee6
-  data.tar.gz: 49bb96a6f5fa6ce7dc5b2ebd46a671cc5d563689
+  metadata.gz: f7e916096d4ff8a797ee0cd64beffda36eff3963
+  data.tar.gz: 330fbb035d329a4d476fd8d96acca39e55343a10
 SHA512:
-  metadata.gz: a8a5916ec9b77b552bb39096d2b2999a5b6db7c2d4e3aa4ac0e363454f94ea26e18bea92ca6a501f7e5c5a6690a79e567d1e426512435f262a03581f33c49230
-  data.tar.gz: d6f27c93cd393546cac9ac983f9483782af798d95be97c1e53ec73191708999b2c86571792c808f158c1360519443e9c659070cbb340a2c9f04d9b33537f8452
+  metadata.gz: 4b6f1348cd11d1b613dadb61ef1f6c028a695322dbe77c6f8fa717ade4fcffb80e59f576c0c450079d38ed09f976618d0c873a1b8e677d561ff12b0e3a2ab564
+  data.tar.gz: f2b40544d51e7dce513931de0a4691b48b50e67f2b1bc88ca43f7edceb555c637cacc477fcfccaf82e9e4839b089e9ef1b43a3674e694d60a501819eb7f106a2

data/lib/admiral_stats_parser/parser/tc_book_info_parser.rb

@@ -90,12 +90,17 @@ class TcBookInfoParser
       5 => {
           priority: Integer,
           card_img_list: Array,
-          status_img: Array,
           variation_num_in_page: Integer,
           acquire_num_in_page: Integer,
       },
   }
 
+  CARD_LIST_OPTIONAL_KEYS = {
+      5 => {
+          status_img: Array,
+      },
+  }
+
   def self.parse(json, api_version)
     items_array = JSON.parse(json)
 
@@ -158,7 +163,7 @@ class TcBookInfoParser
         # 必須のキーが含まれなければエラー
         camel_case_key = key.to_s.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
         unless c.include?(camel_case_key)
-          raise "Mandatory key #{key} does not exist"
+          raise "Mandatory key #{key} does not exist: #{tc_book_info.book_no}"
         end
 
         # 結果のクラスが合わなければエラー
@@ -169,19 +174,33 @@ class TcBookInfoParser
         result.instance_variable_set("@#{key.to_s}", c[camel_case_key])
       end
 
+      CARD_LIST_OPTIONAL_KEYS[api_version].each do |key, key_class|
+        # キーが含まれなければ、処理をスキップ
+        camel_case_key = key.to_s.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
+        next unless c.include?(camel_case_key)
+
+        # 結果のクラスが合わなければエラー
+        unless c[camel_case_key].is_a?(key_class)
+          raise "Optional key #{key} is not class #{key_class}"
+        end
+
+        result.instance_variable_set("@#{key.to_s}", c[camel_case_key])
+      end
+
       results << result
     end
 
+    # admiral_stats_parser は限定カード未対応のため、priority == 0 の要素のみを処理する
+    results = results.select{|r| r.priority == 0 }
+
     case results.size
       when 0
-        # 未入手の場合
+        # 未入手、または priority == 0 のデータが存在しない場合
         tc_book_info.card_img_list = []
         tc_book_info.status_img = []
-      when 1
+      else
         tc_book_info.card_img_list = results[0].card_img_list
         tc_book_info.status_img = results[0].status_img
-      else
-        raise "Number of entry in card_list is #{results.size}"
     end
   end
 

data/lib/admiral_stats_parser/version.rb

@@ -1,3 +1,3 @@
 module AdmiralStatsParser
-  VERSION = '1.17.0'
+  VERSION = '1.17.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admiral_stats_parser
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Masahiro Yoshizawa