goa_model_gen 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c7930eb91dbfa049e61b483ab4e570e5319020a1a0e283bf79c9014b7059f3
-  data.tar.gz: b7dcdd494bbfaf4f93333398c285f94b31e47d24b2c5adb643cfadb844b2c29d
+  metadata.gz: fb100e41bfae1d78b4c222638a59945e42efa13af022c000d55efa3be6d71478
+  data.tar.gz: 53d689f9969dda1338ef1d177e56f1da34d04c40e55433e8e1816f8b8fea74de
 SHA512:
-  metadata.gz: 873ab6ec5df1fd224c8c07d47ca1b4d77220f9aa16cb67913fede6726f4097bd8dc2682afbff38bc6dfbb8a8ce1b5fc8a637066b67233dc9850ff3f7fc246f4e
-  data.tar.gz: 682549fb13dc19eb00d4c7a82be17b8ede6a6e1e8cf7c081ccff9dd52883923b2fe4e7cd6524c0c72a77b7e9ae7b3096b901387805bbcbaf2e413212733cee55
+  metadata.gz: c93f6c04d0fd3f4a1b72856e19c9a8ad026c2253cd14e9632729c075d0e70277f62464d03532cf90a2bd88326d2a4f9df528c3cfce923a46d8a4bcb5d2d12882
+  data.tar.gz: a163ecc4e61e8b03aa8de557a12c029b71a7e8253d910fe45df8c248c9caf4db457c1805a008c5d2bfa6bc870608f9833d047142aacccde45bdd6d9027fdc959

data/lib/goa_model_gen/cli.rb

@@ -9,9 +9,12 @@ require "goa_model_gen/generator"
 
 module GoaModelGen
   class Cli < Thor
+    include Thor::Actions
+
     class_option :version, type: :boolean, aliases: 'v', desc: 'Show version before processing'
-    class_option :dryrun, type: :boolean, aliases: 'd', desc: "Don't write or overwrite file"
+    class_option :skip, type: :boolean, aliases: 's', desc: "Skip generate file"
     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'
 
@@ -81,8 +84,10 @@ module GoaModelGen
 
       def new_generator
         GoaModelGen::Generator.new(cfg).tap do |g|
+          g.thor = self
           g.force = options[:force]
-          g.dryrun = options[:dryrun]
+          g.skip = options[:skip]
+          g.keep_editable = options[:keep_editable]
         end
       end
 

data/lib/goa_model_gen/field.rb

@@ -62,6 +62,16 @@ module GoaModelGen
       !not_null?
     end
 
+    def zero_value_expression
+      case type
+      when 'bool' then 'false'
+      when 'int', 'int32', 'int64',
+           'float', 'float32', 'float64' then '0'
+      when 'string', 'UUID' then '""'
+      else raise "Unsupproted zero value for #{type}"
+      end
+    end
+
     def assign_type_base(types)
       @type_obj = types[self.type]
     end

data/lib/goa_model_gen/generator.rb

@@ -10,14 +10,16 @@ module GoaModelGen
   class Generator
     # These are used in templates
     attr_reader :config
+    attr_accessor :thor
     attr_accessor :source_file
-    attr_accessor :force, :dryrun
+    attr_accessor :force, :skip
+    attr_accessor :keep_editable
 
     def initialize(config)
       @config = config
       @user_editable = false
       @force = false
-      @dryrun = false
+      @skip = false
     end
 
     def golang_helper
@@ -71,35 +73,35 @@ module GoaModelGen
 
       base = ERB.new(File.read(GO_BASE_PATH), nil, "-")
       base.filename = GO_BASE_PATH
-      base.result(binding).strip
+      r = base.result(binding).strip << "\n"
+      r = gofmt(r) unless config.gofmt_disabled
+      return r
+    end
+
+    def gofmt(content)
+      # https://docs.ruby-lang.org/ja/2.5.0/class/IO.html#S_POPEN
+      return IO.popen("gofmt", "r+") do |io|
+        io.puts(content)
+        io.close_write
+        io.read
+      end
     end
 
     COLORS = {
-      generate: "\e[32m",        # green   # !file_exist
-      no_change: "\e[37m",    # white   # file_exist && !modified
-      overwrite: "\e[33m",       # yellow  # file_exist && !user_editable
-      keep: "\e[34m",            # blue    # file_exist && user_editable && !force
-      force_overwrite: "\e[31m", # red     # file_exist && user_editable && force
-      clear: "\e[0m",            # clear
+      blue:  "\e[34m",
+      clear: "\e[0m",
     }
