October 2011 - Jrst-commits - mailman.cloud.codelutin.com

r625 - trunk
by maven-release＠users.nuiton.org Oct. 28, 2011

Oct. 28, 2011

Author: maven-release Date: 2011-10-28 23:25:19 +0200 (Fri, 28 Oct 2011) New Revision: 625 Url: http://nuiton.org/repositories/revision/jrst/625 Log: Update mavenpom4redmineAndCentral to 3.0.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 15:03:30 UTC (rev 624) +++ trunk/pom.xml 2011-10-28 21:25:19 UTC (rev 625) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.4</version> + <version>3.0.5</version> </parent> <artifactId>jrst</artifactId>

1 0

r624 - in trunk/jrst/src: main/java/org/nuiton/jrst main/resources test/resources
by sletellier＠users.nuiton.org Oct. 28, 2011

Oct. 28, 2011

Author: sletellier Date: 2011-10-28 17:03:30 +0200 (Fri, 28 Oct 2011) New Revision: 624 Url: http://nuiton.org/repositories/revision/jrst/624 Log: - Replace DocumentResolver by FasterCachedResourceResolver - Fix #1661 : Error with RST transformation in MS Windows Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java trunk/jrst/src/main/resources/log4j.properties trunk/jrst/src/test/resources/log4j.properties Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-10-28 14:10:56 UTC (rev 623) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-10-28 15:03:30 UTC (rev 624) @@ -26,7 +26,36 @@ package org.nuiton.jrst; -import static org.nuiton.jrst.ReStructuredText.*; +import static org.nuiton.jrst.ReStructuredText.ADDRESS; +import static org.nuiton.jrst.ReStructuredText.AUTHOR; +import static org.nuiton.jrst.ReStructuredText.AUTHORS; +import static org.nuiton.jrst.ReStructuredText.BULLET_LIST; +import static org.nuiton.jrst.ReStructuredText.CLASSIFIER; +import static org.nuiton.jrst.ReStructuredText.CONTACT; +import static org.nuiton.jrst.ReStructuredText.COPYRIGHT; +import static org.nuiton.jrst.ReStructuredText.DATE; +import static org.nuiton.jrst.ReStructuredText.DEFINITION; +import static org.nuiton.jrst.ReStructuredText.DEFINITION_LIST; +import static org.nuiton.jrst.ReStructuredText.DOCINFO; +import static org.nuiton.jrst.ReStructuredText.EMPHASIS; +import static org.nuiton.jrst.ReStructuredText.ENUMERATED_LIST; +import static org.nuiton.jrst.ReStructuredText.FIELD_BODY; +import static org.nuiton.jrst.ReStructuredText.FIELD_LIST; +import static org.nuiton.jrst.ReStructuredText.FIELD_NAME; +import static org.nuiton.jrst.ReStructuredText.LIST_ITEM; +import static org.nuiton.jrst.ReStructuredText.LITERAL; +import static org.nuiton.jrst.ReStructuredText.LITERAL_BLOCK; +import static org.nuiton.jrst.ReStructuredText.ORGANIZATION; +import static org.nuiton.jrst.ReStructuredText.PARAGRAPH; +import static org.nuiton.jrst.ReStructuredText.REVISION; +import static org.nuiton.jrst.ReStructuredText.SECTION; +import static org.nuiton.jrst.ReStructuredText.STATUS; +import static org.nuiton.jrst.ReStructuredText.STRONG; +import static org.nuiton.jrst.ReStructuredText.TABLE; +import static org.nuiton.jrst.ReStructuredText.TITLE; +import static org.nuiton.jrst.ReStructuredText.TITLE_CHAR; +import static org.nuiton.jrst.ReStructuredText.TRANSITION; +import static org.nuiton.jrst.ReStructuredText.VERSION; import java.io.File; import java.io.IOException; @@ -52,6 +81,7 @@ import org.dom4j.Text; import org.dom4j.io.DocumentResult; import org.dom4j.io.DocumentSource; +import org.nuiton.util.FasterCachedResourceResolver; import org.xml.sax.ContentHandler; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -181,7 +211,7 @@ if (uriResolver != null) { factory.setURIResolver(uriResolver); } else { - factory.setURIResolver(new DocumentResolver(stylesheet)); + factory.setURIResolver(new FasterCachedResourceResolver(stylesheet.toString())); } Transformer transformer = factory.newTransformer(new StreamSource( stylesheet.openStream())); @@ -216,7 +246,7 @@ if (uriResolver != null) { factory.setURIResolver(uriResolver); } else { - factory.setURIResolver(new DocumentResolver(stylesheet)); + factory.setURIResolver(new FasterCachedResourceResolver(stylesheet.toString())); } Transformer transformer = factory.newTransformer(new StreamSource( @@ -233,59 +263,6 @@ return transformedDoc; } - static public class DocumentResolver implements URIResolver, EntityResolver { - - URL baseURL; - - public DocumentResolver(URL url) throws MalformedURLException { - String path = new File(url.getPath()).getParent(); - baseURL = new URL(url.getProtocol(), url.getHost(), url.getPort(), - path); - } - - @Override - public Source resolve(String href, String base) - throws TransformerException { - try { - URL url = null; - if (href == null) { - url = baseURL; - } else { - String path = baseURL.getPath(); - if (path.startsWith("file:")) { - path = "file:" - + new File(path.substring("file:".length()), - href).getCanonicalPath(); - } else { - path = new File(path, href).getCanonicalPath(); - } - url = new URL(baseURL.getProtocol(), baseURL.getHost(), - baseURL.getPort(), path); - } - log.debug("** resolve href: '" + href + "' base: '" + base - + "' return: '" + url + "'"); - Source result = new StreamSource(url.openStream()); - return result; - } catch (MalformedURLException eee) { - throw new TransformerException("Can't create url ", eee); - } catch (IOException eee) { - throw new TransformerException("Can't read url", eee); - } - } - - /* - * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String) - */ - @Override - public InputSource resolveEntity(String publicId, String systemId) - throws SAXException, IOException { - log.debug("## resolveEntity publicId '" + publicId - + "' systemId: '" + systemId + "'"); - return null; - } - - } - protected String string(String s, int number) { String result = ""; for (int i = 0; i < number; i++) { Modified: trunk/jrst/src/main/resources/log4j.properties =================================================================== --- trunk/jrst/src/main/resources/log4j.properties 2011-10-28 14:10:56 UTC (rev 623) +++ trunk/jrst/src/main/resources/log4j.properties 2011-10-28 15:03:30 UTC (rev 624) @@ -23,7 +23,7 @@ # #L% ### # Global logging configuration -log4j.rootLogger=WARN, stdout +log4j.rootLogger=INFO, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender @@ -31,4 +31,4 @@ log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # package level -log4j.logger.org.nuiton.jrst=WARN +log4j.logger.org.nuiton.jrst=INFO Modified: trunk/jrst/src/test/resources/log4j.properties =================================================================== --- trunk/jrst/src/test/resources/log4j.properties 2011-10-28 14:10:56 UTC (rev 623) +++ trunk/jrst/src/test/resources/log4j.properties 2011-10-28 15:03:30 UTC (rev 624) @@ -23,7 +23,7 @@ # #L% ### # Global logging configuration -log4j.rootLogger=ERROR, stdout +log4j.rootLogger=INFO, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

