Added ZakCgiFormValidatorRegex.

diff --git a/src/Makefile.am b/src/Makefile.am
index d5f4caea0006182e5d68c96f8bf25c2c91464fba..3c58f477b79b26a7184281c43a01029c8f68ec94 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,7 @@ libzakcgi_la_SOURCES = commons.c \
                        formelementfiltertrim.c \
                        formelementivalidator.c \
                        formelementvalidatornotempty.c \
+                       formelementvalidatorregex.c \
                        main.c \
                        session.c \
                        tag.c \
@@ -44,6 +45,7 @@ libzakcgi_include_HEADERS = \
                             formelementfiltertrim.h \
                             formelementivalidator.h \
                             formelementvalidatornotempty.h \
+                            formelementvalidatorregex.h \
                             main.h \
                             session.h \
                             tag.h \

diff --git a/src/formelementtext.c b/src/formelementtext.c
index af2dc21ba7393f9a00d7eb8f50e56b753188ee03..81971120da319900c131ce92043f57263a72b914 100644 (file)
--- a/src/formelementtext.c
+++ b/src/formelementtext.c
@@ -31,8 +31,6 @@ static void zak_cgi_form_element_text_init (ZakCgiFormElementText *zak_cgi_form_
 
 static gchar *zak_cgi_form_element_text_render (ZakCgiFormElement *element);
 
-static gboolean zak_cgi_form_element_text_is_valid (ZakCgiFormElement *element);
-
 static void zak_cgi_form_element_text_set_property (GObject *object,
                                guint property_id,
                                const GValue *value,
@@ -67,7 +65,6 @@ zak_cgi_form_element_text_class_init (ZakCgiFormElementTextClass *klass)
        object_class->finalize = zak_cgi_form_element_text_finalize;
 
        elem_class->render = zak_cgi_form_element_text_render;
-       //elem_class->is_valid = zak_cgi_form_element_text_is_valid;
 
        g_type_class_add_private (object_class, sizeof (ZakCgiFormElementTextPrivate));
 }
@@ -131,72 +128,6 @@ static gchar
        return ret;
 }
 
-static gboolean
-zak_cgi_form_element_text_check_value (const gchar *validation_regex, GValue *value)
-{
-       gboolean ret;
-
-       GRegex *regex;
-       GError *error;
-
-       if (G_VALUE_HOLDS (value, G_TYPE_STRING))
-               {
-                       error = NULL;
-                       regex = g_regex_new (validation_regex, 0, 0, &error);
-                       if (regex == NULL
-                               || error != NULL)
-                               {
-                                       syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "Error on creating regex: %s.",
-                                                       error->message != NULL ? error->message : "no details");
-                                       return FALSE;
-                               }
-
-                       ret = g_regex_match ((const GRegex *)regex, g_value_get_string (value), 0, NULL);
-               }
-       else
-               {
-                       ret = FALSE;
-               }
-
-       return ret;
-}
-
-static gboolean
-zak_cgi_form_element_text_is_valid (ZakCgiFormElement *element)
-{
-       gboolean ret;
-
-       GValue *gval;
-
-       gchar *str_regex;
-
-       gval = zak_cgi_form_element_get_value (element);
-
-       g_object_get (G_OBJECT (element),
-                                 "validation-regex", &str_regex,
-                                 NULL);
-
-       if (G_VALUE_HOLDS (gval, G_TYPE_PTR_ARRAY))
-               {
-                       guint i;
-                       GPtrArray *ar = (GPtrArray *)g_value_get_boxed (gval);
-                       for (i = 0; i < ar->len; i++)
-                               {
-                                       if (!zak_cgi_form_element_text_check_value (str_regex, (GValue *)g_ptr_array_index (ar, i)))
-                                               {
-                                                       ret = FALSE;
-                                                       break;
-                                               }
-                               }
-               }
-       else
-               {
-                       ret = zak_cgi_form_element_text_check_value (str_regex, gval);
-               }
-
-       return ret;
-}
-
 /* PRIVATE */
 static void
 zak_cgi_form_element_text_set_property (GObject *object,

diff --git a/src/formelementvalidatorregex.c b/src/formelementvalidatorregex.c
new file mode 100644 (file)
index 0000000..3ea9ba1
--- /dev/null
+++ b/src/formelementvalidatorregex.c
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+       #include <config.h>
+#endif
+
+#include <syslog.h>
+
+#include "formelementivalidator.h"
+#include "formelementvalidatorregex.h"
+
+static void zak_cgi_form_element_validator_regex_class_init (ZakCgiFormElementValidatorRegexClass *class);
+static void zak_cgi_form_element_validator_regex_interface_init (ZakCgiFormElementIValidatorInterface *iface);
+static void zak_cgi_form_element_validator_regex_init (ZakCgiFormElementValidatorRegex *zak_cgi_form_element);
+
+static void zak_cgi_form_element_validator_regex_set_property (GObject *object,
+                               guint property_id,
+                               const GValue *value,
+                               GParamSpec *pspec);
+static void zak_cgi_form_element_validator_regex_get_property (GObject *object,
+                               guint property_id,
+                               GValue *value,
+                               GParamSpec *pspec);
+
+static void zak_cgi_form_element_validator_regex_dispose (GObject *gobject);
+static void zak_cgi_form_element_validator_regex_finalize (GObject *gobject);
+
+static gboolean zak_cgi_form_element_validator_regex_validate (ZakCgiFormElementIValidator *validator_regex, GValue *value);
+
+struct _ZakCgiFormElementValidatorRegex
+{
+       GObject parent_instance;
+
+       /* Other members, including private data. */
+};
+
+#define ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_CGI_TYPE_FORM_ELEMENT_VALIDATOR_REGEX, ZakCgiFormElementValidatorRegexPrivate))
+
+typedef struct _ZakCgiFormElementValidatorRegexPrivate ZakCgiFormElementValidatorRegexPrivate;
+struct _ZakCgiFormElementValidatorRegexPrivate
+       {
+               gchar *regex;
+       };
+
+G_DEFINE_TYPE_WITH_CODE (ZakCgiFormElementValidatorRegex, zak_cgi_form_element_validator_regex, G_TYPE_OBJECT,
+                                                G_IMPLEMENT_INTERFACE (ZAK_CGI_TYPE_FORM_ELEMENT_IVALIDATOR,
+                                                                                               zak_cgi_form_element_validator_regex_interface_init))
+
+static void
+zak_cgi_form_element_validator_regex_class_init (ZakCgiFormElementValidatorRegexClass *class)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+       object_class->set_property = zak_cgi_form_element_validator_regex_set_property;
+       object_class->get_property = zak_cgi_form_element_validator_regex_get_property;
+       object_class->dispose = zak_cgi_form_element_validator_regex_dispose;
+       object_class->finalize = zak_cgi_form_element_validator_regex_finalize;
+
+       g_type_class_add_private (object_class, sizeof (ZakCgiFormElementValidatorRegexPrivate));
+}
+
+static void
+zak_cgi_form_element_validator_regex_interface_init (ZakCgiFormElementIValidatorInterface *iface)
+{
+       iface->validate = zak_cgi_form_element_validator_regex_validate;
+}
+
+static void
+zak_cgi_form_element_validator_regex_init (ZakCgiFormElementValidatorRegex *zak_cgi_form_element)
+{
+       ZakCgiFormElementValidatorRegexPrivate *priv = ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_cgi_form_element);
+
+       priv->regex = NULL;
+}
+
+/**
+ * zak_cgi_form_element_validator_regex_new:
+ * @regex:
+ *
+ * Returns: the newly created #ZakCgiFormElementValidatorRegex object.
+ */
+ZakCgiFormElementValidatorRegex
+*zak_cgi_form_element_validator_regex_new (const gchar *regex)
+{
+       ZakCgiFormElementValidatorRegex *zak_cgi_form_element_validator_regex;
+
+       zak_cgi_form_element_validator_regex = ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX (g_object_new (zak_cgi_form_element_validator_regex_get_type (), NULL));
+
+       ZakCgiFormElementValidatorRegexPrivate *priv = ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_cgi_form_element_validator_regex);
+
+       if (regex != NULL)
+               {
+                       priv->regex = g_strdup (regex);
+               }
+
+       return zak_cgi_form_element_validator_regex;
+}
+
+/* PRIVATE */
+static void
+zak_cgi_form_element_validator_regex_set_property (GObject *object,
+                   guint property_id,
+                   const GValue *value,
+                   GParamSpec *pspec)
+{
+       ZakCgiFormElementValidatorRegex *zak_cgi_form_element = (ZakCgiFormElementValidatorRegex *)object;
+       ZakCgiFormElementValidatorRegexPrivate *priv = ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_cgi_form_element);
+
+       switch (property_id)
+               {
+                       default:
+                               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+                               break;
+               }
+}
+
+static void
+zak_cgi_form_element_validator_regex_get_property (GObject *object,
+                   guint property_id,
+                   GValue *value,
+                   GParamSpec *pspec)
+{
+       ZakCgiFormElementValidatorRegex *zak_cgi_form_element = (ZakCgiFormElementValidatorRegex *)object;
+       ZakCgiFormElementValidatorRegexPrivate *priv = ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_cgi_form_element);
+
+       switch (property_id)
+               {
+                       default:
+                               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+                               break;
+               }
+}
+
+static void
+zak_cgi_form_element_validator_regex_dispose (GObject *gobject)
+{
+       ZakCgiFormElementValidatorRegex *zak_cgi_form_element = (ZakCgiFormElementValidatorRegex *)gobject;
+       ZakCgiFormElementValidatorRegexPrivate *priv = ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_cgi_form_element);
+
+
+
+       GObjectClass *parent_class = g_type_class_peek_parent (G_OBJECT_GET_CLASS (gobject));
+       parent_class->dispose (gobject);
+}
+
+static void
+zak_cgi_form_element_validator_regex_finalize (GObject *gobject)
+{
+       ZakCgiFormElementValidatorRegex *zak_cgi_form_element = (ZakCgiFormElementValidatorRegex *)gobject;
+       ZakCgiFormElementValidatorRegexPrivate *priv = ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_cgi_form_element);
+
+
+
+       GObjectClass *parent_class = g_type_class_peek_parent (G_OBJECT_GET_CLASS (gobject));
+       parent_class->finalize (gobject);
+}
+
+static gboolean
+zak_cgi_form_element_validator_regex_validate (ZakCgiFormElementIValidator *validator_regex,
+                                                                                          GValue *value)
+{
+       gboolean ret;
+
+       GRegex *regex;
+       GError *error;
+
+       ZakCgiFormElementValidatorRegexPrivate *priv = ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (validator_regex);
+
+       if (G_VALUE_HOLDS (value, G_TYPE_STRING))
+               {
+                       error = NULL;
+                       regex = g_regex_new (priv->regex, 0, 0, &error);
+                       if (regex == NULL
+                               || error != NULL)
+                               {
+                                       syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "Error on creating regex: %s.",
+                                                       error->message != NULL ? error->message : "no details");
+                                       return FALSE;
+                               }
+
+                       ret = g_regex_match ((const GRegex *)regex, g_value_get_string (value), 0, NULL);
+               }
+       else
+               {
+                       ret = FALSE;
+               }
+
+       return ret;
+}

diff --git a/src/formelementvalidatorregex.h b/src/formelementvalidatorregex.h
new file mode 100644 (file)
index 0000000..d93b05d
--- /dev/null
+++ b/src/formelementvalidatorregex.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_H__
+#define __ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_H__
+
+
+#include <glib-object.h>
+
+
+G_BEGIN_DECLS
+
+
+#define ZAK_CGI_TYPE_FORM_ELEMENT_VALIDATOR_REGEX zak_cgi_form_element_validator_regex_get_type ()
+G_DECLARE_FINAL_TYPE (ZakCgiFormElementValidatorRegex, zak_cgi_form_element_validator_regex, ZAK_CGI, FORM_ELEMENT_VALIDATOR_REGEX, GObject)
+
+ZakCgiFormElementValidatorRegex *zak_cgi_form_element_validator_regex_new (const gchar *regex);
+
+
+G_END_DECLS
+
+
+#endif /* __ZAK_CGI_FORM_ELEMENT_VALIDATOR_REGEX_H__ */

diff --git a/tests/form.c b/tests/form.c
index 05ae5aa90023f6c74bb29c64b08a6bb9e297bd33..8136b0404f64b14d3d5f991d0e986824234b4d5a 100644 (file)
--- a/tests/form.c
+++ b/tests/form.c
@@ -31,6 +31,7 @@
 #include <formelementfiltertrim.h>
 #include <formelementivalidator.h>
 #include <formelementvalidatornotempty.h>
+#include <formelementvalidatorregex.h>
 
 int
 main (int argc, char *argv[])
@@ -68,7 +69,7 @@ main (int argc, char *argv[])
        zak_cgi_form_element_add_filter (element,
                                                                         ZAK_CGI_FORM_ELEMENT_IFILTER (zak_cgi_form_element_filter_trim_new ()));
        zak_cgi_form_element_add_validator (element,
-                                                                               ZAK_CGI_FORM_ELEMENT_IVALIDATOR (zak_cgi_form_element_validator_notempty_new ()));
+                                                                               ZAK_CGI_FORM_ELEMENT_IVALIDATOR (zak_cgi_form_element_validator_regex_new ("aaa")));
        zak_cgi_form_add_element (form, element);
 
        element = zak_cgi_form_element_check_new ("chk", NULL);