view_component 2.41.0 → 2.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec24d635f8ce5341c3735ab855b9099fe2ea9179bb21a8fe79ba0f14f374ec44
-  data.tar.gz: fbc578b4554de38f01a4e92bbcf6ddfaf146ac04fb75e871f8d2378f8a19c053
+  metadata.gz: ec259ffe370fa7001ca5669ff70484a339564e113b5adcde81862873375a91f3
+  data.tar.gz: a1ffead994abcb10cf05a39a5d6cdadbfcc7987c19682858356b16574cda5bc9
 SHA512:
-  metadata.gz: 9ed08e30f614fc25aeb1c1826d159b312fba175a95a71966112069a27bc1da3255948b1c9504b06f55b6c476fda4418f13b3e42050664dc3146def0ff1ba0636
-  data.tar.gz: b02c7784cc31a3e5cfe5d6ec55879bbe832446557810a3884034e871effece891164424f4d4bf34664c3d8a239683405ea31d92b7351321ce0fc8c33c802f3a5
+  metadata.gz: 43b9b1daceb39a542bf2923bf33420c3c3bce34188190393f54982eef65fa3f6bd27315b07ac86fc5fef95847182eeae1994f32e68611b08839287569808e43b
+  data.tar.gz: 761538016609ef056dd3940bc84e2fa425c42a98bfd860f9123b368a75c2c3a6ece671c3fd8454a5e2e754a34d10b30448e5f41dc4f679ab7e38ef7e9b0277a4

data/README.md

@@ -1,4 +1,4 @@
-# ViewComponent
+<img src="/docs/logo/viewcomponent-color-logo.svg" alt="ViewComponent logo" width="500">
 
 A framework for building reusable, testable & encapsulated view components in Ruby on Rails.
 

data/docs/CHANGELOG.md

@@ -5,7 +5,31 @@ title: Changelog
 
 # Changelog
 
-## main
+## 2.42.0
+
+* Add logo files and page to docs.
+
+    *Dylan Smith*
+
+* Add `ViewComponents in practice` documentation.
+
+    *Joel Hawksley*
+
+* Fix bug where calling lambda slots without arguments would break in Ruby < 2.7.
+
+    *Manuel Puyol*
+
+* Improve Stimulus controller template to import from `stimulus` or `@hotwired/stimulus`.
+
+    *Mario Schüttel*
+
+* Fix bug where `helpers` would instantiate and use a new `view_context` in each component.
+
+    *Blake Williams*, *Ian C. Anderson*
+
+* Implement polymorphic slots as experimental feature. See the Slots documentation to learn more.
+
+    *Cameron Dutro*
 
 ## 2.41.0
 
@@ -42,7 +66,7 @@ title: Changelog
 
     *Hans Lemuet*
 
-* Forward keyword arguments from slot wrapper to component instance.
+* Forward keyword arguments from slot wrapper to component instance using ruby2_keywords.
 
     *Cameron Dutro*
 

data/lib/rails/generators/stimulus/component_generator.rb

@@ -12,6 +12,12 @@ module Stimulus
         template "component_controller.js", destination
       end
 
+      def stimulus_module
+        return "stimulus" if legacy_stimulus?
+
+        "@hotwired/stimulus"
+      end
+
       private
 
       def destination
@@ -21,6 +27,11 @@ module Stimulus
           File.join(component_path, class_path, "#{file_name}_component_controller.js")
         end
       end
+
+      def legacy_stimulus?
+        package_json_pathname = Rails.root.join("package.json")
+        package_json_pathname.exist? && JSON.parse(package_json_pathname.read).dig("dependencies", "stimulus").present?
+      end
     end
   end
 end

data/lib/rails/generators/stimulus/templates/component_controller.js.tt

