meta-record 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20cb8eea318a55b539b48eca34a554755cb624a6944180cd7dc611591f4db39d
-  data.tar.gz: 36933fe0fde7d856c30b6c6a50b1c0d1aa8bf2fa660989a54844398eeac3606f
+  metadata.gz: 1b69f5ecbbd9f965b58eb3e7e24afc9eb1984b9731dacacb27c6b9ca9b330e0a
+  data.tar.gz: 27801886a4b4faec633e3126610aafe74a527e4ca01ed196f0cf686fff2e99bb
 SHA512:
-  metadata.gz: e43594ecafa0f39f5a11f8450ec9c2a2fd5dddf2a3ffd9208dec9cd62402d3c436acdc9b260d1bd668da6a7a7a170f139bb5f76032d611fc56ffc894dbf83b57
-  data.tar.gz: 1668284a722f57efcecfc0ea220c3103e1dd1b52358881f96823347444165c7828755b0a175b6b31425db8be6ade028afc3ea55616f8d607abd0b3b1fd34c63d
+  metadata.gz: 17cdcda84be56c6cadb92d0820de95da5afaa7dd308bedc3a85c50ef435cf4ab319d108a556f6e93487922818d5f90d1d32e0fa08d0317acfb653d83a8c3e222
+  data.tar.gz: 2f6e23b9cd576e810ff94418343cd673c8b5a3ac1104a43d2bda67b791abc0d76958f722ad0510161eaa0465ea548a6f220d91db5839897c5e625ee38e55560a

data/bin/metarecord-make

@@ -15,6 +15,7 @@ end
 @tmpdir     = ".tmp"
 
 OptionParser.new do |opts|
+  opts.on "-v",            "--verbose"          do @verbose == true end
   opts.on "-o PATH",       "--output-path=PATH" do |v| @output     = v end
   opts.on "-b PATH",       "--base-path=PATH"   do |v| @base_path  = v end
   opts.on "-i PATH",       "--source-path=PATH" do |v| @input      = v.split(",") end

data/lib/metarecord/generator_base.rb

@@ -176,7 +176,7 @@ class GeneratorBase
     if defined? METARECORD_ID_TYPE
       METARECORD_ID_TYPE
     else
-      "ODB::id_type"
+      "Crails::Odb::id_type"
     end
   end
 
@@ -194,4 +194,8 @@ class GeneratorBase
   def property type, name, options = {} ;; end
   def has_one type, name, options = {} ;; end
   def has_many type, name, options = {} ;; end
+
+  def should_skip_on_client? options
+    (not options[:client].nil?) && options[:client][:ignore] == true
+  end
 end

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

@@ -71,21 +71,24 @@ class CometArchiveGenerator < GeneratorBase
   end
 
   def property type, name, options = {}
+    return if should_skip_on_client? options
     @src += " & #{name}"
   end
 
   def has_one type, name, options = {}
+    return if should_skip_on_client? options
     if options[:joined] != false
-      puts "WARNING: unsupported joined has_one in metarecord/generators/comet/archive_generator"
+      @src += " & #{name}"
     else
       @src += " & #{name}_id"
     end
   end
 
   def has_many type, name, options = {}
+    return if should_skip_on_client? options
     singular_name = get_singular_name name
     if options[:joined] != false
-      puts "WARNING: unsupported joined has_many in metarecord/generators/comet/archive_generator"
+      @src += " & #{name}"
     else
       @src += " & #{singular_name}_ids"
     end

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

@@ -0,0 +1,61 @@
+require 'metarecord/generator_base'
+require 'metarecord/generators/rails/migrations/table_helpers'
+
+class CometArchiveRendererGenerator < GeneratorBase
+  def should_generate_for object
+    false
+  end
+
+  def should_generate_from_manifest
+    true
+  end
+
+  def generate_manifest old_manifest, new_manifest
+    reset
+    @indent = 2
+    @declarations = ""
+    new_manifest.keys.each do |model_name|
+      add_model model_name
+    end
+    @indent = 0
+    make_renderer
+  end
+
+private
+  def add_model model
+    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"
+    _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"
+    _append "templates.insert("
+    _append "  pair<string, Generator>(\"#{name}/index\", #{funcname})"
+    _append ");"
+  end
+
+  def make_renderer
+    filepath = "lib/renderers/archive.cpp"
+    src = <<CPP
+#include <crails/renderers/archive_renderer.hpp>
+#include <crails/archive.hpp>
+
+using namespace Crails;
+using namespace std;
+
+#{@declarations}
+
+ArchiveRenderer::ArchiveRenderer()
+{
+#{@src}
+}
+CPP
+    File.open filepath, 'w' do |f|
+      f.write src
+    end
+    puts "[metarecord][archive/renderer] Generated renderer file #{filepath}"
+  end
+end

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

@@ -27,6 +27,7 @@ class CometDataGenerator < CrailsDataGenerator
     _append "void         from_json(Data data);"
     _append "virtual std::vector<std::string> find_missing_parameters(Data) const;"
     _append "virtual void                     edit(Data);"
+    _append "virtual void                     merge_data(Data) const;"
     _append "virtual std::string              to_json() const;"
     _append "virtual bool                     is_valid();"
     _append_macro "#else"
@@ -65,10 +66,11 @@ class CometDataGenerator < CrailsDataGenerator
 <<CPP
 #{super}
 #ifdef #{client_define}
-# include <crails/comet/mvc/model.hpp>
+# include <comet/mvc/model.hpp>
+# include <comet/mvc/archive_model.hpp>
 # include <comet/promise.hpp>
 # ifndef #{client_super_class}
-#  define #{client_super_class} Comet::JsonModel
+#  define #{client_super_class} Comet::JsonModel<>
 # endif
 #endif
 CPP

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

@@ -138,7 +138,7 @@ class CometEditGenerator < CrailsEditGenerator
 #ifndef #{CometDataGenerator.client_define}
 #{super}
 #else
-# include <crails/comet/mvc/helpers.hpp>
+# include <crails/odb/helpers.hpp>
 #endif
 CPP
     end

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

@@ -70,6 +70,7 @@ class CrailsDataGenerator < GeneratorBase
   def edit_resource_declaration
     _append "virtual std::vector<std::string> find_missing_parameters(Data) const;"
     _append "virtual void                     edit(Data);"
+    _append "virtual void                     merge_data(Data) const;"
     _append "virtual std::string              to_json() const;"
     _append "virtual bool                     is_valid();"
     _append "virtual void                     on_dependent_destroy(#{id_type});"

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

@@ -70,7 +70,7 @@ class CrailsDestroyGenerator < GeneratorBase
       @indent += 1
       depended_by = CrailsDestroyGenerator.destroy_data[object[:classname]]
       if depended_by.class == Array
-        _append "auto& database = *#{GeneratorBase.odb_connection[:object]}::instance;"
+        _append "#{GeneratorBase.odb_connection[:object]} database;"
         depended_by.each do |relation|
           _append "// #{relation[:class]}"
           _append "{"
@@ -150,7 +150,7 @@ class CrailsDestroyGenerator < GeneratorBase
       _append "odb::result<#{relation[:class]}> models;"
       _append "Query query;\n"
       id_field = "#{get_singular_name relation[:field]}_ids"
-      _append "query = Query::#{id_field} + \"@>\" + ODB::array_to_string(ids, \"int\");"
+      _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 "{"

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

@@ -36,11 +36,17 @@ class CrailsEditGenerator < GeneratorBase
 
   def generate_json_methods object
     @rendering_to_json = true
+    _append "void #{@klassname}::merge_data(Data data) const"
+    _append "{"
+    @indent += 1
+    self.instance_eval &object[:block]
+    @indent -= 1
+    _append "}\n"
     _append "std::string #{@klassname}::to_json() const"
     _append "{"
     @indent += 1
     _append "DataTree data;\n"
-    self.instance_eval &object[:block]
+    _append "merge_data(data);\n"
     _append "return data.to_json();"
     @indent -= 1
     _append "}\n"
@@ -131,7 +137,7 @@ class CrailsEditGenerator < GeneratorBase
     tptr = ptr_type type
     _append "#{tptr} #{@klassname}::get_#{name}() const"
     _append "{"
-    _append "  auto& database = *#{GeneratorBase.odb_connection[:object]}::instance;"
+    _append "  #{GeneratorBase.odb_connection[:object]} database;"
     _append "  #{tptr} result;\n"
     _append "  database.find_one(result, #{name}_id);"
     _append "  return result;"
@@ -155,7 +161,7 @@ class CrailsEditGenerator < GeneratorBase
     _append "    set_#{name}(nullptr);"
     _append "  else if (!get_#{name}() || #{data_id} != get_#{name}()->get_id())"
     _append "  {"
-    _append "    auto& database = *#{GeneratorBase.odb_connection[:object]}::instance;"
+    _append "    #{GeneratorBase.odb_connection[:object]} database;"
     _append "    #{tptr} linked_resource;"
     _append "    database.find_one(linked_resource, data[\"#{name}_id\"].as<#{id_type}>());"
     _append "    set_#{name}(linked_resource);"
@@ -326,11 +332,11 @@ class CrailsEditGenerator < GeneratorBase
     _append "{"
     @indent += 1
     _append "typedef odb::pgsql::query<#{type}> query;"
-    _append "auto& database = *#{GeneratorBase.odb_connection[:object]}::instance;"
+    _append "#{GeneratorBase.odb_connection[:object]} database;"
     _append "odb::result<#{type}> results;"
     _append "#{name}.clear();"
     _append "database.find<#{type}>(results,"
-    _append "  query::id + \"=\" + ODB::any(#{singular_name}_ids, \"int\")"
+    _append "  query::id + \"=\" + Crails::Odb::any(#{singular_name}_ids, \"int\")"
     _append ");"
     _append "for (auto model : results)"
     _append "  #{name}.push_back(std::make_shared<#{type}>(model));"

data/lib/metarecord/generators/crails/helpers/validations.rb

