理想を押し通す

Author: fono09

plugins/analyze.py

@@ -5,6 +5,7 @@
 from typing import Callable
 from library.clientclass import BaseClient
 from plugins import hato
+from functools import partial
 
 
 def analyze_message(message: str) -> Callable[[BaseClient], None]:
@@ -14,15 +15,15 @@ def analyze_message(message: str) -> Callable[[BaseClient], None]:
                   'eq': lambda m: hato.earth_quake,
                   '地震': lambda m: hato.earth_quake,
                   'text list': lambda m: hato.get_text_list,
-                  'text add ': lambda m: hato.add_text(m[len('text add '):]),
-                  'text show ': lambda m: hato.show_text(m[len('text show '):]),
-                  'text delete ': lambda m: hato.delete_text(m[len('text delete '):]),
+                  'text add ': lambda m: partial(hato.add_text, word=m[len('text add '):]),
+                  'text show ': lambda m: partial(hato.show_text, power_word_id=m[len('text show '):]),
+                  'text delete ': lambda m: partial(hato.delete_text, power_word_id=m[len('text delete '):]),
                   'text random': lambda m: hato.show_random_text,
                   'text': lambda m: hato.show_random_text,
-                  '>< ': lambda m: hato.totuzensi(m[len('>< '):]),
-                  'amesh': lambda m: hato.amesh((m[len('amesh'):]).strip()),
+                  '>< ': lambda m: partial(hato.totuzensi, message=m[len('>< '):]),
+                  'amesh': lambda m: partial(hato.amesh, place=(m[len('amesh'):]).strip()),
                   '電力': lambda m: hato.electricity_demand,
-                  '標高': lambda m: hato.altitude((m[len('標高'):]).strip()),
+                  '標高': lambda m: partial(hato.altitude, place=(m[len('標高'):]).strip()),
                   'version': lambda m: hato.version,
                   'にゃーん': lambda m: hato.yoshiyoshi,
                   'おみくじ': lambda m: hato.omikuji,

plugins/hato.py

@@ -9,7 +9,7 @@
 from enum import Enum, auto
 from logging import getLogger
 from tempfile import NamedTemporaryFile
-from typing import List
+from typing import List, Callable, Union
 import requests
 from git import Repo
 from git.exc import InvalidGitRepositoryError, GitCommandNotFound
@@ -29,12 +29,12 @@
 logger = getLogger(__name__)
 
 
-def action(plugin_name: str, with_client: bool = False) -> Callable[[BaseClient], None]:
+def action(plugin_name: str, with_client: bool = False) -> Callable[[BaseClient, ...], None]:
     """
     アクション定義メソッドに使うデコレータ
     """
 
-    def _action(func: Callable[[BaseClient], Union[str, None]]):
+    def _action(func: Callable[[BaseClient, ...], Union[str, None]]):
         def wrapper(client: BaseClient, *args, **kwargs):
             logger.debug("%s called '%s'", client.get_send_user(), plugin_name)
             logger.debug("%s app called '%s'", client.get_type(), plugin_name)
@@ -43,7 +43,7 @@ def wrapper(client: BaseClient, *args, **kwargs):
             else:
                 client.post(func(*args, **kwargs))
 
-        return wraper
+        return wrapper
     return _action
 
 
@@ -269,7 +269,7 @@ def altitude(place: str):
 
 
 @action('version')
-def version(client: BaseClient):
+def version():
     """versionを表示する"""
 
     str_ver = "バージョン情報\n```" \
@@ -291,7 +291,7 @@ def version(client: BaseClient):
 
 
 @action('にゃーん')
-def yoshiyoshi(client: BaseClient):
+def yoshiyoshi():
     """「にゃーん」を見つけたら、「よしよし」と返す"""
     return 'よしよし'
 

tests/plugins/test_analyze.py

@@ -24,7 +24,7 @@ def test_totuzensi(self):
         client1 = TestClient()
         analyze_message('>< aaa')(client1)
         client2 = TestClient()
-        hato.totuzensi('aaa')(client2)
+        hato.totuzensi(client2, 'aaa')
         self.assertEqual(client1.get_post_message(),
                          client2.get_post_message())
         # self.assertEqual(analyze_message('>< aaa'), hato.totuzensi('aaa'))

tests/plugins/test_hato.py

@@ -76,8 +76,7 @@ def get_amesh_test(self,
         mocker.get(jma_image_url, content=image_content)
         mocker.get(osm_image_url, content=image_content)
         mocker.get(jma_json_url, content=json_content)
-        res = amesh(place)(client1)
-        self.assertEqual(res, True)
+        amesh(client1, place)
         return client1
 
     def amesh_upload_png_test(self,
@@ -158,8 +157,7 @@ def altitude_test(self,
         query = '&'.join([f'{k}={v}' for k, v in params.items()])
         mocker.get('https://map.yahooapis.jp/alt/V1/getAltitude?' + query,
                    content=json.dumps(content).encode())
-        req = altitude(place)(client1)
-        self.assertEqual(req.status_code, 200)
+        altitude(client1, place)
         return client1
 
     def test_altitude_with_no_params(self):

tests/test_run.py

@@ -23,7 +23,7 @@ def test_telephone_link(self):
         ]
         analyze_slack_message(messages)(client1)
         client2 = TestClient()
-        hato.totuzensi('09012345678')(client2)
+        hato.totuzensi(client2, '09012345678')
         self.assertEqual(client1.get_post_message(),
                          client2.get_post_message())
 
@@ -36,6 +36,6 @@ def test_code(self):
         ]
         analyze_slack_message(messages)(client1)
         client2 = TestClient()
-        hato.totuzensi('09012345678')(client2)
+        hato.totuzensi(client2, '09012345678')
         self.assertEqual(client1.get_post_message(),
                          client2.get_post_message())