goa_model_gen 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c67de54e5abf8bccd463399f089b2d1ca6dd608c771dae7e4102e3c742a63a66
-  data.tar.gz: 9fbcbec4ed85e6e30f87ff8da15a2599c38089aa19fbefb857a1d50066f19aad
+  metadata.gz: fe779fe770c8cd29d871c25eba2b99849f8ac1ded301e2882626b8f77ce05423
+  data.tar.gz: c5ceb285bcd63b666fbc2274718f2bb6a02da528b6828cb32bf8d7057dd9257c
 SHA512:
-  metadata.gz: b05112dfd0abc2818371f55103d60f137994e3ea60d1e8503e576c04bc0331bf2bba591b8282bd3931b9048c194d0cf5d88ba2ab4246d43d9800e5d756747512
-  data.tar.gz: d28035567f27259a583a270dc2142083850955bc2067a71ad0954a7b987fff881fad3d6d7d94082365075018ae6139a97f85c803143d8f20e5b5bffd08f6a1f7
+  metadata.gz: 6c79be2c421b0190493a611a545c9c4d1c674d48ad256dd3a6715bab0132234521bd471ff6cf366f78c9fc93c5c2da80fe77a41121f7549948461cc1da2c72a1
+  data.tar.gz: 617355d9b10271f9e16ec9f37fd4550ae070ecf3d92d90dc334ce1d536e2ebcd8a5bbd168d5382f88645c5fe1195fc3c6086ac3c6c8508b4b28cf728e22566ba

data/lib/goa_model_gen/cli.rb

@@ -48,7 +48,7 @@ module GoaModelGen
     def model(*paths)
       setup
       new_generator.process({
-        'templates/validator.go.erb' => File.join(cfg.model_dir, 'validator.go'),
+        'templates/validator.go.erb' => File.join(cfg.validator_dir, 'validator.go'),
         'templates/model_base.go.erb' => File.join(cfg.model_dir, "model_base.go"),
       })
       load_types_for(paths) do |source_file|

data/lib/goa_model_gen/config.rb

@@ -15,6 +15,8 @@ module GoaModelGen
       base_package_path
       model_dir
       model_package_path
+      validator_dir
+      validator_package_path
       store_dir
       store_package_path
       converter_dir
@@ -32,11 +34,13 @@ module GoaModelGen
       # @swagger_yaml   ||= "./swagger/swagger.yaml"
       @gofmt_disabled ||= false
       @model_dir      ||= "./model"
+      @validator_dir  ||= "./model"
       @store_dir      ||= "./stores"
       @converter_dir  ||= "./converters"
       @goa_gen_dir    ||= "./gen"
       @base_package_path  ||= default_go_package
       @model_package_path ||= join_paths(@base_package_path, @model_dir)
+      @validator_package_path ||= join_paths(@base_package_path, @validator_dir)
       @store_package_path ||= join_paths(@base_package_path, @store_dir)
       @converter_package_path ||= join_paths(@base_package_path, @converter_dir)
       @goa_gen_package_path   ||= join_paths(@base_package_path, @goa_gen_dir)

data/lib/goa_model_gen/field.rb

@@ -14,6 +14,7 @@ module GoaModelGen
     attr_accessor :swagger_name
     attr_reader :type_obj
     attr_reader :datastore_tag
+    attr_reader :prepare_method
 
     def initialize(name, attrs)
       @name = name
@@ -26,6 +27,7 @@ module GoaModelGen
       @goa_name = attrs['goa_name']
       @swagger_name = attrs['swagger_name']
       @datastore_tag = attrs['datastore_tag']
+      @prepare_method = attrs['prepare_method']
     end
 
     # https://goa.design/design/overview/

data/lib/goa_model_gen/loader.rb

@@ -1,5 +1,6 @@
 require "goa_model_gen"
 
+require "erb"
 require "yaml"
 
 require "goa_model_gen/logger"
@@ -17,7 +18,11 @@ module GoaModelGen
       @path = path
       @kind = kind
       @types_key, @fields_key = types_key, fields_key
-      @raw = YAML.load_file(path)
+
+      erb = ERB.new(File.read(path), nil, "-")
+      erb.filename = path
+      txt = erb.result
+      @raw = YAML.load(txt)
     end
 
     def build_type(name, d)

data/lib/goa_model_gen/templates/model.go.erb

@@ -75,7 +75,16 @@ func <%= type.name %>ToString(v <%= type.name %>) string {
 <%- end -%>
 
 <%- source_file.types.select(&:store?).each do |model| -%>
+func (m *<%= model.name %>) Assign(ref *Ref<%= model.id_golang_type.camelize %>) error {
+	ref.ID = m.ID
+<%-   if model.ref_name.present? -%>
+	ref.Name = m.<%= model.ref_name %>
+<%-   end -%>
+	return nil
+}
+
 func (m *<%= model.name %>) PrepareToCreate() error {
+  m.PrepareFields()
 <%- if model.fields.any?{|f| f.name == "CreatedAt"} -%>
 	if m.CreatedAt.IsZero() {
 		m.CreatedAt = time.Now()
@@ -96,6 +105,15 @@ func (m *<%= model.name %>) PrepareToUpdate() error {
 	return nil
 }
 
+func (m *<%= model.name %>) PrepareFields() error {
+<%- model.fields.each do |field| -%>
+<%-   if field.prepare_method.present? -%>
+  m.<%= field.name %> = m.<%= field.name %>.<%= field.prepare_method %>()
+<%-   end -%>
+<%- end -%>
+	return nil
+}
+
 func (m *<%= model.name %>) IsPersisted() bool {
 	return m.ID != <%= model.id_field.zero_value_expression %>
 }

data/lib/goa_model_gen/type.rb

@@ -43,6 +43,7 @@ module GoaModelGen
     attr_reader :goon
     attr_reader :base
     attr_reader :conv
+    attr_reader :ref_name
 
     def initialize(name, attrs)
       super(name, attrs)
@@ -53,6 +54,7 @@ module GoaModelGen
       @payload_name = check_blank(attrs['payload']){ store? ? "#{@name}Payload" : @name }
       @media_type_name = check_blank(attrs['media_type']){ @name }
       @conv = attrs['conv'] || 'generate'
+      @ref_name = attrs['ref_name']
     end
 
     def check_blank(s)

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor