Author: lryan
Date: Fri Nov 7 14:27:38 2008
New Revision: 712293
URL: http://svn.apache.org/viewvc?rev=712293&view=rev
Log:
Make the sime Neko parser the default
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParserTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JsTagConcatContentRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagContentRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java?rev=712293&r1=712292&r2=712293&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
Fri Nov 7 14:27:38 2008
@@ -17,9 +17,11 @@
*/
package org.apache.shindig.gadgets.parse;
-import com.google.inject.ImplementedBy;
import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.parse.caja.CajaHtmlParser;
+import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
+
+import com.google.inject.ImplementedBy;
+
import org.w3c.dom.Document;
/**
@@ -30,7 +32,7 @@
*
* [EMAIL PROTECTED] ParsedHtmlNode} for parsing details
*/
[EMAIL PROTECTED](CajaHtmlParser.class)
[EMAIL PROTECTED](NekoSimplifiedHtmlParser.class)
public abstract class GadgetHtmlParser {
/**
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java?rev=712293&r1=712292&r2=712293&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
Fri Nov 7 14:27:38 2008
@@ -17,9 +17,11 @@
*/
package org.apache.shindig.gadgets.parse;
+import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
+
import com.google.inject.AbstractModule;
import com.google.inject.Provider;
-import org.apache.shindig.gadgets.parse.caja.CajaHtmlParser;
+
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.bootstrap.DOMImplementationRegistry;
@@ -33,8 +35,7 @@
*/
@Override
protected void configure() {
- //bind(GadgetHtmlParser.class).to(NekoHtmlParser.class);
- bind(GadgetHtmlParser.class).to(CajaHtmlParser.class);
+ bind(GadgetHtmlParser.class).to(NekoSimplifiedHtmlParser.class);
bind(DOMImplementation.class).toProvider(DOMImplementationProvider.class);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParserTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParserTest.java?rev=712293&r1=712292&r2=712293&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParserTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParserTest.java
Fri Nov 7 14:27:38 2008
@@ -17,12 +17,14 @@
*/
package org.apache.shindig.gadgets.parse.nekohtml;
-import junit.framework.TestCase;
import org.apache.shindig.gadgets.parse.ParseModule;
+
import org.apache.xml.serialize.HTMLSerializer;
import org.apache.xml.serialize.OutputFormat;
import org.w3c.dom.Document;
+import junit.framework.TestCase;
+
import java.io.IOException;
import java.io.StringWriter;
@@ -56,6 +58,19 @@
"<HTML><head></head><body><br />content<br></body></HTML>");
}
+ /*
+ public void testLarge() throws Exception {
+ String file = "<some bug file>"
+ File inputFile = new File(file);
+ if (!inputFile.exists() || !inputFile.canRead()) {
+ System.err.println("Input file: " + file + " not found or can't be
read.");
+ System.exit(1);
+ }
+ String content = new String(IOUtils.toByteArray(new
FileInputStream(file)));
+ parseAndCompareBalanced(content, content);
+ }
+ */
+
private void parseAndCompareBalanced(String content, String expected) throws
Exception {
NekoSimplifiedHtmlParser builder = new NekoSimplifiedHtmlParser(
new ParseModule.DOMImplementationProvider().get());
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JsTagConcatContentRewriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JsTagConcatContentRewriterTest.java?rev=712293&r1=712292&r2=712293&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JsTagConcatContentRewriterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JsTagConcatContentRewriterTest.java
Fri Nov 7 14:27:38 2008
@@ -54,43 +54,43 @@
}
public void testJSMergeSingleScriptReWrite() throws Exception {
- String s = "<script src=\"http://a.b.com/1.js\";></script>";
- String expected = "<head></head><script src=\"" + concatBase +
"1=http%3A%2F%2Fa.b.com%2F1.js\"></script>";
+ String s = "<head><script src=\"http://a.b.com/1.js\";></script><head>";
+ String expected = "<head><script src=\"" + concatBase +
"1=http%3A%2F%2Fa.b.com%2F1.js\"></script></head>";
String rewritten = rewriteHelper(rewriter, s);
assertEquals(rewritten, expected);
}
public void testJSMergeTwoScriptReWriteWithWhitespace() throws Exception {
- String s = "<script src=\"http://a.b.com/1.js\";></script>"
- + "<script src=\"http://a.b.com/2.js\";></script>";
+ String s = "<head><script src=\"http://a.b.com/1.js\";></script>"
+ + "<script src=\"http://a.b.com/2.js\";></script></head>";
String expected
- = "<head></head><script src=\"" + concatBase +
"1=http%3A%2F%2Fa.b.com%2F1.js&2=http%3A%2F%2Fa.b.com%2F2.js\"></script>";
+ = "<head><script src=\"" + concatBase +
"1=http%3A%2F%2Fa.b.com%2F1.js&2=http%3A%2F%2Fa.b.com%2F2.js\"></script></head>";
String rewritten = rewriteHelper(rewriter, s);
assertEquals(rewritten, expected);
}
public void testJSMergeLeadAndTrailingScriptReWrite() throws Exception {
- String s = "<script>\n"
+ String s = "<body><script>\n"
+ "doSomething\n"
+ "</script>"
+ "<script src=\"http://a.b.com/1.js\";></script>"
+ "<script src=\"http://a.b.com/2.js\";></script>"
+ "<script>\n"
+ "doSomething\n"
- + "</script>";
- String expected = "<head></head><script>\n"
+ + "</script></body>";
+ String expected = "<head></head><body><script>\n"
+ "doSomething\n"
+ "</script>"
+ "<script src=\"" + concatBase +
"1=http%3A%2F%2Fa.b.com%2F1.js&2=http%3A%2F%2Fa.b.com%2F2.js\"></script>"
+ "<script>\n"
+ "doSomething\n"
- + "</script>";
+ + "</script></body>";
String rewritten = rewriteHelper(rewriter, s);
assertEquals(rewritten, expected);
}
public void testJSMergeInterspersed() throws Exception {
- String s = "<script src=\"http://a.b.com/1.js\";></script>"
+ String s = "<head></head><script src=\"http://a.b.com/1.js\";></script>"
+ "<script src=\"http://a.b.com/2.js\";></script>"
+ "<script><!-- doSomething --></script>"
+ "<script src=\"http://a.b.com/3.js\";></script>"
@@ -104,7 +104,7 @@
}
public void testJSMergeDerelativizeHostRelative() throws Exception {
- String s = "<script src=\"/1.js\"></script>";
+ String s = "<head></head><script src=\"/1.js\"></script>";
String expected
= "<head></head><script src=\"" + concatBase +
"1=http%3A%2F%2Fexample.org%2F1.js\"></script>";
String rewritten = rewriteHelper(rewriter, s);
@@ -112,7 +112,7 @@
}
public void testJSMergeDerelativizePathRelative() throws Exception {
- String s = "<script src=\"1.js\"></script>";
+ String s = "<head></head><script src=\"1.js\"></script>";
String expected
= "<head></head><script src=\"" + concatBase +
"1=http%3A%2F%2Fexample.org%2Fdir%2F1.js\"></script>";
String rewritten = rewriteHelper(rewriter, s);
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagContentRewriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagContentRewriterTest.java?rev=712293&r1=712292&r2=712293&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagContentRewriterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagContentRewriterTest.java
Fri Nov 7 14:27:38 2008
@@ -43,13 +43,13 @@
public void testLinkingTagStandardRewrite() throws Exception {
String s = "<img src=\"http://a.b.com/img.gif\";></img>"
- + "<IMG src=\"http://a.b.com/img2.gif\"/>"
- + "<eMbeD src=\"http://a.b.com/some.mov\"/>"
+ + "<img src=\"http://a.b.com/img2.gif\"/>"
+ + "<embed src=\"http://a.b.com/some.mov\";></embed>"
+ "<link href=\"http://a.b.com/link.html\";></link>";
- String expected = "<head></head><img src=\"" + LINK_PREFIX +
"http://a.b.com/img.gif\";>"
+ String expected = "<head></head><BODY><img src=\"" + LINK_PREFIX +
"http://a.b.com/img.gif\";>"
+ "<img src=\"" + LINK_PREFIX + "http://a.b.com/img2.gif\";>"
+ "<embed src=\"" + LINK_PREFIX + "http://a.b.com/some.mov\";></embed>"
- + "<link href=\"" + LINK_PREFIX + "http://a.b.com/link.html\";>";
+ + "<link href=\"" + LINK_PREFIX + "http://a.b.com/link.html\";></BODY>";
String rewritten = rewriteHelper(rewriter, s);
assertEquals(rewritten, expected);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java?rev=712293&r1=712292&r2=712293&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
Fri Nov 7 14:27:38 2008
@@ -18,11 +18,15 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.parse.ParseModule;
-import static org.junit.Assert.*;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -47,7 +51,8 @@
Document document = mhc.getDocument();
assertEquals(2, document.getFirstChild().getChildNodes().getLength());
- assertTrue(document.getFirstChild().getChildNodes().item(1).getNodeType()
== Node.TEXT_NODE);
+
assertTrue(document.getFirstChild().getChildNodes().item(1).getFirstChild().getNodeType()
==
+ Node.TEXT_NODE);
assertEquals(content,
document.getFirstChild().getChildNodes().item(1).getTextContent());
assertSame(content, mhc.getContent());
![http://a.b.com/img.gif\"](http://a.b.com/img.gif\"){kind=link}
![http://a.b.com/img2.gif\"/](http://a.b.com/img2.gif\"/){kind=link}
![http://a.b.com/img2.gif\"](http://a.b.com/img2.gif\"){kind=link}