goa_model_gen 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1bb7af6761db790f79c2af6082ff4770d4d67d6564e7480e0dd158c2d03ec4b
-  data.tar.gz: 9a2b7b37485814180b6162d3de8dc6c92b0be9e5f990526c2de18ad713026107
+  metadata.gz: 282f36bc384d676a9b9162660234551dd1523af68efdd9084f488d4ee85a58c3
+  data.tar.gz: fe886d206e933a280d498b76271e616a5e237658716693990c1d4773edd0152d
 SHA512:
-  metadata.gz: 72223fb263c19e187535f760b87f89b909231efd10d277db816bb5af3fa907ccec5825bbfba257b0678005f22e64a522b0a57429d50c8c95e2595b048ef8de6c
-  data.tar.gz: b03fcc86b5e1af9fee08e24ad14bbc6e1b85072d1921cc1e7ab70a2452fbe9a56d71da8f85383483912df7c7631470a5db4c4f336fa71489bbb0de8e6502d2b4
+  metadata.gz: e35a1fe9ea39d9b73a0bb31c47a48f718403c9f33f7834ff5d5a22db908b930e8c4540b9931420912ed7b575c818e498a615d08d8bf8355aa75b74714845ae82
+  data.tar.gz: 77a5e6431b7f9889cf4634680221d7896a1437d603f1ddbf2216bcc9bba9e6fe40102c1b05f120f96e1d06515f76f1fa1d0675c6f0a49a9b37e68e55c0b16621

data/lib/goa_model_gen/cli.rb

@@ -21,14 +21,20 @@ module GoaModelGen
     class_option :force, type: :boolean, aliases: 'f', desc: 'Force overwrite files'
     class_option :keep_editable, type: :boolean, aliases: 'k', default: true, desc: 'Keep user editable file'
     class_option :log_level, type: :string, aliases: 'l', desc: 'Log level, one of  debug,info,warn,error,fatal. The default value is info'
-    class_option :config, type: :string, aliases: 'c', default: './goa_model_gen.yaml', desc: 'Path to config file. You can generate it by config subcommand'
+    class_option :config, type: :string, aliases: 'c', default: '.goa_model_gen.yaml', desc: 'Path to config file. You can generate it by config subcommand'
 
-    desc "config", "Generate config file"
-    def config(path = './goa_model_gen.yaml')
+    desc "init", "Generate config file"
+    def init(path = '.goa_model_gen.yaml')
       setup
       open(path, 'w'){|f| f.puts(Config.new.fulfill.to_yaml) }
     end
 
+    desc "config", "Show configuration"
+    def config(path = '.goa_model_gen.yaml')
+      setup
+      puts YAML.dump(cfg)
+    end
+
     desc "show FILE1...", "Show model info from definition files"
     def show(*paths)
       setup
@@ -61,15 +67,14 @@ module GoaModelGen
       })
       load_types_for(paths) do |source_file|
         source_file.types.select(&:store?).each do |model|
-          basename = model.name.underscore
           variables = {
             model: model,
-            model_basename: basename,
+            model_package: model.package,
           }
 
           new_generator.tap{|g| g.source_file = source_file }.process({
-            'templates/store.go.erb' => File.join(cfg.store_dir, basename, "store.go"),
-            'templates/store_validation.go.erb' => File.join(cfg.store_dir, basename, "validation.go"),
+            'templates/store.go.erb' => File.join(cfg.store_dir, model.package_path_name, "store.go"),
+            'templates/store_validation.go.erb' => File.join(cfg.store_dir, model.package_path_name, "validation.go"),
           }, variables)
         end
       end
@@ -79,7 +84,6 @@ module GoaModelGen
     def structs_gen
       setup
       new_generator.process({
-        "templates/structs_base.go.erb" => File.join(cfg.structs_gen_dir, "structs.go"),
         "templates/structs_main.go.erb" => File.join(cfg.structs_gen_dir, "main.go"),
       })
     end