-    MAX_ACTION_LENGTH = COLORS.keys.map(&:to_s).map(&:length).max
 
     def run(template_path, output_path)
-      already_exist = File.exist?(output_path)
       content = generate(template_path)
-      modified = already_exist ? (content != File.read(output_path)) : true
-      action =
-        !already_exist ? :generate :
-          !modified ? :no_change :
-            !user_editable? ? :overwrite :
-              force ? :force_overwrite : :keep
-      GoaModelGen.logger.info("%s%-#{MAX_ACTION_LENGTH}s %s%s" % [COLORS[action], action.to_s, output_path, COLORS[:clear]])
-      return if action == :no_change
-      return if dryrun
-      open(output_path, 'w'){|f| f.puts(content) }
-      if (File.extname(output_path) == '.go') && !config.gofmt_disabled
-        system("gofmt -w #{output_path}")
+
+      if user_editable? && keep_editable
+        $stderr.puts("%sKEEP%s %s" % [COLORS[:blue], COLORS[:clear], output_path])
+        return
       end
+
+      options = {skip: skip, force: force}
+      thor.create_file(output_path, content, options)
     end
 
     def process(temp_path_to_dest_path)

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

@@ -43,6 +43,10 @@ func IntToInt64Pointer(v int) *int64 {
 	return &r
 }
 
+func StringToStringPointer(v string) *string {
+	return &v
+}
+
 func StringPointerToString(v *string) string {
 	return StringPointerToStringWith(v, "")
 }

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

@@ -55,6 +55,10 @@ func (m *<%= model.name %>) PrepareToUpdate() error {
 	return nil
 }
 
+func (m *<%= model.name %>) IsPersisted() bool {
+	return m.ID != <%= model.id_field.zero_value_expression %>
+}
+
 <%-   if model.parent -%>
 <%-     import "context" -%>
 func (m *<%= model.name %>) Parent(ctx context.Context) (*<%= model.parent %>, error) {

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

@@ -115,6 +115,9 @@ func (s *<%= store_name %>) IsValidKey(ctx context.Context, key *datastore.Key)
 }
 
 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)
 	key, err := g.KeyError(m)
 	if err != nil {
@@ -133,8 +136,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) {
-	err := m.PrepareToCreate()
-	if err != nil {
+	if err := m.PrepareToCreate(); err != nil {
 		return nil, err
 	}
 	return s.PutWith(ctx, m, func() error {
@@ -144,15 +146,14 @@ 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 fmt.Errorf("Duplicate <%= model.goon['id_name'] %> error: %q of %v\n", m.<%= model.goon['id_name'] %>, m)
+			return fmt.Errorf("Duplicate <%= model.id_name %> error: %q of %v\n", m.<%= model.id_name %>, m)
 		}
 		return nil
 	})
 }
 
 func (s *<%= store_name %>) Update(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
-	err := m.PrepareToUpdate()
-	if err != nil {
+	if err := m.PrepareToUpdate(); err != nil {
 		return nil, err
 	}
 	return s.PutWith(ctx, m, func() error {
@@ -162,7 +163,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 fmt.Errorf("No data to update %q of %v\n", m.<%= model.goon['id_name'] %>, m)
+			return fmt.Errorf("No data to update %q of %v\n", m.<%= model.id_name %>, m)
 		}
 		return nil
 	})
@@ -244,7 +245,11 @@ func (s *<%= store_name %>) ValidateUniqueness(ctx context.Context, m *<%= model
 		if err != nil {
 			return err
 		}
-		if c > 0 {
+		b := 0
+		if m.IsPersisted() {
+				b = 1
+		}
+		if c > b {
 			return &ValidationError{
 				Field: field,
 				Message: fmt.Sprintf("%v has already been taken", value),

data/lib/goa_model_gen/type.rb

@@ -123,9 +123,12 @@ module GoaModelGen
       (conv == 'generate') && !fields.empty?
     end
 
+    def id_field
+      @id_field ||= Field.new(id_name, {'type' => goon['id_type']})
+    end
+
     def fields_including_id
       if goon && goon['id_type']
-        id_field = Field.new(id_name, {'type' => goon['id_type']})
         [id_field] + fields
       else
         fields

data/lib/goa_model_gen/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor