Permalink
Browse files

For now don't upgrade Grails

  • Loading branch information...
1 parent 8a83d63 commit 600e4d169b851b538445f81ff5e79477e36e95ca @bmuschko committed May 1, 2014
View
7 application.properties
@@ -1,4 +1,5 @@
#Grails Metadata file
-#Wed Mar 12 01:18:49 CET 2014
-app.grails.version=2.3.7
-app.servlet.version=2.5
+#Wed Apr 30 21:34:44 EDT 2014
+app.grails.version=2.0.1
+app.name=grails-google-visualization
+plugins.tomcat=2.0.1
View
6 grails-app/conf/BuildConfig.groovy
@@ -11,8 +11,8 @@ grails.project.dependency.resolution = {
}
plugins {
- build (":tomcat:7.0.52.1", ":release:3.0.1", ":rest-client-builder:2.0.1") {
- export = false
- }
+ build(':release:2.0.4', ':rest-client-builder:1.0.2') {
+ export = false
+ }
}
}
View
4 grails-app/views/_visualization_javascript.gsp
@@ -10,7 +10,7 @@
<%=visualizationData.name%>_data.addColumn('<%=column[0]%>', '<%=column[1]%>');
</g:each>
<g:each var="row" in="${visualizationData.rows}">
- <%=visualizationData.name%>_data.addRow(<%=raw(row)%>);
+ <%=visualizationData.name%>_data.addRow(<%=row%>);
</g:each>
<%=visualizationData.name%> = new <%=visualizationData.visualization.object%>(document.getElementById('<%=visualizationData.elementId%>'));
@@ -21,7 +21,7 @@
google.visualization.events.addListener(<%=visualizationData.name%>, '<%=beforeDrawEvent.key%>', <%=beforeDrawEvent.value%>);
</g:each>
- <%=visualizationData.name%>.draw(<%=visualizationData.name%>_data, <%=raw(visualizationData.options)%>);
+ <%=visualizationData.name%>.draw(<%=visualizationData.name%>_data, <%=visualizationData.options%>);
<g:each var="afterDrawEvent" in="${visualizationData.afterDrawEvents}">
google.visualization.events.addListener(<%=visualizationData.name%>, '<%=afterDrawEvent.key%>', <%=afterDrawEvent.value%>);
View
20 test/unit/org/grails/plugins/google/visualization/data/renderer/ObjectRendererTests.groovy
@@ -25,15 +25,15 @@ class ObjectRendererTests extends GrailsUnitTestCase {
void testRenderValue() {
assertEquals "{stroke: 'black', fill: '#eee', strokeSize: 1}", ObjectRenderer.instance.renderValue(new Expando(stroke:'black', fill:'#eee', strokeSize: 1)).toString()
}
+
+ void testRenderValueRealObject() {
+ def simpleObject = new SimpleClass(a: "xxx", b: 123)
+ def renderedObject = ObjectRenderer.instance.renderValue(simpleObject)
+ assertEquals "{b: 123, a: 'xxx'}", renderedObject.toString()
+ }
- void testRenderValueRealObject() {
- def simpleObject = new SimpleClass(a: "xxx", b: 123)
- def renderedObject = ObjectRenderer.instance.renderValue(simpleObject)
- assertEquals "{b: 123, a: 'xxx'}", renderedObject.toString()
- }
-
- class SimpleClass {
- String a
- int b
- }
+ class SimpleClass {
+ String a
+ int b
+ }
}

2 comments on commit 600e4d1

@tcrossland

Any reason not to use raw() encoding in the GSP? Without this, version 0.7 of the plugin is currently not working (at least not with Grails 2.3.x y 2.4.x).

@bmuschko
Owner

Waiting for pull request #30 to be in the desired state. I am still looking for somebody to finish that up (see comments).

Please sign in to comment.