@@ -103,7 +107,7 @@ module GoaModelGen
           payload: pt ? GoStruct.new(pt) : nil,
           result: rt ? GoStruct.new(rt) : nil,
         }
-        new_generator.run('templates/converter.go.erb', File.join(cfg.converter_dir, m.name.underscore, "conv.go"), variables)
+        new_generator.run('templates/converter.go.erb', File.join(cfg.converter_dir, m.package_path_name, "conv.go"), variables)
       end
     end
 

data/lib/goa_model_gen/config.rb

@@ -10,12 +10,17 @@ module GoaModelGen
   class Config
 
     ATTRIBUTES = %w[
-      go_package
       swagger_yaml
       gofmt_disabled
+      base_package_path
       model_dir
+      model_package_path
       store_dir
+      store_package_path
       converter_dir
+      converter_package_path
+      goa_gen_dir
+      goa_gen_package_path
       structs_gen_dir
       validator_path
       generator_version_comment
@@ -24,12 +29,17 @@ module GoaModelGen
     attr_accessor *ATTRIBUTES
 
     def fulfill
-      @go_package     ||= default_go_package
       # @swagger_yaml   ||= "./swagger/swagger.yaml"
       @gofmt_disabled ||= false
       @model_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)
+      @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)
       @structs_gen_dir ||= "./cmd/structs"
       @validator_path ||= "gopkg.in/go-playground/validator.v9"
       @generator_version_comment ||= false
@@ -70,5 +80,9 @@ module GoaModelGen
       return Pathname.new(Dir.pwd).relative_path_from(Pathname.new(File.join(gopath, "src"))).to_s
     end
 
+    def join_paths(path1, path2)
+      Pathname.new(path1).join(Pathname.new(path2)).to_s
+    end
+
   end
 end

data/lib/goa_model_gen/generator.rb

@@ -28,6 +28,7 @@ module GoaModelGen
 
     def package(name = nil)
       if name
+        raise "Invalid package name #{name.inspect}" if name.include?('_')
         @package = name
       else
         @package

data/lib/goa_model_gen/go_package.rb

@@ -0,0 +1,17 @@
+require "goa_model_gen"
+
+module GoaModelGen
+  module GoPackage
+
+    # goa allows underscore for file name
+    def package_path_name
+      name.underscore
+    end
+
+    # underscore isn't used for go package name
+    def package
+      name.downcase.gsub('_', '')
+    end
+
+  end
+end

data/lib/goa_model_gen/go_struct.rb

@@ -1,10 +1,14 @@
 # coding: utf-8
 require 'goa_model_gen'
 
+require "goa_model_gen/go_package"
+
 require "active_support/core_ext/string"
 
 module GoaModelGen
   class GoStruct
+    include GoPackage
+
     attr_reader :name, :pkg_path, :size, :fields
     def initialize(d)
       @name = d['Name']

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

@@ -7,16 +7,16 @@ def method_calling_exp(m, argument)
   end
 end
 
-gen_package = "#{config.go_package}/gen/#{model.name.underscore}"
+gen_package = "#{config.goa_gen_package_path}/#{model.package_path_name}"
 
 -%>
-<%- package model.name.underscore -%>
+<%- package model.package -%>
 
 <%- if payload-%>
 <%-
-    	import "#{config.go_package}/converters"
 			import :gen, gen_package
