vcfb 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbb45046003eb60f818dab6f8f6840fd2db12448638b6e0bbf037febe7eb1181
-  data.tar.gz: 848611876927e81bb4a7d6aa83e56e4748c65b400e8883a34b97abfc8b994a9c
+  metadata.gz: 37ed059430db4dec9fa83fc4afede218952117e5fcbe393bec25d12b19977e96
+  data.tar.gz: 72786a8449548594a9abd8afa51c1bb3b28a0963cfb1299aad0d8afad766e731
 SHA512:
-  metadata.gz: 67b3d105c6dd5f46531bd9662fb0d90b1a7ccaca8d861cb617d1fbb8999eb9a4772a9aa113fa6f1bf6733f6697e1a468247cbab55a113f5de14914e6cc5be079
-  data.tar.gz: c38374b0aa001bbfb897b0587eded3bd085b33f404ca415775f206ef37bd8b0fdc33367bad3c8851754d34bce28f6593a524a13b0a37503237ec58f5c0d2f138
+  metadata.gz: d606a6d676d287b684d28220054b38b1bc84bde12237f90e42e63d4b93e4813139aa30f21c71738ac80c7094894d353a042a59428e08050c4f0ca07045208502
+  data.tar.gz: 80743157ca8269d9323458d21081b03043565d4cab53172aa788abd29bd6acf6d2b54ab9439b6e077fe135ff9e408340e114d4939accb9b3b654f6de4908302d

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 -
 
+## 2.0.2
+
+- Support for ViewComponent 2.61.0
+
 ## 2.0.1
 
 - Restore usage of tag options gem if present.

data/lib/vcfb/component/base.rb

@@ -22,6 +22,19 @@ module VCFB
       def collection_radio_buttons(object, method, collection, value_method, text_method, options = {}, html_options = {}, &block)
         VCFB::Tags::CollectionRadioButtons.new(object, method, self, collection, value_method, text_method, options, html_options).render(&block)
       end
+
+      private
+
+      def deobjectify_options!(options)
+        if instance_variable_defined?(:@form)
+          keys = @form.send(:objectify_options, {}).keys
+          options.extract!(*keys)
+        elsif defined?(TagOptions::Hash)
+          TagOptions::Hash.new
+        else
+          {}
+        end
+      end
     end
   end
 end

data/lib/vcfb/component/base_collection.rb

@@ -4,6 +4,8 @@ module VCFB
       private
 
       def content
+        return unless instance_variable_defined?(:@builder)
+
         @__vc_content = if @view_context && @__vc_render_in_block
           view_context.capture(@builder, &@__vc_render_in_block)
         else

data/lib/vcfb/component/form.rb

@@ -8,7 +8,6 @@ module VCFB
           @url = url
           @format = format
           @options = defined?(TagOptions::Hash) ? TagOptions::Hash.new(options) : options
-          @form = nil
         end
       end
 
@@ -30,6 +29,8 @@ module VCFB
       # Override #content and #get_slot from ViewComponent so that we can yield
       # the form element (and not the component).
       def content
+        return unless instance_variable_defined?(:@form)
+
         if @view_context && @__vc_render_in_block
           @__vc_content = view_context.capture(@form, &@__vc_render_in_block)
         end

data/lib/vcfb/version.rb

@@ -1,3 +1,3 @@
 module VCFB
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcfb
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Alex Monroe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails