goon_model_gen 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae4ea6261885660b6956bce4d82aaa078edd6d727ab6a4e144568473cfdaed69
-  data.tar.gz: 3dbfdd5ac21c79fc6adf1bb9009d81de2584327b53f0c92bcaf4a1150dcc623c
+  metadata.gz: dcbd8191e356ee177b06bfbe3eac365ea41a17f2c112bffaeec6acffde03cc80
+  data.tar.gz: fbac547b17220f58c43edbeeb209b7b0a5db80b5dca434f56c1a1f7b14137102
 SHA512:
-  metadata.gz: 515e715aaffaf9b359ede38fda8b35c12f9cb75eb7ef8fec5be2318175d9ec75233f32ef77e0200b2351302d9fbba9ebc2b6261eddc705a26605a049d07bdc3b
-  data.tar.gz: 4f8e860ed5ca58cbd6d7f8f1a7b96dc8cd98548426a1b6ae47679d27894425b5222b1c645caaa830d524f6cae11f56c4ecb3d76b559c25058973f87433b34ef5
+  metadata.gz: 1fe22afe60a09fa65c67d80bc589118a43dfdfb5140057c7643a4dac3e5de568096de8a9d8a2094443d86c84c7157fcbd806ed40bc913d79b66f7120dded5ceb
+  data.tar.gz: 28a70927a80f1a92ad9ae23f0dc5b17a7172091c27658fc4e7fa04ad53bb955be38fd294175bc476111ff7201ee21a357433756ce7a599d051a713992ae75114

data/lib/goon_model_gen/builder/model_builder.rb

@@ -29,7 +29,9 @@ module GoonModelGen
               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)
+              go_type = pkg.new_enum(t.name, t.base_type).tap do |enum|
+                t.elements.each{|i| enum.add(i.value, i.name) }
+              end
               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)

data/lib/goon_model_gen/golang/enum.rb

@@ -5,16 +5,36 @@ require "goon_model_gen/golang/type"
 module GoonModelGen
   module Golang
     class Enum < Type
-      attr_reader :base_type_name, :map
+      class Element
+        attr_reader :value, :name
+        def initialize(value, name)
+          @value, @name = value, name
+        end
+      end
+
+      attr_reader :base_type_name, :elements
       attr_reader :base_type
 
       # @param name [String]
       # @param base_type_name [String]
-      # @param map [Hash<Object,String>]
-      def initialize(name, base_type_name, map)
+      def initialize(name, base_type_name)
         super(name)
         @base_type_name = base_type_name
-        @map = map
+        @elements = []
+      end
+
+      # @param value [Object]
+      # @param name [String]
+      def add(value, name)
+        elements << Element.new(value, name)
+      end
+
+      # @yieldparam value [Object]
+      # @yieldparam name [String]
+      def each_value_and_name
+        elements.each do |i|
+          yield(i.value, i.name)
+        end
       end
 
       # @param pkgs [Packages]

data/lib/goon_model_gen/golang/package.rb

@@ -57,10 +57,9 @@ module GoonModelGen
 
       # @param name [string]
       # @param base_type [String]
-      # @param map [Hash<Object,Hash>] elements of enum from YAML
       # @return [Enum]
-      def new_enum(name, base_type, map)
-        Enum.new(name, base_type, map).tap{|s| add(s) }
+      def new_enum(name, base_type)
+        Enum.new(name, base_type).tap{|s| add(s) }
       end
 
       # @param name [string]

data/lib/goon_model_gen/source/enum.rb

@@ -5,15 +5,28 @@ require "goon_model_gen/source/type"
 module GoonModelGen
   module Source
     class Enum < Type
-      attr_reader :base_type, :map
+
+      class Element
+        attr_reader :value, :name
+        def initialize(value, name)
+          @value, @name = value, name
+        end
+      end
+
+      attr_reader :base_type, :elements
 
       # @param name [String]
       # @param base_type [String]
-      # @param map [Hash<Object,String>]
-      def initialize(name, base_type, map)
+      # @param element_definitions [Array<Hash<Object,String>>,Hash<Object,String>]
+      def initialize(name, base_type, element_definitions)
+        unless element_definitions.all?{|i| i.is_a?(Hash) && (i.length == 1) }
+          raise "Enum element definitions must be an Array of 1 element Hash but was #{element_definitions.inspect}"
+        end
         super(name)
         @base_type = base_type
-        @map = map
+        @elements = element_definitions.map do |i|
+          Element.new(i.keys.first, i.values.first)
+        end
       end
     end
   end

data/lib/goon_model_gen/source/file.rb

@@ -35,10 +35,10 @@ module GoonModelGen
 
       # @param name [string]
       # @param base_type [String]
-      # @param map [Hash<Object,Hash>] elements of enum from YAML
+      # @param elements [Hash<Object,Hash>] elements of enum from YAML
       # @return [Enum]
-      def new_enum(name, base_type, map)
-        Enum.new(name, base_type, map).tap do |t|
+      def new_enum(name, base_type, elements)
+        Enum.new(name, base_type, elements).tap do |t|
           t.context = self.context
           types.push(t)
         end

data/lib/goon_model_gen/source/loader.rb

@@ -42,7 +42,9 @@ module GoonModelGen
                 end
               end
             elsif t['enum_map'].is_a?(Hash) && t['base']
-              f.new_enum(name, t['base'], t['enum_map'])
+              f.new_enum(name, t['base'], t['enum_map'].map{|k,v| {k => v}})
+            elsif t['enum'].is_a?(Array) && t['base']
+              f.new_enum(name, t['base'], t['enum'])
             elsif t['slice_of'].is_a?(String)
               f.new_named_slice(name, t['slice_of'])
             else

data/lib/goon_model_gen/templates/model/enum/01_base.go.erb

@@ -1,7 +1,7 @@
 type <%= type.name %> <%= type.base_type.qualified_name %>
 
 const (
-<%-   type.map.each do |key, name| -%>
+<%-   type.each_value_and_name do |key, name| -%>
   <%= name.camelize %> <%= type.name %> = <%= key.inspect %>
 <%-   end -%>
 )

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

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

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| -%>
+<%-   type.each_value_and_name do |key, name| -%>
   <%= name.camelize %>: <%= name.inspect %>,
 <%-   end -%>
 }

data/lib/goon_model_gen/templates/model/enum/04_NameToValue.go.erb

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

data/lib/goon_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoonModelGen
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goon_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor