Merge pull request #145 from KiranBaktha/my_tropical_branch

My tropical branch

Author: eliangcs

http_prompt/cli.py

@@ -48,7 +48,7 @@ def update_cookies(base_value, cookies):
     cookie = SimpleCookie(base_value)
     for k, v in cookies.items():
         cookie[k] = v
-    return cookie.output(header='', sep=';').lstrip()
+    return str(cookie.output(header='', sep=';').lstrip())
 
 
 class ExecutionListener(object):

http_prompt/completion.py

@@ -10,6 +10,7 @@
 
 ROOT_COMMANDS = OrderedDict([
     ('cd', 'Change URL/path'),
+    ('clear', 'Clear console screen'),
     ('curl', 'Preview curl command'),
     ('env', 'Print environment'),
     ('exec', 'Clear and load environment from a file'),

http_prompt/context/__init__.py

@@ -29,6 +29,10 @@ def __init__(self, url=None, spec=None):
                 for path in paths:
                     path_tokens = (base_path_tokens +
                                    list(filter(lambda s: s, path.split('/'))))
+                    if path == '/':  # Path is a trailing slash
+                        path_tokens.insert(len(base_path_tokens), '/')
+                    elif path[-1] == '/':  # Path ends with a trailing slash
+                        path_tokens[-1] = path_tokens[-1] + '/'
                     self.root.add_path(*path_tokens)
                     endpoint = paths[path]
                     for method, info in endpoint.items():

http_prompt/execution.py

@@ -33,7 +33,7 @@
     command = mutation / immutation
 
     mutation = concat_mut+ / nonconcat_mut
-    immutation = preview / action / ls / env / help / exit / exec / source / _
+    immutation = preview / action / ls / env / help / exit / exec / source / clear / _
 
     concat_mut = option_mut / full_quoted_mut / value_quoted_mut / unquoted_mut
     nonconcat_mut = cd / rm
@@ -43,6 +43,7 @@
     urlpath = (~r"https?://" unquoted_string) /
               (!concat_mut !redir_out string)
 
+    clear = _ "clear" _
     help = _ "help" _
     exit = _ "exit" _
     ls = _ "ls" _ (urlpath _)? (redir_out)?
@@ -358,6 +359,10 @@ def visit_exit(self, node, children):
         self.context.should_exit = True
         return node
 
+    def visit_clear(self, node, children):
+        self.output.clear()
+        return node
+
     def visit_mutkey(self, node, children):
         if isinstance(children[0], list):
             return children[0][1]

http_prompt/lexer.py

@@ -46,7 +46,8 @@ class HttpPromptLexer(RegexLexer):
 
             (words(HTTP_METHODS, prefix='(?i)', suffix='(?!\S)(\s*)'),
              bygroups(Keyword, Text), combined('redir_out', 'urlpath')),
-
+            
+            (r'(clear)(\s*)', bygroups(Keyword, Text), 'end'),
             (r'(exit)(\s*)', bygroups(Keyword, Text), 'end'),
             (r'(help)(\s)*', bygroups(Keyword, Text), 'end'),
             (r'(env)(\s*)', bygroups(Keyword, Text),

http_prompt/output.py

@@ -27,6 +27,9 @@ def isatty(self):
     def fileno(self):
         return sys.stdout.fileno()
 
+    def clear(self):
+        click.clear()
+
 
 class TextWriter(object):
     """Wrap a file-like object, opened with 'wb' or 'ab', so it accepts text

tests/test_cli.py

@@ -209,6 +209,23 @@ def test_spec_from_http_only(self):
         self.assertEqual(lv1_names, set(['v1']))
         self.assertEqual(lv2_names, set(['me', 'publications', 'users']))
 
+    def test_spec_with_trailing_slash(self):
+        spec_filepath = self.make_tempfile(json.dumps({
+            'basePath': '/api',
+            'paths': {
+                '/': {},
+                '/users/': {}
+            }
+        }))
+        result, context = run_and_exit(['example.com', "--spec",
+                                        spec_filepath])
+        self.assertEqual(result.exit_code, 0)
+        self.assertEqual(context.url, 'http://example.com')
+        lv1_names = set([node.name for node in context.root.ls()])
+        lv2_names = set([node.name for node in context.root.ls('api')])
+        self.assertEqual(lv1_names, set(['api']))
+        self.assertEqual(lv2_names, set(['/', 'users/']))
+
     def test_env_only(self):
         env_filepath = self.make_tempfile(
             "cd http://example.com\nname=bob\nid==10")