goa_model_gen 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10b556d055acc2054efa01a18fa0610dea43bdfa88be354ce818807cdd594a21
-  data.tar.gz: e456994ddafd3e12112af08d88bb797326b951ec979d15844187882f6e95eb82
+  metadata.gz: a94a826ba73aaaf70ac461966a30335bd2172b4b21dc8b2a9cdb67b900c18adb
+  data.tar.gz: c98e3ae9d9e57a0c45bd2cc5fcf8452ae40de3957a7813cb1fc8ba67ce0ff874
 SHA512:
-  metadata.gz: 1d9e5251f038931fd7381e0fe2520e0e10b9c79ccd5a699697878d2fc2d9721ea10cf49aca80e8d3ea4d42b455844b2d2e2e3aca9585053addda0cb7d74ad245
-  data.tar.gz: c2dcd3a32e11d48cb97be59d75fd12aa751192414bc64aa4b54ccbb167f0885e7c5c69d3eb48b029348805b5fb27bf269033f0e1879fee4f0024193cd90e011d
+  metadata.gz: 5d4f762066e7d4d2f797a159041833918f955107b51fcb39f52b02050e2eb9252fdc1e594aafc22d30c8d7c8da5aecee58c31df66d522c6f194d52ddf94e6b45
+  data.tar.gz: 8c00b816ebd1805f36f497e9e336794abb403d57dbf5a9282cd6f461246ca8a05bec0b8ec4ee0192ce837f31d3a17cbe3f8a83cdb8a22be8cc33a43a3bcd14cf

data/lib/goa_model_gen/cli.rb

@@ -1,59 +1,94 @@
 require "goa_model_gen"
 
-require "erb"
-
 require "thor"
 
+require "goa_model_gen/config"
 require "goa_model_gen/loader"
 require "goa_model_gen/generator"
 
 module GoaModelGen
   class Cli < Thor
-    class_option :swagger_yaml, type: :string, default: './swagger/swagger.yaml', desc: 'Swagger definition YAML file'
+    class_option :version, type: :boolean, aliases: 'v', desc: 'Show version before processing'
+    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')
+      show_version_if_required
+      open(path, 'w'){|f| f.puts(Config.new.fulfill.to_yaml) }
+    end
+
+    desc "bootstrap", "Generate files not concerned with model"
+    def bootstrap
+      show_version_if_required
+      generator = new_generator
+      {
+        "templates/goon.go.erb" => "model/goon.go",
+        "templates/converter_base.go.erb" => "controller/converter_base.go",
+      }.each do |template, dest|
+        generator.run(template, dest, overwrite: true)
+      end
+    end
 
     desc "show FILE1...", "Show model info from definition files"
     def show(*paths)
-      load_types_for(paths, options[:swagger_yaml]) do |path, types|
+      show_version_if_required
+      load_types_for(paths) do |path, types|
         puts "types in #{path}"
         puts YAML.dump(types)
       end
     end
 
     desc "model FILE1...", "Generate model files from definition files"
-    option :dir, type: :string, default: './model', desc: 'Output directory path'
-    option :gofmt, type: :boolean, default: true, desc: 'Run gofmt for generated file'
     def model(*paths)
-      generator = GoaModelGen::Generator.new(File.expand_path('../templates/model.go.erb', __FILE__))
-      load_types_for(paths, options[:swagger_yaml]) do |path, types|
-        dest = File.join(options[:dir], File.basename(path, ".*") + ".go")
-        generator.run(types, dest)
-        if options[:gofmt]
-          system("gofmt -w #{dest}")
+      show_version_if_required
+      load_types_for(paths) do |path, types|
+        generator = new_generator.tap{|g| g.types = types }
+        [
+          {path: 'templates/model.go.erb', suffix: '.go', overwrite: true},
+          {path: 'templates/model_validation.go.erb', suffix: '_validation.go', overwrite: false},
+        ].each do |d|
+          dest = File.join(cfg.model_dir, File.basename(path, ".*") + d[:suffix])
+          generator.run(d[:path], dest, overwrite: d[:overwrite])
         end
       end
     end
 
     desc "converter FILE1...", "Generate converter files from definition files and swagger.yaml"
-    option :package, type: :string, default: 'controller', desc: 'package name'
-    option :dir, type: :string, default: './controller', desc: 'Output directory path'
-    option :gofmt, type: :boolean, default: true, desc: 'Run gofmt for generated file'
     def converter(*paths)
-      generator = GoaModelGen::Generator.new(File.expand_path('../templates/converter.go.erb', __FILE__))
-      load_types_for(paths, options[:swagger_yaml]) do |path, types|
-        dest = File.join(options[:dir], File.basename(path, ".*") + "_conv.go")
+      show_version_if_required
+      load_types_for(paths) do |path, types|
+        generator = new_generator.tap{|g| g.types = types }
+        dest = File.join(cfg.controller_dir, File.basename(path, ".*") + "_conv.go")
         if types.any?{|t| !!t.payload || !!t.media_type}
-          generator.run(types, dest)
-          if options[:gofmt]
-            system("gofmt -w #{dest}")
-          end
+          generator.run('templates/converter.go.erb', dest, overwrite: true)
         end
       end
     end
 
+    desc "version", "Show version"
+    def version
+      show_version
+    end
+
     no_commands do
+      def show_version_if_required
+        show_version if options[:version]
+      end
+
+      def show_version
+        puts "#{$PROGRAM_NAME} version:#{::GoaModelGen::VERSION}"
+      end
+
+      def cfg
+        @cfg ||= GoaModelGen::Config.new.load_from(options[:config])
+      end
+
+      def new_generator
+        GoaModelGen::Generator.new(cfg)
+      end
 
-      def load_types_for(paths, swagger_yaml)
-        swagger_loader = GoaModelGen::SwaggerLoader.new(swagger_yaml)
+      def load_types_for(paths)
+        swagger_loader = GoaModelGen::SwaggerLoader.new(cfg.swagger_yaml)
         path_to_types = {}
         defined_types = {}
         paths.each do |path|

data/lib/goa_model_gen/config.rb

@@ -0,0 +1,66 @@
+require "goa_model_gen"
+
+require "erb"
+require "yaml"
+require "pathname"
+
+require "active_support/core_ext/string"
+
+module GoaModelGen
+  class Config
+
+    ATTRIBUTES = %w[
+      go_package
+      swagger_yaml
+      gofmt_disabled
+      model_dir
+      controller_dir
+    ].freeze
+
+    attr_reader *ATTRIBUTES
+
+    def fulfill
+      @go_package     ||= default_go_package
+      @swagger_yaml   ||= "./swagger/swagger.yaml"
+      @gofmt_disabled ||= false
+      @model_dir      ||= "./model"
+      @controller_dir ||= "./controller"
+      self
+    end
+
+    def load_from(path)
+      erb = ERB.new(File.read(path), nil, "-")
+      erb.filename = path
+      config = YAML.load(erb.result, path)
+
+      ATTRIBUTES.each do |name|
+        instance_variable_set("@#{name}", config[name].presence)
+      end
+
+      fulfill
+    end
+
+    def to_hash
+      ATTRIBUTES.each_with_object({}) do |name, d|
+        d[name] = send(name)
+      end
+    end
+
+    def to_yaml
+      YAML.dump(to_hash)
+    end
+
+    def default_go_package
+      return default_go_package!
+    rescue
+      nil
+    end
+
+    def default_go_package!
+      gopath = ENV['GOPATH'] || ''
+      raise "$GOPATH not found" if gopath.empty?
+      return Pathname.new(Dir.pwd).relative_path_from(Pathname.new(File.join(gopath, "src"))).to_s
+    end
+
+  end
+end

data/lib/goa_model_gen/generator.rb

@@ -7,15 +7,24 @@ require "active_support/core_ext/string"
 
 module GoaModelGen
   class Generator
-    def initialize(template_path)
-      content = File
-      @erb = ERB.new(File.read(template_path), nil, "-")
-      @erb.filename = template_path
+    # These are used in templates
+    attr_reader :config
+    attr_accessor :types
+
+    def initialize(config)
+      @config = config
     end
 
-    def run(types, path)
-      content = @erb.result(binding)
+    def run(rel_path, path, overwrite: false)
+      return if File.exist?(path) && !overwrite
+      abs_path = File.expand_path('../' + rel_path, __FILE__)
+      erb = ERB.new(File.read(abs_path), nil, "-")
+      erb.filename = abs_path
+      content = erb.result(binding)
       open(path, 'w'){|f| f.puts(content) }
+      if (File.extname(path) == '.go') && !config.gofmt_disabled
+        system("gofmt -w #{path}")
+      end
     end
 
   end

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

@@ -1,8 +1,8 @@
 package controller
 
 import (
-	"github.com/groovenauts/blocks-concurrent-batch-server/app"
-	"github.com/groovenauts/blocks-concurrent-batch-server/model"
+	"<%= config.go_package %>/app"
+	"<%= config.go_package %>/model"
 )
 
 <%- types.select(&:gen_converter?).each do |type| -%>

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

@@ -0,0 +1,60 @@
+package controller
+
+import (
+	"strconv"
+)
+
+func BoolPointerToBool(v *bool) bool {
+	return BoolPointerToBoolWith(v, false)
+}
+
+func BoolPointerToBoolWith(v *bool, d bool) bool {
+	if v == nil {
+		return d
+	}
+	return *v
+}
+
+func IntPointerToInt(v *int) int {
+	return IntPointerToIntWith(v, 0)
+}
+
+func IntPointerToIntWith(v *int, d int) int {
+	if v == nil {
+		return d
+	}
+	return *v
+}
+
+func IntToInt64(v int) int64 {
+	return int64(v)
+}
+
+func IntToInt64Pointer(v int) *int64 {
+	r := IntToInt64(v)
+	return &r
+}
+
+func StringPointerToString(v *string) string {
+	return StringPointerToStringWith(v, "")
+}
+
+func StringPointerToStringWith(v *string, d string) string {
+	if v == nil {
+		return d
+	}
+	return *v
+}
+
+func StringToInt64(v string) (int64, error) {
+	return strconv.ParseInt(v, 10, 64)
+}
+
+func Int64ToString(v int64) string {
+	return strconv.FormatInt(v, 10)
+}
+
+func Int64ToStringPointer(v int64) *string {
+	s := Int64ToString(v)
+	return &s
+}

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

@@ -0,0 +1,27 @@
+package model
+
+import (
+	"golang.org/x/net/context"
+
+	"github.com/mjibson/goon"
+)
+
+// // Use the following code if you want to change kind name from model struct name.
+// var ModelNameToKindMap = map[string]string{
+// 	"Person": "People",
+// 	"Book":   "Books",
+// }
+
+func GoonFromContext(c context.Context) *goon.Goon {
+	r := goon.FromContext(c)
+	// baseResolver := r.KindNameResolver
+	// r.KindNameResolver = func(src interface{}) string {
+	// 	base := baseResolver(src)
+	// 	mapped := ModelNameToKindMap[base]
+	// 	if mapped != "" {
+	// 		return mapped
+	// 	}
+	// 	return base
+	// }
+	return r
+}

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

@@ -196,7 +196,7 @@ func (s *<%= store_name %>) Create(ctx context.Context, m *<%= model.name %>) (*
 	}
 	if exist {
 		log.Errorf(ctx, "Failed to create %v because of another entity has same key\n", m)
-		return nil, fmt.Errorf("Duplicate Name error: %q of %v\n", m.Name, m)
+		return nil, fmt.Errorf("Duplicate <%= model.goon['id_name'] %> error: %q of %v\n", m.<%= model.goon['id_name'] %>, m)
 	}
 <%- end -%>
 
@@ -219,7 +219,7 @@ func (s *<%= store_name %>) Update(ctx context.Context, m *<%= model.name %>) (*
 	}
 	if !exist {
 		log.Errorf(ctx, "Failed to update %v because it doesn't exist\n", m)
-		return nil, fmt.Errorf("No data to update %q of %v\n", m.Name, m)
+		return nil, fmt.Errorf("No data to update %q of %v\n", m.<%= model.goon['id_name'] %>, m)
 	}
 <%- end -%>
 

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

@@ -0,0 +1,13 @@
+package model
+
+import (
+	"gopkg.in/go-playground/validator.v9"
+)
+
+<%- types.select(&:store?).each do |model| -%>
+func (m *<%= model.name %>) Validate() error {
+	validator := validator.New()
+	return validator.Struct(m)
+}
+
+<%- end -%>

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -116,12 +116,16 @@ files:
 - goa_model_gen.gemspec
 - lib/goa_model_gen.rb
 - lib/goa_model_gen/cli.rb
+- lib/goa_model_gen/config.rb
 - lib/goa_model_gen/field.rb
 - lib/goa_model_gen/generator.rb
 - lib/goa_model_gen/goa.rb
 - lib/goa_model_gen/loader.rb
 - lib/goa_model_gen/templates/converter.go.erb
+- 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_validation.go.erb
 - lib/goa_model_gen/type.rb
 - lib/goa_model_gen/version.rb
 homepage: https://github.com/akm/goa_model_gen