+ Added Css formatter #9

src/ArdorQuery.pro

@@ -10,6 +10,7 @@ RC_ICONS = logo.ico
 ICON = ardorquery.icns
 
 SOURCES += \
+        Formatters/cssformatter.cpp \
         Formatters/formatterfactory.cpp \
         Formatters/htmlformatter.cpp \
         Formatters/jsonformatter.cpp \
@@ -56,12 +57,14 @@ SOURCES += \
         Tests/jsonformatterunittests.cpp \
         Tests/textadvisorviewmodelunittests.cpp \
         Tests/globalvariablesunittest.cpp \
-        Tests/htmlformatterunittests.cpp
+        Tests/htmlformatterunittests.cpp \
+        Tests/cssformatterunittests.cpp \
 }
 
 RESOURCES += qml.qrc
 
 HEADERS += \
+    Formatters/cssformatter.h \
     Formatters/formatterfactory.h \
     Formatters/htmlformatter.h \
     Formatters/jsonformatter.h \
@@ -109,7 +112,8 @@ HEADERS += \
     Tests/jsonformatterunittests.h \
     Tests/textadvisorviewmodelunittests.h \
     Tests/globalvariablesunittest.h \
-    Tests/htmlformatterunittests.h
+    Tests/htmlformatterunittests.h \
+    Tests/cssformatterunittests.h \
 }
 
 usrbininstalldesktop {

src/Formatters/cssformatter.cpp

@@ -0,0 +1,74 @@
+/*
+    ArdorQuery http tester
+    Copyright (C) 2022-2024 Roman Vladimirov
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program 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 General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include <QList>
+#include "cssformatter.h"
+
+CssFormatter::CssFormatter()
+{
+
+}
+
+QString CssFormatter::format(const QString &data)
+{
+    m_stackSize = 0;
+    QString currentOpenBlock = "";
+    m_result.clear();
+
+    for(auto character: data) {
+        auto latinCharacter = character.toLatin1();
+
+        if (latinCharacter == m_blockStart) {
+            setOffset(m_stackSize);
+            m_result.append("<font color=\"#8812a1\">" + currentOpenBlock.trimmed() + "</font> {\n");
+            currentOpenBlock.clear();
+            m_stackSize += 1;
+            continue;
+        }
+        if (latinCharacter == m_blockEnd) {
+            if (m_stackSize > 0) m_stackSize -= 1;
+            setOffset(m_stackSize);
+            m_result.append("}\n");
+            currentOpenBlock.clear();
+            continue;
+        }
+
+        if (latinCharacter == m_endField) {
+            setOffset(m_stackSize);
+            auto trimmedValue = currentOpenBlock.trimmed();
+            if (trimmedValue.indexOf(":") > -1) {
+                auto parts = trimmedValue.split(":");
+                m_result.append("<font color=\"#008000\">" + parts.first().trimmed() + "</font>: ");
+                m_result.append(parts.last().trimmed() + ";\n");
+            } else {
+                m_result.append(currentOpenBlock.trimmed() + ";\n");
+            }
+            currentOpenBlock.clear();
+            continue;
+        }
+
+        currentOpenBlock += latinCharacter;
+    }
+
+    return m_result;
+}
+
+void CssFormatter::setOffset(int stackSize) noexcept
+{
+    for (auto i = 0; i < stackSize; i++) {
+        m_result.append(m_cssTab);
+    }
+}
+

src/Formatters/cssformatter.h

@@ -0,0 +1,46 @@
+/*
+    ArdorQuery http tester
+    Copyright (C) 2022-2024 Roman Vladimirov
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program 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 General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#ifndef CSSFORMATTER_H
+#define CSSFORMATTER_H
+
+#include "outputformatter.h"
+
+class CssFormatter : public OutputFormatter
+{
+private:
+    const QString m_blockStart { "{" };
+    const QString m_blockEnd { "}" };
+    const QString m_separator { ":" };
+    const QString m_atRules { "@" };
+    const QString m_endField { ";" };
+    const QString m_import { "@import" };
+    const QString m_newline { "\n" };
+    const QString m_caretBack { "\r" };
+    const QString m_cssTab { "    " };
+    int m_stackSize { -1 };
+    QString m_result { "" };
+
+public:
+    CssFormatter();
+
+    QString format(const QString& data) override;
+
+private:
+    void setOffset(int stackSize) noexcept;
+
+};
+
+#endif // CSSFORMATTER_H

src/Formatters/formatterfactory.cpp

@@ -19,6 +19,7 @@
 #include "htmlformatter.h"
 #include "xmlformatter.h"
 #include "plaintextformatter.h"
+#include "cssformatter.h"
 
 FormatterFactory::FormatterFactory()
 {
@@ -53,5 +54,11 @@ OutputFormatter* FormatterFactory::getFormatter(const QString& formatter)
         return plainTextFormatter;
     }
 
+    if (formatter == OutputFormatCss) {
+        auto cssFormatter = new CssFormatter();
+        m_instanceCache.insert(OutputFormatCss, cssFormatter);
+        return cssFormatter;
+    }
+
     return m_nullableFormatter;
 }

src/Formatters/htmlformatter.cpp

@@ -37,14 +37,11 @@ QString HtmlFormatter::format(const QString &data)
 {
     m_stackSize = -1;
     QString currentFullTag = "";
-    int iterator = -1;
     m_result.clear();
     bool tagStarted = false;
     bool contentStarted = false;
 
     for(auto character: data) {
-        iterator++;
-
         auto latinCharacter = character.toLatin1();
 
         if (latinCharacter == m_tagStart && !tagStarted) {

src/Formatters/jsonformatter.cpp

@@ -77,7 +77,7 @@ QString JsonFormatter::format(const QString &data)
 
         if (m_string == latinCharacter) {
             if (stringStarted) {
-                auto isProperty = iterator < data.count() - 1 ? data[iterator + 1].toLatin1() == m_colon : false;
+                auto isProperty = iterator < data.size() - 1 ? data[iterator + 1].toLatin1() == m_colon : false;
                 result += (isProperty ? m_propertyStringStart : m_plainStringStart)  + currentString + "\"</font>";
                 currentString.clear();
             }
@@ -87,7 +87,7 @@ QString JsonFormatter::format(const QString &data)
         }
 
         if (m_backslash == latinCharacter && stringStarted) {
-            if (iterator < data.count()) {
+            if (iterator < data.size()) {
                 auto nextCharacter = data[iterator + 1].toLatin1();
                 if (nextCharacter == m_reverse || nextCharacter == m_newline) skipNextCharacters += 1;
                 if (nextCharacter == m_unicode) {

src/Tests/cssformatterunittests.cpp

@@ -0,0 +1,79 @@
+/*
+    ArdorQuery http tester
+    Copyright (C) 2022-2024 Roman Vladimirov
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program 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 General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include <QtTest/QtTest>
+#include "cssformatterunittests.h"
+#include "../Formatters/cssformatter.h"
+
+CssFormatterUnitTests::CssFormatterUnitTests(QObject *parent)
+    : QObject{parent}
+{
+
+}
+
+void CssFormatterUnitTests::simplestyle_completed()
+{
+    CssFormatter formatter;
+    auto result = formatter.format(".myclass {property: value;}");
+    auto expectedResult = QString(R"a(<font color="#8812a1">.myclass</font> {
+    <font color="#008000">property</font>: value;
+}
+)a");
+    QCOMPARE(result, expectedResult);
+}
+
+void CssFormatterUnitTests::simplestyle_multiplevalues_completed()
+{
+    CssFormatter formatter;
+    auto result = formatter.format(".myclass {property: value; property2: lalala ; purupu  : vallll    ;}");
+    auto expectedResult = QString(R"a(<font color="#8812a1">.myclass</font> {
+    <font color="#008000">property</font>: value;
+    <font color="#008000">property2</font>: lalala;
+    <font color="#008000">purupu</font>: vallll;
+}
+)a");
+    QCOMPARE(result, expectedResult);
+}
+
+void CssFormatterUnitTests::multiplestyles_multiplevalues_completed()
+{
+    CssFormatter formatter;
+    auto result = formatter.format(".myclass {property: value; property2: lalala ; purupu  : vallll;}   .myclass2 { muhers: pruher; muhers2: pruher2; }");
+    auto expectedResult = QString(R"a(<font color="#8812a1">.myclass</font> {
+    <font color="#008000">property</font>: value;
+    <font color="#008000">property2</font>: lalala;
+    <font color="#008000">purupu</font>: vallll;
+}
+<font color="#8812a1">.myclass2</font> {
+    <font color="#008000">muhers</font>: pruher;
+    <font color="#008000">muhers2</font>: pruher2;
+}
+)a");
+    QCOMPARE(result, expectedResult);
+}
+
+void CssFormatterUnitTests::nestedstyles_completed()
+{
+    CssFormatter formatter;
+    auto result = formatter.format(".myclass {property: value; .nestedclass { nestedproperty: nestedvalue; } }");
+    auto expectedResult = QString(R"a(<font color="#8812a1">.myclass</font> {
+    <font color="#008000">property</font>: value;
+    <font color="#8812a1">.nestedclass</font> {
+        <font color="#008000">nestedproperty</font>: nestedvalue;
+    }
+}
+)a");
+    QCOMPARE(result, expectedResult);
+}

src/Tests/cssformatterunittests.h

@@ -0,0 +1,35 @@
+/*
+    ArdorQuery http tester
+    Copyright (C) 2022-2024 Roman Vladimirov
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program 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 General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#ifndef CSSFORMATTERUNITTESTS_H
+#define CSSFORMATTERUNITTESTS_H
+
+#include <QObject>
+
+class CssFormatterUnitTests : public QObject
+{
+    Q_OBJECT
+public:
+    explicit CssFormatterUnitTests(QObject *parent = nullptr);
+
+private slots:
+    void simplestyle_completed();
+    void simplestyle_multiplevalues_completed();
+    void multiplestyles_multiplevalues_completed();
+    void nestedstyles_completed();
+
+};
+
+#endif // CSSFORMATTERUNITTESTS_H

src/Views/OpenApiExportWindow.qml

@@ -277,7 +277,7 @@ ApplicationWindow {
                 Rectangle {
                     id: methodText
                     anchors.left: parent.left
-                    anchors.leftMargin: 14
+                    anchors.leftMargin: 8
                     anchors.bottom: parent.bottom
                     anchors.bottomMargin: 5
                     anchors.top: parent.top
@@ -297,9 +297,9 @@ ApplicationWindow {
 
                 Text {
                     anchors.left: methodText.right
-                    anchors.leftMargin: 18
+                    anchors.leftMargin: 12
                     anchors.verticalCenter: parent.verticalCenter
-                    width: parent.width - methodText.width - 30
+                    width: parent.width - methodText.width - 38
                     height: parent.height
                     text: route + " <b>" + description + "</b>"
                     verticalAlignment: Text.AlignVCenter

src/globalconstants.cpp

@@ -43,5 +43,6 @@ QString OutputFormatXml = "xml";
 QString OutputFormatImage = "image";
 QString OutputNeedDownloaded = "downloadable";
 QString OutputFormatPlainText = "plaintext";
+QString OutputFormatCss = "css";
 
 bool IsPortable = false;

src/globalconstants.h

@@ -43,5 +43,6 @@ extern QString OutputFormatXml;
 extern QString OutputFormatImage;
 extern QString OutputNeedDownloaded;
 extern QString OutputFormatPlainText;
+extern QString OutputFormatCss;
 
 extern bool IsPortable;