goon_model_gen 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1bc7f66fb836ee7b30fd1aa1d53853c51fd2de8bf18d3a0675ed769b4e09c35
-  data.tar.gz: 384a9ed52b7f63d4170f06eb6f3f02652178519e09fad4c2b6985909786ecbef
+  metadata.gz: 316458bf5f2033fb2e803fc8cb74b8a8ef80a44eb2adf8bec57862a9283b19ad
+  data.tar.gz: 57100fe6b8c389a3f0eb7faa8ea4e7ac063e386c9866d9eb24eeb0c0ea82ef55
 SHA512:
-  metadata.gz: 64638b0fdf6cc508399c632ce39e20e34536926f5a02df1999bfdd891c15ba1f5cdea474b772e471ddc80775a19f1fc69f64279406dd26a68e076783b46c5de7
-  data.tar.gz: 27cca1dcb36984d1b276e6b614dd6acce691138d33e85fe39c79f46d15dfe6c0974877f58022b1169986e4b6305ead73c094aead6ed0a5a10d08cfb85fbf0515
+  metadata.gz: 9f52397b1dbb695e7f65826cccb701b9cb171bc861b03c50274fd00d94a3a53b5312022f096bedc2fca6d956c0d18748daa2344c673b47c84cfd0b7bbe7ff582
+  data.tar.gz: 8226739cfb3a3404a70eb5814e6d0b7ba8169216850ad509f11493bad632bc3ed0392e4b40da811c06f56cdc5378e10a26b7dd8bbbb8cc04557937e4988b2c58

data/lib/goon_model_gen/builder/abstract_builder.rb

@@ -0,0 +1,104 @@
+require "goon_model_gen"
+
+require "goon_model_gen/golang/packages"
+
+module GoonModelGen
+  module Builder
+    class AbstractBuilder
+      attr_reader :base_package_path
+
+      # @param base_package_path [String]
+      def initialize(base_package_path)
+        @base_package_path = base_package_path
+      end
+
+      # @param context [Source::Context]
+      # @return [Golang::Packages]
+      def build(context)
+        Golang::Packages.new.tap do |r|
+          build_sentences = []
+          context.files.each do |f|
+            package_path = File.join(base_package_path, f.basename)
+            pkg, procs = build_package(package_path, f.types)
+            r << pkg
+            build_sentences.concat(procs)
+          end
+          resolve_type_names(r)
+          build_sentences.each(&:call)
+        end
+      end
+
+      # @param package_path [String]
+      # @param types [Array<Source::Type>]
+      # @return [Golang::Package, Array<Proc>]
+      def build_package(package_path, types)
+        raise NotImplementedError, "#{self.type.name} doesn't implement build_package method"
+      end
+
+      # @param pkgs [Golang::Packages]
+      def resolve_type_names(pkgs)
+        raise NotImplementedError, "#{self.type.name} doesn't implement resolve_type_names method"
+      end
+
+      # @param action [string] directory name under templates directory. ex. model, store...
+      # @param kind [string] directory name under the directory specified by action. ex. goon, struct, enum, slice
+      # @param t [Source::Struct]
+      # @param go_type [Golang::Type]
+      def build_sentences(action, kind, t, go_type)
+        template_base = File.join(action, kind)
+        build_sentences_with(template_base, go_type, t.generators[action])
+      end
+
+      # @param template_base [string] template directory path from templates directory. ex. model/enum, store/goon...
+      # @param generators [Hash<string,Object>]
+      # @param go_type [Golang::Type]
+      def build_sentences_with(template_base, go_type, generators)
+        m2t = method_to_template_for(template_base)
+        generators ||= default_generators_for(template_base)
+        generators.each do |name, suffix|
+          next if !suffix
+          template = m2t[name]
+          raise "No template found for #{name.inspect}" unless template
+          parts = [go_type.name.underscore]
+          custom_suffix = false
+          if suffix.is_a?(String)
+            parts << suffix
+            custom_suffix = true
+          end
+          filename = parts.join('_') << '.go'
+          go_type.package.find_or_new_file(filename).tap do |file|
+            file.custom_suffix = custom_suffix
+            file.new_sentence(File.join(template_base, template), go_type)
+          end
+        end
+      end
+
+      def default_generators_for(template_base)
+        method_to_template_for(template_base).keys.
+          each_with_object({}){|name, d| d[name] = true }
+      end
+
+      def method_to_template_map
+        @method_to_template_map ||= {}
+      end
+
+      def method_to_template_for(template_base)
+        method_to_template_map[template_base] ||=
+          begin
+            templates_for(template_base).each_with_object({}) do |filename, d|
+              m = filename.sub(/\A\d+\_/, '').sub(/\.go\.erb\z/, '')
+              d[m] = filename
+            end
+          end
+      end
+
+      def templates_for(template_base)
+        base_dir = File.join(File.expand_path('../../templates', __FILE__), template_base)
+        Dir.chdir(base_dir) do
+          Dir.glob('*.go.erb')
+        end
+      end
+
+    end
+  end
+end

data/lib/goon_model_gen/builder/model_builder.rb

@@ -0,0 +1,74 @@
+require "goon_model_gen"
+
+require "goon_model_gen/builder/abstract_builder"
+
+require "goon_model_gen/source/struct"
+require "goon_model_gen/source/enum"
+require "goon_model_gen/source/named_slice"
+
+require "goon_model_gen/golang/package"
+require "goon_model_gen/golang/packages"
+require "goon_model_gen/golang/datastore_supported"
+
+require "active_support/core_ext/string"
+
+module GoonModelGen
+  module Builder
+    class ModelBuilder < AbstractBuilder
+
+      # @param package_path [String]
+      # @param types [Array<Source::Type>]
+      # @return [Golang::Package, Array<Proc>]
+      def build_package(package_path, types)
+        procs = []
+        pkg = Golang::Package.new(package_path).tap do |pkg|
+          types.each do |t|
+            case t
+            when Source::Struct then
+              go_type = build_struct(t, pkg)
+              kind = (t.id_name && t.id_type) ? 'goon' : 'struct'
+              procs << Proc.new{ build_sentences('model', kind, t, go_type) }
+            when Source::Enum then
+              go_type = pkg.new_enum(t.name, t.base_type, t.map)
+              procs << Proc.new{ build_sentences('model', 'enum', t, go_type) }
+            when Source::NamedSlice then
+              go_type = pkg.new_named_slice(t.name, t.base_type_name)
+              procs << Proc.new{ build_sentences('model', 'slice', t, go_type) }
+            else
+              raise "Unsupported type #{t.class.name} #{t.inspect}"
+            end
+          end
+        end
+        return pkg, procs
+      end
+
+      # @param pkgs [Golang::Packages]
+      def resolve_type_names(pkgs)
+        pkgs.resolve_type_names(Golang::DatastoreSupported.packages)
+      end
+
+      # @param t [Source::Struct]
+      # @param pkg [Golang::Package]
+      # @return [Golang::Struct]
+      def build_struct(t, pkg)
+        pkg.new_struct(t.name).tap do |s|
+          s.ref_name = t.ref_name
+          if t.id_name && t.id_type
+            tags = {
+              'goon' => ['id'],
+              'datastore' => ['-'],
+              'json' => [t.id_name.underscore],
+            }
+            s.new_field(t.id_name, t.id_type, tags, goon_id: true)
+          end
+          t.fields.each do |f|
+            s.new_field(f.name, f.type_name, f.build_tags).tap do |field|
+              field.unique = f.unique
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/goon_model_gen/builder/store_builder.rb

@@ -0,0 +1,45 @@
+require "goon_model_gen"
+
+require "goon_model_gen/builder/abstract_builder"
+
+require "goon_model_gen/source/struct"
+
+require "goon_model_gen/golang/package"
+require "goon_model_gen/golang/datastore_supported"
+
+
+module GoonModelGen
+  module Builder
+    class StoreBuilder < AbstractBuilder
+      attr_reader :model_packages
+
+      # @param base_package_path [String]
+      # @param model_packages [Golang::Packages]
+      def initialize(base_package_path, model_packages)
+        super(base_package_path)
+        @model_packages = model_packages
+      end
+
+      # @param package_path [String]
+      # @param types [Array<Source::Type>]
+      # @return [Golang::Package, Array<Proc>]
+      def build_package(package_path, types)
+        procs = []
+        pkg = Golang::Package.new(package_path).tap do |pkg|
+          types.select{|t| t.is_a?(Source::Struct) && t.id_name && t.id_type }.each do |t|
+            store_type = pkg.new_struct(t.name + "Store")
+            procs << Proc.new{ build_sentences('store', 'goon', t, store_type) }
+            store_type.memo[:model] = model_packages.detect_by(t.file.basename).lookup(t.name)
+          end
+        end
+        return pkg, procs
+      end
+
+      # @param pkgs [Golang::Packages]
+      def resolve_type_names(pkgs)
+        pkgs.resolve_type_names(Golang::DatastoreSupported.packages.dup.add(model_packages))
+      end
+
+    end
+  end
+end

data/lib/goon_model_gen/builder/validation_builder.rb

@@ -0,0 +1,32 @@
+require "goon_model_gen"
+
+require "goon_model_gen/builder/abstract_builder"
+
+require "goon_model_gen/golang/packages"
+require "goon_model_gen/golang/datastore_supported"
+
+
+module GoonModelGen
+  module Builder
+    class ValidationBuilder < AbstractBuilder
+
+      # @return [Golang::Packages]
+      def build(*)
+        Golang::Packages.new.tap do |r|
+          r.new_package(base_package_path).tap do |pkg|
+            t = pkg.new_struct('ValidationError')
+            pkg.new_file('validation_error.go').tap do |f|
+              build_sentences_with('validation/error', t, nil)
+            end
+          end
+        end
+      end
+
+      # @param pkgs [Golang::Packages]
+      def resolve_type_names(pkgs)
+        pkgs.resolve_type_names(Golang::DatastoreSupported.packages)
+      end
+
+    end
+  end
+end

data/lib/goon_model_gen/cli.rb

@@ -5,7 +5,9 @@ require "yaml"
 require "thor"
 
 require "goon_model_gen/config"
-require "goon_model_gen/model_builder"
+require "goon_model_gen/builder/model_builder"
+require "goon_model_gen/builder/store_builder"
+require "goon_model_gen/builder/validation_builder"
 require "goon_model_gen/source/loader"
 require "goon_model_gen/generator"
 
@@ -30,17 +32,29 @@ module GoonModelGen
       puts YAML.dump(context)
     end
 
-    desc "build FILE1...", "Build golang objects from source YAML files"
-    def build(*paths)
-      packages = build_model_objects(paths)
-      puts YAML.dump(packages)
-    end
-
     desc "model FILE1...", "Generate model files from source YAML files"
+    option :inspect, type: :boolean, desc: "Don't generate any file and show package objects if given"
     def model(*paths)
       packages = build_model_objects(paths)
-      packages.map(&:files).flatten.each do |f|
-        new_generator(f, packages).run
+      if options[:inspect]
+        puts YAML.dump(packages)
+      else
+        packages.map(&:files).flatten.each do |f|
+          new_generator(f, packages).run
+        end
+      end
+    end
+
+    desc "store FILE1...", "Generate store files from source YAML files"
+    option :inspect, type: :boolean, desc: "Don't generate any file and show package objects if given"
+    def store(*paths)
+      packages = build_store_packages(paths).add(*validation_packages)
+      if options[:inspect]
+        puts YAML.dump(packages)
+      else
+        packages.map(&:files).flatten.each do |f|
+          new_generator(f, packages).run
+        end
       end
     end
 
@@ -59,8 +73,16 @@ module GoonModelGen
       # @return [Array<Golang::Package>]
       def build_model_objects(paths)
         context = Source::Loader.new.process(paths)
-        b = ModelBuilder.new(cfg.model_package_path)
-        b.build(context)
+        Builder::ModelBuilder.new(cfg.model_package_path).build(context)
+      end
+
+      # @param paths [Array<String>] Source::Context
+      # @return [Array<Golang::Package>]
+      def build_store_packages(paths)
+        context = Source::Loader.new.process(paths)
+        model_packages = Builder::ModelBuilder.new(cfg.model_package_path).build(context)
+        store_packages = Builder::StoreBuilder.new(cfg.store_package_path, model_packages).build(context)
+        return store_packages
       end
 
       # @param f [Golang::File]
@@ -74,6 +96,11 @@ module GoonModelGen
         g.overwrite_custom_file = options[:overwrite_custom_file]
         return g
       end
+
+      # @return [Golang::Package]
+      def validation_packages
+        Builder::ValidationBuilder.new(cfg.validation_package_path).build
+      end
     end
   end
 end

data/lib/goon_model_gen/config.rb

@@ -14,8 +14,8 @@ module GoonModelGen
       base_package_path
       model_dir
       model_package_path
-      validator_dir
-      validator_package_path
+      validation_dir
+      validation_package_path
       store_dir
       store_package_path
       converter_dir
@@ -31,11 +31,13 @@ module GoonModelGen
       @gofmt_disabled ||= false
       @model_dir      ||= "./model"
       @store_dir      ||= "./stores"
+      @validation_dir ||= "./validation"
       @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)
