updated model classes for treefrog v1.7.

treefrog/config/application.ini

@@ -23,8 +23,7 @@ HtmlContentCharset=UTF-8
 Locale=
 
 # Specify the multiprocessing module, such as 'thread' or 'prefork'
-MultiProcessingModule=thread
-#MultiProcessingModule=hybrid
+MultiProcessingModule=hybrid
 
 # Specify the absolute or relative path of the temporary directory
 # for HTTP uploaded files. Uses system default if not specified.

treefrog/controllers/applicationcontroller.cpp

@@ -24,7 +24,15 @@ QString ApplicationController::jsonEncode(const QVariantMap &obj)
 {
     QString ret("{");
     for (QMap<QString, QVariant>::const_iterator i = obj.begin(); i != obj.end(); ++i) {
-        ret += QString("\"%1\": \"%2\", ").arg(i.key()).arg(i.value().toString());
+        switch (i.value().type()) {
+        case QVariant::UInt:
+        case QVariant::Int:
+            ret += QString("\"%1\":%2, ").arg(i.key()).arg(i.value().toInt());
+            break;
+        default:
+            ret += QString("\"%1\":\"%2\", ").arg(i.key()).arg(i.value().toString());
+            break; 
+        }
     }
     ret.chop(2);
     ret += QLatin1Char('}');
@@ -35,8 +43,8 @@ QString ApplicationController::jsonEncode(const QList<QVariantMap> &lst)
 {
     QString ret("[");
     for (QListIterator<QVariantMap> it(lst); it.hasNext(); ) {
-      ret += jsonEncode(it.next());
-      ret += QLatin1String(", ");
+        ret += jsonEncode(it.next());
+        ret += QLatin1String(", ");
     }
     ret.chop(2);
     ret += QLatin1Char(']');

treefrog/controllers/jsoncontroller.cpp

@@ -14,7 +14,7 @@ void JsonController::json()
     QVariantMap obj;
     obj["message"] = "Hello, World!";
 
-    setContentType("application/json");
+    setContentType("application/json; charset=UTF-8");
     renderText(jsonEncode(obj), false);
 }
 

treefrog/controllers/worldcontroller.cpp

@@ -34,7 +34,7 @@ void WorldController::queries(const QString &num)
         World world = World::get(id);
         worlds << world.toVariantMap();
     }
-    setContentType("application/json");
+    setContentType("application/json; charset=UTF-8");
     renderText(jsonEncode(worlds), false);
 }
 
@@ -42,7 +42,7 @@ void WorldController::random()
 {
     int id = Tf::random(9999) + 1;
     World world = World::get(id);
-    setContentType("application/json");
+    setContentType("application/json; charset=UTF-8");
     renderText(jsonEncode(world.toVariantMap()), false);
 }
 
@@ -127,11 +127,11 @@ void WorldController::updates(const QString &num)
     for (int i = 0; i < d; ++i) {
         int id = Tf::random(9999) + 1;
         World world = World::get(id);
-        world.setRandomnumber( Tf::random(9999) + 1 );
+        world.setRandomNumber( Tf::random(9999) + 1 );
         world.update();
 	worlds << world.toVariantMap();
     }
-    setContentType("application/json");
+    setContentType("application/json; charset=UTF-8");
     renderText(jsonEncode(worlds), false);
 }
 

treefrog/models/fortune.cpp

@@ -46,7 +46,7 @@ Fortune Fortune::create(const QString &message)
     FortuneObject obj;
     obj.message = message;
     if (!obj.create()) {
-        obj.clear();
+        return Fortune();
     }
     return Fortune(obj);
 }
@@ -61,7 +61,7 @@ Fortune Fortune::create(const QVariantMap &values)
     return model;
 }
 
-Fortune Fortune::get(const uint &id)
+Fortune Fortune::get(uint id)
 {
     TSqlORMapper<FortuneObject> mapper;
     return Fortune(mapper.findByPrimaryKey(id));
@@ -72,12 +72,12 @@ QList<Fortune> Fortune::getAll()
     return tfGetModelListByCriteria<Fortune, FortuneObject>(TCriteria());
 }
 
