goa_model_gen 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe779fe770c8cd29d871c25eba2b99849f8ac1ded301e2882626b8f77ce05423
-  data.tar.gz: c5ceb285bcd63b666fbc2274718f2bb6a02da528b6828cb32bf8d7057dd9257c
+  metadata.gz: 0bf4c80340040eaf2b29729d5798bd0c6b6220b25b2fa75b7c8ac507c546d690
+  data.tar.gz: a260252e1472941a1f02ee88712dca0079f6d3898178af619ecb1fce64957132
 SHA512:
-  metadata.gz: 6c79be2c421b0190493a611a545c9c4d1c674d48ad256dd3a6715bab0132234521bd471ff6cf366f78c9fc93c5c2da80fe77a41121f7549948461cc1da2c72a1
-  data.tar.gz: 617355d9b10271f9e16ec9f37fd4550ae070ecf3d92d90dc334ce1d536e2ebcd8a5bbd168d5382f88645c5fe1195fc3c6086ac3c6c8508b4b28cf728e22566ba
+  metadata.gz: 723725e4b61fa693909d4f3d0ffb0337bdd2acf73a074cd79b1fb52571825f63008ce78d9326c4b0b7d1e904574fe6b79c82fc461828b27e47875acc91aaff1c
+  data.tar.gz: b8daf5ce16247ef444146749f9a8189a5b647a241c1a1d583e9ecb06936f1ceaf537720a7bfda94a2675b5fff36ff24ec25c47a1bc596e268b551b858fb44ba4

data/goa_model_gen.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor", "~> 0.20.0"
   spec.add_runtime_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"

data/lib/goa_model_gen/field.rb

@@ -13,6 +13,7 @@ module GoaModelGen
     attr_accessor :validation
     attr_accessor :swagger_name
     attr_reader :type_obj
+    attr_reader :json_tag
     attr_reader :datastore_tag
     attr_reader :prepare_method
 
@@ -26,6 +27,7 @@ module GoaModelGen
       @validation = attrs['validation']
       @goa_name = attrs['goa_name']
       @swagger_name = attrs['swagger_name']
+      @json_tag = attrs['json_tag']
       @datastore_tag = attrs['datastore_tag']
       @prepare_method = attrs['prepare_method']
     end
@@ -79,18 +81,22 @@ module GoaModelGen
     end
 
     def tag
-      json_tag = name.underscore.dup
-      json_tag << ',omitempty' if nullable?
       validate_tags = nullable? ? [] : ['required']
       validate_tags << validation.presence
       validate_tags.compact!
       [
-        ['json', json_tag],
+        ['json', json_tag.presence || build_json_tag],
         ['validate', validate_tags.join(',').presence],
         ['datastore', datastore_tag],
       ].map{|k,v| v ? "#{k}:\"#{v}\"" : nil}.compact.join(' ')
     end
 
+    def build_json_tag
+      r = name.underscore.dup
+      r << ',omitempty' if nullable?
+      return r
+    end
+
     def definition
       "#{ name } #{ type } `#{ tag }`"
     end

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

@@ -99,6 +99,7 @@ func (m *<%= model.name %>) PrepareToCreate() error {
 }
 
 func (m *<%= model.name %>) PrepareToUpdate() error {
+	m.PrepareFields()
 <%- if model.fields.any?{|f| f.name == "UpdatedAt"} -%>
 	m.UpdatedAt = time.Now()
 <%- end -%>

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,8 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generate model files for goa in golang