Support correct attrs in render parameters

Refs #7, #8
iamthechad · Sep 6, 2015 · a88f449 · a88f449
1 parent 8ce83f2
commit a88f449
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/grails-app/services/com/megatome/grails/RecaptchaService.groovy b/grails-app/services/com/megatome/grails/RecaptchaService.groovy
@@ -111,7 +111,7 @@ class RecaptchaService {
 
     /**
      * Create a JSON-like string containing parameters to be passed to the ReCaptcha JavScript object when using explicit mode.
-     * @param props Options for rendering; <code>theme</code>, <code>type</code>, <code>tabindex</code> are currently supported
+     * @param props Options for rendering; <code>theme</code>, <code>type</code>, <code>tabindex</code>, <code>callback</code>, <code>expired-callback</code> are currently supported
      * @return
      */
     def createRenderParameters(props) {

diff --git a/grails-app/taglib/com/megatome/grails/RecaptchaTagLib.groovy b/grails-app/taglib/com/megatome/grails/RecaptchaTagLib.groovy
@@ -20,8 +20,8 @@ class RecaptchaTagLib {
     static namespace = "recaptcha"
     RecaptchaService recaptchaService
     MailhideService mailhideService
-    private def commonAttrNames = ["theme", "lang", "type", "tabindex", "successCallback", "expiredCallback"]
-    private def normalAttrNames = commonAttrNames + "includeScript"
+    private def commonAttrNames = ["theme", "type", "size", "tabindex", "successCallback", "expiredCallback"]
+    private def normalAttrNames = commonAttrNames + "includeScript" + "lang"
     private def explicitAttrNames = ["lang", "loadCallback"]
 
     /**
@@ -46,6 +46,7 @@ class RecaptchaTagLib {
      * Create and display a ReCaptcha instance. Supports the following attributes:
      * <ul>
      * <li>theme - Can be one of 'dark' or 'light'. Defaults to 'light'</li>
+     * <li>size - Can be one of 'compact' or 'normal'. Defaults to 'normal'</li>
      * <li>lang  - Can be one of 'en','nl','fr','de','pt','ru','es','tr'</li>
      * <li>type - Can be one of 'image' or 'audio'. Defaults to 'image'</li>
      * <li>successCallback - Optional function to be called when the user submits a successful response.</li>
@@ -88,8 +89,8 @@ class RecaptchaTagLib {
      * Supports the following attributes:
      * <ul>
      * <li>theme - Can be one of 'dark' or 'light'. Defaults to 'light'</li>
-     * <li>lang  - Can be one of 'en','nl','fr','de','pt','ru','es','tr'</li>
      * <li>type - Can be one of 'image' or 'audio'. Defaults to 'image'</li>
+     * <li>size - Can be one of 'compact' or 'normal'. Defaults to 'normal'</li>
      * <li>successCallback - Optional function to be called when the user submits a successful response.</li>
      * <li>expiredCallback - Optional function to be called when the successful response has expired.</li>
      * <li>tabindex - Tabindex of the captcha, if required.</li>

diff --git a/src/main/groovy/com/megatome/grails/recaptcha/ReCaptcha.groovy b/src/main/groovy/com/megatome/grails/recaptcha/ReCaptcha.groovy
@@ -2,7 +2,7 @@ package com.megatome.grails.recaptcha
 
 import com.megatome.grails.recaptcha.net.AuthenticatorProxy
 import com.megatome.grails.recaptcha.net.Post
-import com.megatome.grails.recaptcha.net.QueryString
+import com.megatome.grails.recaptcha.net.QueryParams
 
 /**
  * Copyright 2010-2015 Megatome Technologies
@@ -26,7 +26,7 @@ public class ReCaptcha {
     private static final String BASE_URL = "https://www.google.com/recaptcha/api"
     public static final String VERIFY_URL = "/siteverify"
     public static final String JS_URL = BASE_URL + ".js"
-    private static final Map<String, String> PARAMETER_MAPPING = ['theme': 'theme', 'type': 'type', 'successCallback': 'callback', 'expiredCallback': 'expired-callback', 'tabindex': 'tabindex']
+    private static final Map<String, String> PARAMETER_MAPPING = ['theme': 'theme', 'type': 'type', 'size': 'size', 'successCallback': 'callback', 'expiredCallback': 'expired-callback', 'tabindex': 'tabindex']
     private static final String AUTOMATIC_PREFIX = "data-"
 
     String publicKey
@@ -112,7 +112,7 @@ public class ReCaptcha {
      * @return
      */
     public static String createScriptTag(Map options) {
-        def qs = new QueryString()
+        def qs = new QueryParams()
         if (options?.lang) {
             qs.add("hl", URLEncoder.encode(options.remove("lang")))
         }
@@ -125,7 +125,7 @@ public class ReCaptcha {
      * @return
      */
     private static String createScriptTagExplicit(Map options) {
-        def qs = new QueryString()
+        def qs = new QueryParams()
         if (options?.lang) {
             qs.add("hl", URLEncoder.encode(options.remove("lang")))
         }
@@ -169,9 +169,9 @@ public class ReCaptcha {
      */
     public boolean checkAnswer(String remoteAddr, String response) {
         def post = new Post(url: BASE_URL + VERIFY_URL, proxy: proxy)
-        post.queryString.add("secret", privateKey)
-        post.queryString.add("response", response)
-        post.queryString.add("remoteip", remoteAddr)
+        post.queryParams.add("secret", privateKey)
+        post.queryParams.add("response", response)
+        post.queryParams.add("remoteip", remoteAddr)
 
         def responseObject = post.response