goa_model_gen 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cef817b3a53794219db9757fa0afe0aa7a288a6bd4b3bce8048ce14a8cb45c6
-  data.tar.gz: 7bc9fdb4fe7722865fa6edd81d5716a1e3f00a1d62d447ca3f292eccc271a471
+  metadata.gz: 55c211e5cded1ceaad2db67152473f68f80db81ee97d83f8ea453ce08ee07cf8
+  data.tar.gz: 2a752f9dcd6daa746f7e8364ca9ca972e73a78e8dfd497eb08783da6ebb8ecc8
 SHA512:
-  metadata.gz: cb69b2304c295fd3419b295b5880b741ea3f74aa78ac04a80cb44b4903b08839c7f3f6741b90c9f0a3d6f2c7df3e2e0bd3bba5a2b07ed29d064dc84d7fd7174b
-  data.tar.gz: 2ad75dccfe25fdb3192ba38e3f16ea211f0b0d12ba84c233a219934139373d7d6e11b253cd0685544ebcfe297899ac56a4fe63e6be4d34fddd9daceaa6fac934
+  metadata.gz: 7197c6ef9959172c9d32f533fe8cacd72ed94f1b9f5a7eacbbed21622e39a5226cd9a2a765f25bed15e206cba6b8bb85a3e93e519596d6f667d7c22d9c5ada6a
+  data.tar.gz: bc4dfd74fd8cc1b0d7362218da8e51039614dcc008b074d95fab2fc5e6214f629be95a5917f3660621f655b65dbd864b50b0d58779345b18240d8e40a46fbde3

data/lib/goa_model_gen/field.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'goa_model_gen'
 require 'goa_model_gen/goa'
 
@@ -21,7 +22,7 @@ module GoaModelGen
     end
 
     # https://goa.design/design/overview/
-    PRIMITIVE_TYPES = %q[bool int int64 float string time.Time uuid.UUID interface{}]
+    PRIMITIVE_TYPES = %w[bool int int64 float string time.Time uuid.UUID *datastore.Key]
 
     def goa_name
       Goa.capitalize_join(name.split("_"))
@@ -78,8 +79,80 @@ module GoaModelGen
 
     def golang_type
       format2type = SWAGGER_TYPE_TO_GOLANG_TYPE[type]
-      raise "Golang type not found for #{type}" unless format2type
+      raise "Golang type not found for #{self.inspect}" unless format2type
       return format2type[format]
     end
+
+    def conv_func_part_for_model
+      conv_func_part_for(type, !!(/\A\*/ =~ type))
+    end
+
+    def conv_func_part_for_payload
+      conv_func_part_for(golang_type, nullable?)
+    end
+
+    def conv_func_part_for_media_type
+      conv_func_part_for(golang_type, nullable?)
+    end
+
+    def conv_func_part_for(value, with_pointer)
+      r = value.sub(/\A\*/, '').split('.').map(&:camelize).join
+      with_pointer ? "#{r}Pointer" : r
+    end
+
+    def payload_assignment_options(f)
+      if custom?
+        if type_obj && type_obj.base
+          if f.not_null?
+            return false, false, type # 型キャスト
+          else
+            st = f.golang_type.camelize
+            dt = type_obj.base.camelize
+            return false, false, ["#{st}PointerTo#{dt}", type] # ポインタを値にしてから型キャスト
+          end
+        else
+          return false, true, "#{type}PayloadToModel"
+        end
+      else
+        if type == f.golang_type
+          if f.not_null?
+            return true, nil, nil
+          else
+            return false, false, "#{f.conv_func_part_for_payload}To#{conv_func_part_for_model}"
+          end
+        else
+          with_error = (f.type == 'string')
+          return false, with_error, "#{f.conv_func_part_for_payload}To#{conv_func_part_for_model}"
+        end
+      end
+    end
+
+    def media_type_assignment_options(f)
+      if custom?
+        if type_obj && type_obj.base
+          if f.not_null?
+            return false, false, type_obj.base # 型キャスト
+          else
+            st = type_obj.base.camelize
+            dt = f.golang_type.camelize
+            return false, false, [type_obj.base, "#{st}To#{dt}Pointer"] # 型キャストしてポインタを値に変換
+          end
+        else
+          return false, true, "#{type}ModelToMediaType"
+        end
+      else
+        if type == f.golang_type
+          if f.not_null?
+            return true, nil, nil
+          else
+            return false, false, "#{conv_func_part_for_model}To#{f.conv_func_part_for_payload}"
+          end
+        else
+          with_error = (type == 'string')
+          return false, with_error, "#{conv_func_part_for_model}To#{f.conv_func_part_for_payload}"
+        end
+      end
+    end
+
   end
 end

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

