From cd99da456148db6eef6517f68774866eaf9e3e27 Mon Sep 17 00:00:00 2001
From: t3yamoto <3yamoto.dev@gmail.com>
Date: Sat, 22 Aug 2020 13:45:25 +0900
Subject: [PATCH] =?UTF-8?q?#5=20=E3=81=8F=E3=82=89=E5=AF=BF=E5=8F=B8URL?=
 =?UTF-8?q?=E3=83=BB=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                          |  5 ++--
 src/sushi_allergy_parser/kura.py   | 10 ++++----
 tests/test_sushi_allergy_parser.py | 37 +++++++++++++++++++++++++++---
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 866d4ba..c5737cc 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,8 @@
 
 `sushi-allergy-parser` is a parser for allergy infomation document of japanese conveyor-belt sushi chain. Currently, the following documents are supported.
 
-* スシロー (http://www3.akindo-sushiro.co.jp/pdf/menu/allergy.pdf)
-* くら寿司 (http://www.kura-corpo.co.jp/common/pdf/kura_allergen.pdf)
-
+- スシロー (http://www3.akindo-sushiro.co.jp/pdf/menu/allergy.pdf)
+- くら寿司 (https://www.kurasushi.co.jp/common/pdf/kura_allergen.pdf)
 
 ## Requirements
 
diff --git a/src/sushi_allergy_parser/kura.py b/src/sushi_allergy_parser/kura.py
index 6943847..6603a0b 100644
--- a/src/sushi_allergy_parser/kura.py
+++ b/src/sushi_allergy_parser/kura.py
@@ -7,11 +7,11 @@
 from .base import AllergenState, BaseParser, Allergen
 from .util import removeNewLine
 
-REMOTE_URL = "http://www.kura-corpo.co.jp/common/pdf/kura_allergen.pdf"
+REMOTE_URL = "https://www.kurasushi.co.jp/common/pdf/kura_allergen.pdf"
 BASE_LAYOUT = [
     ("卵", Allergen.EGG.value, True),  # header, key, required
     ("小麦", Allergen.WHEAT.value, True),
-    ("乳・乳製品", Allergen.MILK.value, True),
+    ("乳成分", Allergen.MILK.value, True),
     ("落花生ピーナッツ", Allergen.PEANUT.value, True),
     ("ソバ", Allergen.BUCKWHEAT.value, True),
     ("えび", Allergen.SHRIMP.value, True),
@@ -33,9 +33,9 @@
     ("山芋", Allergen.YAM_OR_SWEET_POTATO.value, True),
     ("モモ", Allergen.PEACH.value, True),
     ("ごま", Allergen.SESAME.value, True),
-    ("あわび", Allergen.ABALONE.value, True),
+    # ("あわび", Allergen.ABALONE.value, True),
     ("カシューナッツ", Allergen.CASHEW_NUT.value, True),
-    ("松茸", Allergen.MATSUTAKE_MUSHROOM.value, True),
+    # ("松茸", Allergen.MATSUTAKE_MUSHROOM.value, True),
 ]
 PAGE1_LAYOUT = [
     ("品名", "name", True),
@@ -46,7 +46,7 @@
 PAGE2_LAYOUT = PAGE1_LAYOUT
 PAGE3_LAYOUT = [
     ("品名", "name", True),
-    ("一(皿kカ・cロ一aリlー杯当)り", "calory", False),
+    ("一(皿kカ・cロ一aリー杯l当)り", "calory", False),
     ("該当なし", "none", False),
     *BASE_LAYOUT,
 ]
diff --git a/tests/test_sushi_allergy_parser.py b/tests/test_sushi_allergy_parser.py
index c198bd5..65ec47d 100644
--- a/tests/test_sushi_allergy_parser.py
+++ b/tests/test_sushi_allergy_parser.py
@@ -37,13 +37,43 @@
     "matsutakeMushroom",
 ]
 
+EXPECTED_COLUMNS_KURA = [
+    "name",
+    "category",
+    "egg",
+    "wheat",
+    "milk",
+    "peanut",
+    "buckwheat",
+    "shrimp",
+    "crab",
+    "squid",
+    "salmonRoe",
+    "salmon",
+    "mackerel",
+    "beef",
+    "chicken",
+    "pork",
+    "soybean",
+    "orange",
+    "apple",
+    "gelatin",
+    "walnut",
+    "banana",
+    "kiwi",
+    "yamOrSweetPotato",
+    "peach",
+    "sesame",
+    "cashewNut",
+]
+
 
 def test_version():
     assert __version__ == "0.1.3"
 
 
 def test_sushiro():
-    df = KuraAllergyParser().parse()
+    df = SushiroAllergyParser().parse()
     assert isinstance(df, pd.DataFrame)
 
     for column in EXPECTED_COLUMNS:
@@ -51,8 +81,9 @@ def test_sushiro():
 
 
 def test_kura():
-    df = SushiroAllergyParser().parse()
+
+    df = KuraAllergyParser().parse()
     assert isinstance(df, pd.DataFrame)
 
-    for column in EXPECTED_COLUMNS:
+    for column in EXPECTED_COLUMNS_KURA:
         assert isinstance(df[column], pd.Series)