Simplify RspecCreateModuleCommand

Author: guille

RSpecCreateModule.py

@@ -24,53 +24,34 @@ class {name}
 """
 
 
-def snake_case(name):
+def indent(text: str, space: int = 2):
+    return "\n".join(" " * space + line for line in text.split("\n"))
+
+
+def snake_case(name: str):
     s1 = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
     return re.sub("([a-z0-9])([A-Z])", r"\1_\2", s1).lower()
 
 
-class GotoLineCommand(sublime_plugin.TextCommand):
-    def run(self, edit, line, column=0):
+class RspecGotoLineAndIndentCommand(sublime_plugin.TextCommand):
+    def run(self, edit: sublime.Edit, line: int = 0, column: int = 0):
         pt = self.view.text_point(line - 1, column)
 
         self.view.sel().clear()
         self.view.sel().add(sublime.Region(pt))
 
         self.view.show(pt)
+        self.view.insert(edit, pt, "  ")
 
-
-class RspecNewModuleCommand(sublime_plugin.TextCommand):
-    def run(self, edit, name, namespace):
-        class_template = CLASS_TEMPLATE.format(name=name)
-
-        template, level = class_template, len(namespace)
-
-        while namespace:
-            module = namespace.pop()
-            template = MODULE_TEMPLATE.format(
-                module=module, definition=self.indent(template)
-            )
-
-        self.view.insert(edit, 0, template)
-        self.view.run_command("goto_line", {"line": 2 + level, "column": level * 2})
-
-    def indent(self, text, space=2):
-        return "\n".join(" " * space + line for line in text.split("\n"))
-
-
-class RspecNewSpecCommand(sublime_plugin.TextCommand):
-    def run(self, edit, name):
-        template = SPEC_TEMPLATE.format(name=name)
-
-        self.view.insert(edit, 0, template)
-        self.view.run_command("goto_line", {"line": 4})
+    def is_visible(self):
+        return False
 
 
 class RspecCreateModuleCommand(sublime_plugin.WindowCommand):
     def run(self):
         self.window.show_input_panel("Enter module name:", "", self.on_done, None, None)
 
-    def on_done(self, text):
+    def on_done(self, text: str):
         if not text:
             return
 
@@ -79,14 +60,29 @@ def on_done(self, text):
         # create the module
         module = self.window.new_file(syntax="scope:source.ruby")
         module.set_name(snake_case(name) + ".rb")
-
-        module.run_command("rspec_new_module", {"name": name, "namespace": namespace})
+        module_template = CLASS_TEMPLATE.format(name=name)
+        for mod in reversed(namespace):
+            module_template = MODULE_TEMPLATE.format(
+                module=mod, definition=indent(module_template)
+            )
+        module.run_command("rspec_insert_content", {"text": module_template})
+        module.run_command(
+            "rspec_goto_line_and_indent",
+            {"line": 2 + len(namespace), "column": len(namespace) * 2},
+        )
 
         # create the spec
         spec = self.window.new_file(syntax="scope:source.ruby.rspec")
         self.window.run_command(
             "move_to_group", {"group": other_group_in_pair(self.window)}
         )
         spec.set_name(snake_case(name) + "_spec.rb")
-
-        spec.run_command("rspec_new_spec", {"name": "::".join(namespace + [name])})
+        self.window.run_command(
+            "move_to_group", {"group": other_group_in_pair(self.window)}
+        )
+        spec.set_name(snake_case(name) + "_spec.rb")
+        spec.run_command(
+            "rspec_insert_content",
+            {"text": SPEC_TEMPLATE.format(name="::".join(namespace + [name]))},
+        )
+        spec.run_command("rspec_goto_line_and_indent", {"line": 4})

shared.py

@@ -11,7 +11,6 @@ def other_group_in_pair(window: sublime.Window):
     return min(target_group, window.num_groups() - 1)
 
 
-# TODO: Call from RspecNewModuleCommand and RspecNewSpecCommand
 class RspecInsertContentCommand(sublime_plugin.TextCommand):
     def run(self, edit: sublime.Edit, text: str = ""):
         self.view.insert(edit, 0, text)