view_component 2.82.0 → 3.0.0.rc2

data/lib/view_component/version.rb

@@ -2,11 +2,12 @@
 
 module ViewComponent
   module VERSION
-    MAJOR = 2
-    MINOR = 82
+    MAJOR = 3
+    MINOR = 0
     PATCH = 0
+    PRE = "rc2"
 
-    STRING = [MAJOR, MINOR, PATCH].join(".")
+    STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end
 end
 

data/lib/view_component.rb

@@ -7,6 +7,7 @@ module ViewComponent
   extend ActiveSupport::Autoload
 
   autoload :Base
+  autoload :CaptureCompatibility
   autoload :Compiler
   autoload :CompileCache
   autoload :ComponentError
@@ -23,13 +24,4 @@ module ViewComponent
   autoload :Translatable
 end
 
-# :nocov:
-if defined?(ViewComponent::Engine)
-  ViewComponent::Deprecation.deprecation_warning(
-    "Manually loading the engine",
-    "remove `require \"view_component/engine\"`"
-  )
-elsif defined?(Rails::Engine)
-  require "view_component/engine"
-end
-# :nocov:
+require "view_component/engine" if defined?(Rails::Engine)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 2.82.0
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - ViewComponent Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -353,18 +353,17 @@ files:
 - lib/rails/generators/test_unit/templates/component_test.rb.tt
 - lib/view_component.rb
 - lib/view_component/base.rb
+- lib/view_component/capture_compatibility.rb
 - lib/view_component/collection.rb
 - lib/view_component/compile_cache.rb
 - lib/view_component/compiler.rb
 - lib/view_component/component_error.rb
 - lib/view_component/config.rb
-- lib/view_component/content_areas.rb
 - lib/view_component/deprecation.rb
 - lib/view_component/docs_builder_component.html.erb
 - lib/view_component/docs_builder_component.rb
 - lib/view_component/engine.rb
 - lib/view_component/instrumentation.rb
-- lib/view_component/polymorphic_slots.rb
 - lib/view_component/preview.rb
 - lib/view_component/preview_template_error.rb
 - lib/view_component/rails/tasks/view_component.rake
@@ -375,9 +374,7 @@ files:
 - lib/view_component/rendering_component_helper.rb
 - lib/view_component/rendering_monkey_patch.rb
 - lib/view_component/slot.rb
-- lib/view_component/slot_v2.rb
 - lib/view_component/slotable.rb
-- lib/view_component/slotable_v2.rb
 - lib/view_component/system_test_case.rb
 - lib/view_component/system_test_helpers.rb
 - lib/view_component/template_error.rb
@@ -402,12 +399,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.32
 signing_key:

data/lib/view_component/content_areas.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-require "view_component/slot"
-
-# DEPRECATED - ContentAreas is deprecated and will be removed in v3.0.0
-module ViewComponent
-  module ContentAreas
-    extend ActiveSupport::Concern
-
-    # Assign the provided content to the content area accessor
-    #
-    # @private
-    def with(area, content = nil, &block)
-      unless content_areas.include?(area)
-        raise ArgumentError.new(
-          "Unknown content_area '#{area}' for #{self} - expected one of '#{content_areas}'.\n\n" \
-          "To fix this issue, add `with_content_area :#{area}` to #{self} or reference " \
-          "a valid content area."
-        )
-      end
-
-      if block
-        content = view_context.capture(&block)
-      end
-
-      instance_variable_set("@#{area}".to_sym, content)
-      nil
-    end
-
-    class_methods do
-      def with_content_areas(*areas)
-        ViewComponent::Deprecation.deprecation_warning(
-          "`with_content_areas`", "use slots (https://viewcomponent.org/guide/slots.html) instead"
-        )
-
-        if areas.include?(:content)
-          raise ArgumentError.new(
-            "#{self} defines a content area called :content, which is a reserved name. \n\n" \
-            "To fix this issue, use another name, such as `:body`."
-          )
-        end
-
-        areas.each do |area|
-          define_method area.to_sym do
-            content unless content_evaluated? # ensure content is loaded so content_areas will be defined
-            instance_variable_get(:"@#{area}") if instance_variable_defined?(:"@#{area}")
-          end
-        end
-
-        self.content_areas = areas
-      end
-    end
-  end
-end

data/lib/view_component/polymorphic_slots.rb

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-module ViewComponent
-  module PolymorphicSlots
-    # In older rails versions, using a concern isn't a good idea here because they appear to not work with
-    # Module#prepend and class methods.
-    def self.included(base)
-      if base != ViewComponent::Base
-        # :nocov:
-        location = Kernel.caller_locations(1, 1)[0]
-
-        warn(
-          "warning: ViewComponent::PolymorphicSlots is now included in ViewComponent::Base by default " \
-          "and can be removed from #{location.path}:#{location.lineno}"
-        )
-        # :nocov:
-      end
-
-      base.singleton_class.prepend(ClassMethods)
-      base.include(InstanceMethods)
-    end
-
-    module ClassMethods
-      def renders_one(slot_name, callable = nil)
-        return super unless callable.is_a?(Hash) && callable.key?(:types)
-
-        validate_singular_slot_name(slot_name)
-        register_polymorphic_slot(slot_name, callable[:types], collection: false)
-      end
-
-      def renders_many(slot_name, callable = nil)
-        return super unless callable.is_a?(Hash) && callable.key?(:types)
-
-        validate_plural_slot_name(slot_name)
-        register_polymorphic_slot(slot_name, callable[:types], collection: true)
-      end
-
-      def register_polymorphic_slot(slot_name, types, collection:)
-        unless types.empty?
-          getter_name = slot_name
-
-          define_method(getter_name) do
-            get_slot(slot_name)
-          end
-
-          define_method("#{getter_name}?") do
-            get_slot(slot_name).present?
-          end
-        end
-
-        renderable_hash = types.each_with_object({}) do |(poly_type, poly_callable), memo|
-          memo[poly_type] = define_slot(
-            "#{slot_name}_#{poly_type}", collection: collection, callable: poly_callable
-          )
-
-          setter_name =
-            if collection
-              "#{ActiveSupport::Inflector.singularize(slot_name)}_#{poly_type}"
-            else
-              "#{slot_name}_#{poly_type}"
-            end
-
-          define_method(setter_name) do |*args, &block|
-            if _warn_on_deprecated_slot_setter
-              ViewComponent::Deprecation.deprecation_warning(
-                "Using polymorphic slot setters like `#{setter_name}`",
-                :"`with_#{setter_name}`"
-              )
-            end
-
-            set_polymorphic_slot(slot_name, poly_type, *args, &block)
-          end
-          ruby2_keywords(setter_name.to_sym) if respond_to?(:ruby2_keywords, true)
-
-          define_method("with_#{setter_name}") do |*args, &block|
-            set_polymorphic_slot(slot_name, poly_type, *args, &block)
-          end
-          ruby2_keywords(:"with_#{setter_name}") if respond_to?(:ruby2_keywords, true)
-        end
-
-        registered_slots[slot_name] = {
-          collection: collection,
-          renderable_hash: renderable_hash
-        }
-      end
-    end
-
-    module InstanceMethods
-      def set_polymorphic_slot(slot_name, poly_type = nil, *args, &block)
-        slot_definition = self.class.registered_slots[slot_name]
-
-        if !slot_definition[:collection] && (defined?(@__vc_set_slots) && @__vc_set_slots[slot_name])
-          raise ArgumentError, "content for slot '#{slot_name}' has already been provided"
-        end
-
-        poly_def = slot_definition[:renderable_hash][poly_type]
-
-        set_slot(slot_name, poly_def, *args, &block)
-      end
-      ruby2_keywords(:set_polymorphic_slot) if respond_to?(:ruby2_keywords, true)
-    end
-  end
-end

data/lib/view_component/slot_v2.rb

@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-require "view_component/with_content_helper"
-
-module ViewComponent
-  class SlotV2
-    include ViewComponent::WithContentHelper
-
-    attr_writer :__vc_component_instance, :__vc_content_block, :__vc_content
-
-    def initialize(parent)
-      @parent = parent
-    end
-
-    # Used to render the slot content in the template
-    #
-    # There's currently 3 different values that may be set, that we can render.
-    #
-    # If the slot renderable is a component, the string class name of a
-    # component, or a function that returns a component, we render that
-    # component instance, returning the string.
-    #
-    # If the slot renderable is a function and returns a string, it's
-    # set as `@__vc_content` and is returned directly.
-    #
-    # If there is no slot renderable, we evaluate the block passed to
-    # the slot and return it.
-    def to_s
-      return @content if defined?(@content)
-
-      view_context = @parent.send(:view_context)
-
-      if defined?(@__vc_content_block) && defined?(@__vc_content_set_by_with_content)
-        raise ArgumentError.new(
-          "It looks like a block was provided after calling `with_content` on #{self.class.name}, " \
-          "which means that ViewComponent doesn't know which content to use.\n\n" \
-          "To fix this issue, use either `with_content` or a block."
-        )
-      end
-
-      @content =
-        if defined?(@__vc_component_instance)
-          @__vc_component_instance.__vc_original_view_context = @parent.__vc_original_view_context
-
-          if defined?(@__vc_content_set_by_with_content)
-            @__vc_component_instance.with_content(@__vc_content_set_by_with_content)
-
-            @__vc_component_instance.render_in(view_context)
-          elsif defined?(@__vc_content_block)
-            # render_in is faster than `parent.render`
-            @__vc_component_instance.render_in(view_context, &@__vc_content_block)
-          else
-            @__vc_component_instance.render_in(view_context)
-          end
-        elsif defined?(@__vc_content)
-          @__vc_content
-        elsif defined?(@__vc_content_block)
-          view_context.capture(&@__vc_content_block)
-        elsif defined?(@__vc_content_set_by_with_content)
-          @__vc_content_set_by_with_content
-        end
-
-      @content = @content.to_s
-    end
-
-    # Allow access to public component methods via the wrapper
-    #
-    # for example
-    #
-    # calling `header.name` (where `header` is a slot) will call `name`
-    # on the `HeaderComponent` instance.
-    #
-    # Where the component may look like:
-    #
-    # class MyComponent < ViewComponent::Base
-    #   has_one :header, HeaderComponent
-    #
-    #   class HeaderComponent < ViewComponent::Base
-    #     def name
-    #       @name
-    #     end
-    #   end
-    # end
-    #
-    def method_missing(symbol, *args, &block)
-      @__vc_component_instance.public_send(symbol, *args, &block)
-    end
-    ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
-
-    def html_safe?
-      to_s.html_safe?
-    end
-
-    def respond_to_missing?(symbol, include_all = false)
-      defined?(@__vc_component_instance) && @__vc_component_instance.respond_to?(symbol, include_all)
-    end
-  end
-end