haveapi-go-client 0.14.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd022bb61d9864f5530163e06f9d7200db731c96bb5ad53b166bd8725690ccc3
-  data.tar.gz: 2dfb02315a842f2b6297e981cf66e7d4fb63b8c61f225e6531f895050b1c85d5
+  metadata.gz: 6f45b75cf1d53b1fefed6ae5c7e52f92a19451b44e8f9b0a0cd20489d005a9d5
+  data.tar.gz: 441f58911322190ab9ff6feca02ab982e7e89b6e86df01034355a80cd3d749d7
 SHA512:
-  metadata.gz: a1011921f6145ecc8b7956db1b80f17b877876731f185f20721d2fbe59a13c8b5071d112d7207a00fdc5e038ce72b596c4b12c04fb520638e35d08039e2c3837
-  data.tar.gz: 39d9b7d30e151d1358693f6e9a6789e229986c78ea15ab1f66ac22fd20c3e7eefc0acaa5a62d95cffaea9d8e0d1bbce45cfe8f1759dcff166a096144d8eb0492
+  metadata.gz: 3f48a30555cec73de5a1fa65058a625030990bc93cf736220c128ccaf1841e694050d0093e5273a90692d3de2f3ba908c740482bc1ec390f355818cd87463f2e
+  data.tar.gz: '005849f0eea33021ee883a233a8198a596f863e738111be2376c8cfad24c61c59621b181348cf80afa32de6a1342f8062bdafd094a101118ab17d02155f71677'

data/haveapi-go-client.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_runtime_dependency 'haveapi-client', '~> 0.14.2'
+  spec.add_runtime_dependency 'haveapi-client', '~> 0.16.0'
 end

data/lib/haveapi/go_client/action.rb

@@ -113,6 +113,10 @@ module HaveAPI::GoClient
       metadata && metadata.resolve_associations
     end
 
+    def <=>(other)
+      go_name <=> other.go_name
+    end
+
     protected
     attr_reader :prefix
 

data/lib/haveapi/go_client/api_version.rb

@@ -10,11 +10,16 @@ module HaveAPI::GoClient
     attr_reader :resources
 
     def initialize(desc)
-      @resources = desc[:resources].map { |k, v| Resource.new(self, k, v) }
+      @resources = desc[:resources].map do |k, v|
+        Resource.new(self, k, v)
+      end.sort!
+
       @resources.each { |r| r.resolve_associations }
+
       @auth_methods = desc[:authentication].map do |k, v|
         AuthenticationMethods.new(self, k, v)
       end
+
       @metadata_namespace = desc[:meta][:namespace]
     end
   end

data/lib/haveapi/go_client/cli.rb

@@ -34,6 +34,7 @@ module HaveAPI::GoClient
 
       g = Generator.new(ARGV[0], ARGV[1], options)
       g.generate
+      g.go_fmt
     end
   end
 end

data/lib/haveapi/go_client/generator.rb

@@ -59,6 +59,12 @@ module HaveAPI::GoClient
       api.auth_methods.each { |v| v.generate(self) }
     end
 
+    def go_fmt
+      unless system('go', 'fmt', chdir: dst)
+        fail "go fmt failed"
+      end
+    end
+
     protected
     attr_reader :api
   end

data/lib/haveapi/go_client/input_output.rb

@@ -36,7 +36,7 @@ module HaveAPI::GoClient
       @namespace = desc[:namespace]
       @parameters = desc[:parameters].map do |k, v|
         Parameter.new(role, direction, self, k.to_s, v)
-      end.compact
+      end.compact.sort!
       @go_type = action.go_type + (prefix ? prefix : '') + direction.to_s.capitalize
       @go_namespace = camelize(desc[:namespace])
     end

data/lib/haveapi/go_client/parameters/base.rb

@@ -55,6 +55,14 @@ module HaveAPI::GoClient
       @desc = nil
     end
 
+    def nillable?
+      false
+    end
+
+    def <=>(other)
+      go_name <=> other
+    end
+
     protected
     # @return [Hash]
     attr_reader :desc

data/lib/haveapi/go_client/parameters/resource.rb

@@ -10,6 +10,10 @@ module HaveAPI::GoClient
     # @return [Parameters::Association]
     attr_reader :association
 
+    def nillable?
+      true
+    end
+
     protected
     def do_resolve
       @association = Parameters::Association.new(self, desc)

data/lib/haveapi/go_client/resource.rb

@@ -44,10 +44,12 @@ module HaveAPI::GoClient
       @full_dot_name = resource_path.map(&:name).map(&:capitalize).join('.')
       @go_name = camelize(name)
       @go_type = full_go_type
-      @resources = desc[:resources].map { |k, v| Resource.new(self, k, v) }
+      @resources = desc[:resources].map do |k, v|
+        Resource.new(self, k, v)
+      end.sort!
       @actions = desc[:actions].map do |k, v|
         Action.new(self, k.to_s, v, prefix: prefix)
-      end
+      end.sort!
     end
 
     # @return [ApiVersion]
@@ -104,6 +106,10 @@ module HaveAPI::GoClient
       end
     end
 
+    def <=>(other)
+      go_name <=> other.go_name
+    end
+
     protected
     attr_reader :prefix
 

data/lib/haveapi/go_client/version.rb

@@ -1,5 +1,5 @@
 module HaveAPI
   module GoClient
-    VERSION = '0.14.2'
+    VERSION = '0.16.0'
   end
 end

data/template/action.go.erb

@@ -26,6 +26,8 @@ type <%= action.metadata.global.input.go_type %> struct {
 <% end -%>
 	// Only selected parameters are sent to the API. Ignored if empty.
 	_selectedParameters map[string]interface{}
+	// Parameters that are set to nil instead of value
+	_nilParameters map[string]interface{}
 }
 
 <% action.metadata.global.input.parameters.each do |p| -%>
