goa_model_gen 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb100e41bfae1d78b4c222638a59945e42efa13af022c000d55efa3be6d71478
-  data.tar.gz: 53d689f9969dda1338ef1d177e56f1da34d04c40e55433e8e1816f8b8fea74de
+  metadata.gz: 0cfb7caba6e01eee8a29002beafa8806c80c9b1acd47ac0d6d824a39b92f408b
+  data.tar.gz: e90a5a485bcc57521c408e3de2bc81a5d14e3fa62b2dea8695cf31efe858a2a6
 SHA512:
-  metadata.gz: c93f6c04d0fd3f4a1b72856e19c9a8ad026c2253cd14e9632729c075d0e70277f62464d03532cf90a2bd88326d2a4f9df528c3cfce923a46d8a4bcb5d2d12882
-  data.tar.gz: a163ecc4e61e8b03aa8de557a12c029b71a7e8253d910fe45df8c248c9caf4db457c1805a008c5d2bfa6bc870608f9833d047142aacccde45bdd6d9027fdc959
+  metadata.gz: cc42ddcd158483048bb69dd96b1e776dac7d11bbe4822bdfe5dc779d1c679c5d3f4feb65269a3053bce6cbf268defc560d547bc646a5c8cb217a5f67a8b97d4c
+  data.tar.gz: 5e606592d318569856b948d6d06f8927943e85ce6053337e18e880f47ddf1626fb8841ab7827247a4e510489fc96267be40681002cc2fc713fa6bcabb005d3d9

data/goa_model_gen.gemspec

@@ -30,4 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "pry-stack_explorer"
 end

data/lib/goa_model_gen/cli.rb

@@ -37,14 +37,26 @@ module GoaModelGen
     def model(*paths)
       setup
       new_generator.process({
-        "templates/goon.go.erb" => File.join(cfg.model_dir, "goon.go"),
         'templates/validator.go.erb' => File.join(cfg.model_dir, 'validator.go'),
       })
       load_types_for(paths) do |source_file|
         new_generator.tap{|g| g.source_file = source_file }.process({
-          'templates/model.go.erb' => dest_path(cfg.model_dir, source_file, '.go'),
-          'templates/model_store.go.erb' => dest_path(cfg.model_dir, source_file, '_store.go'),
-          'templates/model_validation.go.erb' => dest_path(cfg.model_dir, source_file, '_validation.go'),
+          'templates/model.go.erb' => File.join(cfg.model_dir, "#{source_file.basename}.go"),
+          'templates/model_validation.go.erb' => File.join(cfg.model_dir, "#{source_file.basename}_validation.go"),
+        })
+      end
+    end
+
+    desc "store FILE1...", "Generate store files from definition files"
+    def store(*paths)
+      setup
+      new_generator.process({
+        "templates/goon.go.erb" => File.join(cfg.store_dir, "goon_store", "goon.go"),
+      })
+      load_types_for(paths) do |source_file|
+        new_generator.tap{|g| g.source_file = source_file }.process({
+          'templates/store.go.erb' => File.join(cfg.store_dir, source_file.basename, "store.go"),
+          'templates/store_validation.go.erb' => File.join(cfg.store_dir, source_file.basename, "validation.go"),
         })
       end
     end
@@ -53,12 +65,12 @@ module GoaModelGen
     def converter(*paths)
       setup
       new_generator.process({
-        "templates/converter_base.go.erb" => File.join(cfg.controller_dir, "converter_base.go"),
+        "templates/converter_base.go.erb" => File.join(cfg.converter_dir, "converter_base.go"),
       })
       load_types_for(paths) do |source_file|
         next if source_file.types.all?{|t| !t.payload && !t.media_type}
         new_generator.tap{|g| g.source_file = source_file }.process({
-          'templates/converter.go.erb' => dest_path(cfg.controller_dir, source_file, "_conv.go"),
+          'templates/converter.go.erb' => File.join(cfg.converter_dir, source_file.basename, "conv.go"),
         })
       end
     end
@@ -98,10 +110,6 @@ module GoaModelGen
           yield(source_file)
         end
       end
-
-      def dest_path(dir, source_file, suffix)
-        File.join(dir, File.basename(source_file.yaml_path, ".*") + suffix)
-      end
     end
 
   end

data/lib/goa_model_gen/config.rb

@@ -14,7 +14,8 @@ module GoaModelGen
       swagger_yaml
       gofmt_disabled
       model_dir
-      controller_dir
+      store_dir
+      converter_dir
       validator_path
     ].freeze
 
@@ -25,7 +26,8 @@ module GoaModelGen
       @swagger_yaml   ||= "./swagger/swagger.yaml"
       @gofmt_disabled ||= false
       @model_dir      ||= "./model"
-      @controller_dir ||= "./controller"
+      @store_dir      ||= "./stores"
+      @converter_dir  ||= "./converters"
       @validator_path ||= "gopkg.in/go-playground/validator.v9"
       self
     end

data/lib/goa_model_gen/field.rb

@@ -101,10 +101,7 @@ module GoaModelGen
     # https://tour.golang.org/basics/11
     # https://golang.org/pkg/go/types/#pkg-variables
     SWAGGER_TYPE_TO_GOLANG_TYPE = {
-      "string" => Hash.new("string").update(
-        "date" => "time.Time",
-        "date-time" => "time.Time",
-      ),
+      "string" => Hash.new("string"),
       "number" => Hash.new("float32").update(
         "double" => "float64",
       ),
@@ -118,8 +115,13 @@ module GoaModelGen
       return format2type[format]
     end
 
+    MODEL_FUNC_NAME_FILTERS = {
+      "TimeTime" => "Time",
+    }
+
     def conv_func_part_for_model
-      conv_func_part_for(type, !!(/\A\*/ =~ type))
+      r = conv_func_part_for(type, !!(/\A\*/ =~ type))
+      MODEL_FUNC_NAME_FILTERS[r] || r
     end
 
     def conv_func_part_for_payload

data/lib/goa_model_gen/generator.rb

@@ -35,17 +35,21 @@ module GoaModelGen
     end
 
     def dependencies
-      @dependencies ||= []
+      @dependencies ||= {}
     end
 
     def clear_dependencies
       @dependencies = nil
     end
 
-    def import(*packages)
-      packages.each do |package|
-        dependencies.push(package) unless dependencies.include?(package)
+    def import(alias_or_package, package_or_nil = nil)
+      package = package_or_nil || alias_or_package
+      new_alias = package_or_nil ? alias_or_package.to_s : nil
+      if dependencies.key?(package)
+        old_alias = dependencies[package]
+        raise "Conflict alias #{old_alias.inspect} and #{new_alias.inspect}" if old_alias != new_alias
       end
+      dependencies[package] ||= new_alias
     end
 
     def user_editable(value: true)
@@ -63,6 +67,7 @@ module GoaModelGen
 
     def generate(template_path)
       clear_dependencies
+      user_editable(value: false)
 
       abs_path = File.expand_path('../' + template_path, __FILE__)
       erb = ERB.new(File.read(abs_path), nil, "-")

data/lib/goa_model_gen/source_file.rb

@@ -8,5 +8,9 @@ module GoaModelGen
     def initialize(yaml_path, types)
       @yaml_path, @types = yaml_path, types
     end
+
+    def basename
+      File.basename(yaml_path, ".*")
+    end
   end
 end

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

@@ -9,7 +9,13 @@ package <%= package %>
 
 <%- unless dependencies.empty? -%>
 import (
-<%= golang_helper.partition(dependencies).map{|group| group.map{|path| "\t\"#{path}\"" }.join("\n") }.join("\n\n") %>
+<%=
+  golang_helper.partition(dependencies.keys).map do |group|
+    group.map do |path|
+      ailas_name = dependencies[path]
+      ailas_name ? "\t#{ailas_name} \"#{path}\"" : "\t\"#{path}\""
+    end.join("\n")
+  end.join("\n\n") %>
 )
 <%- end -%>
 

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

@@ -7,15 +7,16 @@ def method_calling_exp(m, argument)
   end
 end
 -%>
-<%- package 'controller' -%>
+<%- package source_file.basename -%>
 
 <%- source_file.types.select(&:gen_converter?).each do |type| -%>
 <%-   if type.payload -%>
 <%-
-        import "#{config.go_package}/app"
+        import "#{config.go_package}/converters"
+        import :gen, "#{config.go_package}/gen/#{type.name.underscore}"
         import "#{config.go_package}/model"
 -%>
-func <%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %>) (*model.<%= type.name %>, error) {
+func <%= type.name %>PayloadToModel(payload *gen.<%= type.payload_name %>) (*model.<%= type.name %>, error) {
 	model := &model.<%= type.name %>{}
 	if err := CopyFrom<%= type.name %>PayloadToModel(payload, model); err != nil {
 		return nil, err
@@ -23,12 +24,12 @@ func <%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %>) (*mod
 	return model, nil
 }
 
-func CopyFrom<%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %>, model *model.<%= type.name %>) error {
+func CopyFrom<%= type.name %>PayloadToModel(payload *gen.<%= type.payload_name %>, model *model.<%= type.name %>) error {
   if payload == nil {
-    return NoPayloadGiven
+    return converters.NoPayloadGiven
   }
   if model == nil {
-    return NoModelGiven
+    return converters.NoModelGiven
   }
 
 <%-
@@ -44,9 +45,9 @@ func CopyFrom<%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %
 <%-     if simple -%>
   model.<%= f.name %> = payload.<%= f.goa_name %>
 <%-     elsif !with_error -%>
-  model.<%= f.name %> = <%= method_calling_exp(method_name, "payload.#{f.goa_name}") %>
+  model.<%= f.name %> = converters.<%= method_calling_exp(method_name, "payload.#{f.goa_name}") %>
 <%-     else -%>
-  if v, err := <%= method_calling_exp(method_name, "payload.#{f.goa_name}") %>; err != nil {
+  if v, err := converters.<%= method_calling_exp(method_name, "payload.#{f.goa_name}") %>; err != nil {
     return err
   } else {
     model.<%= f.name %> = v
@@ -62,11 +63,11 @@ func CopyFrom<%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %
 
 <%-   end -%>
 <%-   if type.media_type -%>
-func <%= type.name %>ModelToMediaType(model *model.<%= type.name %>) (*app.<%= type.media_type_name_for_go %>, error) {
+func <%= type.name %>ModelToMediaType(model *model.<%= type.name %>) (*gen.<%= type.media_type_name_for_go %>, error) {
   if model == nil {
-    return nil, NoModelGiven
+    return nil, converters.NoModelGiven
   }
-  r := &app.<%= type.media_type_name_for_go %>{}
+  r := &gen.<%= type.media_type_name_for_go %>{}
 
 <%-
       type.fields_including_id.each do |f|
@@ -81,9 +82,9 @@ func <%= type.name %>ModelToMediaType(model *model.<%= type.name %>) (*app.<%= t
 <%-       if simple -%>
   r.<%= f.goa_name %> = model.<%= f.name %>
 <%-       elsif !with_error -%>
-  r.<%= f.goa_name %> = <%= method_calling_exp(method_name, "model.#{f.name}") %>
+  r.<%= f.goa_name %> = converters.<%= method_calling_exp(method_name, "model.#{f.name}") %>
 <%-       else -%>
-  if val, err := <%= method_calling_exp(method_name, "model.#{f.name}") %>; err != nil {
+  if val, err := converters.<%= method_calling_exp(method_name, "model.#{f.name}") %>; err != nil {
      return nil, err
   } else {
     r.<%= f.goa_name %> = val

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

@@ -1,11 +1,10 @@
-<%- package 'controller' -%>
+<%- package 'converters' -%>
 
 <%-
-  import(
-    "fmt",
-    "strconv",
-    "google.golang.org/appengine/datastore",
-  )
+  import "fmt"
+  import "strconv"
+  import "time"
+  import "google.golang.org/appengine/datastore"
 -%>
 
 var NoModelGiven = fmt.Errorf("No model given")
@@ -96,3 +95,23 @@ func DatastoreKeyPointerToStringPointer(key *datastore.Key) *string {
 	s := DatastoreKeyPointerToString(key)
 	return &s
 }
+
+func StringToTime(v string) (time.Time, error) {
+	return time.Parse(time.RFC3339, v)
+}
+
+func StringPointerToTime(v *string) (time.Time, error) {
+	if v == nil {
+		return time.Time{}, nil
+	}
+	return StringToTime(*v)
+}
+
+func TimeToString(t time.Time) string {
+	return t.Format(time.RFC3339)
+}
+
+func TimeToStringPointer(t time.Time) *string {
+	s := TimeToString(t)
+	return &s
+}

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

@@ -1,11 +1,9 @@
 <%- user_editable -%>
-<%- package 'model' -%>
+<%- package 'goon_store' -%>
 
 <%-
-  import(
-    "golang.org/x/net/context",
-    "github.com/mjibson/goon",
-  )
+  import "golang.org/x/net/context"
+  import "github.com/mjibson/goon"
 -%>
 
 // // Use the following code if you want to change kind name from model struct name.

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

@@ -6,17 +6,6 @@
       import "context"
       import config.validator_path # "gopkg.in/go-playground/validator.v9"
 -%>
-<%-   store_name = "#{model.name}Store" -%>
-func (s *<%= store_name %>) Validate(ctx context.Context, m *<%= model.name %>) error {
-	if err := m.Validate(ctx); err != nil {
-		return err
-	}
-	if err := s.ValidateUniqueness(ctx, m); err != nil {
-		return err
-	}
-	return nil
-}
-
 func (m *<%= model.name %>) Validate(ctx context.Context) error {
 	return WithValidator(ctx, func(validate *validator.Validate) error {
 		return validate.Struct(m)

data/lib/goa_model_gen/templates/{model_store.go.erb → store.go.erb}

@@ -1,14 +1,16 @@
-<%- package "model" -%>
+<%- package source_file.basename -%>
 
 <%- source_file.types.select(&:store?).each do |model| -%>
 <%-	 store_name = "#{model.name}Store" -%>
 <%-
-			import(
-				"context",
-				"fmt",
-				"google.golang.org/appengine/datastore",
-				"google.golang.org/appengine/log",
-			)
+			import "context"
+			import "fmt"
+			import "google.golang.org/appengine/datastore"
+			import "google.golang.org/appengine/log"
+      import "#{config.go_package}/model"
+      import :goon, "#{config.go_package}/stores/goon_store"
+
+      model_name = "model.#{model.name}"
 -%>
 type <%= store_name %> struct{
 <%- if model.parent -%>
@@ -16,44 +18,44 @@ type <%= store_name %> struct{
 <%- end -%>
 }
 
-func (s *<%= store_name %>) All(ctx context.Context) ([]*<%= model.name %>, error) {
+func (s *<%= store_name %>) All(ctx context.Context) ([]*<%= model_name %>, error) {
 	return s.Select(ctx, s.Query(ctx))
 }
 
-func (s *<%= store_name %>) Select(ctx context.Context, q *datastore.Query) ([]*<%= model.name %>, error) {
-	g := GoonFromContext(ctx)
-	r := []*<%= model.name %>{}
+func (s *<%= store_name %>) Select(ctx context.Context, q *datastore.Query) ([]*<%= model_name %>, error) {
+	g := goon.FromContext(ctx)
+	r := []*<%= model_name %>{}
 	log.Infof(ctx, "q is %v\n", q)
 	_, err := g.GetAll(q.EventualConsistency(), &r)
 	if err != nil {
-		log.Errorf(ctx, "Failed to Select <%= model.name %> because of %v\n", err)
+		log.Errorf(ctx, "Failed to Select <%= model_name %> because of %v\n", err)
 		return nil, err
 	}
 	return r, nil
 }
 
 func (s *<%= store_name %>) CountBy(ctx context.Context, q *datastore.Query) (int, error) {
-	g := GoonFromContext(ctx)
+	g := goon.FromContext(ctx)
 	c, err := g.Count(q)
 	if err != nil {
-		log.Errorf(ctx, "Failed to count <%= model.name %> with %v because of %v\n", q, err)
+		log.Errorf(ctx, "Failed to count <%= model_name %> with %v because of %v\n", q, err)
 		return 0, err
 	}
 	return c, nil
 }
 
 func (s *<%= store_name %>) Query(ctx context.Context) *datastore.Query {
-	g := GoonFromContext(ctx)
-	k := g.Kind(new(<%= model.name %>))
-	// log.Infof(ctx, "Kind for <%= model.name %> is %v\n", k)
+	g := goon.FromContext(ctx)
+	k := g.Kind(new(<%= model_name %>))
+	// log.Infof(ctx, "Kind for <%= model_name %> is %v\n", k)
 	return datastore.NewQuery(k)
 }
 
-func (s *<%= store_name %>) ByID(ctx context.Context, <%= model.id_name_var %> <%= model.id_golang_type %>) (*<%= model.name %>, error) {
+func (s *<%= store_name %>) ByID(ctx context.Context, <%= model.id_name_var %> <%= model.id_golang_type %>) (*<%= model_name %>, error) {
 <%- if model.parent -%>
-	r := <%= model.name %>{ParentKey: s.ParentKey, <%= model.id_name %>: <%= model.id_name_var %>}
+	r := <%= model_name %>{ParentKey: s.ParentKey, <%= model.id_name %>: <%= model.id_name_var %>}
 <%- else -%>
-	r := <%= model.name %>{<%= model.id_name %>: <%= model.id_name_var %>}
+	r := <%= model_name %>{<%= model.id_name %>: <%= model.id_name_var %>}
 <%- end -%>
 	err := s.Get(ctx, &r)
 	if err != nil {
@@ -62,16 +64,16 @@ func (s *<%= store_name %>) ByID(ctx context.Context, <%= model.id_name_var %> <
 	return &r, nil
 }
 
-func (s *<%= store_name %>) ByKey(ctx context.Context, key *datastore.Key) (*<%= model.name %>, error) {
+func (s *<%= store_name %>) ByKey(ctx context.Context, key *datastore.Key) (*<%= model_name %>, error) {
 	if err := s.IsValidKey(ctx, key); err != nil {
 		log.Errorf(ctx, "<%= store_name %>.ByKey got Invalid key: %v because of %v\n", key, err)
 		return nil, err
 	}
 
 <%- if model.parent -%>
-	r := <%= model.name %>{ParentKey: key.Parent(), <%= model.id_name %>: key.<%= model.key_id_method %>()}
+	r := <%= model_name %>{ParentKey: key.Parent(), <%= model.id_name %>: key.<%= model.key_id_method %>()}
 <%- else -%>
-	r := <%= model.name %>{<%= model.id_name %>: key.<%= model.key_id_method %>()}
+	r := <%= model_name %>{<%= model.id_name %>: key.<%= model.key_id_method %>()}
 <%- end -%>
 	err := s.Get(ctx, &r)
 	if err != nil {
@@ -80,16 +82,16 @@ func (s *<%= store_name %>) ByKey(ctx context.Context, key *datastore.Key) (*<%=
 	return &r, nil
 }
 
-func (s *<%= store_name %>) Get(ctx context.Context, m *<%= model.name %>) error {
-	g := GoonFromContext(ctx)
+func (s *<%= store_name %>) Get(ctx context.Context, m *<%= model_name %>) error {
+	g := goon.FromContext(ctx)
 	err := g.Get(m)
 	if err != nil {
-		log.Errorf(ctx, "Failed to Get <%= model.name %> because of %v\n", err)
+		log.Errorf(ctx, "Failed to Get <%= model_name %> because of %v\n", err)
 		return err
 	}
 <%- if model.parent -%>
 	if err := s.ValidateParent(m); err != nil {
-		log.Errorf(ctx, "Invalid parent key for <%= model.name %> because of %v\n", err)
+		log.Errorf(ctx, "Invalid parent key for <%= model_name %> because of %v\n", err)
 		return err
 	}
 <%- end -%>
@@ -101,8 +103,8 @@ func (s *<%= store_name %>) IsValidKey(ctx context.Context, key *datastore.Key)
 	if key == nil {
 		return fmt.Errorf("key is nil")
 	}
-	g := GoonFromContext(ctx)
-	expected := g.Kind(&<%= model.name %>{})
+	g := goon.FromContext(ctx)
+	expected := g.Kind(&<%= model_name %>{})
 	if key.Kind() != expected {
 		return fmt.Errorf("key kind must be %s but was %s", expected, key.Kind())
 	}
@@ -114,11 +116,11 @@ func (s *<%= store_name %>) IsValidKey(ctx context.Context, key *datastore.Key)
 	return nil
 }
 
-func (s *<%= store_name %>) Exist(ctx context.Context, m *<%= model.name %>) (bool, error) {
+func (s *<%= store_name %>) Exist(ctx context.Context, m *<%= model_name %>) (bool, error) {
 	if m.ID == <%= model.id_field.zero_value_expression %> {
 		return false, nil
 	}
-	g := GoonFromContext(ctx)
+	g := goon.FromContext(ctx)
 	key, err := g.KeyError(m)
 	if err != nil {
 		log.Errorf(ctx, "Failed to Get Key of %v because of %v\n", m, err)
@@ -135,7 +137,7 @@ func (s *<%= store_name %>) Exist(ctx context.Context, m *<%= model.name %>) (bo
 	}
 }
 
-func (s *<%= store_name %>) Create(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
+func (s *<%= store_name %>) Create(ctx context.Context, m *<%= model_name %>) (*datastore.Key, error) {
 	if err := m.PrepareToCreate(); err != nil {
 		return nil, err
 	}
@@ -152,7 +154,7 @@ func (s *<%= store_name %>) Create(ctx context.Context, m *<%= model.name %>) (*
 	})
 }
 
-func (s *<%= store_name %>) Update(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
+func (s *<%= store_name %>) Update(ctx context.Context, m *<%= model_name %>) (*datastore.Key, error) {
 	if err := m.PrepareToUpdate(); err != nil {
 		return nil, err
 	}
@@ -169,7 +171,7 @@ func (s *<%= store_name %>) Update(ctx context.Context, m *<%= model.name %>) (*
 	})
 }
 
-func (s *<%= store_name %>) PutWith(ctx context.Context, m *<%= model.name %>, f func() error) (*datastore.Key, error) {
+func (s *<%= store_name %>) PutWith(ctx context.Context, m *<%= model_name %>, f func() error) (*datastore.Key, error) {
 	if err := s.Validate(ctx, m); err != nil {
 		return nil, err
 	}
@@ -182,7 +184,7 @@ func (s *<%= store_name %>) PutWith(ctx context.Context, m *<%= model.name %>, f
 	return s.Put(ctx, m)
 }
 
-func (s *<%= store_name %>) Put(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
+func (s *<%= store_name %>) Put(ctx context.Context, m *<%= model_name %>) (*datastore.Key, error) {
 <%- if model.goon['id_type'] == 'UUID' -%>
 <%-	 import "github.com/goadesign/goa/uuid" -%>
 	if m.Id == "" {
@@ -191,11 +193,11 @@ func (s *<%= store_name %>) Put(ctx context.Context, m *<%= model.name %>) (*dat
 <%- end -%>
 <%- if model.parent -%>
 	if err := s.ValidateParent(m); err != nil {
-		log.Errorf(ctx, "Invalid parent key for <%= model.name %> because of %v\n", err)
+		log.Errorf(ctx, "Invalid parent key for <%= model_name %> because of %v\n", err)
 		return nil, err
 	}
 <%- end -%>
-	g := GoonFromContext(ctx)
+	g := goon.FromContext(ctx)
 	key, err := g.Put(m)
 	if err != nil {
 		log.Errorf(ctx, "Failed to Put %v because of %v\n", m, err)
@@ -205,7 +207,7 @@ func (s *<%= store_name %>) Put(ctx context.Context, m *<%= model.name %>) (*dat
 }
 
 <%- if model.parent -%>
-func (s *<%= store_name %>) ValidateParent(m *<%= model.name %>) error {
+func (s *<%= store_name %>) ValidateParent(m *<%= model_name %>) error {
 	if s.ParentKey == nil {
 		return nil
 	}
@@ -219,8 +221,8 @@ func (s *<%= store_name %>) ValidateParent(m *<%= model.name %>) error {
 }
 
 <%- end -%>
-func (s *<%= store_name %>) Delete(ctx context.Context, m *<%= model.name %>) error {
-	g := GoonFromContext(ctx)
+func (s *<%= store_name %>) Delete(ctx context.Context, m *<%= model_name %>) error {
+	g := goon.FromContext(ctx)
 	key, err := g.KeyError(m)
 	if err != nil {
 		log.Errorf(ctx, "Failed to Get key of %v because of %v\n", m, err)
@@ -233,7 +235,7 @@ func (s *<%= store_name %>) Delete(ctx context.Context, m *<%= model.name %>) er
 	return nil
 }
 
-func (s *<%= store_name %>) ValidateUniqueness(ctx context.Context, m *<%= model.name %>) error {
+func (s *<%= store_name %>) ValidateUniqueness(ctx context.Context, m *<%= model_name %>) error {
 	conditions := map[string]interface{}{
 <%- model.fields.select(&:unique?).each do |field| -%>
 		"<%= field.name %>": m.<%= field.name %>,
@@ -250,7 +252,7 @@ func (s *<%= store_name %>) ValidateUniqueness(ctx context.Context, m *<%= model
 				b = 1
 		}
 		if c > b {
-			return &ValidationError{
+			return &model.ValidationError{
 				Field: field,
 				Message: fmt.Sprintf("%v has already been taken", value),
 			}

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

@@ -0,0 +1,20 @@
+<%- user_editable -%>
+<%- package source_file.basename -%>
+
+<%- source_file.types.select(&:store?).each do |model| -%>
+<%-
+      import "context"
+      import "#{config.go_package}/model"
+-%>
+<%-   store_name = "#{model.name}Store" -%>
+func (s *<%= store_name %>) Validate(ctx context.Context, m *model.<%= model.name %>) error {
+	if err := m.Validate(ctx); err != nil {
+		return err
+	}
+	if err := s.ValidateUniqueness(ctx, m); err != nil {
+		return err
+	}
+	return nil
+}
+
+<%- end -%>

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

@@ -1,11 +1,9 @@
 <%- user_editable -%>
 <%- package "model" -%>
 <%-
-		import(
-			"context",
-			config.validator_path,
-			# ja_translations "github.com/akm/validator/translations/ja",
-		)
+		import "context"
+		import config.validator_path
+		# import ja_translations "github.com/akm/validator/translations/ja"
 -%>
 
 func NewValidator(ctx context.Context) (*validator.Validate, error) {

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate model files for goa in golang
 email:
 - akm2000@gmail.com
@@ -129,8 +157,9 @@ 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_store.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
 - lib/goa_model_gen/templates/validator.go.erb
 - lib/goa_model_gen/type.rb
 - lib/goa_model_gen/version.rb
@@ -154,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Generate model files for goa in golang