pbbuilder 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 539297324fde33e45611d422bac031542f19c6f1e58954b6c5e6d3c5f389a31b
-  data.tar.gz: a9ff9febe9a09a9991eba21ed6c7d7a92e084e931dd336ab2eadc616819ef592
+  metadata.gz: 4e4a4d405e3fe428fa8de8ba8609f62211a0224d76fe13bc32d7caf2a07e089c
+  data.tar.gz: 35cf4c2ed96cbb643dfb22db3de4d6ff035cc420f78806489d329b42fd14f88e
 SHA512:
-  metadata.gz: e29e8b2663bd02012c93f10722897b53561939e9329d812a593271c334d2c7430f3fa3f31581debb9485aab63193dae92c3953a7bd11bddc6312b2efe91f961e
-  data.tar.gz: 94d42951a9a0a6befadd02a25610a8cc9e9c297776ed6fc6383f01c5646cd3d0a0aacb34e6835f1a862395dea3b65cfd255d2c9c8c3ae78261e7e65a27aa0d22
+  metadata.gz: 5aa3d1b2e64745042fdc1e828ee295d9e14c9891ab3a826d7af64563451b31e2dff28b744419cbb54db31e564dff5e960a2270ab98f480baeca4aeee71373e5e
+  data.tar.gz: 26d816822376f1857cd517c81ac88df26f2cf52cc0aa82dc602249e67f33a446bd8c10aec1cff544638484cb58c03121f15145af7f4ea3af05c13d45f770e29d

data/.github/workflows/test.yml

@@ -1,25 +1,41 @@
 name: ruby
-on: push
+on: [push]
 
 jobs:
   test:
+    name: Ruby ${{ matrix.ruby }} (${{ matrix.gemfile }})
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
     strategy:
+      fail-fast: false
       matrix:
-        ruby: ["2.7.5", "3.0.1", "3.1.0"]
-    name: tests for ruby-${{ matrix.ruby }}
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
+
+        gemfile: [ "rails_6_1", "rails_7_0"]
+        experimental: [false]
+
+        #include:
+        #  - ruby: '2.7'
+        #    gemfile: rails_head
+        #    experimental: true
+        #  - ruby: '3.0'
+        #    gemfile: rails_head
+        #    experimental: true
+        #  - ruby: '3.1'
+        #    gemfile: rails_head
+        #    experimental: true
+
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
           ruby-version: ${{ matrix.ruby }}
 
-      - name: Setup Appraisal
-        run:  bundle exec appraisal install
-
       - name: Run tests
-        run: bundle exec appraisal rake
+        run: bundle exec rake

data/.gitignore

@@ -12,3 +12,11 @@
 Gemfile.lock
 *.gem
 /.idea
+
+gemfiles/.bundle
+gemfiles/*.lock
+Gemfile.lock
+.ruby-version
+pkg
+
+

data/.ruby-version

@@ -1 +1 @@
-3.1.0
+3.1.2

data/Appraisals

@@ -2,6 +2,10 @@ appraise "rails-6-1" do
   gem "rails", "~> 6.1.0"
 end
 
-appraise "rails-7" do
+appraise "rails-7-0" do
   gem "rails", "~> 7.0.0"
 end
+
+appraise "rails-head" do
+  gem "rails", github: "rails/rails", branch: "main"
+end

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+# Pbbuilder Changelog
+All notable changes to this project will be documented in this file.
+
+This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.13.0 2023.01.18
+### Added
+- #merge! method added for PbbuilderTemplate class
+- ActiveSupport added as a dependency for gem
+- Fragment Caching support added, with #cache! and #cache_if! methods in PbbuilderTemplate class.
+
+
+### Changed
+- Appraisal is properly configured to run against all rubies and rails combinations.
+- Supported ruby version's are 2.7, 3.0, 3.1
+- Superclass for pbbuilder is now active_support/proxy_object, with a fallback to active_support/basic_object.
+- Library upgrade: All gems are updated to the latest possible version. Most notable upgrades:
+  - `rails` from version 6.1.4.4 to 6.1.7, and from version 7.0.1 to 7.0.4
+  - `google-protobuf` is let loose
+  - `bundler` from version 2.3.4 to 2.3.22
+
+### Removed
+- TestUnit dependency
+
+
+## 0.12.0 Prior to 2022-10-14
+
+A templating language, for protobuf, for Rails, inspired by [Jbuilder](https://github.com/rails/jbuilder)

data/Gemfile

@@ -4,5 +4,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake"
-gem "rails"
 gem "appraisal"

data/README.md

@@ -1,8 +1,47 @@
 # Pbbuilder
-Short description and motivation.
+PBBuilder generates [Protobuf](https://developers.google.com/protocol-buffers) Messages with a simple DSL similar to [JBuilder](https://rubygems.org/gems/jbuilder) gem.
 
 ## Usage
-How to use my plugin.
+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.
+
+
+Following Pbbuilder code
+```
+person = RPC::Person.new
+ Pbbuilder.new(person) do |pb|
+   pb.name "Hello"
+   pb.friends [1, 2, 3] do |number|
+     pb.name "Friend ##{number}"
+   end
+ end
+```
+Would produce this message:
+
+```
+message Person {
+  string name = 1;
+  repeated Person friends = 2;
+}
+```
+
+
+### Caching
+Fragment caching is supported, it uses Rails.cache and works like caching in HTML templates:
+
+```
+pb.cache! "cache-key", expires_in: 10.minutes do
+  pb.name @person.name
+end
+```
+
+You can also conditionally cache a block by using cache_if! like this:
+
+```
+pb.cache_if! !admin?, "cache-key", expires_in: 10.minutes do
+  pb.name @person.name
+end
+```
+
 
 ## Installation
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1,11 +1,18 @@
+require "bundler/setup"
+require "bundler/gem_tasks"
 require "rake/testtask"
-require "appraisal"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
-  t.verbose = false
-  t.warning = false
-end
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["CI"]
+  require "appraisal/task"
+  Appraisal::Task.new
+  task default: :appraisal
+else
+  Rake::TestTask.new(:test) do |t|
+    t.libs << "test"
+    t.pattern = "test/**/*_test.rb"
+    t.verbose = false
+    t.warning = false
+  end
 
-task default: :test
+  task default: :test
+end

data/gemfiles/rails_6_1.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "rails", "~> 6.1.0"
 gem "appraisal"
+gem "rails", "~> 6.1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_7.gemfile → rails_7_0.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "rails", "~> 7.0.0"
 gem "appraisal"
+gem "rails", "~> 7.0.0"
 
 gemspec path: "../"

data/gemfiles/rails_head.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "appraisal"
+gem "rails", github: "rails/rails", branch: "main"
+
+gemspec path: "../"

data/lib/pbbuilder/errors.rb

@@ -0,0 +1,10 @@
+require 'pbbuilder'
+
+class Pbbuilder
+  class MergeError < ::StandardError
+    def self.build(current_value, updates)
+      message = "Can't merge #{updates.inspect} into #{current_value.inspect}"
+      self.new(message)
+    end
+  end
+end

data/lib/pbbuilder/pbbuilder.rb

@@ -0,0 +1,7 @@
+Pbbuilder = Class.new(begin
+  require 'active_support/proxy_object'
+  ActiveSupport::ProxyObject
+rescue LoadError
+  require 'active_support/basic_object'
+  ActiveSupport::BasicObject
+end)

data/lib/pbbuilder/railtie.rb

@@ -1,3 +1,4 @@
+require 'rails'
 require "pbbuilder/handler"
 
 class Pbbuilder

data/lib/pbbuilder/template.rb

@@ -47,8 +47,103 @@ class PbbuilderTemplate < Pbbuilder
     end
   end
 
+  # Caches fragment of message. Can be called like the following:
+  # 'pb.cache! "cache-key" do; end'
+  # 'pb.cache! "cache-key", expire_in: 1.min do; end'
+  #
+  # @param key String
+  # @param options Hash
+  #
+  # @return nil
+  def cache!(key=nil, options={})
+    if @context.controller.perform_caching
+      value = _cache_fragment_for(key, options) do
+        _scope(target!) { yield self }.to_h.compact_blank
+      end
+
+      merge! value
+    else
+      yield
+    end
+  end
+
+  # Conditionally caches the protobuf message depending on the condition given as first parameter. Has the same
+  # signature as the `cache` helper method in `ActionView::Helpers::CacheHelper` and so can be used in
+  # the same way.
+  #
+  # Example:
+  #
+  #   pb.cache_if! !admin?, @person, expires_in: 10.minutes do
+  #     pb.extract! @person, :name, :age
+  #   end
+  def cache_if!(condition, *args, &block)
+    condition ? cache!(*args, &block) : yield
+  end
+
   private
 