@@ -37,9 +39,32 @@ func (in *<%= action.metadata.global.input.go_type %>) Set<%= p.go_name %>(value
 		in._selectedParameters = make(map[string]interface{})
 	}
 
+<% if p.nillable? -%>
+	in.Set<%= p.go_name %>Nil(false)
+<% end -%>
 	in._selectedParameters["<%= p.go_name %>"] = nil
 	return in
 }
+<% if p.nillable? -%>
+
+// Set<%= p.go_name %>Nil sets parameter <%= p.go_name %> to nil and selects it for sending
+func (in *<%= action.metadata.global.input.go_type %>) Set<%= p.go_name %>Nil(set bool) *<%= action.metadata.global.input.go_type %> {
+	if in._nilParameters == nil {
+		if !set {
+			return in
+		}
+		in._nilParameters = make(map[string]interface{})
+	}
+
+	if set {
+		in._nilParameters["<%= p.go_name %>"] = nil
+		in.SelectParameters("<%= p.go_name %>")
+	} else {
+		delete(in._nilParameters, "<%= p.go_name %>")
+	}
+	return in
+}
+<% end -%>
 <% end -%>
 
 // SelectParameters sets parameters from <%= action.metadata.global.input.go_type %>
@@ -74,6 +99,8 @@ type <%= action.input.go_type %> struct {
 <% end -%>
 	// Only selected parameters are sent to the API. Ignored if empty.
 	_selectedParameters map[string]interface{}
+	// Parameters that are set to nil instead of value
+	_nilParameters map[string]interface{}
 }
 
 <% action.input.parameters.each do |p| -%>
@@ -85,9 +112,32 @@ func (in *<%= action.input.go_type %>) Set<%= p.go_name %>(value <%= p.go_in_typ
 		in._selectedParameters = make(map[string]interface{})
 	}
 
+<% if p.nillable? -%>
+	in.Set<%= p.go_name %>Nil(false)
+<% end -%>
 	in._selectedParameters["<%= p.go_name %>"] = nil
 	return in
 }
+<% if p.nillable? -%>
+
+// Set<%= p.go_name %>Nil sets parameter <%= p.go_name %> to nil and selects it for sending
+func (in *<%= action.input.go_type %>) Set<%= p.go_name %>Nil(set bool) *<%= action.input.go_type %> {
+	if in._nilParameters == nil {
+		if !set {
+			return in
+		}
+		in._nilParameters = make(map[string]interface{})
+	}
+
+	if set {
+		in._nilParameters["<%= p.go_name %>"] = nil
+		in.SelectParameters("<%= p.go_name %>")
+	} else {
+		delete(in._nilParameters, "<%= p.go_name %>")
+	}
+	return in
+}
+<% end -%>
 <% end -%>
 
 // SelectParameters sets parameters from <%= action.input.go_type %>
@@ -105,6 +155,21 @@ func (in *<%= action.input.go_type %>) SelectParameters(params ...string) *<%= a
 	return in
 }
 
+// UnselectParameters unsets parameters from <%= action.input.go_type %>
+// that will be sent to the API.
+// UnsSelectParameters can be called multiple times.
+func (in *<%= action.input.go_type %>) UnselectParameters(params ...string) *<%= action.input.go_type %> {
+	if in._selectedParameters == nil {
+		return in
+	}
+
+	for _, param := range params {
+		delete(in._selectedParameters, param)
+	}
+
+	return in
+}
+
 func (in *<%= action.input.go_type %>) AnySelected() bool {
 	if in._selectedParameters == nil {
 		return false
@@ -254,6 +319,16 @@ func (inv *<%= action.go_invocation_type %>) IsParameterSelected(param string) b
 	_, exists := inv.Input._selectedParameters[param]
 	return exists
 }
+
+// IsParameterNil returns true if param is to be sent to the API as nil
+func (inv *<%= action.go_invocation_type %>) IsParameterNil(param string) bool {
+	if inv.Input._nilParameters == nil {
+		return false
+	}
+
+	_, exists := inv.Input._nilParameters[param]
+	return exists
+}
 <% end -%>
 <% if action.metadata.has_global_input? -%>
 // NewMetaInput returns a new struct for global meta input parameters and sets
@@ -278,6 +353,16 @@ func (inv *<%= action.go_invocation_type %>) IsMetaParameterSelected(param strin
 	_, exists := inv.MetaInput._selectedParameters[param]
 	return exists
 }
+
+// IsMetaParameterNil returns true if global meta param is to be sent to the API as nil
+func (inv *<%= action.go_invocation_type %>) IsMetaParameterNil(param string) bool {
+	if inv.MetaInput._nilParameters == nil {
+		return false
+	}
+
+	_, exists := inv.MetaInput._nilParameters[param]
+	return exists
+}
 <% end -%>
 
 // Call() invokes the action and returns a response from the API server
@@ -448,7 +533,15 @@ func (inv *<%= action.go_invocation_type %>) makeInputParams() map[string]interf
 	if inv.Input != nil {
 <% action.input.parameters.each do |p| -%>
 		if inv.IsParameterSelected("<%= p.go_name %>") {
+<% if p.nillable? -%>
+			if inv.IsParameterNil("<%= p.go_name %>") {
+				ret["<%= p.name %>"] = nil
+			} else {
+				ret["<%= p.name %>"] = inv.Input.<%= p.go_name %>
+			}
+<% else -%>
 			ret["<%= p.name %>"] = inv.Input.<%= p.go_name %>
+<% end -%>
 		}
 <% end -%>
 	}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-go-client
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Jakub Skokan
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.16.0
 description: Go client generator
 email:
 - jakub.skokan@vpsfree.cz