-			import "#{config.go_package}/model"
+			import config.converter_package_path
+			import config.model_package_path
 -%>
 func <%= model.name %>PayloadToModel(payload *gen.<%= payload.name %>) (*model.<%= model.name %>, error) {
 	m := &model.<%= model.name %>{}
@@ -82,9 +82,9 @@ func CopyFrom<%= model.name %>PayloadToModel(payload *gen.<%= payload.name %>, m
 
 <%- if result -%>
 <%-
-    	import "#{config.go_package}/converters"
 			import :gen, gen_package
-			import "#{config.go_package}/model"
+			import config.converter_package_path
+			import config.model_package_path
 
       indirect_types =
         result.fields.map{|rf| rf.type.pkg_path == gen_package ? rf.type : nil }.

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

@@ -1,5 +1,5 @@
 <%- user_editable -%>
-<%- package 'goon_store' -%>
+<%- package 'goonstore' -%>
 
 <%-
   import "golang.org/x/net/context"

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

@@ -1,4 +1,4 @@
-<%- package model_basename -%>
+<%- package model_package -%>
 
 <%-	 store_name = "#{model.name}Store" -%>
 <%-
@@ -6,8 +6,8 @@
 			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"
+			import config.model_package_path
+			import :goon, "#{config.store_package_path}/goon_store"
 
       model_name = "model.#{model.name}"
 -%>

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

@@ -1,9 +1,9 @@
 <%- user_editable -%>
-<%- package model_basename -%>
+<%- package model_package -%>
 
 <%-
       import "context"
-      import "#{config.go_package}/model"
+			import config.model_package_path
 -%>
 <%-   store_name = "#{model.name}Store" -%>
 func (s *<%= store_name %>) Validate(ctx context.Context, m *model.<%= model.name %>) error {

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

@@ -3,14 +3,21 @@ package 'main'
 
 user_editable
 
+import "os"
+import "reflect"
 import "regexp"
+
+import "github.com/akm/typedict"
+
+import config.model_package_path
 -%>
 
+
 // Usage
 // $ go run <%= config.structs_gen_dir %>/*.go
 
 func main() {
-	ptn := regexp.MustCompile(`\A<%= config.go_package  %>`)
+	ptn := regexp.MustCompile(`\A<%= config.model_package_path %>|\A<%= config.store_package_path %>|\A<%= config.converter_package_path %>`)
 
 	objectMap := map[string][]interface{}{
 		"model": []interface{}{
@@ -24,5 +31,10 @@ func main() {
 		},
 	}
 
-	process(objectMap, ptn)
+	structs := typedict.CategorizedTypes(objectMap,
+		typedict.KindFilter(append([]reflect.Kind{reflect.Struct}, typedict.SimpleKinds...)...),
+		func(t reflect.Type) bool {
+			return ptn.MatchString(t.PkgPath())
+		})
+	typedict.WriteJson(os.Stdout, structs)
 }

data/lib/goa_model_gen/type.rb

@@ -1,7 +1,11 @@
 require "goa_model_gen"
 
+require "goa_model_gen/go_package"
+
 module GoaModelGen
   class Type
+    include GoPackage
+
     attr_reader :name, :fields
 
     def initialize(name, attrs)

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -147,6 +147,7 @@ files:
 - lib/goa_model_gen/config.rb
 - lib/goa_model_gen/field.rb
 - lib/goa_model_gen/generator.rb
+- lib/goa_model_gen/go_package.rb
 - lib/goa_model_gen/go_struct.rb
 - lib/goa_model_gen/goa.rb
 - lib/goa_model_gen/golang_helper.rb
@@ -162,7 +163,6 @@ files:
 - 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/structs_base.go.erb
 - lib/goa_model_gen/templates/structs_main.go.erb
 - lib/goa_model_gen/templates/validator.go.erb
 - lib/goa_model_gen/type.rb

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

@@ -1,170 +0,0 @@
-<%- package 'main' -%>
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"reflect"
-	"regexp"
-	"sort"
-)
-
-func process(objectMap map[string][]interface{}, ptn *regexp.Regexp) {
-	res := map[string][]*DataType{}
-
-	for key, objects := range objectMap {
-		types := []reflect.Type{}
-		for _, obj := range objects {
-			types = append(types, reflect.TypeOf(obj))
-		}
-
-		types = digTypes(types)
-
-		dataTypes := []*DataType{}
-		for _, t := range types {
-			dt := newDataType(t)
-			if ptn.MatchString(dt.PkgPath) {
-				dataTypes = append(dataTypes, dt)
-			}
-		}
-
-		sort.Slice(dataTypes, func(i, j int) bool {
-			return (dataTypes[i].PkgPath +"."+ dataTypes[i].Name) < (dataTypes[j].PkgPath +"."+ dataTypes[j].Name)
-		})
-
-		res[key] = dataTypes
-	}
-
-	b, err := json.MarshalIndent(res, "", "  ")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to json.MarshalIndent because of %v\n", err)
-		return
-	}
-	_, err = os.Stdout.Write(b)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to write because of %v\n", err)
-		return
-	}
-}
-
-type DataFieldType struct {
-	PkgPath        string   `json:"PkgPath,omitempty"`
-	Name           string   `json:"Name,omitempty"`
-	Kinds          []string `json:"Kinds,omitempty"`
-	Representation string
-}
-
-type DataField struct {
-	Name      string
-	Type      *DataFieldType
-	RawTag    string            `json:"RawTag,omitempty"`
-	Tag       map[string]string `json:"Tag,omitempty"`
-	Anonymous bool
-}
-
-type DataType struct {
-	Name    string
-	PkgPath string
-	Size    uintptr
-	Fields  []*DataField
-}
-
-func digTypes(types []reflect.Type) []reflect.Type {
-	m := map[string]reflect.Type{}
-	for _, t := range types {
-		key := t.PkgPath() + "." + t.Name()
-		m[key] = t
-	}
-
-	for _, t := range types {
-		digType(m, t)
-	}
-
-	r := []reflect.Type{}
-	for _, t := range m {
-		r = append(r, t)
-	}
-	return r
-}
-
-func digType(m map[string]reflect.Type, t reflect.Type) {
-	switch t.Kind() {
-	case reflect.Struct:
-		digStruct(m, t)
-	case reflect.Array, reflect.Chan, reflect.Map, reflect.Ptr, reflect.Slice:
-		digType(m, t.Elem())
-	}
-}
-
-func digStruct(m map[string]reflect.Type, t reflect.Type) {
-	numField := t.NumField()
-	for i := 0; i < numField; i++ {
-		f := t.Field(i)
-		ft := f.Type
-		if ft.PkgPath() != "" {
-			key := ft.PkgPath() + "." + ft.Name()
-			_, ok := m[key]
-			if !ok {
-				m[key] = ft
-				switch ft.Kind() {
-				case reflect.Struct:
-					digType(m, ft)
-				}
-			}
-		}
-	}
-}
-
-func newDataType(t reflect.Type) *DataType {
-	r := &DataType{
-		Name:    t.Name(),
-		PkgPath: t.PkgPath(),
-		Size:    t.Size(),
-	}
-	if t.Kind() != reflect.Struct {
-		return r
-	}
-
-	fields := []*DataField{}
-	numField := t.NumField()
-	for i := 0; i < numField; i++ {
-		f := t.Field(i)
-		ft := f.Type
-		fields = append(fields, &DataField{
-			Name:      f.Name,
-			Anonymous: f.Anonymous,
-			Type:      DataFieldTypeFromType(ft),
-			Tag:       parseTag(string(f.Tag)),
-			RawTag:    string(f.Tag),
-		})
-	}
-	r.Fields = fields
-	return r
-}
-
-func DataFieldTypeFromType(t reflect.Type) *DataFieldType {
-	switch t.Kind() {
-	case reflect.Array, reflect.Chan, reflect.Map, reflect.Ptr, reflect.Slice:
-		r := DataFieldTypeFromType(t.Elem())
-		r.Kinds = append(r.Kinds, t.Kind().String())
-		return r
-	default:
-		return &DataFieldType{
-			PkgPath:        t.PkgPath(),
-			Name:           t.Name(),
-			Kinds:          []string{t.Kind().String()},
-			Representation: t.String(),
-		}
-	}
-}
-
-var TagParserRE = regexp.MustCompile(`\s*([^:\s]+?):"(.+?)"`)
-
-func parseTag(src string) map[string]string {
-	parsed := TagParserRE.FindAllStringSubmatch(src, -1)
-	r := map[string]string{}
-	for _, parts := range parsed {
-		r[parts[1]] = parts[2]
-	}
-	return r
-}