goa_model_gen 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b0d93af5777f1460e792e2b1aafb7553d0bd054558a411668687d825de5e9d
-  data.tar.gz: 8b1ec15e0b26806474ca3005f9951529434f680e0e22b243c04d9d8467215d9f
+  metadata.gz: 1061248dca4fbff0b9b4517a722da29e1beb98a131381fd13b44cb36197c0b53
+  data.tar.gz: c94af8e7365506e8e579740351cecaf3071fbdd75db6a91b9625f69f08cb43b0
 SHA512:
-  metadata.gz: b68b7d2d1488af468dc14a78ab150d22becfcacd852aa8ec87fbf6b40b107bcaa40688154205ff3a727a6d87a7536cb3f39ca492b612188782c7ac6debd780d6
-  data.tar.gz: bb0dcd08ac16663d0cb3f54dfee59ed5e52d3a0a4e75872fdf2f9665e573a774d2d70ffb2de6fabd117ac337bc1eb40e73735764ca3701aa5edce74c6540bff2
+  metadata.gz: 8094e4fe0dc6d4e76b7c7f063108ef04748b014e8688a95b59f334aa79aea2feb14b91cc46c939fe1b7ba68ee50b0ce0a6f61176ad5024176e15183ff6d93634
+  data.tar.gz: '0117000180a31a443396f37768774dd8c6db73bf7abae228f2468ff59d7cc02d1d662a1cfeb3ca61e30bb1bb7ef4fe2e61e3d4334947d63df082285db683be1d'

data/lib/goa_model_gen/cli.rb

@@ -60,10 +60,18 @@ module GoaModelGen
         "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"),
-        })
+        source_file.types.select(&:store?).each do |model|
+          basename = model.name.underscore
+          variables = {
+            model: model,
+            model_basename: basename,
+          }
+
+          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"),
+          }, variables)
+        end
       end
     end
 

data/lib/goa_model_gen/generator.rb

@@ -114,8 +114,8 @@ module GoaModelGen
       thor.create_file(output_path, content, options)
     end
 
-    def process(temp_path_to_dest_path)
-      temp_path_to_dest_path.each{|src, dest| run(src, dest) }
+    def process(temp_path_to_dest_path, variables = {}, &block)
+      temp_path_to_dest_path.each{|src, dest| run(src, dest, variables, &block) }
     end
   end
 end

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

@@ -1,6 +1,5 @@
-<%- package source_file.basename -%>
+<%- package model_basename -%>
 
-<%- source_file.types.select(&:store?).each do |model| -%>
 <%-	 store_name = "#{model.name}Store" -%>
 <%-
 			import "context"
@@ -12,7 +11,14 @@
 
       model_name = "model.#{model.name}"
 -%>
+type <%= store_name %>Binder interface {
+	Query(q *datastore.Query) *datastore.Query
+	Visible(m *model.<%= model.name %>) bool
+	Prepare(m *model.<%= model.name %>)
+}
+
 type <%= store_name %> struct{
+	Binder <%= store_name %>Binder
 <%- if model.parent -%>
 	ParentKey *datastore.Key
 <%- end -%>
@@ -48,7 +54,11 @@ func (s *<%= store_name %>) Query(ctx context.Context) *datastore.Query {
 	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)
+	q := datastore.NewQuery(k)
+	if s.Binder != nil {
+		q = s.Binder.Query(q)
+	}
+	return q
 }
 
 func (s *<%= store_name %>) ByID(ctx context.Context, <%= model.id_name_var %> <%= model.id_golang_type %>) (*<%= model_name %>, error) {
@@ -70,16 +80,7 @@ func (s *<%= store_name %>) ByKey(ctx context.Context, key *datastore.Key) (*<%=
 		return nil, err
 	}
 
-<%- if model.parent -%>
-	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 %>()}
-<%- end -%>
-	err := s.Get(ctx, &r)
-	if err != nil {
-		return nil, err
-	}
-	return &r, nil
+	return s.ByID(ctx, key.IntID())
 }
 
 func (s *<%= store_name %>) Get(ctx context.Context, m *<%= model_name %>) error {
@@ -96,7 +97,11 @@ func (s *<%= store_name %>) Get(ctx context.Context, m *<%= model_name %>) error
 	}
 <%- end -%>
 
-	return nil
+	if s.Binder != nil && !s.Binder.Visible(m) {
+		return datastore.ErrNoSuchEntity
+	}
+
+  return nil
 }
 
 func (s *<%= store_name %>) IsValidKey(ctx context.Context, key *datastore.Key) error {
@@ -172,6 +177,9 @@ 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) {
+	if s.Binder != nil {
+		s.Binder.Prepare(m)
+	}
 	if err := s.Validate(ctx, m); err != nil {
 		return nil, err
 	}
@@ -260,5 +268,3 @@ func (s *<%= store_name %>) ValidateUniqueness(ctx context.Context, m *<%= model
 	}
 	return nil
 }
-
-<%- end -%>

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

@@ -6,6 +6,7 @@ import (
 	"os"
 	"reflect"
 	"regexp"
+	"sort"
 )
 
 func process(objectMap map[string][]interface{}, ptn *regexp.Regexp) {
@@ -27,6 +28,10 @@ func process(objectMap map[string][]interface{}, ptn *regexp.Regexp) {
 			}
 		}
 
+		sort.Slice(dataTypes, func(i, j int) bool {
+			return (dataTypes[i].PkgPath +"."+ dataTypes[i].Name) < (dataTypes[j].PkgPath +"."+ dataTypes[j].Name)
+		})
+
 		res[key] = dataTypes
 	}
 

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.8.4"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - akm