@@ -1,3 +1,12 @@
+<%-
+def method_calling_exp(m, argument)
+  if m.is_a?(Array)
+    m.reverse.join('(') + argument + (')' * m.length)
+  else
+    "#{m}(#{argument})"
+  end
+end
+-%>
 package controller
 
 import (
@@ -7,71 +16,86 @@ import (
 
 <%- types.select(&:gen_converter?).each do |type| -%>
 <%-   if type.payload -%>
-func <%= type.name %>PayloadToModel(src *app.<%= type.payload_name %>) model.<%= type.name %> {
-	if src == nil {
-		return model.<%= type.name %>{}
+func <%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %>) (*model.<%= type.name %>, error) {
+	model := &model.<%= type.name %>{}
+	if err := CopyFrom<%= type.name %>PayloadToModel(payload, model); err != nil {
+		return nil, err
 	}
-  return model.<%= type.name %>{
-<%-
-      comments = []
+	return model, nil
+}
+
+func CopyFrom<%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %>, model *model.<%= type.name %>) error {
+  if payload == nil {
+    return NoPayloadGiven
+  }
+  if model == nil {
+    return NoModelGiven
+  }
 
+<%-
       type.fields_including_id.each do |f|
       pf = type.payload.fields.detect{|pf| f.name.underscore == pf.name }
       if pf.nil?
-        comments << "#{f.name} no payload field"
-      elsif f.custom?
 -%>
-    <%= f.name %>: <%= f.type %>PayloadToModel(src.<%= f.name %>),
-<%-   elsif pf.nullable? -%>
-    <%= f.name %>: <%= f.type.camelize %>PointerTo<%= f.type.camelize %>(src.<%= f.name %>),
-<%-   else -%>
-    <%= f.name %>: src.<%= f.name %>,
+  // <%= f.name %> not found in payload fields
+<%-
+      else
+        simple, with_error, method_name = f.payload_assignment_options(pf)
+-%>
+<%-     if simple -%>
+  model.<%= f.name %> = payload.<%= f.name %>
+<%-     elsif !with_error -%>
+  model.<%= f.name %> = <%= method_calling_exp(method_name, "payload.#{f.name}") %>
+<%-     else -%>
+  if v, err := <%= method_calling_exp(method_name, "payload.#{f.name}") %>; err != nil {
+    return err
+  } else {
+    model.<%= f.name %> = v
+  }
+<%-     end -%>
 <%-   end -%>
 <%- end -%>
-<%- comments.each do |comment| -%>
-    // <%= comment %>
-<%- end -%>
-<%- type.payload.field_diffs(type.fields.map{|f| f.name.underscore}).each do |pf| -%>
-    // No model field for payload field "<%= pf.name %>"
+<%- type.payload.field_diffs(type.fields_including_id.map{|f| f.name.underscore}).each do |pf| -%>
+  // No model field for payload field "<%= pf.name %>"
 <%- end -%>
-  }
+  return nil
 }
 
 <%-   end -%>
 <%-   if type.media_type -%>
-func <%= type.name %>ModelToMediaType(src *model.<%= type.name %>) *app.<%= type.media_type_name_for_go %> {
-	if src == nil {
-		return nil
-	}
-  return &app.<%= type.media_type_name_for_go %>{
-<%-
-      comments = []
+func <%= type.name %>ModelToMediaType(model *model.<%= type.name %>) (*app.<%= type.media_type_name_for_go %>, error) {
+  if model == nil {
+    return nil, NoModelGiven
+  }
+  r := &app.<%= type.media_type_name_for_go %>{}
 
+<%-
       type.fields_including_id.each do |f|
-        mf = type.media_type.fields.detect{|mf| f.name == mf.name.camelize }
+        mf = type.media_type.fields.detect{|mf| f.name.underscore == mf.name }
         if mf.nil?
-          comments << "#{f.name} no media type field"
-        elsif f.custom?
-          if f.type_obj && f.type_obj.base -%>
-    <%= mf.goa_name %>: <%= f.type_obj.base %>(src.<%= f.name %>),
+-%>
+  // <%= f.name %> not found for media type field
+<%-
+        else
+          simple, with_error, method_name = f.media_type_assignment_options(mf)
+-%>
+<%-       if simple -%>
+  r.<%= mf.goa_name %> = model.<%= f.name %>
+<%-       elsif !with_error -%>
+  r.<%= mf.goa_name %> = <%= method_calling_exp(method_name, "model.#{f.name}") %>
 <%-       else -%>
-    <%= mf.goa_name %>: <%= f.type %>ModelToMediaType(&src.<%= f.name %>),
+  if val, err := <%= method_calling_exp(method_name, "model.#{f.name}") %>; err != nil {
+     return nil, err
+  } else {
+    r.<%= mf.goa_name %> = val
+  }
 <%-       end
-        else -%>
-<%-       if mf.golang_type == f.type -%>
-    <%= mf.goa_name %>: <%= mf.nullable? ? '&' : '' %>src.<%= f.name %>,
-<%-       else -%>
-    <%= mf.goa_name %>: <%= f.type.camelize %>To<%= mf.golang_type.camelize %><%= mf.nullable? ? 'Pointer' : '' %>(src.<%= f.name %>),
-<%-       end -%>
-<%-     end -%>
-<%-   end -%>
-<%-   comments.each do |comment| -%>
-    // <%= comment %>
+        end -%>
 <%-   end -%>
-<%-   type.media_type.field_diffs(type.fields.map{|f| f.name.underscore}).each do |mf| -%>
-    // No field for media type field "<%= mf.name %>"
+<%-   type.media_type.field_diffs(type.fields_including_id.map{|f| f.name.underscore}).each do |mf| -%>
+    // No model field for media type field "<%= mf.name %>"
 <%-   end -%>
-  }
+  return r, nil
 }
 
 <%-   end -%>

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

@@ -1,9 +1,16 @@
 package controller
 
 import (
+  "fmt"
 	"strconv"
+
+	"google.golang.org/appengine/datastore"
 )
 
+var NoModelGiven = fmt.Errorf("No model given")
+var NoPayloadGiven = fmt.Errorf("No payload given")
+var NoMediaTypeGiven = fmt.Errorf("No media type given")
+
 func BoolPointerToBool(v *bool) bool {
 	return BoolPointerToBoolWith(v, false)
 }
@@ -58,3 +65,29 @@ func Int64ToStringPointer(v int64) *string {
 	s := Int64ToString(v)
 	return &s
 }
+
+func StringToDatastoreKeyPointer(v string) (*datastore.Key, error) {
+	return datastore.DecodeKey(v)
+}
+
+func StringPointerToDatastoreKeyPointer(v *string) (*datastore.Key, error) {
+	if v == nil {
+		return nil, nil
+	}
+	return StringToDatastoreKeyPointer(*v)
+}
+
+func DatastoreKeyPointerToString(key *datastore.Key) string {
+	if key == nil {
+		return ""
+	}
+	return key.Encode()
+}
+
+func DatastoreKeyPointerToStringPointer(key *datastore.Key) *string {
+	if key == nil {
+		return nil
+	}
+	s := DatastoreKeyPointerToString(key)
+	return &s
+}

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor