pbbuilder 0.2.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91b9708fb9269602e7f35f2a36e2491c1598e9d7968608912e58fb285d6c2c8a
-  data.tar.gz: '089f9118be245c4a979bb10da5483b1b7f7d4136a8db8771a903581c226c1918'
+  metadata.gz: d3f417c956ceb3a2123489021f4cc401b7bf56399355fb6bb0d4ebaa437d1cb2
+  data.tar.gz: '0408c3174481e7aa7e22f129829a973f822a7245d57c3e93bad2ef564d3ee05f'
 SHA512:
-  metadata.gz: a235c7d38a1f38a98668bc2ceb68fe3d6b468196fa0d5e5cf668b9dfafa199ec875b3c769370a6b1a1db9b1c3e24b22f6ca247105d87bdf5b4358c33d5404e91
-  data.tar.gz: 747cf5e267268b2d05e64e297b41e0d181a0af6a01885521a734fd20845513914b4ba92d7a02fbd669dd2f8463cbb15eb5c6804978ce4d062d299fd1a2839957
+  metadata.gz: e7476c24846d78dd0dc011372998bb54301a673510ccc8cffe540714db1a991ba6b36c14ec0eb45572aef1880e9cb638870be38a7a510c4edb501eb0da670278
+  data.tar.gz: 3027ae2509d083bd9da6a02bf9732c43038534992790017a3bdb00ba1bb80179d650d1a12d6f136af036854a5944125cad64d7b17268b084609f3642e8f7dbfc

data/.github/workflows/test.yml

@@ -0,0 +1,22 @@
+name: ruby
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ["2.7", "3.0.1"]
+    name: tests for ruby-${{ matrix.ruby }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Run tests
+        run: bin/test

data/.gitignore

@@ -11,3 +11,4 @@
 .byebug_history
 Gemfile.lock
 *.gem
+/.idea

data/README.md

@@ -22,7 +22,8 @@ $ gem install pbbuilder
 ```
 
 ## Contributing
-Contribution directions go here.
+
+When debugging, make sure you're prepending `::Kernel` to any calls such as `puts` as otherwise the code will think you're trying to add another attribute onto the protobuf.
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

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,29 @@ 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_hash)
+          # pb.fields {"one" => "two"}
+          arg.to_hash.each do |k, v|
+            @message[name][k] = v
+          end
+        elsif 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 +86,9 @@ class Pbbuilder < BasicObject
           extract!(item, *args)
         end
       else
-        extract!(element, *args)
+        set!(name) do
+          extract!(element, *args)
+        end
       end
     end
   end
@@ -115,4 +135,5 @@ class Pbbuilder < BasicObject
   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.2.0"
+  spec.version = "0.6.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

@@ -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,25 @@ 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
+      pb.favourite_foods({
+        "Breakfast" => "Eggs",
+        "Lunch" => "Shawarma",
+        "Dinner" => "Pizza"
+      })
     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
+    assert_equal "Eggs", person.favourite_foods["Breakfast"]
   end
 
   test "it can extract fields in a nice way" do
@@ -19,11 +34,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,22 @@ 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"
+      map :favourite_foods, :string, :string, 6
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbbuilder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Bouke van der Bijl
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -24,13 +24,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.15.5
-description:
+description: 
 email:
 - bouke@cheddar.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - Gemfile
 - MIT-LICENSE
@@ -39,16 +40,18 @@ 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:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -63,10 +66,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 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