handle quoted extract argument, ref #4

Author: b3b

restmagic/magic.py

@@ -25,6 +25,7 @@
     ResponseParser,
     expand_variables,
     parse_rest_request,
+    remove_argument_quotes,
 )
 from restmagic.request import RESTRequest
 from restmagic.sender import RequestSender
@@ -220,7 +221,7 @@ def rest(self, line, cell=''):
                 if args.parser_expression:
                     display_dict(
                         ResponseParser(response=response,
-                                       expression=args.parser_expression,
+                                       expression=remove_argument_quotes(args.parser_expression),
                                        content_subtype=args.parser).parse()
                     )
                 else:

restmagic/parser.py

@@ -15,6 +15,14 @@ class ParseError(Exception):
     """Query parsing error occured."""
 
 
+def remove_argument_quotes(text: str) -> str:
+    """Remove single and double outer quotes from text.
+    """
+    if re.match(r'^(\'.*\')|(".*")$', text or ''):
+        return text[1:-1]
+    return text
+
+
 def expand_variables(text, kwargs):
     """Expand python variables in a string.
 

tests/test_magic.py

@@ -279,6 +279,29 @@ def test_timeout_option_handled(send):
     assert send.call_args[1]['timeout'] == 1.01
 
 
+@pytest.mark.parametrize('option', ('-[', '--extract'))
+def test_extract_option_handled(send, display_dict, display_response,
+                                response_parser, option):
+    RESTMagic().rest(line=f"{option} test GET http://localhost")
+    response_parser.assert_called_once_with(response='test sended', expression='test',
+                                            content_subtype=None)
+    display_dict.assert_called_once()
+
+
+@pytest.mark.parametrize(
+    'line, expected_expression', (
+        ('-[ "a b"', 'a b'),
+        ('--extract \'/[name() = "svg"]\'', '/[name() = "svg"]'),
+    )
+)
+def test_extract_option_quoted_expression_handled(send, display_dict, display_response,
+                                                  response_parser, line, expected_expression):
+    RESTMagic().rest(line=f"{line} test GET http://localhost")
+    response_parser.assert_called_once_with(response='test sended', expression=expected_expression,
+                                            content_subtype=None)
+    display_dict.assert_called_once()
+
+
 @pytest.mark.parametrize('parser', ('json', 'xml', 'html'))
 def test_parser_option_handled(send, display_dict, display_response,
                                response_parser, parser):

tests/test_parser.py

@@ -12,6 +12,7 @@
     parse_rest_request,
     guess_response_content_subtype,
     parse_json_response,
+    remove_argument_quotes,
 )
 
 
@@ -223,3 +224,17 @@ def test_guess_response_content_subtype(response, expected):
 
 def test_response_parser(json_response):
     ResponseParser(response=json_response, expression=None)
+
+
+@pytest.mark.parametrize(
+    'text, expected', (
+        ('', ''),
+        ('test', 'test'),
+        ('"test test"', 'test test'),
+        ("'test test'", 'test test'),
+        ("'test' 'test' \"test\"", "test 'test' \"test\""),
+        ("test 'test'", "test 'test'"),
+    )
+)
+def test_quotes_removed_from_argument(text, expected):
+    remove_argument_quotes(text) == expected