goon_model_gen 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35eae7744ace6ecb88fdce49041734f3cfd1c724ef899e6996e4a4fcdd7ea59a
-  data.tar.gz: a32f155f2e6bb40fb48ddf3eb166e67e1d3090948bb7a4e50bd203c86317825c
+  metadata.gz: 1b3a9f1be05eeba8aa04aa53bb51f772733251f87d6f0b5902b3e6c8f1a510ce
+  data.tar.gz: 0f088cd4911a7fcc6959a7727d56e95d01ed41721bab85b47e4d890221abbfc2
 SHA512:
-  metadata.gz: bddf0a66939b7a378d6d75fab1a9770068b93817f70122ba8f27c2f2fa15004e0604c065c4d94607a13f3cc6cffdb7b51ff75a3dc604d3cfea5674512516f0d7
-  data.tar.gz: 070c8c3081315a3b4721291fb3969b69322378eb33d96d318dec6f5d90f3ea29662ff7bb15736482b2562d7ac6cccf8f0107f76b98fd0304826af2adf3656f48
+  metadata.gz: 796194776aac212a5036cbedc42d43d8a79ebd0b608b1d2e33de3b6b6125074d5d614c50f17b6a64e23db7d02360cc79d1f0abd561f1b80d3e1b1262ff84ebe1
+  data.tar.gz: 7dcdeddd27e7766c194cbdd7922e028e6533651bf9673a12ab69437044725bb6610e175acd93d0726654b6e347eb43722be0fa1735c74c9445c327c5b584cd92

data/lib/goon_model_gen/builder/converter_builder.rb

@@ -54,6 +54,8 @@ module GoonModelGen
                 g = conv.gen_type
                 t.add(:model, m.name, m.package_path, m.package_base_path)
                 t.add(:gen_type, g.name, g.package_path, g.package_base_path)
+                t.memo['base_conv_func'] = (m.ordinary_name == g.ordinary_name) ? "#{m.ordinary_name}ToResult" : "#{m.ordinary_name}To#{g.ordinary_name}"
+                t.memo['slice_conv_func'] = (m.ordinary_name == g.ordinary_name) ? "#{m.ordinary_name}SliceToResultSlice" : "#{m.ordinary_name}SliceTo#{g.ordinary_name}Slice"
                 t.memo['mappings'] = conv.mappings
                 unless conv.model.slice_with_ptr.nil?
                   t.memo['model_slice_with_ptr'] = conv.model.slice_with_ptr

data/lib/goon_model_gen/converter/type_ref.rb

@@ -9,6 +9,11 @@ module GoonModelGen
       def initialize(name, package_path)
         @name, @package_path = name, package_path
       end
+
+      def ordinary_name
+        name.include?('.') ? name.split('.').last : name
+      end
+
     end
   end
 end

data/lib/goon_model_gen/templates/converter/result/02_SliceToResultSlice.go.erb

@@ -2,6 +2,9 @@
 model = type.map[:model].type
 gen_type = type.map[:gen_type].type
 
+base_conv_func = type.memo['base_conv_func'] || raise("type #{type.name} has no memo named 'base_conv_func'")
+slice_conv_func = type.memo['slice_conv_func'] || raise("type #{type.name} has no memo named 'slice_conv_func'")
+
 model_slice = model.package.types.detect do |t|
   t.is_a?(GoonModelGen::Golang::NamedSlice) &&
   (
@@ -21,13 +24,13 @@ else
 end
 -%>
 
-func <%= model.name %>SliceToResultSlice(s *<%= plural_model_type_name %>) *[]*<%= gen_type.qualified_name(dependencies) %> {
+func <%= slice_conv_func %>(s *<%= plural_model_type_name %>) *[]*<%= gen_type.qualified_name(dependencies) %> {
   if s == nil {
     return nil
   }
   r := []*<%= gen_type.qualified_name(dependencies) %>{}
   for _, m := range *s {
-    r = append(r, <%= model.name %>ToResult(<%= element_is_ptr ? '' : '&' %>m))
+    r = append(r, <%= base_conv_func %>(<%= element_is_ptr ? '' : '&' %>m))
   }
   return &r
 }

data/lib/goon_model_gen/templates/converter/result/03_ToResult.go.erb

@@ -2,10 +2,11 @@
 model = type.map[:model].type
 gen_type = type.map[:gen_type].type
 mappings = type.memo['mappings'] || []
+base_conv_func = type.memo['base_conv_func'] || raise("type #{type.name} has no memo named 'base_conv_func'")
 -%>
 
 
-func <%= model.name %>ToResult(m *<%= model.qualified_name %>) *<%= gen_type.qualified_name(dependencies) %> {
+func <%= base_conv_func %>(m *<%= model.qualified_name %>) *<%= gen_type.qualified_name(dependencies) %> {
   if m == nil {
     return nil
   }

data/lib/goon_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoonModelGen
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goon_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Generate model source files with datastore in Golang