pbbuilder 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95c1a8225cbe27f9523fe58f6e0a706108ae12839d1b091b6a2a70d02d5363cc
-  data.tar.gz: b133c221d7f27e76626632c488309c4c1d8c929e1725d34298847c42ad5f7350
+  metadata.gz: 1ef756425a57d8ea7b70338e5d15f4de645a0fe43c6429a7bc83e601c3ae7730
+  data.tar.gz: 5c7579092048ee2b38f4aca3fa02c0c1490bb2f87a0ae58e9120672ca78b2de7
 SHA512:
-  metadata.gz: 033030a337a7b3a7e334719d564dfe098c7e1f7b54e8cea18ace761d51adb091c7fbe0b6b42d527ebc1e3b622e8d3332f4400a1444e263b55c2a95cf9a8e92fd
-  data.tar.gz: 76f971940ae26fcd1360552cec8e5e9bb3160f21a39e36184d2bc700524f480c1b5261781dd760be5d33d702c4e2a95739e5f32d890d348f6f698dc0ee1a315f
+  metadata.gz: 6f963451d5430510700378384d0a996ad6eb15e311dc3669d8246122c2db7e65a0bb9b50b63855b18da1cf5f1484a57f85ad3eda95b3647f09438d04fc78d0e9
+  data.tar.gz: 52d88436c2f78dbe307f2ce87935a03c293a6ee68d2c471c993ef753166f7450380bf600f759b2d4d5467c5167a50d93dcb63d145085f8bf50acbcdc43531bd1

data/.gitignore

@@ -10,3 +10,5 @@
 /test/dummy/tmp/
 .byebug_history
 Gemfile.lock
+*.gem
+/.idea

data/Gemfile

@@ -2,3 +2,6 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in pbbuilder.gemspec.
 gemspec
+
+gem "rake"
+gem "rails"

data/lib/pbbuilder.rb

@@ -21,7 +21,7 @@
 # It basically works exactly like jbuilder. The main difference is that it can use introspection to figure out what kind
 # of protobuf message it needs to create.
 
-class Pbbuilder
+class Pbbuilder < BasicObject
   def initialize(message)
     @message = message
 
@@ -44,7 +44,7 @@ class Pbbuilder
       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
       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
@@ -68,7 +81,9 @@ class Pbbuilder
           extract!(item, *args)
         end
       else
-        extract!(element, *args)
+        set!(name) do
+          extract!(element, *args)
+        end
       end
     end
   end
@@ -115,4 +130,5 @@ class Pbbuilder
   end
 end
 
+require "pbbuilder/protobuf_extension"
 require "pbbuilder/railtie" if defined?(Rails)

data/lib/pbbuilder/handler.rb

@@ -6,7 +6,7 @@ class PbbuilderHandler
   def self.call(template, source = nil)
     source ||= template.source
     # We need to keep `source` on the first line, so line numbers are correct if there's an error
-    %{pb=Pbbuilder.new(response_class.new); #{source}
+    %{pb=Pbbuilder.new(@_response_class.new); #{source}
       pb.target!}
   end
 end

data/lib/pbbuilder/protobuf_extension.rb

@@ -0,0 +1,7 @@
+require "google/protobuf/message_exts"
+
+module Google::Protobuf::MessageExts::ClassMethods
+  def build(*args, &block)
+    Pbbuilder.new(new(*args), &block).target!
+  end
+end

data/pbbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "pbbuilder"
-  spec.version = "0.1.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"
@@ -10,6 +10,5 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files`.split("\n")
   spec.test_files = `git ls-files -- test/*`.split("\n")
 
-  spec.add_dependency "rails", "~> 6.1.3"
   spec.add_dependency "google-protobuf", "~> 3.15.5"
 end

data/test/pbbuilder_test.rb

@@ -1,5 +1,4 @@
 require "test_helper"
-require "pbbuilder"
 
 class PbbuilderTest < ActiveSupport::TestCase
   test "it makes it possible to create a person" do
@@ -8,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
@@ -19,11 +27,13 @@ class PbbuilderTest < ActiveSupport::TestCase
     person = Pbbuilder.new(API::Person.new) do |pb|
       pb.name "Hello world"
       pb.friends friends, :name
+      pb.best_friend friends[0], :name
     end.target!
 
     assert_equal person.name, "Hello world"
     assert_equal person.friends.size, 2
     assert_equal person.friends.first.name, "Friend 1"
     assert_equal person.friends.last.name, "Friend 2"
+    assert_equal person.best_friend.name, "Friend 1"
   end
 end

data/test/protobuf_extension_test.rb

@@ -0,0 +1,18 @@
+require "test_helper"
+
+class ProtobufExtensionTest < ActiveSupport::TestCase
+  test ".build" do
+    person = API::Person.build(name: "Hello world!") do |pb|
+      pb.best_friend do
+        pb.name "Johnny"
+      end
+    end
+    assert_equal "Hello world!", person.name
+    assert_equal "Johnny", person.best_friend.name
+  end
+
+  test ".build without block" do
+    person = API::Person.build
+    assert_equal "", person.name
+  end
+end

data/test/test_helper.rb

@@ -4,16 +4,21 @@ ENV["RAILS_ENV"] = "test"
 require "rails"
 require "rails/test_help"
 require "rails/test_unit/reporter"
+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
     add_message "pbbuildertest.Person" 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,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pbbuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.3
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -53,10 +39,12 @@ files:
 - bin/test
 - lib/pbbuilder.rb
 - lib/pbbuilder/handler.rb
+- lib/pbbuilder/protobuf_extension.rb
 - lib/pbbuilder/railtie.rb
 - lib/tasks/pbbuilder_tasks.rake
 - pbbuilder.gemspec
 - test/pbbuilder_test.rb
+- test/protobuf_extension_test.rb
 - test/test_helper.rb
 homepage: https://github.com/cheddar-me/pbbuilder
 licenses:
@@ -83,4 +71,5 @@ specification_version: 4
 summary: Generate Protobuf messages via a Builder-style DSL
 test_files:
 - test/pbbuilder_test.rb
+- test/protobuf_extension_test.rb
 - test/test_helper.rb