Generate the default mask lazily

wantedly · Sep 6, 2023 · ff227c9 · ff227c9
1 parent dfefdef
commit ff227c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/pb/serializable.rb b/lib/pb/serializable.rb
@@ -17,7 +17,7 @@ def self.included(base)
     # @param with [
     #   Google::Protobuf::FieldMask,
     #   Array<(Symbol, Hash)>,
-    #   Hash{Symbol=>(Array,Symbol,Hash)},
+    #   Hash{Symbol=>(Array,Symbol,Hash,Proc)},
     #   ]
     #   Specifies the list of fields to be serialized in the Proto message object.
     #   `nil` means that all fields defined in .proto will be serialized.

diff --git a/lib/pb/serializer.rb b/lib/pb/serializer.rb
@@ -81,7 +81,7 @@ def build_default_mask(descriptor)
                 "google.protobuf.BoolValue"  ,
                 "google.protobuf.BytesValue" then m << fd.name.to_sym
               else
-                m << { fd.name.to_sym => build_default_mask(fd.subtype) }
+                m << { fd.name.to_sym => -> { build_default_mask(fd.subtype) } }
               end
             else
               m << fd.name.to_sym
@@ -102,8 +102,8 @@ def parse_field_mask(field_mask)
         end
       end
 
-      # @param input [Google::Protobuf::FieldMask, Symbol, Array<(Symbol,Hash)>, Hash{Symbol=>(Array,Symbol,Hash)}]
-      # @return [Hash{Symbol=>(Array,Hash)}]
+      # @param input [Google::Protobuf::FieldMask, Symbol, Array<(Symbol,Hash)>, Hash{Symbol=>(Array,Symbol,Hash,Proc)}]
+      # @return [Hash{Symbol=>(Array,Hash,Proc)}]
       def normalize_mask(input)
         if input.kind_of?(Google::Protobuf::FieldMask)
           input = parse_field_mask(input)
@@ -118,6 +118,7 @@ def normalize_mask(input)
             normalized[el] ||= []
           when Hash
             el.each do |k, v|
+              v = v.call if input.kind_of?(Proc)
               v = [v] if v.kind_of?(Hash)
               normalized[k] ||= []
               normalized[k].push(*Array(v))