1 0

r623 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs test/resources/bugs
by sletellier＠users.nuiton.org Oct. 28, 2011

Oct. 28, 2011

Author: sletellier Date: 2011-10-28 16:10:56 +0200 (Fri, 28 Oct 2011) New Revision: 623 Url: http://nuiton.org/repositories/revision/jrst/623 Log: #1788 Option argument not parsed Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/OptionTest.java trunk/jrst/src/test/resources/bugs/testOptionArgumentSize1788.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-10-27 11:39:00 UTC (rev 622) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-10-28 14:10:56 UTC (rev 623) @@ -764,7 +764,8 @@ option_argument = matcher.group().substring(1, matcher.group().length()); option.addAttribute(OPTIONARGUMENT, option_argument); - if (option_stringTmp.charAt(option_argument.length() + 1) == ',') { + int size = option_argument.length() + 1; + if (option_stringTmp.length() < size && option_stringTmp.charAt(size) == ',') { delimiter = ','; } else { done = true; Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/OptionTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/OptionTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/OptionTest.java 2011-10-28 14:10:56 UTC (rev 623) @@ -0,0 +1,43 @@ +package org.nuiton.jrst.bugs; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; + +import java.io.File; +import java.io.IOException; + +/** + * Test concernant les options. + * + * @author sletellier + */ +public class OptionTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(AdmonitionTest.class); + + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + + /** + * Test que les options des options dans des listes sont bien parsée + * parsées. + * + * @throws Exception + */ + @Test + public void testOptionArgumentSizeInList() throws Exception { + File in = new File("src/test/resources/bugs/testOptionArgumentSize1788.rst"); + File out = File.createTempFile("jrst-testOptionArgumentSize1788", ".html"); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + } + +} Added: trunk/jrst/src/test/resources/bugs/testOptionArgumentSize1788.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testOptionArgumentSize1788.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testOptionArgumentSize1788.rst 2011-10-28 14:10:56 UTC (rev 623) @@ -0,0 +1,2 @@ + +--import <file.zip>

1 0

r622 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs test/resources/bugs
by sletellier＠users.nuiton.org Oct. 27, 2011

Oct. 27, 2011

Author: sletellier Date: 2011-10-27 13:39:00 +0200 (Thu, 27 Oct 2011) New Revision: 622 Url: http://nuiton.org/repositories/revision/jrst/622 Log: - #1787 Admonition not parsed - Create test Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-09-22 17:25:48 UTC (rev 621) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-10-27 11:39:00 UTC (rev 622) @@ -1089,7 +1089,7 @@ String line = in.readLine(); if (line != null) { String lineTest = line.toLowerCase(); - Pattern pAdmonition = Pattern.compile("^\\.\\.\\s*(" + Pattern pAdmonition = Pattern.compile("^\\s*\\.\\.\\s(" + ADMONITION_PATTERN + ")::\\s*(.*)$"); Matcher matcher = pAdmonition.matcher(lineTest); Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java 2011-10-27 11:39:00 UTC (rev 622) @@ -0,0 +1,49 @@ +package org.nuiton.jrst.bugs; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; + +import java.io.File; +import java.io.IOException; + +/** + * Test concernant les admonitions. + * + * @author sletellier + */ +public class AdmonitionTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(AdmonitionTest.class); + + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + + /** + * Test que les options des admonitions dans des listes sont bien parsée + * parsées. + * + * @throws Exception + */ + @Test + public void testAdmonitionInList() throws Exception { + File in = new File("src/test/resources/bugs/testAdminitionInList1787.rst"); + File out = File.createTempFile("jrst-testAdminitionInList1787", ".html"); +// out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + +// Must contains <div class="note"> + Assert.assertTrue(content.contains("<div class=\"note\">")); + } + +} Added: trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst 2011-10-27 11:39:00 UTC (rev 622) @@ -0,0 +1,5 @@ +* item + + .. Note:: note + +* item2

1 0