view_component 2.50.0 → 2.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea90ad2ed037528865b7e6cf8b5850df938b624883a1508d85de52d8978c4fb
-  data.tar.gz: f2c1e558a700b9f79b3939785f3ff6c2f812a6e03b697f9b60f4aa6f6eaf54a0
+  metadata.gz: 0d505afaa4cb16810628e814c69bb2d00bc76498f6c681173d7811f44cd87c8e
+  data.tar.gz: 2bc859d6034fed19e34739cf1844679bcf83332c7e227c487ddb7364e8166f4b
 SHA512:
-  metadata.gz: 9fd97f786e4382098f81e5ec6230b6ae550991641f83d74ecfd67d3eacea515cd899ab21264c8ac5b5de1caed7f35304eb9b6cba13f092e5abdb3a6dc45f6b06
-  data.tar.gz: b70d4f308f47c6937d8aa2e518564ebbc6313366168e6382f4c296823ed07489c7be333f8f47822e65d3a5159753b5d3934ead8cd4323c3777d0c22dde9870f8
+  metadata.gz: 75dcf204fd8e3dfad8a1da18de6d96d43fd779f1c9a73ca66b76f0db1ac7be04cf04447c9eaa901d32bc674d7eb7fa79fd5572bff08652a892a7e96f5186faaa
+  data.tar.gz: 7be68adaa9de981a4fb12451ebcc19875f5754fa4798eef60f98702b1c7396bb598a1f6ae77b768bbe55e5b4f77c33f6b9db7156fa18f04c0a63075c54fdd7cc

data/docs/CHANGELOG.md

@@ -3,10 +3,75 @@ layout: default
 title: Changelog
 ---
 
+<!-- Add unreleased changes under the "main" heading. -->
+
 # Changelog
 
 ## main
 
+## 2.53.0
+
+* Add support for relative I18n scopes to translations.
+
+    *Elia Schito*
+
+* Update CI configuration to use latest Rails 7.0.
+
+    *Hans Lemuet*
+
+* Document how to use blocks with lambda slots.
+
+    *Sam Partington*
+
+* Skip Rails 5.2 in local test environment if using incompatible Ruby version.
+
+    *Cameron Dutro*, *Blake Williams*, *Joel Hawksley*
+
+* Improve landing page documentation.
+
+    *Jason Swett*
+
+* Add Bearer to list of companies that heavily rely on ViewComponent.
+
+    *Yaroslav Shmarov*
+
+* Add articles to resources page.
+
+    *Joel Hawksley*
+
+## 2.52.0
+
+* Add ADR for separate slot getter/setter API.
+
+    *Blake Williams*
+
+* Add the option to use a "global" output buffer so `form_for` and friends can be used with view components.
+
+    *Cameron Dutro*, *Blake Williams*
+
+* Fix fragment caching in partials when global output buffer is enabled.
+* Fix template inheritance when eager loading is disabled.
+
+    *Cameron Dutro*
+
+## 2.51.0
+
+* Update the docs only when releasing a new version.
+
+    *Hans Lemuet*
+
+* Alphabetize companies using ViewComponent and add Brightline to the list.
+
+    *Jack Schuss*
+
+* Add CMYK value for ViewComponent Red color on logo page.
+
+    *Dylan Smith*
+
+* Improve performance by moving template compilation from `#render_in` to `#render_template_for`.
+
+    *Cameron Dutro*
+
 ## 2.50.0
 
 * Add tests for `layout` usage when rendering via controller.
@@ -91,7 +156,7 @@ title: Changelog
 
     *Joel Hawksley*
 
-* Add Ruby 3.1 and Rails 7.0 to CI
+* Add Ruby 3.1 and Rails 7.0 to CI.
 
     *Peter Goldstein*
 

data/lib/view_component/base.rb

@@ -66,11 +66,11 @@ module ViewComponent
     #
     # @return [String]
     def render_in(view_context, &block)
-      self.class.compile(raise_errors: true)
-
       @view_context = view_context
       self.__vc_original_view_context ||= view_context
 
+      @output_buffer = ActionView::OutputBuffer.new unless @global_buffer_in_use
+
       @lookup_context ||= view_context.lookup_context
 
       # required for path helpers in older Rails versions
@@ -104,7 +104,7 @@ module ViewComponent
       before_render
 
       if render?
