steps toward Jython i18n support, still one hard-coded piece to remov…

…e, and some work around languages having unicode issues
sabrams · Jan 30, 2012 · da476b4 · da476b4 · aslakhellesoy · Jan 30, 2012
1 parent d98bf81
commit da476b4
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/jython/pom.xml b/jython/pom.xml
@@ -124,11 +124,13 @@ def engine = new SimpleTemplateEngine()
 def templateSource = new File(project.baseDir, "src${File.separator}main${File.separator}code_generator${File.separator}I18n.jython.txt").getText()
 
 I18n.all.each { i18n ->
-  def binding = ["i18n":i18n]
-  template = engine.createTemplate(templateSource).make(binding)
-  def file = new File(project.baseDir, "target${File.separator}generated-sources${File.separator}i18n${File.separator}java${File.separator}cucumber${File.separator}runtime${File.separator}jython${File.separator}${i18n.underscoredIsoCode.toUpperCase()}.py")
-  file.parentFile.mkdirs()
-  file.write(template.toString(), "UTF-8")
+  if (!["ar", "bg", "he", "is", "ja", "ko", "pl", "ru", "sr_cyrl", "uk", "uz", "zh_cn", "zh_tw"].contains(i18n.underscoredIsoCode)) {
+    def binding = ["i18n":i18n]
+    template = engine.createTemplate(templateSource).make(binding)
+    file = new File(project.baseDir, "target${File.separator}generated-sources${File.separator}i18n${File.separator}java${File.separator}cucumber${File.separator}runtime${File.separator}jython${File.separator}i18n${File.separator}${i18n.underscoredIsoCode.toUpperCase()}.py")
+    file.parentFile.mkdirs()
+    file.write(template.toString(), "UTF-8")
+  }
 }
       ]]></groovy>
 
@@ -143,15 +145,17 @@ I18n.all.each { i18n ->
                 <version>1.7</version>
                 <executions>
                     <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
+                        <id>add-resource</id>
+                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>add-source</goal>
+                            <goal>add-resource</goal>
                         </goals>
                         <configuration>
-                            <sources>
-                                <source>${basedir}/target/generated-sources/i18n/java</source>
-                            </sources>
+                            <resources>
+                                <resource>
+                                  <directory>${basedir}/target/generated-sources/i18n/java</directory>
+                                </resource>
+                            </resources>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/jython/src/main/code_generator/I18n.jython.txt b/jython/src/main/code_generator/I18n.jython.txt
@@ -4,13 +4,4 @@ def keywords = i18n.codeKeywords.collect { kw ->
   Normalizer.normalize(kw,  Normalizer.Form.NFD).replaceAll("\\p{InCombiningDiacriticalMarks}+", "")
 }.unique()
 %>
-class ${keywords[0]}(object):
-  def __init__(self, regexp):
-    self.regexp = regexp
-
-  def __call__(self, func):
-    arity = func.func_code.co_argcount - 1
-    backend.registerStepdef(StepDefinition(self.regexp, func), arity)
-    return func
-
-${keywords.reverse().join(" = ")}
+${keywords.join(" = ")} = I18NKeywordTemplate
diff --git a/jython/src/main/java/cucumber/runtime/jython/JythonBackend.java b/jython/src/main/java/cucumber/runtime/jython/JythonBackend.java
@@ -13,11 +13,15 @@
 import org.python.core.PyString;
 import org.python.util.PythonInterpreter;
 
+import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.List;
 
 public class JythonBackend implements Backend {
     private static final String DSL = "/cucumber/runtime/jython/dsl.py";
+    private static final String EN = "/cucumber/runtime/jython/i18n/EN.py"; // temporary
     private final SnippetGenerator snippetGenerator = new SnippetGenerator(new JythonSnippet());
     private final ResourceLoader resourceLoader;
     private final PythonInterpreter jython;
@@ -29,6 +33,7 @@ public JythonBackend(ResourceLoader resourceLoader, PythonInterpreter jython) {
         this.jython = jython;
         jython.set("backend", this);
         jython.execfile(getClass().getResourceAsStream(DSL), DSL);
+        jython.execfile(getClass().getResourceAsStream(EN), EN);       
     }
 
     public JythonBackend(ResourceLoader resourceLoader) {

diff --git a/jython/src/main/resources/cucumber/runtime/jython/dsl.py b/jython/src/main/resources/cucumber/runtime/jython/dsl.py
@@ -1,11 +1,19 @@
 import re
 from gherkin.formatter import Argument
-
+class I18NKeywordTemplate(object):
+  def __init__(self, regexp):
+    self.regexp = regexp
+
+  def __call__(self, func):
+    arity = func.func_code.co_argcount - 1
+    backend.registerStepdef(StepDefinition(self.regexp, func), arity)
+    return func
+
 class StepDefinition:
   def __init__(self, regexp, func):
-    self.regexp = regexp
-    self.func = func
-
+	self.regexp = regexp
+	self.func = func
+	
   def matched_arguments(self, step_name):
     match = re.match(self.regexp, step_name)
     if(match):
@@ -26,6 +34,6 @@ def execute(self, *args):
   def pattern(self):
     return self.regexp
 
+
 class World:
   """The World"""
-