@@ -1,4 +1,4 @@
-import { Controller } from "stimulus";
+import { Controller } from "<%= stimulus_module %>";
 
 export default class extends Controller {
   connect() {

data/lib/view_component/base.rb

@@ -5,6 +5,7 @@ require "active_support/configurable"
 require "view_component/collection"
 require "view_component/compile_cache"
 require "view_component/content_areas"
+require "view_component/polymorphic_slots"
 require "view_component/previewable"
 require "view_component/slotable"
 require "view_component/slotable_v2"
@@ -28,6 +29,8 @@ module ViewComponent
     class_attribute :content_areas
     self.content_areas = [] # class_attribute:default doesn't work until Rails 5.2
 
+    attr_accessor :original_view_context
+
     # EXPERIMENTAL: This API is experimental and may be removed at any time.
     # Hook for allowing components to do work as part of the compilation process.
     #
@@ -49,6 +52,8 @@ module ViewComponent
       self.class.compile(raise_errors: true)
 
       @view_context = view_context
+      self.original_view_context ||= view_context
+
       @lookup_context ||= view_context.lookup_context
 
       # required for path helpers in older Rails versions
@@ -132,9 +137,10 @@ module ViewComponent
     # @private
     def render(options = {}, args = {}, &block)
       if options.is_a? ViewComponent::Base
+        options.original_view_context = original_view_context
         super
       else
-        view_context.render(options, args, &block)
+        original_view_context.render(options, args, &block)
       end
     end
 
@@ -173,7 +179,14 @@ module ViewComponent
         )
       end
 
-      @__vc_helpers ||= controller.view_context
+      # Attempt to re-use the original view_context passed to the first
+      # component rendered in the rendering pipeline. This prevents the
+      # instantiation of a new view_context via `controller.view_context` which
+      # always returns a new instance of the view context class.
+      #
+      # This allows ivars to remain persisted when using the same helper via
+      # `helpers` across multiple components and partials.
+      @__vc_helpers ||= original_view_context || controller.view_context
     end
 
     # Exposes .virtual_path as an instance method

data/lib/view_component/polymorphic_slots.rb

@@ -0,0 +1,74 @@
+# 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)
+      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:)
+        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
+          )
+
+          getter_name = slot_name
+          setter_name =
+            if collection
+              "#{ActiveSupport::Inflector.singularize(slot_name)}_#{poly_type}"
+            else
+              "#{slot_name}_#{poly_type}"
+            end
+
+          define_method(getter_name) do
+            get_slot(slot_name)
+          end
+          ruby2_keywords(getter_name.to_sym) if respond_to?(:ruby2_keywords, true)
+
+          define_method(setter_name) do |*args, &block|
+            set_polymorphic_slot(slot_name, poly_type, *args, &block)
+          end
+          ruby2_keywords(setter_name.to_sym) if respond_to?(:ruby2_keywords, true)
+        end
+
+        self.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] && get_slot(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

@@ -86,15 +86,10 @@ module ViewComponent
     #   end
     # end
     #
-    if RUBY_VERSION >= "2.7.0"
-      def method_missing(symbol, *args, **kwargs, &block)
-        @__vc_component_instance.public_send(symbol, *args, **kwargs, &block)
-      end
-    else
-      def method_missing(symbol, *args, &block)
-        @__vc_component_instance.public_send(symbol, *args, &block)
-      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?

data/lib/view_component/slotable_v2.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "active_support/concern"
-
 require "view_component/slot_v2"
 
 module ViewComponent
@@ -67,13 +66,14 @@ module ViewComponent
       def renders_one(slot_name, callable = nil)
         validate_singular_slot_name(slot_name)
 
-        define_method slot_name do |*args, **kwargs, &block|
-          if args.empty? && kwargs.empty? && block.nil?
+        define_method slot_name do |*args, &block|
+          if args.empty? && block.nil?
             get_slot(slot_name)
           else
-            set_slot(slot_name, *args, **kwargs, &block)
+            set_slot(slot_name, nil, *args, &block)
           end
         end
+        ruby2_keywords(slot_name.to_sym) if respond_to?(:ruby2_keywords, true)
 
         register_slot(slot_name, collection: false, callable: callable)
       end
@@ -123,9 +123,10 @@ module ViewComponent
         # Define setter for singular names
         # e.g. `renders_many :items` allows fetching all tabs with
         # `component.tabs` and setting a tab with `component.tab`
-        define_method singular_name do |*args, **kwargs, &block|
-          set_slot(slot_name, *args, **kwargs, &block)
+        define_method singular_name do |*args, &block|
+          set_slot(slot_name, nil, *args, &block)
         end
+        ruby2_keywords(singular_name.to_sym) if respond_to?(:ruby2_keywords, true)
 
         # Instantiates and and adds multiple slots forwarding the first
         # argument to each slot constructor
@@ -134,7 +135,7 @@ module ViewComponent
             get_slot(slot_name)
           else
             collection_args.map do |args|
-              set_slot(slot_name, **args, &block)
+              set_slot(slot_name, nil, **args, &block)
             end
           end
         end
@@ -162,27 +163,37 @@ module ViewComponent
 
       private
 
-      def register_slot(slot_name, collection:, callable:)
+      def register_slot(slot_name, **kwargs)
+        self.registered_slots[slot_name] = define_slot(slot_name, **kwargs)
+      end
+
+      def define_slot(slot_name, collection:, callable:)
         # Setup basic slot data
         slot = {
           collection: collection,
         }
+        return slot unless callable
+
         # If callable responds to `render_in`, we set it on the slot as a renderable
-        if callable && callable.respond_to?(:method_defined?) && callable.method_defined?(:render_in)
+        if callable.respond_to?(:method_defined?) && callable.method_defined?(:render_in)
           slot[:renderable] = callable
         elsif callable.is_a?(String)
           # If callable is a string, we assume it's referencing an internal class
           slot[:renderable_class_name] = callable
-        elsif callable
+        elsif callable.respond_to?(:call)
           # If slot does not respond to `render_in`, we assume it's a proc,
           # define a method, and save a reference to it to call when setting
           method_name = :"_call_#{slot_name}"
           define_method method_name, &callable
           slot[:renderable_function] = instance_method(method_name)
+        else
+          raise(
+            ArgumentError,
+            "invalid slot definition. Please pass a class, string, or callable (i.e. proc, lambda, etc)"
+          )
         end
 
-        # Register the slot on the component
-        self.registered_slots[slot_name] = slot
+        slot
       end
 
       def validate_plural_slot_name(slot_name)
@@ -235,9 +246,8 @@ module ViewComponent
       end
     end
 
-    def set_slot(slot_name, *args, **kwargs, &block)
-      slot_definition = self.class.registered_slots[slot_name]
-
+    def set_slot(slot_name, slot_definition = nil, *args, &block)
+      slot_definition ||= self.class.registered_slots[slot_name]
       slot = SlotV2.new(self)
 
       # Passing the block to the sub-component wrapper like this has two
@@ -253,23 +263,24 @@ module ViewComponent
 
       # If class
       if slot_definition[:renderable]
-        slot.__vc_component_instance = slot_definition[:renderable].new(*args, **kwargs)
+        slot.__vc_component_instance = slot_definition[:renderable].new(*args)
       # If class name as a string
       elsif slot_definition[:renderable_class_name]
         slot.__vc_component_instance =
-          self.class.const_get(slot_definition[:renderable_class_name]).new(*args, **kwargs)
+          self.class.const_get(slot_definition[:renderable_class_name]).new(*args)
       # If passed a lambda
       elsif slot_definition[:renderable_function]
         # Use `bind(self)` to ensure lambda is executed in the context of the
         # current component. This is necessary to allow the lambda to access helper
         # methods like `content_tag` as well as parent component state.
+        renderable_function = slot_definition[:renderable_function].bind(self)
         renderable_value =
           if block_given?
-            slot_definition[:renderable_function].bind(self).call(*args, **kwargs) do |*args, **kwargs|
-              view_context.capture(*args, **kwargs, &block)
+            renderable_function.call(*args) do |*args|
+              view_context.capture(*args, &block)
             end
           else
-            slot_definition[:renderable_function].bind(self).call(*args, **kwargs)
+            renderable_function.call(*args)
           end
 
         # Function calls can return components, so if it's a component handle it specially
@@ -291,5 +302,6 @@ module ViewComponent
 
       slot
     end
+    ruby2_keywords(:set_slot) if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/view_component/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 2.41.0
+  version: 2.42.0
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -314,6 +314,7 @@ files:
 - lib/view_component/content_areas.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/previewable.rb
@@ -355,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: View components for Rails