meta-record 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfe22f2148b93de82c111247ee4ebead27df53960f1b80969cfc1e3774afe1ef
-  data.tar.gz: c9723763509a7a081fcbf504da5cd13f0d2d69eec19da5958432df8fe6937f33
+  metadata.gz: fd905957387d68112f4bb8859fe5ae06db2034f9348ab5fc0905f89dbade4788
+  data.tar.gz: ab7706bc2a7a16473f50608a0a034c686256972060297cc84dcef8a33605034b
 SHA512:
-  metadata.gz: a550333bf4091a017af771c1949a507935bf15e5f157d8115b07a10a17e3b5ffaa5c556a61fbd8b0fa81360046b933b2a472d9546ce41c0ac92e21f81a139360
-  data.tar.gz: 4ff439c3bc570caac8433d29f745d7b38384a18968496017087d2436759972e2fb3647448a3783f78f5873cdfe38b7c685df1769ab6967a6bcc4c0d40ed9552e
+  metadata.gz: 50b8d575404dce1818ab374dac6c3109261c9cc28289f2627b150e1c984c7ba01fb142267ee58b28496ff9172b487998e6cd9f7b54d473030b57993f148387ff
+  data.tar.gz: 963ce8511befec8d569fe8308e52781b274b59626e6ceb19a8cd0c298802da48626901a2ce17294282cf6050fd6abd97bb6cee98d3c5db19f784800c46ca245f

data/bin/metarecord-make

@@ -8,11 +8,18 @@ Dir["config/metarecord.rb"].each do |file|
   require "#{Dir.pwd}/#{file}"
 end
 
+config_filepath = "config/metarecord.rb"
+
 @base_path  = ""
 @output     = ""
 @input      = []
 @generators = []
 @tmpdir     = ".tmp"
+$: << Dir.pwd
+
+if File.exists? config_filepath
+  require_relative config_filepath
+end
 
 OptionParser.new do |opts|
   opts.on "-v",            "--verbose"          do @verbose == true end

data/lib/metarecord/generator_base.rb

@@ -1,20 +1,7 @@
-class String
-  def underscore
-    self.gsub(/::/, '/').
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    tr("-", "_").
-    downcase
-  end
-
-  def camelcase
-    return self if self !~ /_/ && self =~ /[A-Z]+.*/
-    split(/_|\//).map{|e| e.capitalize}.join
-  end
-end
-
 require 'pathname'
 require 'json'
+require_relative './string'
+require_relative './properties'
 
 class GeneratorBase
   def self.is_file_based? ; true ; end
@@ -118,7 +105,7 @@ class GeneratorBase
 
   def make_block delimiters = '{}', &block
     _append delimiters[0] if delimiters.size > 0
-    indent block
+    indent &block
     _append delimiters[1] if delimiters.size > 1
   end
 
@@ -199,3 +186,22 @@ class GeneratorBase
     (not options[:client].nil?) && options[:client][:ignore] == true
   end
 end
+
+class GeneratorCppBase < GeneratorBase
+  def nativeTypeNameFor type
+    if type.class == Class
+      case type.name
+      when 'String'    then 'std::string'
+      when 'ByteArray' then 'std::string'
+      when 'Hash'      then 'DataTree'
+      when 'DateTime'  then 'std::time_t'
+      when 'Integer'   then 'int'
+      when 'Float'     then 'float'
+      when 'Boolean'   then 'bool'
+      else type
+      end
+    else
+      type
+    end
+  end
+end

data/lib/metarecord/generators/comet/archive_generator.rb

@@ -18,6 +18,7 @@ class CometArchiveGenerator < GeneratorBase
     reset
     _append "#ifndef #{self.class.client_define}"
     _append "# include <crails/renderer.hpp>"
+    _append "# include <crails/utils/backtrace.hpp>
     _append "#endif"
     _append "#include <crails/archive.hpp>"
     _append "#include \"#{object[:header]}\"\n"
@@ -49,7 +50,10 @@ class CometArchiveGenerator < GeneratorBase
     @indent += 1
     _append "auto* model = Crails::cast<#{ptr_type}>(vars, \"model\");"
     _append "OArchive archive;\n"
-    _append "model->serialize(archive);"
+    _append "if (model)"
+    _append "  model->serialize(archive);"
+    _append "else"
+    _append "  throw boost_ext::runtime_error(\"Called #{funcname} with null model\");"
     _append "target.set_body(archive.as_string());"
     @indent -= 1
     _append "}\n"

data/lib/metarecord/generators/crails/destroy_generator.rb

@@ -101,7 +101,7 @@ class CrailsDestroyGenerator < GeneratorBase
       _append "query = Query::#{relation[:field]}_id == self_id;"
     end
     _append "database.find<::#{relation[:class]}>(models, query);"
-    _append "for (auto model : odb::to_vector<::#{relation[:class]}>(models))"
+    _append "for (auto model : Crails::Odb::to_vector<::#{relation[:class]}>(models))"
     if relation[:options][:dependent] == :destroy
       _append "  database.destroy(model);"
     elsif relation[:options][:dependent] == :unlink
@@ -127,7 +127,7 @@ class CrailsDestroyGenerator < GeneratorBase
       _append "Query query;\n"
       _append "query = Query::#{klassname}::id == self_id;"
       _append "database.find<#{view_klass}>(models, query);"
-      _append "for (auto model : odb::to_vector<#{relation[:class]}, #{view_klass}>(models))"
+      _append "for (auto model : Crails::Odb::to_vector<#{relation[:class]}, #{view_klass}>(models))"
       _append "{"
       @indent += 1
       if relation[:options][:dependent] == :destroy
@@ -152,7 +152,7 @@ class CrailsDestroyGenerator < GeneratorBase
       id_field = "#{get_singular_name relation[:field]}_ids"
       _append "query = Query::#{id_field} + \"@>\" + Crails::Odb::array_to_string(ids, \"int\");"
       _append "database.find<#{relation[:class]}>(models, query);"
-      _append "for (auto model : odb::to_vector<#{relation[:class]}>(models))"
+      _append "for (auto model : Crails::Odb::to_vector<#{relation[:class]}>(models))"
       _append "{"
       @indent += 1
       if relation[:options][:dependent] == :destroy

data/lib/metarecord/generators/crails/view_generator.rb

@@ -64,7 +64,7 @@ class CrailsViewGenerator < GeneratorBase
   end
 
   class << self
-    def extension ; ".cjson" ; end
+    def extension ; ".json" ; end
 
     def make_file filename, data
       source = ""

data/lib/metarecord/generators/qt/base.rb

@@ -0,0 +1,63 @@
+require 'metarecord/model'
+require 'metarecord/generator_base'
+
+class GeneratorQtBase < GeneratorBase
+  class << self
+    def super_class
+      if defined? METARECORD_MODEL_SUPER_CLASS
+        METARECORD_MODEL_SUPER_CLASS
+      else
+        "MetaRecordNotifiable"
+      end
+    end
+
+    def super_class_include
+      if defined? METARECORD_MODEL_SUPER_CLASS_PATH
+        METARECORD_MODEL_SUPER_CLASS_PATH
+      else
+        "metarecord-qt/metarecordnotifiable.h"
+      end
+    end
+  end
+
+  def id_type
+    "QByteArray"
+  end
+
+  def null_id
+    case id_type
+    when 'QByteArray' then 'QByteArray()'
+    else 0
+    end
+  end
+
+  def get_type type
+    if type.kind_of? Class
+      return type.new self if type <= PropertyType
+    end
+    PropertyType.new(nativeTypeNameFor type)
+  end
+
+  def nativeTypeNameFor type
+    if type.class == Class
+      case type.name
+      when 'String'    then 'QString'
+      when 'ByteArray' then 'QByteArray'
+      when 'Hash'      then 'QVariantMap'
+      when 'DateTime'  then 'QDateTime'
+      when 'Integer'   then 'qint64'
+      when 'Float'     then 'qfloat16'
+      when 'Boolean'   then 'bool'
+      else type
+      end
+    else
+      case type
+      when 'std::string'          then 'QString'
+      when 'std::time_t'          then 'QDateTime'
+      when 'DataTree'             then 'QJsonObject'
+      when 'Crails::Odb::id_type' then id_type
+      else type
+      end
+    end
+  end
+end

data/lib/metarecord/generators/qt/header_generator.rb

@@ -0,0 +1,205 @@
+require 'metarecord/generators/qt/base'
+
+class QtHeaderGenerator < GeneratorQtBase
+  def reset
+    super
+    @state = nil
+    @relations = {}
+    @fields = []
+    @transients = []
+    @signals = []
+  end
+
+  def generate_for object
+    reset
+    @class_name = object[:name]
+    @inherits = object[:inherits]
+    _append "class #{@class_name} : public #{super_class}"
+    make_block ['{', '};'] do
+      generate_qobject object
+      generate_transient_members unless @transients.empty?
+      unindent do _append "public:" end
+      generate_constructor object
+      generate_methods object
+      generate_signals object
+      generate_members object
+    end
+    @src
+  end
+
+  def super_class
+    if @inherits.nil?
+      self.class.super_class
+    else
+      @inherits
+    end
+  end
+
+  def generate_qobject object
+    @state = :qproperty
+    _append "Q_OBJECT"
+    _append "Q_PROPERTY(#{id_type} uid READ getUid WRITE setUid NOTIFY uidChanged)"
+    self.instance_eval &object[:block]
+  end
+
+  def generate_constructor object
+    @state = :constructor
+    _append "#{@class_name}(QObject* parent = nullptr);"
+  end
+
+  def generate_methods object
+    @state = :methods
+    self.instance_eval &object[:block]
+  end
+
+  def generate_transient_members
+    list = []
+    macro = "METARECORD_VIRTUAL_PROPERTIES"
+    _append "static const QStringList virtualPropertyNames;"
+    _append "#{macro}(#{super_class}, virtualPropertyNames)"
+  end
+
+  def generate_members object
+    @state = :members
+    self.instance_eval &object[:block]
+  end
+
+  def generate_signals object
+    unindent do _append "Q_SIGNALS:" end
+    @signals.each do |signal|
+      _append "void #{signal}();"
+    end
+  end
+
+  def property type, name, options = {}
+    property_type = type.to_property_type(self)
+    type = property_type.name
+    member = "m_#{name.lower_camelcase}"
+    member = options[:qt][:member] if options[:qt] && options[:qt][:member]
+    getter = name.lower_camelcase
+    setter = "set#{name.camelcase}"
+    signal = "#{name.lower_camelcase}Changed"
+    case @state
+    when :qproperty
+      _append "Q_PROPERTY(#{type} #{name} READ #{getter} WRITE #{setter} NOTIFY #{signal})"
+      @transients << name if options[:db] && options[:db][:transient]
+      @signals << signal
+    when :members
+      if options[:qt].nil? || options[:qt][:member].nil?
+        if options[:default].nil?
+          _append "#{type} #{member};"
+        else
+          _append "#{type} #{member} = #{get_value options[:default]};"
+        end
+      end
+    when :methods
+      getter_options = if options[:qt] && options[:qt][:getter] then options[:qt][:getter] else {} end
+      setter_options = if options[:qt] && options[:qt][:setter] then options[:qt][:setter] else {} end
+      getter_type = property_type.parameter_type getter_options
+      setter_type = property_type.parameter_type setter_options
+      getter_override = if getter_options[:override] then " override" else "" end
+      setter_override = if setter_options[:override] then " override" else "" end
+      _append "virtual #{getter_type} #{getter}() const#{getter_override};"
+      _append "virtual void #{setter}(#{setter_type} _value)#{setter_override};"
+    end
+  end
+
+  def has_one type, name, options = {}
+    id_name = "#{name.lower_camelcase}Id"
+    getter = name.lower_camelcase
+    setter = "set#{name.camelcase}"
+    signal = "#{name}Changed"
+    member_name = "m_#{name.lower_camelcase}"
+    case @state
+    when :qproperty
+      _append "Q_PROPERTY(#{id_type} #{id_name} MEMBER m_#{id_name} NOTIFY #{signal})"
+      _append "Q_PROPERTY(#{type.gsub! /^::/, ''}* #{name} READ #{getter} WRITE #{setter} NOTIFY #{signal})"
+      @transients << name
+      @signals << signal
+    when :constructor
+      _append "connect(this, #{@class_name}::#{signal}, this, #{@class_name}::attributeChanged);"
+    when :methods
+      _append "#{type}* #{getter}() const { return #{member_name}; }"
+      _append "METARECORD_MODEL_SETTER_BY_COPY_WITH_SIGNAL(#{type}, #{member_name}, #{setter}, #{signal})"
+    when :members
+      _append "#{id_type} m_#{id_name} = #{null_id};"
+      _append "#{type}* #{member_name} = nullptr;"
+    end
+  end
+
+  def has_many type, name, options = {}
+    qml_getter = "getQml#{name.camelcase}"
+    getter = name.lower_camelcase
+    setter = "set#{name.camelcase}"
+    member_name = "m_#{name.lower_camelcase}"
+    signal = "#{name}Changed"
+    case @state
+    when :qproperty
+      @src += "# ifdef METARECORD_WITH_QML\n"
+      _append "Q_PROPERTY(QQmlListProperty<#{type}> #{name} READ #{qml_getter} NOTIFY #{signal})"
+      @src += "# endif\n"
+      @signals << signal
+    when :constructor
+      _append "registerRelationship(\"#{name}\", #{name});"
+    when :methods
+      _append "const QList<#{type}*>& #{getter}() const { return #{member_name}; }"
+      _append "void #{setter}(const QList<#{type}*>&);"
+      @src += "# ifdef METARECORD_WITH_QML\n"
+      _append "Q_INVOKABLE QQmlListProperty<#{type}> #{qml_getter}() { return QQmlListProperty<#{type}>(this, &#{member_name}); }"
+      @src += "# endif\n"
+    when :members
+      _append "QList<#{type}*> #{member_name};"
+    end
+  end
+
+  def visibility name
+    case @state
+    when :members
+      @src += name.to_s + ":\n"
+    end
+  end
+
+  def resource_name name
+    case @state
+    when :methods
+      _append "static QByteArray resourceName() { return #{name.to_s.inspect}; }"
+    end
+  end
+
+  def order_by name, flow = nil
+    flow_value = if flow == :desc then -1 else 1 end
+    case @state
+    when :methods
+      _append "static QPair<QByteArray, int> orderedBy() { return {#{name.to_s.inspect}, #{flow_value}}; }"
+    end
+  end
+
+  class << self
+    def extension ; ".h" ; end
+
+    def is_file_based? ; true ; end
+
+    def generate_includes
+<<CPP
+# include <#{super_class_include}>
+# include <metarecord-qt/hasOne.h>
+# ifdef METARECORD_WITH_QML
+#  include <QQmlListProperty>
+# endif
+CPP
+    end
+
+    def make_file filename, data
+      file_define = "_#{filename[0...-3].upcase.gsub "/", "_"}_H"
+      source = <<CPP
+#ifndef  #{file_define}
+# define #{file_define}
+#{generate_includes}
+#{collect_includes_for(filename, true).join "\n"}
+
+#{data[:bodies].join "\n"}
+#endif
+CPP
+    end
+  end
+end

data/lib/metarecord/generators/qt/source_generator.rb

@@ -0,0 +1,133 @@
+require 'metarecord/generators/qt/base'
+
+class QtSourceGenerator < GeneratorQtBase
+  def reset
+    super
+    @state = nil
+    @relations = {}
+    @fields = []
+    @transients = []
+    @signals = []
+  end
+
+  def generate_for object
+    reset
+    @class_name = object[:name]
+    @inherits = object[:inherits]
+    generate_constructor object
+    generate_transient_members unless @transients.empty?
+    generate_methods object
+    @src
+  end
+
+  def super_class
+    if @inherits.nil?
+      self.class.super_class
+    else
+      @inherits
+    end
+  end
+
+  def generate_constructor object
+    @state = :constructor
+    _append "#{@class_name}::#{@class_name}(QObject* parent) : #{super_class}(parent)"
+    make_block do
+      self.instance_eval &object[:block]
+    end
+    _append ""
+  end
+
+  def generate_transient_members
+    @transients.each do |member|
+      list << "{#{member.inspect}}"
+    end
+    _append "const QStringList #{@class_name}::virtualPropertyNames = {#{list.join ','}};"
+  end
+
+  def generate_methods object
+    @state = :methods
+    self.instance_eval &object[:block]
+  end
+
+  def property type, name, options = {}
+    property_type = type.to_property_type(self)
+    type = property_type.name
+    member = "m_#{name.lower_camelcase}"
+    member = options[:qt][:member] if options[:qt] && options[:qt][:member]
+    getter = name.lower_camelcase
+    setter = "set#{name.camelcase}"
+    signal = "#{name.lower_camelcase}Changed"
+    case @state
+    when :constructor
+      _append "connect(this, &#{@class_name}::#{signal}, this, &#{@class_name}::attributeChanged);"
+      unless options[:qt].nil? || options[:qt][:member].nil?
+        _append "#{member} = #{get_value options[:default]};" unless options[:default].nil?
+      end
+      @transients << name if options[:db] && options[:db][:transient]
+    when :methods
+      getter_options = if options[:qt] && options[:qt][:getter] then options[:qt][:getter] else {} end
+      setter_options = if options[:qt] && options[:qt][:setter] then options[:qt][:setter] else {} end
+      getter_type = property_type.parameter_type getter_options
+      setter_type = property_type.parameter_type setter_options
+      _append "\n#{getter_type} #{@class_name}::#{getter}() const"
+      make_block do
+        _append "return #{member};"
+      end
+      _append "\nvoid #{@class_name}::#{setter}(#{setter_type} _value)"
+      make_block do
+        _append "if (_value != #{member})"
+        make_block do
+          _append "#{member} = _value;"
+          _append "Q_EMIT #{signal}();"
+        end
+      end
+    end
+  end
+
+  def has_one type, name, options = {}
+    case @state
+    when :constructor
+      @transients << name
+    end
+  end
+
+  def has_many type, name, options = {}
+    setter = "set#{name.camelcase}"
+    member_name = "m_#{name.lower_camelcase}"
+    signal = "#{name}Changed"
+    case @state
+    when :constructor
+      _append "registerRelationship(\"#{name}\", #{member_name});"
+    when :methods
+      _append "void #{@class_name}::#{setter}(const  QList<#{type}*>& value)"
+      make_block do
+        _append "#{member_name} = value;"
+        _append "Q_EMIT #{signal}();"
+      end 
+    end
+  end
+
+  def visibility name
+  end
+
+  def resource_name name
+  end
+
+  def order_by name, flow = nil
+  end
+
+  class << self
+    def extension ; ".cpp" ; end
+
+    def is_file_based? ; true ; end
+
+    def make_file filename, data
+      source = <<CPP
+#include "#{filename.split('/').last[0...-3]}.h"
+#{collect_includes_for(filename).join "\n"}
+
+#{data[:bodies].join "\n"}
+CPP
+    end
+  end
+end

data/lib/metarecord/properties.rb

@@ -0,0 +1,83 @@
+class PropertyType
+  def initialize name
+    @name = name
+  end
+
+  def name
+    @name
+  end
+
+  def parameter_type options = {}
+    if (pass_by_const_reference? && options[:ref].nil?) || options[:ref]
+      "const #{@name}&"
+    else
+      @name
+    end
+  end
+
+  def pass_by_const_reference?
+    true
+  end
+end
+
+class PropertyTypeFromRubyType < PropertyType
+  def initialize name, sourceType
+    super name
+    @sourceType = sourceType
+  end
+
+  def pass_by_const_reference?
+    if [Float, Integer, Fixnum, Bignum, Complex, Rational].include? @sourceType
+      false
+    else
+      true
+    end
+  end
+end
+
+class Boolean < PropertyType
+  def initialize parent
+    super(if parent.methods.include?(:nativeTypeNameFor)
+      name = parent.nativeTypeNameFor ByteArray
+      if name == ByteArray then default_name else name end
+    else
+      default_name
+    end)
+  end
+
+  def default_name
+    "bool"
+  end
+
+  def pass_by_const_reference?
+    false
+  end
+end
+
+class ByteArray < PropertyType
+  def initialize parent
+    super(if parent.methods.include?(:nativeTypeNameFor)
+      name = parent.nativeTypeNameFor ByteArray
+      if name == ByteArray then default_name else name end
+    else
+      default_name
+    end)
+  end
+
+  def default_name
+    "std::string"
+  end
+end
+
+class Class
+  def to_property_type parent
+    if self <= PropertyType
+      self.new parent
+    elsif parent.methods.include? :nativeTypeNameFor
+      PropertyTypeFromRubyType.new parent.nativeTypeNameFor(self), self
+    else
+      throw "Cannot use Class as a property type parameter with a generator that doesn't implement nativeTypeNameFor"
+    end
+  end
+end
+

data/lib/metarecord/string.rb

@@ -0,0 +1,29 @@
+require_relative './properties'
+
+class String
+  def underscore
+    self.gsub(/::/, '/').
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    tr("-", "_").
+    downcase
+  end
+
+  def camelcase
+    return self if self !~ /_/ && self =~ /[A-Z]+.*/
+    split(/_|\//).map{|e| e.capitalize}.join
+  end
+
+  def lower_camelcase
+    upperCamelcase = camelcase
+    upperCamelcase[0].downcase + upperCamelcase[1..-1]
+  end
+
+  def to_property_type parent
+    if parent.methods.include? :nativeTypeNameFor
+      PropertyType.new(parent.nativeTypeNameFor self)
+    else
+      PropertyType.new self
+    end
+  end
+end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: meta-record
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Michael Martin Moro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies: []
 description: |2
     MetaRecord is a code generator that allows you to define your application
     models using a Ruby-powered DSL, and generates various implementation for
     them, for your web server, client, or mobile application.
-    It can generates code for the following targests: Crails, ActiveRecord,
+    It can generate code for the following targests: Crails, Qt, ActiveRecord,
     Comet.cpp, and Aurelia.js.
 email: michael@unetresgrossebite.com
 executables:
@@ -36,13 +36,18 @@ files:
 - lib/metarecord/generators/crails/helpers/validations.rb
 - lib/metarecord/generators/crails/query_generator.rb
 - lib/metarecord/generators/crails/view_generator.rb
+- lib/metarecord/generators/qt/base.rb
+- lib/metarecord/generators/qt/header_generator.rb
+- lib/metarecord/generators/qt/source_generator.rb
 - lib/metarecord/generators/rails/data_generator.rb
 - lib/metarecord/generators/rails/migration_generator.rb
 - lib/metarecord/generators/rails/migrations/table_helpers.rb
 - lib/metarecord/generators/rails/migrations/type_helpers.rb
 - lib/metarecord/manifest_generator.rb
 - lib/metarecord/model.rb
+- lib/metarecord/properties.rb
 - lib/metarecord/runner.rb
+- lib/metarecord/string.rb
 homepage: https://github.com/crails-framework/meta-record
 licenses:
 - 0BSD