svn commit: r965561 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java

[jo...@apache.org]

Author: johnh
Date: Mon Jul 19 17:14:05 2010
New Revision: 965561

URL: http://svn.apache.org/viewvc?rev=965561&view=rev
Log:
Trim leading and trailing whitespaces before converting the URIs to their proxied forms.

Patch provided by Anupama Dutta.


Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java?rev=965561&r1=965560&r2=965561&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java Mon Jul 19 17:14:05 2010
@@ -97,7 +97,7 @@ public class ProxyingVisitor implements 
     for (Node node : nodes) {
       Element element = (Element)node;
       String nodeName = node.getNodeName().toLowerCase();
-      String uriStr = element.getAttribute(RESOURCE_TAGS.get(nodeName));
+      String uriStr = element.getAttribute(RESOURCE_TAGS.get(nodeName)).trim();
       try {
         reservedUris.add(new ProxyUriManager.ProxyUri(gadget, Uri.parse(uriStr)));
       } catch (UriException e) {

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java?rev=965561&r1=965560&r2=965561&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java Mon Jul 19 17:14:05 2010
@@ -116,10 +116,11 @@ public class ProxyingVisitorTest extends
     Element e1 = elem("script", "src", scriptSrc);
     Element e2 = elem("script", "src", "^!,,|BLARGH");
     Element e3 = elem("IMG", "src", imgSrc);
-    List<Node> nodes = ImmutableList.<Node>of(e1, e2, e3);
+    Element e4 = elem("script", "src", " " + scriptSrc + " ");
+    List<Node> nodes = ImmutableList.<Node>of(e1, e2, e3, e4);
     ProxyUriManager uriManager = createMock(ProxyUriManager.class);
     Uri rewrittenUri = Uri.parse("http://bar.com/");
-    List<Uri> returned = Lists.newArrayList(rewrittenUri, null, rewrittenUri);
+    List<Uri> returned = Lists.newArrayList(rewrittenUri, null, rewrittenUri, rewrittenUri);
     ContentRewriterFeature.Config config = createMock(ContentRewriterFeature.Config.class);
     Integer expires = new Integer(3);
     expect(config.getExpires()).andReturn(expires).once();
@@ -134,13 +135,15 @@ public class ProxyingVisitorTest extends
     assertTrue(rewriter.revisit(gadget, nodes));
     verify(config, uriManager);
 
-    assertEquals(3, cap.getValue().size());
+    assertEquals(4, cap.getValue().size());
     assertEquals(Uri.parse(scriptSrc), cap.getValue().get(0).getResource());
     assertNull(cap.getValue().get(1));
     assertEquals(Uri.parse(imgSrc), cap.getValue().get(2).getResource());
+    assertEquals(Uri.parse(scriptSrc), cap.getValue().get(3).getResource());
     assertSame(expires, intCap.getValue());
     assertEquals(rewrittenUri.toString(), e1.getAttribute("src"));
     assertEquals("^!,,|BLARGH", e2.getAttribute("src"));
     assertEquals(rewrittenUri.toString(), e3.getAttribute("src"));
+    assertEquals(rewrittenUri.toString(), e4.getAttribute("src"));
   }
 }