+      @validation_package_path ||= join_paths(@base_package_path, @validation_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"

data/lib/goon_model_gen/generator.rb

@@ -41,12 +41,15 @@ module GoonModelGen
       end
 
       content = execute(variables)
+      return unless content
 
       options = {skip: skip, force: force}
       thor.create_file(output_path, content, options)
     end
 
     def execute(variables = {})
+      return nil if file.sentences.empty?
+
       variables.each do |key, val|
         define_singleton_method(key){ val }
       end
@@ -57,6 +60,9 @@ module GoonModelGen
         # local variables used in tempaltes
         type = sentence.type
         package = type.package
+        type.memo.each do |key, val|
+          define_singleton_method(key){ val }
+        end
 
         erb = ERB.new(File.read(template_path), nil, "-")
         erb.filename = template_path

data/lib/goon_model_gen/golang/field.rb

@@ -9,6 +9,7 @@ module GoonModelGen
       attr_reader :type
       attr_accessor :struct
       attr_accessor :prepare_method
+      attr_accessor :unique
 
       def initialize(name, type_name, tags, goon_id: false)
         @name, @type_name = name, type_name

data/lib/goon_model_gen/golang/packages.rb

@@ -1,5 +1,6 @@
 require "goon_model_gen"
 
+require "goon_model_gen/golang/package"
 require "goon_model_gen/golang/modifier"
 
 require "active_support/core_ext/string"
@@ -25,6 +26,10 @@ module GoonModelGen
         self
       end
 
+      def new_package(path)
+        Package.new(path).tap{|pkg| add(pkg)}
+      end
+
       def detect_by(basename)
         detect{|pkg| pkg.basename == basename}
       end

data/lib/goon_model_gen/golang/struct.rb

@@ -12,8 +12,8 @@ module GoonModelGen
         @fields ||= []
       end
 
-      # @param name [string]
-      # @param t [Type]
+      # @param name [String]
+      # @param t [String]
       # @param tags [Hash<String,Array<String>>]
       def new_field(name, t, tags, options = {})
         Field.new(name, t, tags, options).tap do |f|

data/lib/goon_model_gen/golang/type.rb

@@ -24,6 +24,11 @@ module GoonModelGen
           name
         end
       end
+
+      def memo
+        @memo ||= {}
+      end
+
     end
   end
 end

data/lib/goon_model_gen/source/field.rb

@@ -29,8 +29,7 @@ module GoonModelGen
         end
         r['json'] ||= [name.underscore]
         if required
-          r['validate'] ||= []
-          r['validate'] << 'required'
+          r['validate'] = ['required'] + (r['validate'] || [])
         else
           r['json'] << 'omitempty'
         end

data/lib/goon_model_gen/source/file.rb

@@ -28,6 +28,7 @@ module GoonModelGen
       def new_struct(name)
         Struct.new(name).tap do |s|
           s.context = self.context
+          s.file = self
           types.push(s)
         end
       end

data/lib/goon_model_gen/source/loader.rb

@@ -48,7 +48,25 @@ module GoonModelGen
             else
               raise "Unsupported type definition named '#{name}': #{t.inspect}"
             end
-          source_type.generators = t['generates']
+
+          source_type.generators =
+            case t['generates']
+            when false then Hash.new({}) # Return empty Hash not to generate any file
+            when nil, true then Hash.new(nil) # Fulfill by default methods
+            when Hash then
+              t['generates'].each_with_object({}) do |(k,v), d|
+                d[k] =
+                  case v
+                  when false then {}
+                  when nil, true then nil
+                  when Array then v.each_with_object({}){|i,d| d[i] = true}
+                  when Hash then v
+                  else raise "Invalid generates value in #{k.inspect}: #{v.inspect}"
+                  end
+              end
+            when Array then t['generates'].each_with_object({}){|i,d| d[i] = true}
+            else raise "Invalid generates: #{t['generates'].inspect}"
+            end
         end
       end
 

data/lib/goon_model_gen/source/type.rb

@@ -8,7 +8,7 @@ module GoonModelGen
       include Contextual
 
       attr_reader :name
-      attr_accessor :package
+      attr_accessor :file
       attr_accessor :generators # key: method_name, value: true|false|string(file_suffix)
 
       # @param name [string]

data/lib/goon_model_gen/templates/model/enum/02_Map.go.erb

@@ -1,5 +1,5 @@
 var <%= type.name %>Map = map[<%= type.name %>]string{
 <%-   type.map.each do |key, name| -%>
-  <%= key.inspect %>: <%= name.inspect %>,
+  <%= name.camelize %>: <%= name.inspect %>,
 <%-   end -%>
 }

data/lib/goon_model_gen/templates/store/goon/01_Binder.go.erb

@@ -0,0 +1,10 @@
+<%-
+import 'google.golang.org/appengine/datastore'
+import model.package
+-%>
+
+type <%= type.name %>Binder interface {
+	Query(q *datastore.Query) *datastore.Query
+	Visible(m *<%= model.qualified_name %>) bool
+	Prepare(m *<%= model.qualified_name %>)
+}

data/lib/goon_model_gen/templates/store/goon/02_Hook.go.erb

@@ -0,0 +1,10 @@
+<%-
+import 'context'
+import model.package
+-%>
+
+type <%= type.name %>Hook interface {
+	AfterQuery(ctx context.Context, m *[]*<%= model.qualified_name %>) error
+	AfterGet(ctx context.Context, m *<%= model.qualified_name %>) error
+	BeforeValidation(ctx context.Context, m *<%= model.qualified_name %>) error
+}

data/lib/goon_model_gen/templates/store/goon/03_struct.go.erb

@@ -0,0 +1,4 @@
+type <%= type.name %> struct {
+	Binder <%= type.name %>Binder
+	Hook   <%= type.name %>Hook
+}

data/lib/goon_model_gen/templates/store/goon/04_KindName.go.erb

@@ -0,0 +1,3 @@
+func (s *<%= type.name %>) KindName() string {
+	return "<%= model.name %>"
+}

data/lib/goon_model_gen/templates/store/goon/05_Query.go.erb

@@ -0,0 +1,11 @@
+<%-
+import 'google.golang.org/appengine/datastore'
+-%>
+
+func (s *<%= type.name %>) Query() *datastore.Query {
+	q := datastore.NewQuery(s.KindName())
+	if s.Binder != nil {
+		q = s.Binder.Query(q)
+	}
+	return q
+}

data/lib/goon_model_gen/templates/store/goon/06_Run.go.erb

@@ -0,0 +1,10 @@
+<%-
+import 'context'
+import 'google.golang.org/appengine/datastore'
+import 'github.com/mjibson/goon'
+-%>
+
+func (s *<%= type.name %>) Run(ctx context.Context, q *datastore.Query) *goon.Iterator {
+	g := goon.FromContext(ctx)
+	return g.Run(q)
+}

data/lib/goon_model_gen/templates/store/goon/07_All.go.erb

@@ -0,0 +1,8 @@
+<%-
+import 'context'
+import model.package
+-%>
+
+func (s *<%= type.name %>) All(ctx context.Context) ([]*<%= model.qualified_name %>, error) {
+	return s.AllBy(ctx, s.Query())
+}

data/lib/goon_model_gen/templates/store/goon/08_AllBy.go.erb

@@ -0,0 +1,24 @@
+<%-
+import 'context'
+import model.package
+import 'google.golang.org/appengine/datastore'
+import 'google.golang.org/appengine/log'
+-%>
+
+func (s *<%= type.name %>) AllBy(ctx context.Context, q *datastore.Query) ([]*<%= model.qualified_name %>, error) {
+	g := goon.FromContext(ctx)
+	r := []*<%= model.qualified_name %>{}
+	_, err := g.GetAll(q.EventualConsistency(), &r)
+	if err != nil {
+		log.Errorf(ctx, "Failed to AllBy <%= model.qualified_name %> because of %v\n", err)
+		return nil, err
+	}
+
+	if s.Hook != nil {
+		if err := s.Hook.AfterQuery(ctx, &r); err != nil {
+			return nil, err
+		}
+	}
+
+	return r, nil
+}

data/lib/goon_model_gen/templates/store/goon/09_Select.go.erb

@@ -0,0 +1,9 @@
+<%-
+import 'context'
+import model.package
+import 'google.golang.org/appengine/datastore'
+-%>
+
+func (s *<%= type.name %>) Select(ctx context.Context, q *datastore.Query) ([]*<%= model.qualified_name %>, error) {
+	return s.AllBy(ctx, q)
+}

data/lib/goon_model_gen/templates/store/goon/10_FirstBy.go.erb

@@ -0,0 +1,17 @@
+<%-
+import 'context'
+import model.package
+import 'google.golang.org/appengine/datastore'
+-%>
+
+func (s *<%= type.name %>) FirstBy(ctx context.Context, q *datastore.Query) (*<%= model.qualified_name %>, error) {
+	r, err := s.AllBy(ctx, q.Limit(1))
+	if err != nil {
+		return nil, err
+	}
+	if len(r) > 0 {
+		return r[0], nil
+	} else {
+		return nil, nil
+	}
+}

data/lib/goon_model_gen/templates/store/goon/11_CountBy.go.erb

@@ -0,0 +1,16 @@
+<%-
+import 'context'
+import 'google.golang.org/appengine/datastore'
+import 'google.golang.org/appengine/log'
+import 'github.com/mjibson/goon'
+-%>
+
+func (s *<%= type.name %>) CountBy(ctx context.Context, q *datastore.Query) (int, error) {
+	g := goon.FromContext(ctx)
+	c, err := g.Count(q)
+	if err != nil {
+		log.Errorf(ctx, "Failed to count <%= model.qualified_name %> with %v because of %v\n", q, err)
+		return 0, err
+	}
+	return c, nil
+}

data/lib/goon_model_gen/templates/store/goon/12_ByID.go.erb

@@ -0,0 +1,20 @@
+<%-
+import 'context'
+import model.package
+-%>
+
+func (s *<%= type.name %>) ByID(ctx context.Context, iD int64) (*<%= model.qualified_name %>, error) {
+	r := <%= model.qualified_name %>{ID: iD}
+	err := s.Get(ctx, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	if s.Hook != nil {
+		if err := s.Hook.AfterGet(ctx, &r); err != nil {
+			return nil, err
+		}
+	}
+
+	return &r, nil
+}

data/lib/goon_model_gen/templates/store/goon/13_ByKey.go.erb

@@ -0,0 +1,15 @@
+<%-
+import 'context'
+import model.package
+import 'google.golang.org/appengine/datastore'
+import 'google.golang.org/appengine/log'
+-%>
+
+func (s *<%= type.name %>) ByKey(ctx context.Context, key *datastore.Key) (*<%= model.qualified_name %>, error) {
+	if err := s.IsValidKey(ctx, key); err != nil {
+		log.Errorf(ctx, "<%= type.name %>.ByKey got Invalid key: %v because of %v\n", key, err)
+		return nil, err
+	}
+
+	return s.ByID(ctx, key.IntID())
+}

data/lib/goon_model_gen/templates/store/goon/14_Get.go.erb

@@ -0,0 +1,22 @@
+<%-
+import 'context'
+import model.package
+import 'google.golang.org/appengine/datastore'
+import 'google.golang.org/appengine/log'
+import 'github.com/mjibson/goon'
+-%>
+
+func (s *<%= type.name %>) Get(ctx context.Context, m *<%= model.qualified_name %>) error {
+	g := goon.FromContext(ctx)
+	err := g.Get(m)
+	if err != nil {
+		log.Errorf(ctx, "Failed to Get <%= model.qualified_name %> because of %v\n", err)
+		return err
+	}
+
+	if s.Binder != nil && !s.Binder.Visible(m) {
+		return datastore.ErrNoSuchEntity
+	}
+
+	return nil
+}

data/lib/goon_model_gen/templates/store/goon/15_IsValidKey.go.erb

@@ -0,0 +1,20 @@
+<%-
+import 'context'
+import 'fmt'
+import model.package
+import 'google.golang.org/appengine/datastore'
+import 'google.golang.org/appengine/log'
+import 'github.com/mjibson/goon'
+-%>
+
+func (s *<%= type.name %>) IsValidKey(ctx context.Context, key *datastore.Key) error {
+	if key == nil {
+		return fmt.Errorf("key is nil")
+	}
+	g := goon.FromContext(ctx)
+	expected := g.Kind(&<%= model.qualified_name %>{})
+	if key.Kind() != expected {
+		return fmt.Errorf("key kind must be %s but was %s", expected, key.Kind())
+	}
+	return nil
+}

data/lib/goon_model_gen/templates/store/goon/16_Exist.go.erb

@@ -0,0 +1,28 @@
+<%-
+import 'context'
+import model.package
+import 'google.golang.org/appengine/datastore'
+import 'google.golang.org/appengine/log'
+import 'github.com/mjibson/goon'
+-%>
+
+func (s *<%= type.name %>) Exist(ctx context.Context, m *<%= model.qualified_name %>) (bool, error) {
+	if m.ID == 0 {
+		return false, nil
+	}
+	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)
+		return false, err
+	}
+	_, err = s.ByKey(ctx, key)
+	if err == datastore.ErrNoSuchEntity {
+		return false, nil
+	} else if err != nil {
+		log.Errorf(ctx, "Failed to get existance of %v because of %v\n", m, err)
+		return false, err
+	} else {
+		return true, nil
+	}
+}

data/lib/goon_model_gen/templates/store/goon/17_Create.go.erb

@@ -0,0 +1,24 @@
+<%-
+import 'context'
+import 'fmt'
+import model.package
+import 'google.golang.org/appengine/datastore'
+import 'google.golang.org/appengine/log'
+-%>
+
+func (s *<%= type.name %>) Create(ctx context.Context, m *<%= model.qualified_name %>) (*datastore.Key, error) {
+	if err := m.PrepareToCreate(); err != nil {
+		return nil, err
+	}
+	return s.PutWith(ctx, m, func() error {
+		exist, err := s.Exist(ctx, m)
+		if err != nil {
+			return err
+		}
+		if exist {
+			log.Errorf(ctx, "Failed to create %v because of another entity has same key\n", m)
+			return fmt.Errorf("Duplicate ID error: %q of %v\n", m.ID, m)
+		}
+		return nil
+	})
+}

data/lib/goon_model_gen/templates/store/goon/18_Update.go.erb

@@ -0,0 +1,24 @@
+<%-
+import 'context'
+import 'fmt'
+import model.package
+import 'google.golang.org/appengine/datastore'
+import 'google.golang.org/appengine/log'
+-%>
+
+func (s *<%= type.name %>) Update(ctx context.Context, m *<%= model.qualified_name %>) (*datastore.Key, error) {
+	if err := m.PrepareToUpdate(); err != nil {
+		return nil, err
+	}
+	return s.PutWith(ctx, m, func() error {
+		exist, err := s.Exist(ctx, m)
+		if err != nil {
+			return err
+		}
+		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.ID, m)
+		}
+		return nil
+	})
+}