-TSqlObject *Fortune::data()
+TModelObject *Fortune::modelData()
 {
     return d.data();
 }
 
-const TSqlObject *Fortune::data() const
+const TModelObject *Fortune::modelData() const
 {
     return d.data();
 }

treefrog/models/fortune.h

@@ -8,7 +8,7 @@
 #include <TGlobal>
 #include <TAbstractModel>
 
-class TSqlObject;
+class TModelObject;
 class FortuneObject;
 
 
@@ -27,14 +27,14 @@ public:
 
     static Fortune create(const QString &message);
     static Fortune create(const QVariantMap &values);
-    static Fortune get(const uint &id);
+    static Fortune get(uint id);
     static QList<Fortune> getAll();
 
 private:
     QSharedDataPointer<FortuneObject> d;
 
-    TSqlObject *data();
-    const TSqlObject *data() const;
+    TModelObject *modelData();
+    const TModelObject *modelData() const;
 };
 
 Q_DECLARE_METATYPE(Fortune)

treefrog/models/sqlobjects/fortuneobject.h

@@ -16,9 +16,9 @@ public:
         Message,
     };
 
-    QString tableName() const { return QLatin1String("Fortune"); }
     int primaryKeyIndex() const { return Id; }
     int autoValueIndex() const { return Id; }
+    QString tableName() const { return QLatin1String("Fortune"); }
 
 private:    /*** Don't modify below this line ***/
     Q_OBJECT

treefrog/models/sqlobjects/worldobject.h

@@ -9,23 +9,23 @@ class T_MODEL_EXPORT WorldObject : public TSqlObject, public QSharedData
 {
 public:
     uint id;
-    int randomnumber;
+    int randomNumber;
 
     enum PropertyIndex {
         Id = 0,
-        Randomnumber,
+        RandomNumber,
     };
 
-    QString tableName() const { return QLatin1String("World"); }
     int primaryKeyIndex() const { return Id; }
     int autoValueIndex() const { return Id; }
+    QString tableName() const { return QLatin1String("World"); }
 
 private:    /*** Don't modify below this line ***/
     Q_OBJECT
     Q_PROPERTY(uint id READ getid WRITE setid)
     T_DEFINE_PROPERTY(uint, id)
-    Q_PROPERTY(int randomnumber READ getrandomnumber WRITE setrandomnumber)
-    T_DEFINE_PROPERTY(int, randomnumber)
+    Q_PROPERTY(int randomNumber READ getrandomNumber WRITE setrandomNumber)
+    T_DEFINE_PROPERTY(int, randomNumber)
 };
 
 #endif // WORLDOBJECT_H

treefrog/models/world.cpp

@@ -5,7 +5,7 @@
 World::World()
     : TAbstractModel(), d(new WorldObject)
 {
-    d->randomnumber = 0;
+    d->randomNumber = 0;
 }
 
 World::World(const World &other)
@@ -27,14 +27,14 @@ uint World::id() const
     return d->id;
 }
 
-int World::randomnumber() const
+int World::randomNumber() const
 {
-    return d->randomnumber;
+    return d->randomNumber;
 }
 
-void World::setRandomnumber(int randomnumber)
+void World::setRandomNumber(int randomNumber)
 {
-    d->randomnumber = randomnumber;
+    d->randomNumber = randomNumber;
 }
 
 World &World::operator=(const World &other)
@@ -43,12 +43,12 @@ World &World::operator=(const World &other)
     return *this;
 }
 
-World World::create(int randomnumber)
+World World::create(int randomNumber)
 {
     WorldObject obj;
-    obj.randomnumber = randomnumber;
+    obj.randomNumber = randomNumber;
     if (!obj.create()) {
-        obj.clear();
+        return World();
     }
     return World(obj);
 }
@@ -63,7 +63,7 @@ World World::create(const QVariantMap &values)
     return model;
 }
 
-World World::get(const uint &id)
+World World::get(uint id)
 {
     TSqlORMapper<WorldObject> mapper;
     return World(mapper.findByPrimaryKey(id));
@@ -74,12 +74,12 @@ QList<World> World::getAll()
     return tfGetModelListByCriteria<World, WorldObject>(TCriteria());
 }
 
-TSqlObject *World::data()
+TModelObject *World::modelData()
 {
     return d.data();
 }
 
-const TSqlObject *World::data() const
+const TModelObject *World::modelData() const
 {
     return d.data();
 }

treefrog/models/world.h

@@ -8,7 +8,7 @@
 #include <TGlobal>
 #include <TAbstractModel>
 
-class TSqlObject;
+class TModelObject;
 class WorldObject;
 
 
@@ -21,20 +21,20 @@ public:
     ~World();
 
     uint id() const;
-    int randomnumber() const;
-    void setRandomnumber(int randomnumber);
+    int randomNumber() const;
+    void setRandomNumber(int randomNumber);
     World &operator=(const World &other);
 
-    static World create(int randomnumber);
+    static World create(int randomNumber);
     static World create(const QVariantMap &values);
-    static World get(const uint &id);
+    static World get(uint id);
     static QList<World> getAll();
 
 private:
     QSharedDataPointer<WorldObject> d;
 
-    TSqlObject *data();
-    const TSqlObject *data() const;
+    TModelObject *modelData();
+    const TModelObject *modelData() const;
 };
 
 Q_DECLARE_METATYPE(World)

treefrog/views/world/edit.erb

@@ -17,7 +17,7 @@
     <label>ID<br /><input type="text" name="world[id]" value="<%= world["id"] %>" readonly="readonly" /></label>
   </p>
   <p>
-    <label>Randomnumber<br /><input type="text" name="world[randomnumber]" value="<%= world["randomnumber"] %>" /></label>
+    <label>RandomNumber<br /><input type="text" name="world[randomNumber]" value="<%= world["randomNumber"] %>" /></label>
   </p>
   <p>
     <input type="submit" value="Update" />

treefrog/views/world/entry.erb

@@ -14,7 +14,7 @@
 
 <%== formTag(urla("create"), Tf::Post) %>
   <p>
-    <label>Randomnumber<br /><input name="world[randomnumber]" value="<%= world["randomnumber"] %>" /></label>
+    <label>RandomNumber<br /><input name="world[randomNumber]" value="<%= world["randomNumber"] %>" /></label>
   </p>
   <p>
     <input type="submit" value="Create" />

treefrog/views/world/index.erb

@@ -14,14 +14,14 @@
 <table border="1" cellpadding="5" style="border: 1px #d0d0d0 solid; border-collapse: collapse;">
   <tr>
     <th>ID</th>
-    <th>Randomnumber</th>
+    <th>RandomNumber</th>
   </tr>
 <% tfetch(QList<World>, worldList); %>
 <% for (QListIterator<World> it(worldList); it.hasNext(); ) {
      const World &i = it.next(); %>
   <tr>
     <td><%= i.id() %></td>
-    <td><%= i.randomnumber() %></td>
+    <td><%= i.randomNumber() %></td>
     <td>
       <%== linkTo("Show", urla("show", i.id())) %>
       <%== linkTo("Edit", urla("edit", i.id())) %>

treefrog/views/world/show.erb

@@ -12,7 +12,7 @@
 
 <h1>Showing World</h1>
 <dt>ID</dt><dd><%= world.id() %></dd><br />
-<dt>Randomnumber</dt><dd><%= world.randomnumber() %></dd><br />
+<dt>RandomNumber</dt><dd><%= world.randomNumber() %></dd><br />
 
 <%== linkTo("Edit", urla("edit", world.id())) %> |
 <%== linkTo("Back", urla("index")) %>