+  # Writes to cache, if cache with keys is missing.
+  #
+  # @return fragment value
+
+  def _cache_fragment_for(key, options, &block)
+    key = _cache_key(key, options)
+    _read_fragment_cache(key, options) || _write_fragment_cache(key, options, &block)
+  end
+
+  # Reads from cache
+  #
+  # @param key string
+  # @params options hash
+  #
+  # @return string
+  def _read_fragment_cache(key, options = nil)
+    @context.controller.instrument_fragment_cache :read_fragment, key do
+      ::Rails.cache.read(key, options)
+    end
+  end
+
+  # Writes into cache and returns value
+  #
+  # @param key string
+  # @params options hash
+  #
+  # @return string
+  def _write_fragment_cache(key, options = nil)
+    @context.controller.instrument_fragment_cache :_write_fragment, key do
+      yield.tap do |value|
+        ::Rails.cache.write(key, value, options)
+      end
+    end
+  end
+
+  # Composes full cache key for internal storage
+  #
+  # @param key string
+  # @param options hash
+  #
+  # @return string
+  def _cache_key(key, options)
+    name_options = options.slice(:skip_digest, :virtual_path)
+    key = _fragment_name_with_digest(key, name_options)
+
+    if @context.respond_to?(:combined_fragment_cache_key)
+      key = @context.combined_fragment_cache_key(key)
+    else
+      key = url_for(key).split('://', 2).last if ::Hash === key
+    end
+
+    ::ActiveSupport::Cache.expand_cache_key(key, :ppbuilder)
+  end
+
+  def _fragment_name_with_digest(key, options)
+    if @context.respond_to?(:cache_fragment_name)
+      @context.cache_fragment_name(key, **options)
+    else
+      key
+    end
+  end
+
   def _is_active_model?(object)
     object.class.respond_to?(:model_name) && object.respond_to?(:to_partial_path)
   end

data/lib/pbbuilder.rb

@@ -1,3 +1,9 @@
+require "pbbuilder/pbbuilder"
+require 'pbbuilder/errors'
+require "pbbuilder/protobuf_extension"
+require "pbbuilder/railtie" if defined?(Rails)
+
+
 # Pbbuilder makes it easy to create a protobuf message using the builder pattern
 # It is heavily inspired by jbuilder
 #
@@ -21,7 +27,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 < BasicObject
+class Pbbuilder
   def initialize(message)
     @message = message
 
@@ -101,12 +107,54 @@ class Pbbuilder < BasicObject
     end
   end
 
+  # Merges object into a protobuf message, mainly used for caching.
+  #
+  # @param object [Hash]
+  def merge!(object)
+    ::Kernel.raise ::MergeError.build(target!, object) unless object.class == ::Hash
+
+    object.each_key do |key|
+      if object[key].empty?
+        ::Kernel.raise ::MergeError.build(target!, object)
+      end
+
+      if object[key].class == ::String
+        # pb.fields {"one" => "two"}
+        @message[key.to_s] = object[key]
+      elsif object[key].class == ::Array
+        # pb.tags ['test', 'ok']
+        @message[key.to_s].replace object[key]
+      elsif ( obj = object[key]).class == ::Hash
+        # pb.field_name do
+        #    pb.tags ["ok", "cool"]
+        # end
+        #
+
+        # optional empty fields don't show up in @message object,
+        # we recreate empty message, so we can fill it with values
+        if @message[key.to_s].nil?
+          field_descriptor = @message.class.descriptor.lookup(key.to_s)
+          @message[key.to_s] = _new_message_from_descriptor(field_descriptor)
+        end
+
+        @message[key.to_s] = _scope(@message[key.to_s]) { self.merge!(obj) }
+      end
+    end
+  end
+
+  # @return Initialized message object
   def target!
     @message
   end
 
   private
 
+  # Appends protobuf message with existing @message object
+  #
+  # @param name string
+  # @param descriptor Google::Protobuf::FieldDescriptor
+  # @param collection hash
+  # @param &block
   def _append_repeated(name, descriptor, collection, &block)
     ::Kernel.raise ::ArgumentError, "expected Enumerable" unless collection.respond_to?(:map)
     elements = collection.map do |element|
@@ -117,6 +165,9 @@ class Pbbuilder < BasicObject
     @message[name].push(*elements)
   end
 