data/lib/goon_model_gen/templates/store/goon/19_PutWith.go.erb

@@ -0,0 +1,28 @@
+<%-
+import 'context'
+import model.package
+import 'google.golang.org/appengine/datastore'
+-%>
+
+func (s *<%= type.name %>) PutWith(ctx context.Context, m *<%= model.qualified_name %>, f func() error) (*datastore.Key, error) {
+	if s.Binder != nil {
+		s.Binder.Prepare(m)
+	}
+
+	if s.Hook != nil {
+		if err := s.Hook.BeforeValidation(ctx, m); err != nil {
+			return nil, err
+		}
+	}
+
+	if err := s.Validate(ctx, m); err != nil {
+		return nil, err
+	}
+	if f != nil {
+		if err := f(); err != nil {
+			return nil, err
+		}
+	}
+
+	return s.Put(ctx, m)
+}

data/lib/goon_model_gen/templates/store/goon/20_Put.go.erb

@@ -0,0 +1,17 @@
+<%-
+import 'context'
+import model.package
+import 'google.golang.org/appengine/datastore'
+import 'google.golang.org/appengine/log'
+import 'github.com/mjibson/goon'
+-%>
+
+func (s *<%= type.name %>) Put(ctx context.Context, m *<%= model.qualified_name %>) (*datastore.Key, error) {
+	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)
+		return nil, err
+	}
+	return key, nil
+}

data/lib/goon_model_gen/templates/store/goon/21_Delete.go.erb

@@ -0,0 +1,20 @@
+<%-
+import 'context'
+import model.package
+import 'google.golang.org/appengine/log'
+import 'github.com/mjibson/goon'
+-%>
+
+func (s *<%= type.name %>) Delete(ctx context.Context, m *<%= model.qualified_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)
+		return err
+	}
+	if err := g.Delete(key); err != nil {
+		log.Errorf(ctx, "Failed to Delete %v because of %v\n", m, err)
+		return err
+	}
+	return nil
+}

