pbbuilder 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d815652fcf7100f400afe821ed08806cec9f21fb9b58d99214483b1cc899ccf
-  data.tar.gz: 14d1dae70e77d9916f47bed8c3b270003817702101439ececb2f834417d9acf2
+  metadata.gz: 1ef756425a57d8ea7b70338e5d15f4de645a0fe43c6429a7bc83e601c3ae7730
+  data.tar.gz: 5c7579092048ee2b38f4aca3fa02c0c1490bb2f87a0ae58e9120672ca78b2de7
 SHA512:
-  metadata.gz: 1a9b24cf94ebfdb28533a0a964eee720a7e7108b17f31140dc5a3d5d86b1e4a8c22f8a219a665e9f9997bec22f1c92c51061708a334eeec00d70db2cae365c37
-  data.tar.gz: b08bf671e0e1fe671ecf8e0a7aac2da91b8e64044d8629bc4d76a77284a3e6d8c8423e2224edc1e72755793d0ea6139e3b2fc3eee158ffc290c0fe7cf3476733
+  metadata.gz: 6f963451d5430510700378384d0a996ad6eb15e311dc3669d8246122c2db7e65a0bb9b50b63855b18da1cf5f1484a57f85ad3eda95b3647f09438d04fc78d0e9
+  data.tar.gz: 52d88436c2f78dbe307f2ce87935a03c293a6ee68d2c471c993ef753166f7450380bf600f759b2d4d5467c5167a50d93dcb63d145085f8bf50acbcdc43531bd1

data/lib/pbbuilder.rb

@@ -44,7 +44,7 @@ class Pbbuilder < BasicObject
       raise ::ArgumentError, "can't pass block to non-message field" unless descriptor.type == :message
 
       if descriptor.label == :repeated
-        # pb.field @array { |element| pb.name = element.name }
+        # pb.field @array { |element| pb.name element.name }
         raise ::ArgumentError, "wrong number of arguments (expected 1)" unless args.length == 1
         collection = args.first
         _append_repeated(name, descriptor, collection, &block)
@@ -52,11 +52,24 @@ class Pbbuilder < BasicObject
       end
 
       raise ::ArgumentError, "wrong number of arguments (expected 0)" unless args.empty?
-      # pb.field { pb.name = "hello" }
+      # pb.field { pb.name "hello" }
       message = (@message[name] ||= _new_message_from_descriptor(descriptor))
       _scope(message, &block)
     elsif args.length == 1
-      @message[name] = args.first
+      arg = args.first
+      if descriptor.label == :repeated
+        if arg.respond_to?(:to_ary)
+          # pb.fields ["one", "two"]
+          # Using concat so it behaves the same as _append_repeated
+          @message[name].concat arg.to_ary
+        else
+          # pb.fields "one"
+          @message[name].push arg
+        end
+      else
+        # pb.field "value"
+        @message[name] = arg
+      end
     else
       # pb.field @value, :id, :name, :url
       element = args.shift

data/pbbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "pbbuilder"
-  spec.version = "0.4.0"
+  spec.version = "0.5.0"
   spec.authors = ["Bouke van der Bijl"]
   spec.email = ["bouke@cheddar.me"]
   spec.homepage = "https://github.com/cheddar-me/pbbuilder"

data/test/pbbuilder_test.rb

@@ -7,9 +7,18 @@ class PbbuilderTest < ActiveSupport::TestCase
       pb.friends 1..3 do |number|
         pb.name "Friend ##{number}"
       end
+      pb.best_friend do
+        pb.name "Manuelo"
+      end
+      pb.field_mask do
+        pb.paths ["ok", "that's"]
+        pb.paths "cool"
+      end
     end.target!
-    assert_equal person.name, "Hello world"
-    assert_equal person.friends.first.name, "Friend #1"
+    assert_equal "Hello world", person.name
+    assert_equal "Friend #1", person.friends.first.name
+    assert_equal ["ok", "that's", "cool"], person.field_mask.paths
+    assert_equal "Manuelo", person.best_friend.name
   end
 
   test "it can extract fields in a nice way" do

data/test/test_helper.rb

@@ -9,6 +9,7 @@ require "pbbuilder"
 Rails::TestUnitReporter.executable = "bin/test"
 
 require "google/protobuf"
+require "google/protobuf/field_mask_pb"
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("pbbuilder.proto", syntax: :proto3) do
@@ -16,6 +17,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :name, :string, 1
       repeated :friends, :message, 2, "pbbuildertest.Person"
       optional :best_friend, :message, 3, "pbbuildertest.Person"
+      repeated :nicknames, :string, 4
+      optional :field_mask, :message, 5, "google.protobuf.FieldMask"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbbuilder
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf