meta-record 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b69f5ecbbd9f965b58eb3e7e24afc9eb1984b9731dacacb27c6b9ca9b330e0a
-  data.tar.gz: 27801886a4b4faec633e3126610aafe74a527e4ca01ed196f0cf686fff2e99bb
+  metadata.gz: 7d3ae0ed61506286b16383437708cb00772a261b5918c7bad70eb3a98f2a9801
+  data.tar.gz: a4c8bbc4eb90d352a6a3d6d78f3412e9b2dc70ce966ad83061466a6d98d3bd99
 SHA512:
-  metadata.gz: 17cdcda84be56c6cadb92d0820de95da5afaa7dd308bedc3a85c50ef435cf4ab319d108a556f6e93487922818d5f90d1d32e0fa08d0317acfb653d83a8c3e222
-  data.tar.gz: 2f6e23b9cd576e810ff94418343cd673c8b5a3ac1104a43d2bda67b791abc0d76958f722ad0510161eaa0465ea548a6f220d91db5839897c5e625ee38e55560a
+  metadata.gz: fcd4a7e510f542d0d02226f00995fd8cc70e09e87009ddbbb835d08df056a9d78365e43a34dd750aaa4f672c31d863d8f0a65922b3e6cc5619242fc631e2a149
+  data.tar.gz: b898b99895df1a27d4e168b587e5251ae54fe8d5176c804c5e2f840d5d70008eb9c4c01fcda1c799867e00ab300375951ca112a44eac1e84cfcfc153484a8be5

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

@@ -44,18 +44,18 @@ class CometArchiveGenerator < GeneratorBase
     funcname_prefix = "render_#{object[:classname].gsub(/^::/,'').underscore}"
     funcname = "#{funcname_prefix}_show_archive"
     _append "#ifndef #{self.class.client_define}"
-    _append "std::string #{funcname}(const Crails::Renderer* renderer, Crails::SharedVars& vars)"
+    _append "void #{funcname}(const Crails::Renderer&, Crails::RenderTarget& target, Crails::SharedVars& vars)"
     _append "{"
     @indent += 1
     _append "auto* model = Crails::cast<#{ptr_type}>(vars, \"model\");"
     _append "OArchive archive;\n"
     _append "model->serialize(archive);"
-    _append "return archive.as_string();"
+    _append "target.set_body(archive.as_string());"
     @indent -= 1
     _append "}\n"
 
     funcname = "#{funcname_prefix}_index_archive"
-    _append "std::string #{funcname}(const Crails::Renderer* renderer, Crails::SharedVars& vars)"
+    _append "void #{funcname}(const Crails::Renderer&, Crails::RenderTarget& target, Crails::SharedVars& vars)"
     _append "{"
     @indent += 1
     _append "auto* models = Crails::cast<std::vector<#{object[:classname]}>*>(vars, \"models\");"
@@ -64,7 +64,7 @@ class CometArchiveGenerator < GeneratorBase
     _append "archive & size;"
     _append "for (auto& model : *models)"
     _append "  model.serialize(archive);"
-    _append "return archive.as_string();"
+    _append "target.set_body(archive.as_string());"
     @indent -= 1
     _append "}"
     _append "#endif"

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

@@ -26,12 +26,12 @@ private
     name = model.gsub(/^::/,'').underscore
     funcname_prefix = "render_#{name}"
     funcname = "#{funcname_prefix}_show_archive"
-    @declarations += "std::string #{funcname}(const Crails::Renderer* renderer, Crails::SharedVars& vars);\n"
+    @declarations += "void #{funcname}(const Crails::Renderer& renderer, Crails::RenderTarget& target, Crails::SharedVars& vars);\n"
     _append "templates.insert("
     _append "  pair<string, Generator>(\"#{name}/show\", #{funcname})"
     _append ");"
     funcname = "#{funcname_prefix}_index_archive"
-    @declarations += "std::string #{funcname}(const Crails::Renderer* renderer, Crails::SharedVars& vars);\n"
+    @declarations += "void #{funcname}(const Crails::Renderer& renderer, Crails::RenderTarget& target,  Crails::SharedVars& vars);\n"
     _append "templates.insert("
     _append "  pair<string, Generator>(\"#{name}/index\", #{funcname})"
     _append ");"

data/lib/metarecord/generators/rails/data_generator.rb

@@ -13,6 +13,10 @@ class RailsDataGenerator < GeneratorBase
       "ActiveRecord::Base"
     end
   end
+
+  def super_class
+    if @inherits.nil? then model_base_class else @inherits end
+  end
   
   def reset
     super
@@ -21,8 +25,9 @@ class RailsDataGenerator < GeneratorBase
 
   def generate_for object
     reset
+    @inherits = object[:inherits]
     indent do
-      _append "class #{object[:name]} < #{model_base_class}"
+      _append "class #{object[:name]} < #{super_class}"
       indent do
         _append "self.abstract_class = true"
         _append ""

data/lib/metarecord/model.rb

@@ -10,8 +10,14 @@ class Model
         definition = { classname: definition.first, hpp: definition.last }
       end
       definition[:classname] ||= "::#{name}"
-      @list << { name: name, filename: current_file, block: block,
-                 classname: definition[:classname], header: definition[:hpp] }
+      @list << {
+        name: name,
+        filename: current_file,
+        classname: definition[:classname],
+        header: definition[:hpp],
+        inherits: definition[:inherits],
+        block: block,
+      }
     end
 
     def list

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meta-record
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Michael Martin Moro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2023-02-12 00:00:00.000000000 Z
 dependencies: []
 description: |2
     MetaRecord is a code generator that allows you to define your application