Merge lp:~renamer-developers/renamer/900657-unicode-templates into lp:renamer

[Jonathan Jacobs]

=== modified file 'renamer/application.py'
--- renamer/application.py	2011-09-12 21:12:16 +0000
+++ renamer/application.py	2011-12-06 09:20:31 +0000
@@ -30,10 +30,6 @@
     optParameters = [
         ('config', 'c', '~/.renamer/renamer.conf',
          'Configuration file path.'),
-        ('name',   'e', None,
-         'Formatted filename.', string.Template),
-        ('prefix', 'p', None,
-         'Formatted path to prefix to files before renaming.', string.Template),
         ('concurrency', 'l',  10,
          'Maximum number of asynchronous tasks to perform concurrently.', int)]
 
@@ -56,6 +52,7 @@
     def __init__(self, config):
         super(Options, self).__init__()
         self['verbosity'] = 1
+        self['name'] = self['prefix'] = None
         self.config = config
 
 
@@ -65,11 +62,22 @@
             os.path.basename(sys.argv[0]),)
 
 
-    def postOptions(self):
-        if self['name'] is not None:
-            self['name'] = self.decodeCommandLine(self['name'])
-        if self['prefix'] is not None:
-            self['prefix'] = self.decodeCommandLine(self['prefix'])
+    def opt_name(self, option):
+        """
+        Formatted filename.
+        """
+        self['name'] = string.Template(self.decodeCommandLine(option))
+
+    opt_e = opt_name
+
+
+    def opt_prefix(self, option):
+        """
+        Formatted path to prefix to files before renaming.
+        """
+        self['prefix'] = string.Template(self.decodeCommandLine(option))
+
+    opt_p = opt_prefix
 
 
     def opt_verbose(self):

=== added file 'renamer/test/test_application.py'
--- renamer/test/test_application.py	1970-01-01 00:00:00 +0000
+++ renamer/test/test_application.py	2011-12-06 09:20:31 +0000
@@ -0,0 +1,38 @@
+import string
+
+from twisted.python.filepath import FilePath
+from twisted.trial.unittest import TestCase
+
+from renamer import config
+from renamer.application import Options
+
+
+
+class OptionsTests(TestCase):
+    """
+    Tests for L{renamer.application.Options}.
+    """
+    def setUp(self):
+        path = FilePath(__file__).sibling('data').child('test.conf')
+        self.config = config.ConfigFile(path)
+        self.options = Options(self.config)
+
+
+    def test_parsePrefix(self):
+        """
+        Prefix options are decoded to C{unicode} before being wrapped in
+        C{string.Template}.
+        """
+        self.options.parseOptions(['--prefix=foo'])
+        self.assertIdentical(string.Template, type(self.options['prefix']))
+        self.assertIdentical(unicode, type(self.options['prefix'].template))
+
+
+    def test_parseName(self):
+        """
+        Name options are decoded to C{unicode} before being wrapped in
+        C{string.Template}.
+        """
+        self.options.parseOptions(['--name=foo'])
+        self.assertIdentical(string.Template, type(self.options['name']))
+        self.assertIdentical(unicode, type(self.options['name'].template))