data/lib/goon_model_gen/templates/store/goon/22_ValidateUniqueness.go.erb

@@ -0,0 +1,35 @@
+<%-
+import 'context'
+import 'fmt'
+import model.package
+
+validation_error = packages.type_for('ValidationError')
+raise "ValidationError not found" unless validation_error
+import validation_error.package
+-%>
+
+func (s *<%= type.name %>) ValidateUniqueness(ctx context.Context, m *<%= model.qualified_name %>) error {
+	conditions := map[string]interface{}{
+<%- model.fields.select(&:unique).each do |field| -%>
+		"<%= field.name %>": m.<%= field.name %>,
+<%- end -%>
+  }
+	for field, value := range conditions {
+		q := s.Query().Filter(field+" =", value)
+		c, err := s.CountBy(ctx, q)
+		if err != nil {
+			return err
+		}
+		b := 0
+		if m.IsPersisted() {
+			b = 1
+		}
+		if c > b {
+			return &<%= validation_error.qualified_name %>{
+				Field:   field,
+				Message: fmt.Sprintf("%v has already been taken", value),
+			}
+		}
+	}
+	return nil
+}

data/lib/goon_model_gen/templates/store/goon/23_Validate.go.erb

@@ -0,0 +1,14 @@
+<%-
+import 'context'
+import model.package
+-%>
+
+func (s *<%= type.name %>) Validate(ctx context.Context, m *<%= model.qualified_name %>) error {
+	if err := m.Validate(ctx); err != nil {
+		return err
+	}
+	if err := s.ValidateUniqueness(ctx, m); err != nil {
+		return err
+	}
+	return nil
+}

data/lib/goon_model_gen/templates/validation/error/01_struct.go.erb

@@ -0,0 +1,4 @@
+type <%= type.name %> struct {
+	Field   string
+	Message string
+}

data/lib/goon_model_gen/templates/validation/error/02_Error.go.erb

@@ -0,0 +1,4 @@
+<%- import 'fmt' -%>
+func (err *<%= type.name %>) Error() string {
+	return fmt.Sprintf("Invalid %s: %s", err.Field, err.Message)
+}

data/lib/goon_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoonModelGen
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goon_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - akm
@@ -143,6 +143,10 @@ files:
 - exe/goon_model_gen
 - goon_model_gen.gemspec
 - lib/goon_model_gen.rb
+- lib/goon_model_gen/builder/abstract_builder.rb
+- lib/goon_model_gen/builder/model_builder.rb
+- lib/goon_model_gen/builder/store_builder.rb
+- lib/goon_model_gen/builder/validation_builder.rb
 - lib/goon_model_gen/cli.rb
 - lib/goon_model_gen/config.rb
 - lib/goon_model_gen/generator.rb
@@ -160,7 +164,6 @@ files:
 - lib/goon_model_gen/golang/sentence.rb
 - lib/goon_model_gen/golang/struct.rb
 - lib/goon_model_gen/golang/type.rb
-- lib/goon_model_gen/model_builder.rb
 - lib/goon_model_gen/source/context.rb
 - lib/goon_model_gen/source/contextual.rb
 - lib/goon_model_gen/source/enum.rb
@@ -187,6 +190,31 @@ files:
 - lib/goon_model_gen/templates/model/goon/06_IsPersisted.go.erb
 - lib/goon_model_gen/templates/model/slice/01_base.go.erb
 - lib/goon_model_gen/templates/model/struct/01_struct.go.erb
+- lib/goon_model_gen/templates/store/goon/01_Binder.go.erb
+- lib/goon_model_gen/templates/store/goon/02_Hook.go.erb
+- lib/goon_model_gen/templates/store/goon/03_struct.go.erb
+- lib/goon_model_gen/templates/store/goon/04_KindName.go.erb
+- lib/goon_model_gen/templates/store/goon/05_Query.go.erb
+- lib/goon_model_gen/templates/store/goon/06_Run.go.erb
+- lib/goon_model_gen/templates/store/goon/07_All.go.erb
+- lib/goon_model_gen/templates/store/goon/08_AllBy.go.erb
+- lib/goon_model_gen/templates/store/goon/09_Select.go.erb
+- lib/goon_model_gen/templates/store/goon/10_FirstBy.go.erb
+- lib/goon_model_gen/templates/store/goon/11_CountBy.go.erb
+- lib/goon_model_gen/templates/store/goon/12_ByID.go.erb
+- lib/goon_model_gen/templates/store/goon/13_ByKey.go.erb
+- lib/goon_model_gen/templates/store/goon/14_Get.go.erb
+- lib/goon_model_gen/templates/store/goon/15_IsValidKey.go.erb
+- lib/goon_model_gen/templates/store/goon/16_Exist.go.erb
+- lib/goon_model_gen/templates/store/goon/17_Create.go.erb
+- lib/goon_model_gen/templates/store/goon/18_Update.go.erb
+- lib/goon_model_gen/templates/store/goon/19_PutWith.go.erb
+- lib/goon_model_gen/templates/store/goon/20_Put.go.erb
+- lib/goon_model_gen/templates/store/goon/21_Delete.go.erb
+- lib/goon_model_gen/templates/store/goon/22_ValidateUniqueness.go.erb
+- lib/goon_model_gen/templates/store/goon/23_Validate.go.erb
+- lib/goon_model_gen/templates/validation/error/01_struct.go.erb
+- lib/goon_model_gen/templates/validation/error/02_Error.go.erb
 - lib/goon_model_gen/version.rb
 homepage: https://github.com/akm/goon_model_gen
 licenses:

data/lib/goon_model_gen/model_builder.rb

@@ -1,137 +0,0 @@
-require "goon_model_gen"
-
-require "goon_model_gen/source/context"
-require "goon_model_gen/source/struct"
-require "goon_model_gen/source/enum"
-require "goon_model_gen/source/named_slice"
-
-
-require "goon_model_gen/golang/package"
-require "goon_model_gen/golang/packages"
-require "goon_model_gen/golang/datastore_supported"
-
-require "active_support/core_ext/string"
-
-module GoonModelGen
-  class ModelBuilder
-    attr_reader :base_package_path
-
-    def initialize(base_package_path)
-      @base_package_path = base_package_path
-    end
-
-
-    # @param context [Source::Context]
-    # @return [Golang::Packages]
-    def build(context)
-      Golang::Packages.new.tap do |r|
-        build_sentences = []
-        context.files.each do |f|
-          package_path = File.join(base_package_path, f.basename)
-          pkg, procs = build_package(package_path, f.types)
-          r << pkg
-          build_sentences.concat(procs)
-        end
-        r.resolve_type_names(Golang::DatastoreSupported.packages)
-        build_sentences.each(&:call)
-      end
-    end
-
-    # @param package_path [String]
-    # @param types [Array<Source::Type>]
-    # @return [Golang::Package, Array<Proc>]
-    def build_package(package_path, types)
-      procs = []
-      pkg = Golang::Package.new(package_path).tap do |pkg|
-        types.each do |t|
-          case t
-          when Source::Struct then
-            go_type = build_struct(t, pkg)
-            template = (t.id_name && t.id_type) ? "model/goon" : "model/struct"
-            procs << Proc.new{ build_sentences(template, t, go_type) }
-          when Source::Enum then
-            go_type = pkg.new_enum(t.name, t.base_type, t.map)
-            procs << Proc.new{ build_sentences("model/enum", t, go_type) }
-          when Source::NamedSlice then
-            go_type = pkg.new_named_slice(t.name, t.base_type_name)
-            procs << Proc.new{ build_sentences("model/slice", t, go_type) }
-          else
-            raise "Unsupported type #{t.class.name} #{t.inspect}"
-          end
-        end
-      end
-      return pkg, procs
-    end
-
-    # @param t [Source::Struct]
-    # @param pkg [Golang::Package]
-    # @return [Golang::Struct]
-    def build_struct(t, pkg)
-      pkg.new_struct(t.name).tap do |s|
-        s.ref_name = t.ref_name
-        if t.id_name && t.id_type
-          tags = {
-            'goon' => ['id'],
-            'datastore' => ['-'],
-            'json' => [t.id_name.underscore],
-          }
-          s.new_field(t.id_name, t.id_type, tags, goon_id: true)
-        end
-        t.fields.each do |f|
-          s.new_field(f.name, f.type_name, f.build_tags)
-        end
-      end
-    end
-
-
-    # @param template_base [string]
-    # @param t [Source::Struct]
-    # @param go_type [Golang::Type]
-    def build_sentences(template_base, t, go_type)
-      m2t = method_to_template_for(template_base)
-      t.generators ||= default_generators_for(template_base)
-      t.generators.each do |name, suffix|
-        next if !suffix
-        template = m2t[name]
-        parts = [t.name.underscore]
-        custom_suffix = false
-        if suffix.is_a?(String)
-          parts << suffix
-          custom_suffix = true
-        end
-        filename = parts.join('_') << '.go'
-        go_type.package.find_or_new_file(filename).tap do |file|
-          file.custom_suffix = custom_suffix
-          file.new_sentence(File.join(template_base, template), go_type)
-        end
-      end
-    end
-
-    def default_generators_for(template_base)
-      method_to_template_for(template_base).keys.
-        each_with_object({}){|name, d| d[name] = true }
-    end
-
-    def method_to_template_map
-      @method_to_template_map ||= {}
-    end
-
-    def method_to_template_for(template_base)
-      method_to_template_map[template_base] ||=
-        begin
-          templates_for(template_base).each_with_object({}) do |filename, d|
-            m = filename.sub(/\A\d+\_/, '').sub(/\.go\.erb\z/, '')
-            d[m] = filename
-          end
-        end
-    end
-
-    def templates_for(template_base)
-      base_dir = File.join(File.expand_path('../templates', __FILE__), template_base)
-      Dir.chdir(base_dir) do
-        Dir.glob('*.go.erb')
-      end
-    end
-
-  end
-end