Merge branch '2.4.x' of github.com:grails/grails-core into 2.4.x

Author: graemerocher

grails-databinding/src/test/groovy/org/grails/databinding/converters/CurrencyConversionSpec.groovy

@@ -18,7 +18,7 @@ class CurrencyConversionSpec extends Specification {
 
         then:
         bank.currency instanceof Currency
-        '$' == bank.currency.symbol
+        'USD' == bank.currency.currencyCode
     }
 }
 

grails-encoder/src/main/groovy/org/codehaus/groovy/grails/plugins/codecs/BasicCodecLookup.java

@@ -27,13 +27,14 @@
 import org.codehaus.groovy.grails.support.encoding.CodecLookup;
 import org.codehaus.groovy.grails.support.encoding.Decoder;
 import org.codehaus.groovy.grails.support.encoding.Encoder;
+import org.codehaus.groovy.grails.support.encoding.StreamingEncoder;
 import org.springframework.beans.factory.InitializingBean;
 
 public class BasicCodecLookup implements CodecLookup, InitializingBean {
     private static final String NONE_CODEC_NAME = "none";
     protected Map<String, Encoder> encoders;
     protected Map<String, Decoder> decoders;
-    public static final Encoder NONE_ENCODER = new NoneEncoder();
+    public static final StreamingEncoder NONE_ENCODER = new NoneEncoder();
 
     public BasicCodecLookup() {
         super();

grails-encoder/src/main/groovy/org/codehaus/groovy/grails/support/encoding/DefaultEncodingStateRegistry.java

@@ -21,6 +21,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.codehaus.groovy.grails.plugins.codecs.BasicCodecLookup;
+
 /**
  * default implementation of {@link EncodingStateRegistry}
  *
@@ -29,7 +31,7 @@
  */
 public final class DefaultEncodingStateRegistry implements EncodingStateRegistry {
     private Map<Encoder, Set<Integer>> encodingTagIdentityHashCodes = new HashMap<Encoder, Set<Integer>>();
-    public static Encoder NONE_ENCODER;
+    public static final StreamingEncoder NONE_ENCODER = BasicCodecLookup.NONE_ENCODER;
 
     private Set<Integer> getIdentityHashCodesForEncoder(Encoder encoder) {
         Set<Integer> identityHashCodes = encodingTagIdentityHashCodes.get(encoder);

grails-encoder/src/main/groovy/org/codehaus/groovy/grails/web/util/GrailsPrintWriter.java

@@ -94,14 +94,40 @@ protected Writer unwrapWriter(Writer writer) {
      * Provides Groovy << left shift operator, but intercepts call to make sure
      * nulls are converted to "" strings
      *
-     * @param value The value
+     * @param obj The value
      * @return Returns this object
      * @throws IOException
      */
-    public GrailsPrintWriter leftShift(Object value) throws IOException {
-        usageFlag = true;
-        if (value != null) {
-            InvokerHelper.write(this, value);
+    public GrailsPrintWriter leftShift(Object obj) throws IOException {
+        if (trouble || obj == null) {
+            usageFlag = true;
+            return this;
+        }
+
+        Class<?> clazz = obj.getClass();
+        if (clazz == String.class) {
+            write((String)obj);
+        }
+        else if (clazz == StreamCharBuffer.class) {
+            write((StreamCharBuffer)obj);
+        }
+        else if (clazz == GStringImpl.class) {
+            write((Writable)obj);
+        }
+        else if (obj instanceof Writable) {
+            write((Writable)obj);
+        }
+        else if (obj instanceof CharSequence) {
+            try {
+                usageFlag = true;
+                getOut().append((CharSequence)obj);
+            }
+            catch (IOException e) {
+                handleIOException(e);
+            }
+        }
+        else {        
+            InvokerHelper.write(this, obj);
         }
         return this;
     }
@@ -517,6 +543,11 @@ public void write(final Writable writable) {
     }
 
     protected void writeWritable(final Writable writable) {
+        if(writable.getClass() == StreamCharBuffer.class) {
+            write((StreamCharBuffer)writable);
+            return;
+        }
+        
         usageFlag = true;
         if (trouble)
             return;

grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/GrailsWebDataBinderSpec.groovy

@@ -1331,7 +1331,7 @@ class GrailsWebDataBinderSpec extends Specification {
 
         then:
         publisher.localCurrency instanceof Currency
-        '$' == publisher.localCurrency.symbol
+        'USD' == publisher.localCurrency.currencyCode
     }
 }
 

grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/sitemesh/FullSitemeshLifeCycleTests.groovy

@@ -192,4 +192,46 @@ class FullSitemeshLifeCycleTests extends AbstractGrailsTagTests {
 
         assertEquals 'good', result
     }
+    
+    // GRAILS-11484
+    void testMultilineTitle() {
+        def template = '''
+<html>
+        <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+This is the title
+</title></head>
+        <body onload="test();">body text</body>
+</html>
+'''
+
+        assertOutputEquals '''
+<html>
+        <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+This is the title
+</title></head>
+        <body onload="test();">body text</body>
+</html>
+''', template
+
+        def layout = '''
+<html>
+    <head><title>Decorated <g:layoutTitle /></title><g:layoutHead /></head>
+    <body><h1>Hello</h1><g:layoutBody /></body>
+</html>
+'''
+        def result = applyLayout(layout, template)
+
+        assertEquals '''
+<html>
+    <head><title>Decorated 
+This is the title
+</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+    <body><h1>Hello</h1>body text</body>
+</html>
+''', result
+    }
+
 }

grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPageOutputStack.java

@@ -51,10 +51,11 @@ public static GroovyPageOutputStack currentStack(boolean allowCreate) {
     }
 
     public static GroovyPageOutputStack currentStack(GrailsWebRequest request, boolean allowCreate) {
-        if (allowCreate) {
-            return currentStack(request, allowCreate, null, allowCreate, false);
+        GroovyPageOutputStack outputStack = lookupStack(request);
+        if (outputStack == null && allowCreate) {
+            outputStack = currentStack(request, allowCreate, null, allowCreate, false);
         }
-        return lookupStack(request);
+        return outputStack;
     }
 
     public static GroovyPageOutputStack currentStack(boolean allowCreate, Writer topWriter, boolean autoSync, boolean pushTop) {
@@ -75,16 +76,16 @@ public static GroovyPageOutputStack currentStack(GroovyPageOutputStackAttributes
         }
 
         if (attributes.isAllowCreate()) {
-            if (attributes.getTopWriter() == null) {
-                attributes=new GroovyPageOutputStackAttributes.Builder(attributes).topWriter(lookupRequestWriter(attributes.getWebRequest())).build();
-            }
             return createNew(attributes);
         }
 
         return null;
     }
 
     private static final GroovyPageOutputStack createNew(GroovyPageOutputStackAttributes attributes) {
+        if (attributes.getTopWriter() == null) {
+            attributes=new GroovyPageOutputStackAttributes.Builder(attributes).topWriter(lookupRequestWriter(attributes.getWebRequest())).build();
+        }
         GroovyPageOutputStack instance = new GroovyPageOutputStack(attributes);
         attributes.getWebRequest().setAttribute(
                 ATTRIBUTE_NAME_OUTPUT_STACK, instance, RequestAttributes.SCOPE_REQUEST);

grails-web-sitemesh/src/main/groovy/org/codehaus/groovy/grails/web/sitemesh/GSPSitemeshPage.java

@@ -93,7 +93,7 @@ public void writeHead(Writer out) throws IOException {
             }
             String headAsString = headBuffer.toString();
             // strip out title for sitemesh version of <head>
-            out.write(headAsString.replaceFirst("<title(\\s[^>]*)?>(.*?)</title>",""));
+            out.write(headAsString.replaceFirst("(?is)<title(\\s[^>]*)?>(.*?)</title>",""));
         }
         else {
             headBuffer.writeTo(out);