pbbuilder 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ca08d74d2463d2d14d5d57127e482a0ea9fde4a0cdcaac3f237c3a8f48ff23
-  data.tar.gz: 828fe17a1b1be0feab98d7cc68940350df6093d0995751e0873c46d9a363f487
+  metadata.gz: e22f13cb28a04d0b767c619b7c63c91e86a246d524abc200e5062d92cadb977e
+  data.tar.gz: b323e88b227263bfbd4ebc8b0e50f05208afe24527a2069e1110a6a605e453cb
 SHA512:
-  metadata.gz: 2c4285699991af59101b07e3e04dd987620065362febdc8623d62390b15a17fd2660031f9e3a4cc3eb602609504ab70cde82848012fc061759124a706809fd3a
-  data.tar.gz: 214263e610fc46ab2bf978f17dd3dc8633ae757af8859906c4c588827c00e383b542ac749b5f9e089ede8401153a54629b82e83a29d5c212043965c70035fc58
+  metadata.gz: c245be23b0283a134b1dc28b1ab29d96bd9ca0023456f9e984ff3406b164f057147ab9e366bdcf150236fe494417ef182480cc1d89a53880c684403efb60bb95
+  data.tar.gz: e4c4bbd500f921b0b2a71a7fc0e23ec99ea005a872f7f0d66a72f04cca712de54ef3e4898023bf22880eedb9afe990d9fac54dfce62ae164fd4c0b267bfc03bb

data/lib/pbbuilder/template.rb

@@ -27,12 +27,20 @@ class PbbuilderTemplate < Pbbuilder
   end
 
   def set!(field, *args, **kwargs, &block)
-    # If partial options are being passed, we assume a collection is being rendered with a partial for every element
-    # pb.friends @friends, partial: "friend", as: :friend
-    if args.one? && _partial_options?(kwargs)
-      # Call set! on the super class, passing in a block that renders a partial for every element
-      super(field, *args) do |element|
-        _set_inline_partial(element, kwargs)
+    # If partial options are being passed, we render a submessage with a partial
+    if kwargs.has_key?(:partial)
+      if args.one? && kwargs.has_key?(:as)
+        # pb.friends @friends, partial: "friend", as: :friend
+        # Call set! on the super class, passing in a block that renders a partial for every element
+        super(field, *args) do |element|
+          _set_inline_partial(element, kwargs)
+        end
+      else
+        # pb.best_friend partial: "person", person: @best_friend
+        # Call set! as a submessage, passing in the kwargs as partial options
+        super(field, *args) do
+          _render_partial_with_options(kwargs)
+        end
       end
     else
       super
@@ -41,10 +49,6 @@ class PbbuilderTemplate < Pbbuilder
 
   private
 
-  def _partial_options?(options)
-    ::Hash === options && options.key?(:as) && options.key?(:partial)
-  end
-
   def _is_active_model?(object)
     object.class.respond_to?(:model_name) && object.respond_to?(:to_partial_path)
   end

data/pbbuilder.gemspec

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

data/test/pbbuilder_template_test.rb

@@ -9,9 +9,7 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
   RACER_PARTIAL = <<-PBBUILDER
     pb.extract! racer, :name
     pb.friends racer.friends, partial: "racers/racer", as: :racer
-    pb.best_friend do
-      pb.partial! "racers/racer", racer: racer.best_friend
-    end if racer.best_friend.present?
+    pb.best_friend partial: "racers/racer", racer: racer.best_friend if racer.best_friend.present?
   PBBUILDER
 
   PARTIALS = {
@@ -33,6 +31,18 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
     assert_equal "hello", result.name
   end
 
+  test "submessage partial" do
+    other_racer = Racer.new(2, "Max Verstappen", [])
+    racer = Racer.new(123, "Chris Harris", [], other_racer)
+    result = render('pb.best_friend partial: "person", person: @racer.best_friend', racer: racer)
+    assert_equal "Max Verstappen", result.best_friend.name
+  end
+
+  test "hash" do
+    result = render('pb.favourite_foods "pizza" => "yes"')
+    assert_equal({"pizza" => "yes"}, result.favourite_foods.to_h)
+  end
+
   test "partial by name with nested locals" do
     result = render('pb.partial! "partial", locals: { name: "hello" }')
     assert_equal "hello", result.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pbbuilder
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Bouke van der Bijl