-        render_template_for(@__vc_variant).to_s + _output_postamble
+        perform_render
       else
         ""
       end
@@ -112,6 +112,20 @@ module ViewComponent
       @current_template = old_current_template
     end
 
+    def perform_render
+      render_template_for(@__vc_variant).to_s + _output_postamble
+    end
+
+    # :nocov:
+    def render_template_for(variant = nil)
+      # Force compilation here so the compiler always redefines render_template_for.
+      # This is mostly a safeguard to prevent infinite recursion.
+      self.class.compile(raise_errors: true, force: true)
+      # .compile replaces this method; call the new one
+      render_template_for(variant)
+    end
+    # :nocov:
+
     # EXPERIMENTAL: Optional content to be returned after the rendered template.
     #
     # @return [String]
@@ -413,6 +427,22 @@ module ViewComponent
         # `compile` defines
         compile
 
+        # Give the child its own personal #render_template_for to protect against the case when
+        # eager loading is disabled and the parent component is rendered before the child. In
+        # such a scenario, the parent will override ViewComponent::Base#render_template_for,
+        # meaning it will not be called for any children and thus not compile their templates.
+        if !child.instance_methods(false).include?(:render_template_for) && !child.compiled?
+          child.class_eval <<~RUBY, __FILE__, __LINE__ + 1
+            def render_template_for(variant = nil)
+              # Force compilation here so the compiler always redefines render_template_for.
+              # This is mostly a safeguard to prevent infinite recursion.
+              self.class.compile(raise_errors: true, force: true)
+              # .compile replaces this method; call the new one
+              render_template_for(variant)
+            end
+          RUBY
+        end
+
         # If Rails application is loaded, add application url_helpers to the component context
         # we need to check this to use this gem as a dependency
         if defined?(Rails) && Rails.application
@@ -445,8 +475,8 @@ module ViewComponent
       # Do as much work as possible in this step, as doing so reduces the amount
       # of work done each time a component is rendered.
       # @private
-      def compile(raise_errors: false)
-        compiler.compile(raise_errors: raise_errors)
+      def compile(raise_errors: false, force: false)
+        compiler.compile(raise_errors: raise_errors, force: force)
       end
 
       # @private

data/lib/view_component/compile_cache.rb

@@ -20,10 +20,11 @@ module ViewComponent
 
     def invalidate_class!(klass)
       cache.delete(klass)
+      klass.compiler.reset_render_template_for
     end
 
     def invalidate!
-      cache.clear
+      cache.each { |klass| invalidate_class!(klass) }
     end
   end
 end

data/lib/view_component/compiler.rb

@@ -27,12 +27,11 @@ module ViewComponent
       self.class.mode == DEVELOPMENT_MODE
     end
 
-    def compile(raise_errors: false)
-      return if compiled?
+    def compile(raise_errors: false, force: false)
+      return if compiled? && !force
+      return if component_class == ViewComponent::Base
 
       with_lock do
-        CompileCache.invalidate_class!(component_class)
-
         subclass_instance_methods = component_class.instance_methods(false)
 
         if subclass_instance_methods.include?(:with_content) && raise_errors
@@ -65,13 +64,12 @@ module ViewComponent
           # as Ruby warns when redefining a method.
           method_name = call_method_name(template[:variant])
 
-          if component_class.instance_methods.include?(method_name.to_sym)
-            component_class.send(:undef_method, method_name.to_sym)
+          if component_class.instance_methods(false).include?(method_name.to_sym)
+            component_class.send(:remove_method, method_name.to_sym)
           end
 
-          component_class.class_eval <<-RUBY, template[:path], -1
+          component_class.class_eval <<-RUBY, template[:path], 0
           def #{method_name}
-            @output_buffer = ActionView::OutputBuffer.new
             #{compiled_template(template[:path])}
           end
           RUBY
@@ -93,14 +91,18 @@ module ViewComponent
       end
     end
 
+    def reset_render_template_for
+      if component_class.instance_methods(false).include?(:render_template_for)
+        component_class.send(:remove_method, :render_template_for)
+      end
+    end
+
     private
 
     attr_reader :component_class
 
     def define_render_template_for
-      if component_class.instance_methods.include?(:render_template_for)
-        component_class.send(:undef_method, :render_template_for)
-      end
+      reset_render_template_for
 
       variant_elsifs = variants.compact.uniq.map do |variant|
         "elsif variant.to_sym == :#{variant}\n    #{call_method_name(variant)}"

