gorm 0.0.6 → 0.0.7

data/cog/templates/gorm/generator.rb.erb

@@ -0,0 +1,14 @@
+<% if tool.explicit_require %>require '<%= tool.path %>'
+<% else %>require '<%= tool.name %>'
+<% end %>
+
+Gorm.schema '<%= name %>', :namespace => '<%= camelized %>' do |s|
+
+  s.migration do |m|
+    m.create_table :widgets do |t|
+      t.string :name
+      t.integer :size
+    end
+  end
+
+end

data/cog/templates/gorm/schema.cpp.erb

@@ -0,0 +1,124 @@
+<%= stamp 'warning.h' %> 
+
+#include "<%= output_path %>.h"
+#include "Bump/Bump.h"
+#include <QFile>
+#include <QtSql>
+
+using namespace <%= namespace %>;
+
+const QString DATABASE_FILENAME = "<%= namespace %>.sqlite";
+
+<%= class_name %>::<%= class_name %>(QObject *parent) :
+    QObject(parent)
+{
+}
+
+<%= class_name %>::~<%= class_name %>()
+{
+}
+
+bool <%= class_name %>::open()
+{
+    _qDatabase = QSqlDatabase::addDatabase("QSQLITE");
+    _qDatabase.setDatabaseName(sandboxPath(DATABASE_FILENAME));
+    return _qDatabase.open() && updateSchema();
+}
+
+bool <%= class_name %>::close()
+{
+    _qDatabase.close();
+    return true;
+}
+
+bool <%= class_name %>::erase()
+{
+    _qDatabase.close();
+    return QFile::remove(sandboxPath(DATABASE_FILENAME));
+}
+
+bool <%= class_name %>::updateSchema()
+{
+    int nextVersion;
+    int version = currentSchemaVersion();
+    while (version < APP_SCHEMA_VERSION)
+    {
+        if (!applyIncrementalMigration(version + 1))
+        {
+            qCritical() << "Could not apply incremental migration" << QString::number(version + 1)
+                        << _qDatabase.lastError();
+            return false;
+        }
+        nextVersion = currentSchemaVersion();
+        if (nextVersion <= version)
+        {
+            qCritical() << "Incremental migration failed to increment the database schema number";
+            return false;
+        }
+        version = nextVersion;
+    }
+    return true;
+}
+
+int <%= class_name %>::currentSchemaVersion() const
+{
+    Q_ASSERT(_qDatabase.isOpen() && _qDatabase.isValid());
+    if (_qDatabase.tables().count() == 0) return -1;
+    QSqlQuery query;
+    if (!query.exec("SELECT schema_version FROM meta WHERE id = 1") || !query.next())
+    {
+        qCritical() << "Unable to determine the current database schema version. The database is corrupt.";
+        abort();
+    }
+    return query.value(0).toInt();
+}
+
+bool <%= class_name %>::applyIncrementalMigration(int migrationVersion)
+{
+    switch(migrationVersion)
+    {
+<% migrations.each do |m| %>
+    case <%= m.index %>: return <%= m.method_call %>;
+<% end %>
+    default:
+        qCritical() << "No such schema migration version" << QString::number(migrationVersion);
+        return false;
+    }
+}
+
+<% migrations.each do |m| %>
+<%= m.method_stub :qualify => true %> 
+{
+    QSqlQuery query;
+    _qDatabase.transaction();
+    // TODO: migration body
+    query.exec("UPDATE meta SET schema_version = <%= m.index %> WHERE id = 1");
+    return _qDatabase.commit();
+}
+<% end %>
+
+// bool <%= class_name %>::applyMigration0()
+// {
+//     QSqlQuery query;
+//     _qDatabase.transaction();
+//     query.exec("CREATE TABLE meta (id INTEGER PRIMARY KEY, schema_version INTEGER)");
+//     query.exec("INSERT INTO meta VALUES (1, 1);");
+//     return _qDatabase.commit();
+// }
+// 
+// bool <%= class_name %>::applyMigration1()
+// {
+//     QSqlQuery query;
+//     _qDatabase.transaction();
+//     query.exec("CREATE TABLE file_types (id INTEGER PRIMARY KEY, name VARCHAR(256))");
+//     query.exec("CREATE TABLE file_type_recognizers (id INTEGER PRIMARY KEY, file_type_id INTEGER, extension VARCHAR(16), path_pattern TEXT)");
+//     query.exec("CREATE TABLE matchers (id INTEGER PRIMARY KEY, file_type_id INTEGER, pattern TEXT)");
+//     query.exec("INSERT INTO file_types VALUES (NULL, 'Bump Log')");
+//     int fileTypeId = query.lastInsertId().toInt();
+//     query.prepare("INSERT INTO matchers VALUES (NULL, ?, ?)");
+//     query.bindValue(0, fileTypeId);
+//     query.bindValue(1, "(?P<year>\\d{4})-(?P<month>\\d{2})-(?P<day>\\d{2})");
+//     query.exec();
+//     query.exec("UPDATE meta SET schema_version = 2 WHERE id = 1");
+//     return _qDatabase.commit();
+// }

