gapic-generator 0.45.1 → 0.45.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c44ace94e73e85dad3b7b20373016a28f46181631709dd52fe19672b7da80a6
-  data.tar.gz: 2f8bdc5d63b8253687711ff7bc6d139e536cc3f5d096be9c8f1546676db60aa4
+  metadata.gz: 2f2a5263485263873c059ce342f1cd26c800bab3349b7b191132b57f79d986ea
+  data.tar.gz: eda4ecd48fe183ffd4f98927f80c6500fc7b1d578fd8a45f4d539c5e0cecc9bd
 SHA512:
-  metadata.gz: 3f24b95f72f3a26e89190694fff115e8b6e5206b430676fda14ef6d3669b6b2de1eefdada75d2420607f63d31789491acfb11f419cbdce237deaa1fa597fb667
-  data.tar.gz: b88884b59cc8d3d426f793a97696617e2314b81c4c38e61fa3a507270a2d9e20e67c631fdefad2cf2cd793f5c1bae06577dd4381157a33b64092ad7c7f77ee97
+  metadata.gz: a49ad3a37ed0d730ef3bed251a2d58f06a4f9686d9fb4d65bcc163e1074ff76d427396798e3e9223a9b2d0d4d82be27c712f9c079f3379f573fe7026bfebbd29
+  data.tar.gz: 84dd1fd882a77ff2c659d3d17e56722bb0f80240dc8a644c282290c321a090352ff315c415d4f0e74172830560868f143b9e48fe0b319ae8a56a36680b0f5089

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History for gapic-generator
 
+### 0.45.2 / 2025-06-04
+
+* Fix: update Ruby prebuilt binary, version 3.4.3
+
 ### 0.45.1 / 2025-05-01
 
 No significant changes

data/lib/gapic/formatting_utils.rb

@@ -102,7 +102,8 @@ module Gapic
 
       def line_indent line
         m = /^( *)\S/.match line
-        m.nil? ? nil : m[1].length
+        return nil unless m
+        m[1].length
       end
 
       def escape_line_braces line

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.45.1"
+    VERSION = "0.45.2"
   end
 end

data/lib/gapic/presenters/method/{rest_pagination_info.rb → compute_pagination_info.rb}

@@ -20,7 +20,7 @@ module Gapic
       ##
       # Pagination info determined from the proto method
       #
-      class RestPaginationInfo
+      class ComputePaginationInfo
         include Gapic::Helpers::NamespaceHelper
         ##
         # @param proto_method [Gapic::Schema::Method] the method to derive pagination info from
@@ -78,7 +78,9 @@ module Gapic
 
         private
 
+        ##
         # Whether the underlying proto rpc is a server streaming rpc
+        #
         # @return [Boolean]
         attr_accessor :server_streaming
 
@@ -105,7 +107,7 @@ module Gapic
         ##
         # The field in the request that holds a page_token
         #
-        # @return[Gapic::Schema::Field, nil]
+        # @return [Gapic::Schema::Field, nil]
         def request_page_token_field
           # Has a String page_token field which specifies the actual (next) page to retrieve.
           @request_page_token_field ||= @request.fields.find do |f|
@@ -117,7 +119,7 @@ module Gapic
         # The field in the request that holds a page_size
         # For Regapic can have a name of either `page_size` or `max_results`
         #
-        # @return[Gapic::Schema::Field, nil]
+        # @return [Gapic::Schema::Field, nil]
         def request_page_size_field
           @request_page_size_field ||=
             begin
@@ -149,7 +151,7 @@ module Gapic
         ##
         # The field in the response that holds a next page_token
         #
-        # @return[Gapic::Schema::Field, nil]
+        # @return [Gapic::Schema::Field, nil]
         def response_next_page_token_field
           # Has the string next_page_token field to be used in the next request as page_token to retrieve the next page.
           @response_next_page_token_field ||= @response.fields.find do |f|

data/lib/gapic/presenters/method_rest_presenter.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "gapic/presenters/method/rest_pagination_info"
+require "gapic/presenters/method/compute_pagination_info"
 
 module Gapic
   module Presenters
@@ -22,9 +22,14 @@ module Gapic
     # A presenter for rpc methods (REST submethods)
     #
     class MethodRestPresenter
-      # @return [Gapic::Presenters::Method::RestPaginationInfo]
+      # @return [Gapic::Presenters::Method::ComputePaginationInfo] Special pagination presenter for Compute
       attr_reader :compute_pagination
 
+      ##
+      # Presenters for HTTP bindings, used to check whether this method should be generated in REST client
+      #
+      # @return [Array<Gapic::Presenters::Method::HttpBindingsPresenter>]
+      #
       attr_reader :http_bindings
 
       # @return [String] String representation of this presenter type.
@@ -39,7 +44,7 @@ module Gapic
         @http_bindings = main_method.http_bindings
         @compute_pagination =
           if @main_method.service.special_compute_behavior?
-            Gapic::Presenters::Method::RestPaginationInfo.new main_method.method, api
+            Gapic::Presenters::Method::ComputePaginationInfo.new main_method.method, api
           end
         @type = "method"
       end
@@ -54,7 +59,7 @@ module Gapic
       end
 
       ##
-      # Method name
+      # Method's name
       #
       # @return [String]
       #
@@ -62,8 +67,11 @@ module Gapic
         @main_method.name
       end
 
+      ##
       # Fully qualified proto name of the method (namespace.PascalCase)
+      #
       # @return [String]
+      #
       def grpc_full_name
         @main_method.grpc.full_name
       end
@@ -103,7 +111,10 @@ module Gapic
       end
 
       ##
-      # @return [String] The name of the repeated field in paginated responses
+      # Name of the repeated field in paginated responses
+      # For Compute the pagination is different from GRPC and cannot be looked up in GRPC method presenter
+      #
+      # @return [String]
       #
       def paged_response_repeated_field_name
         if compute_pagination
@@ -168,7 +179,9 @@ module Gapic
       end
 
       ##
-      # @return [Boolean] Whether the method is marked as deprecated.
+      # Whether the method is marked as deprecated.
+      #
+      # @return [Boolean]
       #
       def is_deprecated?
         @main_method.is_deprecated?

data/lib/gapic/presenters/snippet/expression_presenter.rb

@@ -95,7 +95,7 @@ module Gapic
 
         def render_complex proto, json
           lines = ["{"]
-          proto.each do |key, value_expr|
+          proto.sort_by { |key, _| key.to_s }.each do |key, value_expr|
             value_presenter = ExpressionPresenter.new value_expr, json[key]
             value_lines = value_presenter.render_lines
             next unless value_lines
@@ -107,9 +107,12 @@ module Gapic
         end
 
         def render_list proto, json
+          exprs = proto.map.with_index do |item, index|
+            ExpressionPresenter.new item, json[index]
+          end
+
           lines = ["["]
-          proto.each_with_index do |item, index|
-            expr = ExpressionPresenter.new item, json[index]
+          exprs.sort_by(&:render).each do |expr|
             value_lines = expr.render_lines
             lines[lines.size - 1] = "#{lines.last}," if lines.size > 1
             lines += value_lines.map { |line| "  #{line}" }
@@ -118,17 +121,33 @@ module Gapic
         end
 
         def render_map proto, json
+          key_to_kvlines = get_key_to_kvlines proto, json
+
           lines = ["{"]
-          proto.keys.zip(proto.values).each_with_index do |(key, value), index|
-            key_lines = ExpressionPresenter.new(key, json["keys"][index]).render_lines
-            value_lines = ExpressionPresenter.new(value, json["values"][index]).render_lines
-            next unless key_lines && value_lines
+          key_to_kvlines.sort_by { |key, _| key }.each do |_, key_val_lines|
+            key_lines = key_val_lines[0]
+            value_lines = key_val_lines[1]
             elem_lines = key_lines[0..-2] + ["#{key_lines.last} => #{value_lines.first}"] + value_lines[1..]
             lines[lines.size - 1] = "#{lines.last}," if lines.size > 1
             lines += elem_lines.map { |line| "  #{line}" }
           end
           lines + ["}"]
         end
+
+        # Helper method to render_map.
+        # Returns a map from a key rendered as a string
+        # to the array of key and value rendered as lines.
+        def get_key_to_kvlines proto, json
+          key_to_kvlines = {}
+          proto.keys.zip(proto.values).each_with_index do |(key, value), index|
+            key_expr = ExpressionPresenter.new key, json["keys"][index]
+            value_expr = ExpressionPresenter.new value, json["values"][index]
+            next unless key_expr.render_lines && value_expr.render_lines
+
+            key_to_kvlines[key_expr.render] = [key_expr.render_lines, value_expr.render_lines]
+          end
+          key_to_kvlines
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.45.1
+  version: 0.45.2
 platform: ruby
 authors:
 - Ernest Landrito
@@ -167,8 +167,8 @@ files:
 - lib/gapic/presenters/gem_presenter.rb
 - lib/gapic/presenters/grpc_service_config_presenter.rb
 - lib/gapic/presenters/message_presenter.rb
+- lib/gapic/presenters/method/compute_pagination_info.rb
 - lib/gapic/presenters/method/http_binding_presenter.rb
-- lib/gapic/presenters/method/rest_pagination_info.rb
 - lib/gapic/presenters/method_presenter.rb
 - lib/gapic/presenters/method_rest_presenter.rb
 - lib/gapic/presenters/package_presenter.rb
@@ -365,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An API Client Generator for Ruby in Ruby!
 test_files: []