data/lib/view_component/engine.rb

@@ -20,6 +20,7 @@ module ViewComponent
       options.instrumentation_enabled = false if options.instrumentation_enabled.nil?
       options.preview_route ||= ViewComponent::Base.preview_route
       options.preview_controller ||= ViewComponent::Base.preview_controller
+      options.use_global_output_buffer = false if options.use_global_output_buffer.nil?
 
       if options.show_previews
         options.preview_paths << "#{Rails.root}/test/components/previews" if defined?(Rails.root) && Dir.exist?(
@@ -57,6 +58,21 @@ module ViewComponent
       end
     end
 
+    initializer "view_component.enable_global_output_buffer" do |app|
+      ActiveSupport.on_load(:view_component) do
+        env_use_gob = ENV.fetch("VIEW_COMPONENT_USE_GLOBAL_OUTPUT_BUFFER", "false") == "true"
+        config_use_gob = app.config.view_component.use_global_output_buffer
+
+        if config_use_gob || env_use_gob
+          # :nocov:
+          app.config.view_component.use_global_output_buffer = true
+          ViewComponent::Base.prepend(ViewComponent::GlobalOutputBuffer)
+          ActionView::Base.prepend(ViewComponent::GlobalOutputBuffer::ActionViewMods)
+          # :nocov:
+        end
+      end
+    end
+
     initializer "view_component.set_autoload_paths" do |app|
       options = app.config.view_component
 

data/lib/view_component/global_output_buffer.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module ViewComponent
+  module GlobalOutputBuffer
+    def render_in(view_context, &block)
+      unless view_context.output_buffer.is_a?(OutputBufferStack)
+        # use instance_variable_set here to avoid triggering the code in the #output_buffer= method below
+        view_context.instance_variable_set(:@output_buffer, OutputBufferStack.new(view_context.output_buffer))
+      end
+
+      @output_buffer = view_context.output_buffer
+      @global_buffer_in_use = true
+
+      super(view_context, &block)
+    end
+
+    def perform_render
+      # HAML unhelpfully assigns to @output_buffer directly, so we hold onto a reference to
+      # it and restore @output_buffer when the HAML engine is finished. In non-HAML cases,
+      # @output_buffer and orig_buf will point to the same object, making the reassignment
+      # statements no-ops.
+      orig_buf = @output_buffer
+      @output_buffer.push
+      result = render_template_for(@__vc_variant).to_s + _output_postamble
+      @output_buffer = orig_buf
+      @output_buffer.pop
+      result
+    end
+
+    def output_buffer=(other_buffer)
+      @output_buffer.replace(other_buffer)
+    end
+
+    def with_output_buffer(buf = nil)
+      unless buf
+        buf = ActionView::OutputBuffer.new
+        if output_buffer && output_buffer.respond_to?(:encoding)
+          buf.force_encoding(output_buffer.encoding)
+        end
+      end
+
+      output_buffer.push(buf)
+      result = nil
+
+      begin
+        yield
+      ensure
+        # assign result here to avoid a return statement, which will
+        # immediately return to the caller and swallow any errors
+        result = output_buffer.pop
+      end
+
+      result
+    end
+
+    module ActionViewMods
+      def output_buffer=(other_buffer)
+        if @output_buffer.is_a?(OutputBufferStack)
+          @output_buffer.replace(other_buffer)
+        else
+          super
+        end
+      end
+
+      def with_output_buffer(buf = nil)
+        unless buf
+          buf = ActionView::OutputBuffer.new
+          if @output_buffer && @output_buffer.respond_to?(:encoding)
+            buf.force_encoding(@output_buffer.encoding)
+          end
+        end
+
+        result = nil
+
+        if @output_buffer.is_a?(OutputBufferStack)
+          @output_buffer.push(buf)
+
+          begin
+            yield
+          ensure
+            result = @output_buffer.pop
+          end
+
+          result
+        else
+          @output_buffer, old_buffer = buf, output_buffer
+
+          begin
+            yield
+          ensure
+            @output_buffer = old_buffer
+          end
+
+          buf
+        end
+      end
+    end
+  end
+end

data/lib/view_component/output_buffer_stack.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module ViewComponent
+  class OutputBufferStack
+    delegate_missing_to :@current_buffer
+    delegate :presence, :present?, :html_safe?, to: :@current_buffer
+
+    attr_reader :buffer_stack
+
+    def self.make_frame(*args)
+      ActionView::OutputBuffer.new(*args)
+    end
+
+    def initialize(initial_buffer = nil)
+      if initial_buffer.is_a?(self.class)
+        @current_buffer = self.class.make_frame(initial_buffer.current)
+        @buffer_stack = [*initial_buffer.buffer_stack[0..-2], @current_buffer]
+      else
+        @current_buffer = initial_buffer || self.class.make_frame
+        @buffer_stack = [@current_buffer]
+      end
+    end
+
+    def replace(buffer)
+      return if self == buffer
+
+      @current_buffer = buffer.current
+      @buffer_stack = buffer.buffer_stack
+    end
+
+    def append=(arg)
+      @current_buffer.append = arg
+    end
+
+    def safe_append=(arg)
+      @current_buffer.safe_append = arg
+    end
+
+    def safe_concat(arg)
+      # rubocop:disable Rails/OutputSafety
+      @current_buffer.safe_concat(arg)
+      # rubocop:enable Rails/OutputSafety
+    end
+
+    def length
+      @current_buffer.length
+    end
+
+    def push(buffer = nil)
+      buffer ||= self.class.make_frame
+      @buffer_stack.push(buffer)
+      @current_buffer = buffer
+    end
+
+    def pop
+      @buffer_stack.pop.tap do
+        @current_buffer = @buffer_stack.last
+      end
+    end
+
+    def to_s
+      @current_buffer
+    end
+
+    alias_method :current, :to_s
+  end
+end

data/lib/view_component/slot_v2.rb

@@ -45,18 +45,12 @@ module ViewComponent
           if defined?(@__vc_content_set_by_with_content)
             @__vc_component_instance.with_content(@__vc_content_set_by_with_content)
 
-            view_context.capture do
-              @__vc_component_instance.render_in(view_context)
-            end
+            @__vc_component_instance.render_in(view_context)
           elsif defined?(@__vc_content_block)
-            view_context.capture do
-              # render_in is faster than `parent.render`
-              @__vc_component_instance.render_in(view_context, &@__vc_content_block)
-            end
+            # render_in is faster than `parent.render`
+            @__vc_component_instance.render_in(view_context, &@__vc_content_block)
           else
-            view_context.capture do
-              @__vc_component_instance.render_in(view_context)
-            end
+            @__vc_component_instance.render_in(view_context)
           end
         elsif defined?(@__vc_content)
           @__vc_content

data/lib/view_component/translatable.rb

@@ -3,7 +3,6 @@
 require "erb"
 require "set"
 require "i18n"
-require "action_view/helpers/translation_helper"
 require "active_support/concern"
 
 module ViewComponent
@@ -68,7 +67,10 @@ module ViewComponent
       return key.map { |k| translate(k, **options) } if key.is_a?(Array)
 
       locale = options.delete(:locale) || ::I18n.locale
+      scope = options.delete(:scope)
+      scope = scope.join(".") if scope.is_a? Array
       key = key&.to_s unless key.is_a?(String)
+      key = "#{scope}.#{key}" if scope
       key = "#{i18n_scope}#{key}" if key.start_with?(".")
 
       if HTML_SAFE_TRANSLATION_KEY.match?(key)

data/lib/view_component/version.rb

@@ -3,7 +3,7 @@
 module ViewComponent
   module VERSION
     MAJOR = 2
-    MINOR = 50
+    MINOR = 53
     PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].join(".")

data/lib/view_component.rb

@@ -11,7 +11,9 @@ module ViewComponent
   autoload :CompileCache
   autoload :ComponentError
   autoload :Deprecation
+  autoload :GlobalOutputBuffer
   autoload :Instrumentation
+  autoload :OutputBufferStack
   autoload :Preview
   autoload :PreviewTemplateError
   autoload :TestHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 2.50.0
+  version: 2.53.0
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -333,7 +333,9 @@ files:
 - lib/view_component/docs_builder_component.html.erb
 - lib/view_component/docs_builder_component.rb
 - lib/view_component/engine.rb
+- lib/view_component/global_output_buffer.rb
 - lib/view_component/instrumentation.rb
+- lib/view_component/output_buffer_stack.rb
 - lib/view_component/polymorphic_slots.rb
 - lib/view_component/preview.rb
 - lib/view_component/preview_template_error.rb