data/cog/templates/gorm/schema.h.erb

@@ -0,0 +1,76 @@
+<%= stamp 'warning.h' %> 
+
+<%= include_guard_begin include_guard_name %> 
+
+#include <QObject>
+#include <QString>
+#include <QSqlDatabase>
+
+<%= namespace_begin namespace %> 
+
+
+class <%= class_name %> : public QObject
+{
+    Q_OBJECT
+    QSqlDatabase _qDatabase;
+
+    /** The schema version required by this release of the app. */
+    static const int APP_SCHEMA_VERSION = <%= app_schema_version %>;
+
+public:
+
+    explicit <%= class_name %>(QObject *parent = 0);
+    virtual ~<%= class_name %>();
+
+    /** Open the database. */
+    bool open();
+    
+    /** Close the database. */
+    bool close();
+    
+    /** Erase the database. */
+    bool erase();
+
+private:
+
+    /**
+      Apply the given incremental migration.
+      @param migrationVersion An integer indicating which migration to apply.
+        A migration version of 1 applies the migration which takes the database
+        from schema version 0 to 1. A migration version of 2 takes it from 1 to
+        2, and so on.
+      @returns @c false if the migration could not be applied.
+      */
+    bool applyIncrementalMigration(int migrationVersion);
+
+    /**
+      The schema version of the current database.
+      Schema versions start at 0 and increase at integer intervals. Schema
+      version -1 has a special meaning: the database is empty. Schema version
+      0 installs a meta table for keeping track of the current database schema.
+      Schema version 1 is the schema used by the first release of the app,
+      version 2 by the second release, and so on.
+      @returns The schema version.
+      */
+    int currentSchemaVersion() const;
+
+    /**
+      Update the database schema if necessary.
+      @returns @c false if the update failed.
+      */
+    bool updateSchema();
+
+private: // Schema Migrations
+<% migrations.each do |m| %>
+    <%= m.method_stub %>;
+<% end %>
+
+signals:
+    
+public slots:
+    
+};
+
+
+<%= namespace_end namespace %> 
+<%= include_guard_end %> 

data/cog/templates/gorm/table.cpp.erb

@@ -0,0 +1 @@
+<%= stamp 'warning.h' %> 

data/cog/templates/gorm/table.h.erb

@@ -0,0 +1 @@
+<%= stamp 'warning.h' %> 

data/lib/gorm/version.rb

@@ -1,5 +1,5 @@
 module Gorm 
   unless const_defined? :VERSION
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/yard-templates/default/fulldoc/html/css/common.css

@@ -0,0 +1,6 @@
+#toc {
+  -webkit-box-shadow: 0px 0px 2px #bbb;
+}
+#search a:link, #search a:visited {
+  -webkit-box-shadow: 0px 0px 2px #eee;
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gorm
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Kevin Tonon
@@ -32,7 +32,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: yard
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,36 +45,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: aruba
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: gli
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 4
-        - 1
-        version: 2.4.1
-  type: :runtime
-  version_requirements: *id004
 description: 
 email: kevin@betweenconcepts.com
 executables: []
@@ -85,6 +55,11 @@ extra_rdoc_files: []
 
 files: 
 - LICENSE
+- cog/templates/gorm/generator.rb.erb
+- cog/templates/gorm/schema.cpp.erb
+- cog/templates/gorm/schema.h.erb
+- cog/templates/gorm/table.cpp.erb
+- cog/templates/gorm/table.h.erb
 - lib/gorm/cog_tool.rb
 - lib/gorm/column.rb
 - lib/gorm/migration.rb
@@ -92,14 +67,13 @@ files:
 - lib/gorm/table.rb
 - lib/gorm/version.rb
 - lib/gorm.rb
+- yard-templates/default/fulldoc/html/css/common.css
 homepage: https://github.com/ktonon/gorm
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --title
-- gorm
-- -ri
+rdoc_options: []
+
 require_paths: 
 - lib
 - lib