@@ -25,7 +25,7 @@ def validate_uniqueness source_type, name
     type = source_type[16..-2]
 <<CPP
   {
-    auto& database = *#{GeneratorBase.odb_connection[:object]}::instance;
+    #{GeneratorBase.odb_connection[:object]} database;
     odb::result<#{source_type}> results;
 
     database.find(results, odb::query<#{source_type}::#{name}->id == get_#{name}_id());
@@ -36,7 +36,7 @@ CPP
   else
 <<CPP
   {
-    auto& database = *#{GeneratorBase.odb_connection[:object]}::instance;
+    #{GeneratorBase.odb_connection[:object]} database;
     odb::result<#{source_type}> results;
 
     database.find(results, odb::query<#{source_type}::#{name} == #{name});
@@ -58,7 +58,7 @@ CPP
 if (#{name} == nullptr)
   errors["#{name}_id"]["t"] = "validate.required";
 CPP
-  elsif type == "ODB::id_type"
+  elsif type == "Crails::Odb::id_type"
 <<CPP
 if (#{name} == 0)
   errors["#{name}"]["t"] = "validate.required";

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

@@ -28,7 +28,7 @@ class CrailsViewGenerator < GeneratorBase
   end
 
   def property type, name, options = {}
-    return if (not options[:client].nil?) && options[:client][:ignore] == true
+    return if should_skip_on_client? options
     if type == "DataTree" || type == "LocaleString"
       _append "json(#{name.inspect}, model.get_#{name}().as_data());"
     else
@@ -37,7 +37,7 @@ class CrailsViewGenerator < GeneratorBase
   end
 
   def has_one type, name, options = {}
-    return if (not options[:client].nil?) && options[:client][:ignore] == true
+    return if should_skip_on_client? options
     if options[:joined] == false
       _append "if (model.get_#{name}_id() != 0)"
       _append "  json(\"#{name}_id\", model.get_#{name}_id());"
@@ -48,7 +48,7 @@ class CrailsViewGenerator < GeneratorBase
   end
 
   def has_many type, name, options = {}
-    return if (not options[:client].nil?) && options[:client][:ignore] == true
+    return if should_skip_on_client? options
     _append "{"
     @indent += 1
     id_attr = (get_singular_name name) + "_ids"

data/lib/metarecord/generators/rails/migrations/type_helpers.rb

@@ -1,23 +1,23 @@
 module RailsTypeHelpers
   def get_record_type type
     case type
-    when "ODB::id_type"       then :bigint
-    when "char"               then :tinyint
-    when "unsigned char"      then :smallint
-    when "short"              then :smallint
-    when "unsigned short"     then :mediumint
-    when "int"                then :integer
-    when "unsigned int"       then :integer
-    when "long"               then :bigint
-    when "long long"          then :bigint
-    when "unsigned long"      then :bigint
-    when "unsigned long long" then :bigint
-    when "double"             then :float
-    when "long double"        then :float
-    when "float"              then :float
-    when "bool"               then :boolean
-    when "std::string"        then :string
-    when "std::time_t"        then :timestamp
+    when "Crails::Odb::id_type" then :bigint
+    when "char"                 then :tinyint
+    when "unsigned char"        then :smallint
+    when "short"                then :smallint
+    when "unsigned short"       then :mediumint
+    when "int"                  then :integer
+    when "unsigned int"         then :integer
+    when "long"                 then :bigint
+    when "long long"            then :bigint
+    when "unsigned long"        then :bigint
+    when "unsigned long long"   then :bigint
+    when "double"               then :float
+    when "long double"          then :float
+    when "float"                then :float
+    when "bool"                 then :boolean
+    when "std::string"          then :string
+    when "std::time_t"          then :timestamp
     else nil
     end
   end

data/lib/metarecord/manifest_generator.rb

@@ -28,7 +28,7 @@ class ManifestGenerator < GeneratorBase
     db_options  = options[:db] || Hash.new
     column_name = db_options[:column] || "#{name}_id"
     db_options.delete :column
-    @current_manifest_item[column_name] = { type: "ODB::id_type", options: db_options }
+    @current_manifest_item[column_name] = { type: "Crails::Odb::id_type", options: db_options }
   end
 
   def has_many type, name, options = {}

data/lib/metarecord/runner.rb

@@ -37,7 +37,7 @@ module MetaRecordRunner
         puts "[metarecord] generated #{new_path}"
         `mkdir -p '#{File.dirname new_path}'`
         `cp '#{tmp_file}' '#{new_path}'`
-      else
+      elsif @verbose == true
         puts "[metarecord] no updates required for #{new_path}"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta-record
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Michael Martin Moro
@@ -27,6 +27,7 @@ files:
 - lib/metarecord/generator_base.rb
 - lib/metarecord/generators/aurelia_generator.rb
 - lib/metarecord/generators/comet/archive_generator.rb
+- lib/metarecord/generators/comet/archive_renderer_generator.rb
 - lib/metarecord/generators/comet/data_generator.rb
 - lib/metarecord/generators/comet/edit_generator.rb
 - lib/metarecord/generators/crails/data_generator.rb
@@ -44,7 +45,7 @@ files:
 - lib/metarecord/runner.rb
 homepage: https://github.com/crails-framework/meta-record
 licenses:
-- BSD
+- 0BSD
 metadata: {}
 post_install_message:
 rdoc_options: []