goa_model_gen 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca554d53fda64080cd5a64e2408b2558f548c5d6acd6f5e14848736cf2d39fa
-  data.tar.gz: a426126a914b0b8d3e70f8fe6e4e995540c099dcbe5eadb97705ba489a146ceb
+  metadata.gz: 207c463abc5bf1e3b04bed480d759deb7bde42e54a8470d673ed90f3c48d3989
+  data.tar.gz: 90bfe7129e9b8bf5bf1dd0f902d091885d1e9adb09b49a4070533d459f5bd476
 SHA512:
-  metadata.gz: 890c57ae95750b80d5b96034c4c4844e7660c027c2e3959e53de6491bfb5f2d742922753a1ad1f7be55b28330fab3c34c650341b0053e8f9a602b56fd9608c38
-  data.tar.gz: 4c11251847cc608ec123875924ef01393f0d8c95e66dedf3cb03491c2cb18efe85a9c06cd79288739acbcd37b30d335a878ba8b3c6d6949547d58f56afd818b7
+  metadata.gz: 47235bac3a32610001c1f2cb8c1389f5e5c66471d0cb5f6f6993ab6a7658580bfdc9d288f65ad8f6c0c159925fcd53ed65f01b56b19962f10c50a74d6d76601c
+  data.tar.gz: 41d81eb3469f45625b1bdd60dbc963f1f7b26534dc3f6dcd83ec3f5e746104508f003b7d71a9a2e8544c5217e59a5ee92a36bab93f3a43331ca91d896acfafd6

data/lib/goa_model_gen/cli.rb