+  # Yields an Protobuf object in a scope of message and provided values.
+  #
+  # @param message Google::Protobuf::(field_type)
   def _scope(message)
     old_message = @message
     @message = message
@@ -126,6 +177,9 @@ class Pbbuilder < BasicObject
     @message = old_message
   end
 
+  # Build up empty protobuf message based on descriptor
+  #
+  # @param descriptor Google::Protobuf::FieldDescriptor
   def _new_message_from_descriptor(descriptor)
     ::Kernel.raise ::ArgumentError, "can't pass block to non-message field" unless descriptor.type == :message
 
@@ -134,7 +188,4 @@ class Pbbuilder < BasicObject
     message_class = message_descriptor.msgclass
     message_class.new
   end
-end
-
-require "pbbuilder/protobuf_extension"
-require "pbbuilder/railtie" if defined?(Rails)
+end

data/pbbuilder.gemspec

@@ -1,14 +1,19 @@
 Gem::Specification.new do |spec|
   spec.name = "pbbuilder"
-  spec.version = "0.12.0"
+  spec.version = "0.13.0"
   spec.authors = ["Bouke van der Bijl"]
   spec.email = ["bouke@cheddar.me"]
   spec.homepage = "https://github.com/cheddar-me/pbbuilder"
-  spec.summary = "Generate Protobuf messages via a Builder-style DSL"
+  spec.summary = "Generate Protobuf Messages with a simple DSL similar to JBuilder"
   spec.license = "MIT"
 
+  spec.required_ruby_version = '>= 2.7'
+
   spec.files = `git ls-files`.split("\n")
   spec.test_files = `git ls-files -- test/*`.split("\n")
 
-  spec.add_dependency "google-protobuf", "~> 3.19", ">= 3.19.2"
+  spec.add_dependency "google-protobuf"
+  spec.add_dependency "activesupport"
+  spec.add_development_dependency 'm'
+  spec.add_development_dependency "pry"
 end

data/test/pbbuilder_template_test.rb

@@ -21,6 +21,8 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
     "_person.html.erb" => "Hello world!"
   }
 
+  setup { Rails.cache.clear }
+
   test "basic template" do
     result = render('pb.name "hello"')
     assert_equal "hello", result.name
@@ -77,6 +79,143 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
     assert_equal "Max Verstappen", result.best_friend.name
   end
 
+  test "support for merge! method" do
+    result = render('pb.merge! "name" => "suslik"')
+
+    assert_equal("suslik", result.name)
+  end
+
+  test "support for merge! method in a block" do
+    result = render(<<-PBBUILDER)
+      pb.best_friend do
+        pb.merge! "name" => "Manuelo"
+      end
+    PBBUILDER
+
+    assert_equal("Manuelo", result.best_friend.name)
+  end
+
+  test "should raise Error in merge! an empty hash" do
+    assert_raise(ActionView::Template::Error) {
+      render(<<-PBBUILDER)
+        pb.merge! "name" => {}
+      PBBUILDER
+    }
+
+    assert_raise(ActionView::Template::Error) {
+      render(<<-PBBUILDER)
+        pb.merge! "" => {}
+      PBBUILDER
+    }
+  end
+
+  test "empty fragment caching" do
+    render 'pb.cache! "nothing" do; end'
+
+    result = nil
+
+    assert_nothing_raised do
+      result = render(<<-JBUILDER)
+        pb.name "suslik"
+        pb.cache! "nothing" do; end
+      JBUILDER
+    end
+
+    assert_equal "suslik", result["name"]
+  end
+
+  test "object fragment caching" do
+    render(<<-PBBUILDER)
+      pb.cache! "cache-key" do
+        pb.name "Hit"
+      end
+    PBBUILDER
+
+    hit = render('pb.cache! "cache-key" do; end ')
+    assert_equal "Hit", hit["name"]
+  end
+
+  test "fragment caching for arrays" do
+    render <<-PBBUILDER
+      pb.cache! "cache-key" do
+        pb.tags ["ok", "cool"]
+      end
+    PBBUILDER
+
+    result = render('pb.cache! "cache-key" do; end')
+
+    assert_equal(['ok', 'cool'], result.tags)
+  end
+
+  test "optional array fragment caching" do
+    render <<-PBBUILDER
+      pb.cache! "cache-key" do
+        pb.field_mask do
+          pb.paths ["ok", "that's", "cool"]
+        end
+      end
+    PBBUILDER
+
+    result = render('pb.cache! "cache-key" do; end')
+
+    assert_equal(["ok", "that's", "cool"], result.field_mask.paths)
+  end
+
+  test "object fragment caching with expiry" do
+    travel_to Time.iso8601("2018-05-12T11:29:00-04:00")
+
+    render <<-PBBUILDER
+      pb.cache! "cache-key", expires_in: 1.minute do
+        pb.name "Hit"
+      end
+    PBBUILDER
+
+    travel 30.seconds
+
+    result = render(<<-PBBUILDER)
+      pb.cache! "cache-key", expires_in: 1.minute do
+        pb.name "Miss"
+      end
+    PBBUILDER
+
+    assert_equal "Hit", result["name"]
+
+    travel 31.seconds
+
+    result = render(<<-PBBUILDER)
+      pb.cache! "cache-key", expires_in: 1.minute do
+        pb.name "Miss"
+      end
+    PBBUILDER
+
+    assert_equal "Miss", result["name"]
+  end
+
+  test "conditional object fragment caching" do
+    render(<<-JBUILDER)
+      pb.cache_if! true, "cache-key" do
+        pb.name "Hit"
+      end
+
+      pb.cache_if! false, "cache-key" do
+        pb.last_name "Hit"
+      end
+    JBUILDER
+
+    result = render(<<-JBUILDER)
+      pb.cache_if! true, "cache-key" do
+        pb.name "Miss"
+      end
+
+      pb.cache_if! false, "cache-key" do
+        pb.last_name "Miss"
+      end
+    JBUILDER
+
+    assert_equal "Hit", result["name"]
+    assert_equal "Miss", result["last_name"]
+  end
+
   private
 
   def render(*args)

data/test/test_helper.rb

@@ -1,9 +1,6 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
+require "bundler/setup"
 
 require "rails"
-require "rails/test_help"
-require "rails/test_unit/reporter"
 
 require "active_support"
 require "active_support/core_ext/array/access"
@@ -11,24 +8,27 @@ require "active_support/cache/memory_store"
 require "active_support/json"
 require "active_model"
 require "action_view"
-require "rails/version"
 
 require "pbbuilder"
 
-Rails::TestUnitReporter.executable = "bin/test"
-
 require "google/protobuf"
 require "google/protobuf/field_mask_pb"
 
+require "active_support/testing/autorun"
+
+ActiveSupport.test_order = :random
+
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("pbbuilder.proto", syntax: :proto3) do
     add_message "pbbuildertest.Person" do
       optional :name, :string, 1
+      optional :last_name, :string, 8
       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
+      repeated :tags, :string, 7
     end
   end
 end
@@ -37,6 +37,12 @@ module API
   Person = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("pbbuildertest.Person").msgclass
 end
 
+class << Rails
+  def cache
+    @cache ||= ActiveSupport::Cache::MemoryStore.new
+  end
+end
+
 class Racer < Struct.new(:id, :name, :friends, :best_friend)
   extend ActiveModel::Naming
   include ActiveModel::Conversion

metadata

@@ -1,35 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: pbbuilder
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.19.2
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.19.2
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - bouke@cheddar.me
@@ -42,6 +78,7 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -50,15 +87,15 @@ files:
 - bin/test
 - gemfiles/.bundle/config
 - gemfiles/rails_6_1.gemfile
-- gemfiles/rails_6_1.gemfile.lock
-- gemfiles/rails_7.gemfile
-- gemfiles/rails_7.gemfile.lock
+- gemfiles/rails_7_0.gemfile
+- gemfiles/rails_head.gemfile
 - lib/pbbuilder.rb
+- lib/pbbuilder/errors.rb
 - lib/pbbuilder/handler.rb
+- lib/pbbuilder/pbbuilder.rb
 - lib/pbbuilder/protobuf_extension.rb
 - lib/pbbuilder/railtie.rb
 - lib/pbbuilder/template.rb
-- lib/tasks/pbbuilder_tasks.rake
 - pbbuilder.gemspec
 - test/pbbuilder_template_test.rb
 - test/pbbuilder_test.rb
@@ -76,17 +113,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Generate Protobuf messages via a Builder-style DSL
+summary: Generate Protobuf Messages with a simple DSL similar to JBuilder
 test_files:
 - test/pbbuilder_template_test.rb
 - test/pbbuilder_test.rb

data/gemfiles/rails_6_1.gemfile.lock

@@ -1,152 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    pbbuilder (0.11.0)
-      google-protobuf (~> 3.19, >= 3.19.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      mail (>= 2.7.1)
-    actionmailer (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      actionview (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.4)
-      actionview (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      rack (~> 2.0, >= 2.0.9)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      nokogiri (>= 1.8.5)
-    actionview (6.1.4.4)
-      activesupport (= 6.1.4.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.4)
-      activesupport (= 6.1.4.4)
-      globalid (>= 0.3.6)
-    activemodel (6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activerecord (6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activestorage (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      marcel (~> 1.0.0)
-      mini_mime (>= 1.1.0)
-    activesupport (6.1.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    builder (3.2.4)
-    concurrent-ruby (1.1.9)
-    crass (1.0.6)
-    erubi (1.10.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
-    google-protobuf (3.19.2)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    loofah (2.13.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
-    minitest (5.15.0)
-    nio4r (2.5.8)
-    nokogiri (1.13.0)
-      mini_portile2 (~> 2.7.0)
-      racc (~> 1.4)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.4.4)
-      actioncable (= 6.1.4.4)
-      actionmailbox (= 6.1.4.4)
-      actionmailer (= 6.1.4.4)
-      actionpack (= 6.1.4.4)
-      actiontext (= 6.1.4.4)
-      actionview (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      bundler (>= 1.15.0)
-      railties (= 6.1.4.4)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      method_source
-      rake (>= 0.13)
-      thor (~> 1.0)
-    rake (13.0.6)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    thor (1.2.1)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  pbbuilder!
-  rails (~> 6.1.0)
-  rake
-
-BUNDLED WITH
-   2.3.4

data/gemfiles/rails_7.gemfile.lock

@@ -1,170 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    pbbuilder (0.11.0)
-      google-protobuf (~> 3.19, >= 3.19.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (7.0.1)
-      actionpack (= 7.0.1)
-      activesupport (= 7.0.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.1)
-      actionpack (= 7.0.1)
-      activejob (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.1)
-      actionpack (= 7.0.1)
-      actionview (= 7.0.1)
-      activejob (= 7.0.1)
-      activesupport (= 7.0.1)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.1)
-      actionview (= 7.0.1)
-      activesupport (= 7.0.1)
-      rack (~> 2.0, >= 2.2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.1)
-      actionpack (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.0.1)
-      activesupport (= 7.0.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.1)
-      activesupport (= 7.0.1)
-      globalid (>= 0.3.6)
-    activemodel (7.0.1)
-      activesupport (= 7.0.1)
-    activerecord (7.0.1)
-      activemodel (= 7.0.1)
-      activesupport (= 7.0.1)
-    activestorage (7.0.1)
-      actionpack (= 7.0.1)
-      activejob (= 7.0.1)
-      activerecord (= 7.0.1)
-      activesupport (= 7.0.1)
-      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    builder (3.2.4)
-    concurrent-ruby (1.1.9)
-    crass (1.0.6)
-    digest (3.1.0)
-    erubi (1.10.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
-    google-protobuf (3.19.2)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    io-wait (0.2.1)
-    loofah (2.13.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
-    minitest (5.15.0)
-    net-imap (0.2.3)
-      digest
-      net-protocol
-      strscan
-    net-pop (0.1.1)
-      digest
-      net-protocol
-      timeout
-    net-protocol (0.1.2)
-      io-wait
-      timeout
-    net-smtp (0.3.1)
-      digest
-      net-protocol
-      timeout
-    nio4r (2.5.8)
-    nokogiri (1.13.0)
-      mini_portile2 (~> 2.7.0)
-      racc (~> 1.4)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (7.0.1)
-      actioncable (= 7.0.1)
-      actionmailbox (= 7.0.1)
-      actionmailer (= 7.0.1)
-      actionpack (= 7.0.1)
-      actiontext (= 7.0.1)
-      actionview (= 7.0.1)
-      activejob (= 7.0.1)
-      activemodel (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
-      bundler (>= 1.15.0)
-      railties (= 7.0.1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (7.0.1)
-      actionpack (= 7.0.1)
-      activesupport (= 7.0.1)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rake (13.0.6)
-    strscan (3.0.1)
-    thor (1.2.1)
-    timeout (0.2.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  pbbuilder!
-  rails (~> 7.0.0)
-  rake
-
-BUNDLED WITH
-   2.3.4

data/lib/tasks/pbbuilder_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :pbbuilder do
-#   # Task goes here
-# end