@@ -43,6 +43,7 @@ module GoaModelGen
       setup
       new_generator.process({
         'templates/validator.go.erb' => File.join(cfg.model_dir, 'validator.go'),
+        'templates/model_base.go.erb' => File.join(cfg.model_dir, "model_base.go"),
       })
       load_types_for(paths) do |source_file|
         new_generator.tap{|g| g.source_file = source_file }.process({

data/lib/goa_model_gen/go_struct.rb

@@ -43,6 +43,9 @@ module GoaModelGen
     end
     alias_method :assignable_with?, :==
 
+    def pointer?
+      kinds.last == 'ptr'
+    end
     def pointer_of?(other)
       (pkg_path == other.pkg_path) &&
         (name == other.name) &&
@@ -59,10 +62,16 @@ module GoaModelGen
     end
 
     def method_part_name
+      parts = kinds.dup
+      parts.pop if parts.last == 'ptr'
       parts =
-        kinds.first == 'struct' ?
-          [name] + kinds[1..-1] : kinds
+        (parts.first == 'struct' || pkg_path.present?) ?
+          [name] + parts[1..-1] : parts
       parts.map(&:camelize).join
     end
+
+    def defined_in_model?
+      pkg_path =~ /\/model\z/
+    end
   end
 end

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

@@ -37,6 +37,7 @@ func CopyFrom<%= model.name %>PayloadToModel(payload *gen.<%= payload.name %>, m
         pf_name = (mf.tags['payload'] || mf.name).downcase
         pf = payload.fields.detect{|pf| pf.name.downcase == pf_name }
         assigned_field_names.push(pf.name) if pf
+        conv_pkg = mf.type.defined_in_model? ? 'model' : 'converters'
         if pf.nil?
 -%>
   // <%= mf.name %> not found in <%= payload.name %> fields
@@ -47,13 +48,20 @@ func CopyFrom<%= model.name %>PayloadToModel(payload *gen.<%= payload.name %>, m
     m.<%= mf.name %> = *payload.<%= pf.name %>
   }
 <%-     elsif !pf.type.needs_error_to_convert_to?(mf.type) -%>
-  m.<%= mf.name %> = converters.<%= pf.type.method_part_name %>To<%= mf.type.method_part_name %>(payload.<%= pf.name %>)
+  m.<%= mf.name %> = <%= conv_pkg %>.<%= pf.type.method_part_name %>To<%= mf.type.method_part_name %>(payload.<%= pf.name %>)
 <%-     else -%>
-  if v, err := converters.<%= pf.type.method_part_name %>To<%= mf.type.method_part_name %>(payload.<%= pf.name %>); err != nil {
+<%-       meth = "#{pf.type.method_part_name}To#{mf.type.method_part_name}" -%>
+<%-       if pf.type.pointer? -%>
+  if payload.<%= pf.name %> != nil {
+<%-       end -%>
+  if v, err := <%= conv_pkg %>.<%= meth %>(<%= '*' if pf.type.pointer? %>payload.<%= pf.name %>); err != nil {
     return err
   } else {
     m.<%= mf.name %> = v
   }
+<%-       if pf.type.pointer? -%>
+  }
+<%-       end -%>
 <%-     end -%>
 <%-   end -%>
 <%-
@@ -87,6 +95,7 @@ func <%= model.name %>ModelToResult(m *model.<%= model.name %>) (*gen.<%= result
         rf_name = (mf.tags['result'] || mf.name).downcase
         rf = result.fields.detect{|rf| rf.name.downcase == rf_name }
         assigned_field_names.push(rf.name) if rf
+        conv_pkg = mf.type.defined_in_model? ? 'model' : 'converters'
         if rf.nil?
 -%>
   // <%= mf.name %> not found in <%= result.name %> fields
@@ -95,9 +104,10 @@ func <%= model.name %>ModelToResult(m *model.<%= model.name %>) (*gen.<%= result
 <%-     elsif rf.type.pointer_of?(mf.type) -%>
   r.<%= rf.name %> = &m.<%= mf.name %>
 <%-     elsif !mf.type.needs_error_to_convert_to?(rf.type) -%>
-  r.<%= rf.name %> = converters.<%= mf.type.method_part_name %>To<%= rf.type.method_part_name %>(m.<%= mf.name %>)
+  r.<%= rf.name %> = <%= conv_pkg %>.<%= mf.type.method_part_name %>To<%= rf.type.method_part_name %>(m.<%= mf.name %>)
 <%-     else -%>
-  if v, err := converters.<%= mf.type.method_part_name %>To<%= rf.type.method_part_name %>(m.<%= mf.name %>); err != nil {
+<%-       meth = "#{mf.type.method_part_name}To#{rf.type.method_part_name}" -%>
+  if v, err := <%= conv_pkg %>.<%= meth %>(m.<%= mf.name %>); err != nil {
     return err
   } else {
     r.<%= rf.name %> = v

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

@@ -53,15 +53,21 @@ var <%= type.name %>NameToValue = map[string]<%= type.name %>{
 <%-       end -%>
 }
 
-func Parse<%= type.name %>(s string) *<%= type.name %> {
+func StringTo<%= type.name %>(s string) (<%= type.name %>, error) {
   val, ok := <%= type.name %>NameToValue[s]
   if ok {
-    return &val
+    return val, nil
   } else {
-    return nil
+    err := &InvalidEnumName{Name: s}
+    return <%= type.name %><%= type.enum_map[type.enum_map.keys.first].camelize %>, err
   }
 }
 
+
+func <%= type.name %>ToString(v <%= type.name %>) string {
+  return v.String()
+}
+
 <%-     end -%>
 
 <%-   end -%>

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

@@ -0,0 +1,15 @@
+<%- user_editable -%>
+<%- package "model" -%>
+
+<%-
+  import "fmt"
+-%>
+
+type InvalidEnumName struct {
+  Name string
+  // Options []string
+}
+
+func (e *InvalidEnumName) Error() string {
+  return fmt.Sprintf("Invalid enum name %q", e.Name)
+}

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -158,6 +158,7 @@ files:
 - lib/goa_model_gen/templates/converter_base.go.erb
 - lib/goa_model_gen/templates/goon.go.erb
 - lib/goa_model_gen/templates/model.go.erb
+- lib/goa_model_gen/templates/model_base.go.erb
 - lib/goa_model_gen/templates/model_validation.go.erb
 - lib/goa_model_gen/templates/store.go.erb
 - lib/goa_model_gen/templates/store_validation.go.erb