actionview-component 1.7.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '085434585e1e3fa1493bbc7bd90439b1645015acd66a713a33545c0eb4677dc4'
-  data.tar.gz: 34ec8d8f390471689fbd1085c94885b74c4f9a1b0b7d9b78650dae506520dd13
+  metadata.gz: 24d6994186bb4c3e5f6fb8c628a3d91124cc6bdcbad61b966365c9170ab3b901
+  data.tar.gz: 020ab981225e9bb34508583c2aff096b125e43bee8c5ecc935ab52c6a22eb014
 SHA512:
-  metadata.gz: 89e3c7d8b6c1d67a29f2ad67a032e424c42f57dd719d5b8cbde01b167385d9d2aeb5feb8fd77fcd9284e0a33da828b935edeebbb758c7cd68951178eea2d3b14
-  data.tar.gz: bc76f28233c72f7d5ff3a818429e8c763649db3ec46e406b554070cd456b73ae923905ecb94d3b37949ca5c6b0960890594a341e72a9755343462cf4c5c24cff
+  metadata.gz: 608b7e73a07c3b24c1fa273f65c1dea5f1e5d993f3db8ff3c3dde2d9d6a207604141849686cd78f4a6ac7a4a6c45567d81fb3eb054c7bccf4802565a3eb83a71
+  data.tar.gz: 8376ee07b5534e81b25c6241a0e9da6d02cf13a0b8b3b4036cdb6a062695897efaefd75a779f5d5d7009477ab03524da13f7a52fc557484dfd128cf77927e3f3

data/.github/ISSUE_TEMPLATE

@@ -6,17 +6,12 @@
 ### Motivation
 
 <!-- What would you like to do with this feature? Can you provide
-context or references to similar behavior in other libraries. -->
+context or references to similar behavior in other libraries? -->
 
-
-
-
-
-<!-- **** Filing a Bug Report? Include these sections. **** -->
+<!-- **** Filing a Bug Report? Include these sections: **** -->
 
 ### Steps to reproduce
-<!-- Provide an series of steps or, better yet, a link to a repo to
-demonstrate the bug you've identified. -->
+<!-- Provide a series of steps or, better yet, a link to a repo to demonstrate the bug you've identified. -->
 
 ### Expected behavior
 <!-- Tell us what should happen -->
@@ -28,3 +23,5 @@ demonstrate the bug you've identified. -->
 **Rails version**:
 
 **Ruby version**:
+
+**Gem version**:

data/.github/PULL_REQUEST_TEMPLATE

@@ -1,4 +1,4 @@
-<!-- https://github.com/github/actionview-component/blob/master/CONTRIBUTING.md#submitting-a-pull-request  -->
+<!-- See https://github.com/github/view_component/blob/master/CONTRIBUTING.md#submitting-a-pull-request  -->
 
 ### Summary
 
@@ -14,6 +14,4 @@ request, mention that information here. This could include
 benchmarks, or other information.
 
 If you are updating any of the CHANGELOG files or are asked to update the
-CHANGELOG files by reviewers, please add the CHANGELOG entry at the top of the file.
-
-Thanks for contributing to actionview-component! -->
+CHANGELOG files by reviewers, please add the CHANGELOG entry at the top of the file. -->

data/.github/workflows/ruby_on_rails.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         rails_version: [5.0.0, 5.2.3, 6.0.0, master]
-        ruby_version: [2.4.x, 2.5.x, 2.6.x]
+        ruby_version: [2.4.x, 2.5.x, 2.6.x, 2.7.x]
         exclude:
           - rails_version: master
             ruby_version: 2.4.x
@@ -20,9 +20,13 @@ jobs:
       uses: actions/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby_version }}
+    - name: Update rubygems when testing with Ruby 2.4.x
+      if: startsWith(matrix.ruby_version, '2.4')
+      run: |
+        gem update --system --no-document
     - name: Build and test with Rake
       run: |
-        gem install bundler:1.14.0
+        gem install bundler:1.17.3
         bundle update
         bundle install --jobs 4 --retry 3
         bundle exec rake

data/.gitignore

@@ -11,6 +11,7 @@
 /tmp/
 /test/log/*
 /test/app/tmp/*
+/test/tmp/*
 
 # Used by dotenv library to load environment variables.
 # .env

data/.rubocop.yml

@@ -2,3 +2,7 @@ inherit_gem:
   rubocop-github:
     - config/default.yml
     - config/rails.yml
+
+AllCops:
+  Exclude:
+    - "test/tmp/**/*"

data/CHANGELOG.md

@@ -1,3 +1,153 @@
+# master
+
+# v1.17.0
+
+* Support Ruby 2.4 in CI.
+
+    *Andrew Mason*
+
+* ViewComponent generators do not not prompt for content requirement.
+
+    *Joel Hawksley*
+
+* Add post-install message that gem has been renamed to `view_component`.
+
+    *Joel Hawksley*
+
+# v1.16.0
+
+* Add `refute_component_rendered` test helper.
+
+    *Joel Hawksley*
+
+* Check for Rails before invocation.
+
+    *Dave Paola*
+
+* Allow components to be rendered without a template file (aka inline component).
+
+    *Rainer Borene*
+
+# v1.15.0
+
+* Re-introduce ActionView::Component::TestHelpers.
+
+    *Joel Hawksley*
+
+* Bypass monkey patch on Rails 6.1 builds.
+
+    *Joel Hawksley*
+
+* Make `ActionView::Helpers::TagHelper` available in Previews.
+
+    ```ruby
+    def with_html_content
+      render(MyComponent.new) do
+        tag.div do
+          content_tag(:span, "Hello")
+        end
+      end
+    end
+    ```
+
+    *Sean Doyle*
+
+# v1.14.1
+
+* Fix bug where generator created invalid test code.
+
+    *Joel Hawksley*
+
+# v1.14.0
+
+* Rename ActionView::Component::Base to ViewComponent::Base
+
+    *Joel Hawksley*
+
+# v1.13.0
+
+* Allow components to be rendered inside controllers.
+
+    *Joel Hawksley*
+
+* Improve backtraces from exceptions raised in templates.
+
+    *Blake Williams*
+
+# v1.12.0
+
+* Revert: Remove initializer requirement for Ruby 2.7+
+
+    *Joel Hawksley*
+
+* Restructure Railtie into Engine
+
+    *Sean Doyle*
+
+* Allow components to override before_render_check
+
+    *Joel Hawksley*
+
+# v1.11.1
+
+* Relax Capybara requirement.
+
+    *Joel Hawksley*
+
+# v1.11.0
+
+* Add support for Capybara matchers.
+
+    *Joel Hawksley*
+
+* Add erb, haml, & slim template generators
+
+    *Asger Behncke Jacobsen*
+
+# v1.10.0
+
+* Deprecate all `render` syntaxes except for `render(MyComponent.new(foo: :bar))`
+
+    *Joel Hawksley*
+
+# v1.9.0
+
+* Remove initializer requirement for Ruby 2.7+
+
+    *Dylan Clark*
+
+# v1.8.1
+
+* Run validation checks before calling `#render?`.
+
+    *Ash Wilson*
+
+# v1.8.0
+
+* Remove the unneeded ComponentExamplesController and simplify preview rendering.
+
+    *Jon Palmer*
+
+* Add `#render?` hook to easily allow components to be no-ops.
+
+    *Kyle Fox*
+
+* Don't assume ApplicationController exists.
+
+    *Jon Palmer*
+
+* Allow some additional checks to overrided render?
+
+    *Sergey Malykh*
+
+* Fix generator placing namespaced components in the root directory.
+
+    *Asger Behncke Jacobsen*
+
+* Fix cache test.
+
+    *Sergey Malykh*
+
 # v1.7.0
 
 * Simplify validation of templates and compilation.

data/CONTRIBUTING.md

@@ -1,7 +1,7 @@
-## Contributing
+# Contributing
 
-[fork]: https://github.com/github/actionview-component/fork
-[pr]: https://github.com/github/actionview-component/compare
+[fork]: https://github.com/github/view_component/fork
+[pr]: https://github.com/github/view_component/compare
 [style]: https://github.com/styleguide/ruby
 [code-of-conduct]: CODE_OF_CONDUCT.md
 
@@ -15,9 +15,11 @@ Please note that this project is released with a [Contributor Code of Conduct][c
 
 0. [Fork][fork] and clone the repository
 0. Configure and install the dependencies: `bundle`
-0. Make sure the tests pass on your machine: `rake`
+0. Make sure the tests pass on your machine: `bundle exec rake`
 0. Create a new branch: `git checkout -b my-branch-name`
 0. Make your change, add tests, and make sure the tests still pass
+0. Add an entry to the top of `CHANGELOG.md` for your changes
+0. If it's your first time contributing, add yourself to the contributors at the bottom of `README.md`
 0. Push to your fork and [submit a pull request][pr]
 0. Pat your self on the back and wait for your pull request to be reviewed and merged.
 
@@ -32,24 +34,13 @@ Here are a few things you can do that will increase the likelihood of your pull
 If you are the current maintainer of this gem:
 
 1. Create a branch for the release: `git checkout -b release-vxx.xx.xx`
-1. Bump gem version in `lib/action_view/component/version.rb`.
+1. Bump gem version in `lib/action_view/component/version.rb`. Try to adhere to SemVer.
 1. Add version heading/entries to `CHANGELOG.md`.
 1. Make sure your local dependencies are up to date: `bundle`
 1. Ensure that tests are green: `bundle exec rake`
-1. Build a test gem `GEM_VERSION=$(git describe --tags 2>/dev/null | sed 's/-/./g' | sed 's/v//') gem build actionview-component.gemspec`
-1. Test the test gem:
-   1. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
-   1. Install the new gem locally
-   1. Test behavior locally, branch deploy, whatever needs to happen
-1. Make a PR to github/actionview-component.
+1. Make a PR to github/view_component.
 1. Build a local gem: `gem build actionview-component.gemspec`
-1. Merge github/actionview-component PR
+1. Merge github/view_component PR
 1. Tag and push: `git tag vx.xx.xx; git push --tags`
-1. Create a GitHub release with the pushed tag (https://github.com/github/actionview-component/releases/new) and populate it with a list of the commits from `git log --pretty=format:"- %s" --reverse refs/tags/[OLD TAG]...refs/tags/[NEW TAG]`
+1. Create a GitHub release with the pushed tag (https://github.com/github/view_component/releases/new) and populate it with a list of the commits from `git log --pretty=format:"- %s" --reverse refs/tags/[OLD TAG]...refs/tags/[NEW TAG]`
 1. Push to rubygems.org -- `gem push actionview-component-VERSION.gem`
-
-## Resources
-
-- [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)
-- [Using Pull Requests](https://help.github.com/articles/about-pull-requests/)
-- [GitHub Help](https://help.github.com)

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    actionview-component (1.7.0)
+    actionview-component (1.17.0)
+      capybara (~> 3)
 
 GEM
   remote: https://rubygems.org/
@@ -61,6 +62,8 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.1, >= 2.1.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
     better_html (1.0.14)
       actionview (>= 4.0)
@@ -71,6 +74,14 @@ GEM
       parser (>= 2.4)
       smart_properties
     builder (3.2.3)
+    capybara (3.31.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
     concurrent-ruby (1.1.5)
     crass (1.0.5)
     erubi (1.8.0)
@@ -96,11 +107,12 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.1.0)
     nio4r (2.5.2)
-    nokogiri (1.10.5)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
+    public_suffix (4.0.3)
     rack (2.0.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -131,7 +143,8 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
+    regexp_parser (1.7.0)
     rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -166,6 +179,8 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
     zeitwerk (2.1.10)
 
 PLATFORMS
@@ -174,11 +189,11 @@ PLATFORMS
 DEPENDENCIES
   actionview-component!
   better_html (~> 1)
-  bundler (>= 1.14)
+  bundler (~> 1.14)
   haml (~> 5)
   minitest (= 5.1.0)
   rails (= 6.0.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rubocop (= 0.74)
   rubocop-github (~> 0.13.0)
   slim (~> 4.0)

data/README.md

@@ -1,111 +1,105 @@
-# ActionView::Component
-`ActionView::Component` is a framework for building view components in Rails.
+# ViewComponent
+A view component framework for Rails.
 
-**Current Status**: Used in production at GitHub. Because of this, all changes will be thoroughly vetted, which could slow down the process of contributing. We will do our best to actively communicate status of pull requests with any contributors. If you have any substantial changes that you would like to make, it would be great to first [open an issue](http://github.com/github/actionview-component/issues/new) to discuss them with us.
+**Current Status**: Used in production at GitHub. Because of this, all changes will be thoroughly vetted, which could slow down the process of contributing. We will do our best to actively communicate status of pull requests with any contributors. If you have any substantial changes that you would like to make, it would be great to first [open an issue](http://github.com/github/view_component/issues/new) to discuss them with us.
+
+## Migration in progress
+
+This gem is in the process of a name / API change from `ActionView::Component` to `ViewComponent`, see https://github.com/github/view_component/issues/206.
+
+### What's changing in the migration
+
+1. `ActionView::Component::Base` is now `ViewComponent::Base`.
+1. Components can only be rendered with `render(MyComponent.new)` syntax.
+1. Validations are no longer supported by default.
+
+### How to migrate to ViewComponent
+
+1. In `application.rb`, require `view_component/engine`
+1. Update components to inherit from `ViewComponent::Base`.
+1. Update component tests to inherit from `ViewComponent::TestCase`.
+1. Update component previews to inherit from `ViewComponent::Preview`.
+1. Include `ViewComponent::TestHelpers` in the appropriate test helper file.
 
 ## Roadmap
 
-This gem is meant to serve as a precursor to upstreaming the `ActionView::Component` class into Rails. It also serves to enable the usage of `ActionView::Component` in older versions of Rails.
+Support for third-party component frameworks was merged into Rails `6.1.0.alpha` in https://github.com/rails/rails/pull/36388 and https://github.com/rails/rails/pull/37919. Our goal with this project is to provide a first-class component framework for this new capability in Rails.
 
-Preliminary support for rendering components was merged into Rails `6.1.0.alpha` in https://github.com/rails/rails/pull/36388. Assuming `ActionView::Component` makes it into Rails, this gem will then exist to serve as a backport.
+This gem includes a backport of those changes for Rails `5.0.0` through `6.1.0.alpha`.
 
 ## Design philosophy
 
-As the goal of this gem is to be upstreamed into Rails, it is designed to integrate as seamlessly as possible, with the [least surprise](https://www.artima.com/intv/ruby4.html).
+This library is designed to integrate as seamlessly as possible with Rails, with the [least surprise](https://www.artima.com/intv/ruby4.html).
 
 ## Compatibility
 
-`actionview-component` is tested for compatibility with combinations of Ruby `2.4`/`2.5`/`2.6` and Rails `5.0.0`/`5.2.3`/`6.0.0`/`6.1.0.alpha`.
+`actionview-component` is tested for compatibility with combinations of Ruby `2.4`/`2.5`/`2.6`/`2.7` and Rails `5.0.0`/`5.2.3`/`6.0.0`/`master`.
 
 ## Installation
-Add this line to your application's Gemfile:
+
+In `Gemfile`, add:
 
 ```ruby
 gem "actionview-component"
 ```
 
-And then execute:
-```bash
-$ bundle
-```
-
 In `config/application.rb`, add:
 
 ```bash
-require "action_view/component/railtie"
+require "view_component/engine"
 ```
 
 ## Guide
 
 ### What are components?
 
-`ActionView::Component`s are Ruby classes that are used to render views. They take data as input and return output-safe HTML. Think of them as an evolution of the presenter/decorator/view model pattern, inspired by [React Components](https://reactjs.org/docs/react-component.html).
+`ViewComponent`s are Ruby classes that are used to render views. They take data as input and return output-safe HTML. Think of them as an evolution of the presenter/decorator/view model pattern, inspired by [React Components](https://reactjs.org/docs/react-component.html).
 
-### Why components?
+Components are most effective in cases where view code is reused or benefits from being tested directly.
 
-In working on views in the Rails monolith at GitHub (which has over 3700 templates), we have run into several key pain points:
+### Why should I use components?
 
 #### Testing
 
-Currently, Rails encourages testing views via integration or system tests. This discourages us from testing our views thoroughly, due to the costly overhead of exercising the routing/controller layer, instead of just the view. It also often leads to partials being tested for each view they are included in, cheapening the benefit of DRYing up our views.
+Rails encourages testing views with integration tests. This discourages us from testing views thoroughly, due to the overhead of exercising the routing and controller layers in addition to the view.
 
-#### Code Coverage
+For partials, this means being tested for each view they are included in, reducing the benefit of reusing them.
 
-Many common Ruby code coverage tools cannot properly handle coverage of views, making it difficult to audit how thorough our tests are and leading to gaps in our test suite.
+`ViewComponent`s can be unit-tested. In the GitHub codebase, our component unit tests run in around 25 milliseconds, compared to about six seconds for integration tests.
 
 #### Data Flow
 
-Unlike a method declaration on an object, views do not declare the values they are expected to receive, making it hard to figure out what context is necessary to render them. This often leads to subtle bugs when we reuse a view across different contexts.
-
-#### Standards
+Unlike a method declaration on an object, views do not declare the values they are expected to receive, making it hard to figure out what context is necessary to render them. This often leads to subtle bugs when reusing a view in different contexts.
 
-Our views often fail even the most basic standards of code quality we expect out of our Ruby classes: long methods, deep conditional nesting, and mystery guests abound.
+By clearly defining the context necessary to render a `ViewComponent`, they're easier to reuse than partials.
 
-### What are the benefits?
+#### Standards
 
-#### Testing
+Views often fail basic Ruby code quality standards: long methods, deep conditional nesting, and mystery guests abound.
 
-`ActionView::Component` allows views to be unit-tested. In the main GitHub codebase, our unit tests run in around 25ms/test, vs. ~6s/test for integration tests.
+`ViewComponent`s are Ruby objects, making it easy to follow code quality standards.
 
 #### Code Coverage
 
-`ActionView::Component` is at least partially compatible with code coverage tools. We’ve seen some success with SimpleCov.
+Many common Ruby code coverage tools cannot properly handle coverage of views, making it difficult to audit how thorough tests are and leading to missing coverage in test suites.
 
-#### Data flow
-
-By clearly defining the context necessary to render a component, we’ve found them to be easier to reuse than partials.
-
-#### Performance
-
-In early benchmarks, we’ve seen performance improvements over the existing rendering pipeline. For a test page with nested renders 10 levels deep, we’re seeing around a 5x increase in speed over partials:
-
-```
-Comparison:
-           component:     6515.4 i/s
-             partial:     1251.2 i/s - 5.21x  slower
-```
-
-_Rails 6.1.0.alpha, [joelhawksley/actionview-component-demo](https://github.com/joelhawksley/actionview-component-demo), /benchmark route, via `RAILS_ENV=production rails s`, measured with [evanphx/benchmark-ips](https://github.com/evanphx/benchmark-ips)_
-
-### When should I use components?
-
-Components are most effective in cases where view code is reused or needs to be tested directly.
+`ViewComponent` is at least partially compatible with code coverage tools, such as SimpleCov.
 
 ### Building components
 
-Components are subclasses of `ActionView::Component::Base` and live in `app/components`. You may wish to create an `ApplicationComponent` that is a subclass of `ActionView::Component::Base` and inherit from that instead.
+#### Conventions
+
+Components are subclasses of `ViewComponent::Base` and live in `app/components`. It's recommended to create an `ApplicationComponent` that is a subclass of `ViewComponent::Base` and inherit from that instead.
 
 Component class names end in -`Component`.
 
 Component module names are plural, as they are for controllers. (`Users::AvatarComponent`)
 
-Components support ActiveModel validations. Components are validated after initialization, but before rendering.
-
-Content passed to an `ActionView::Component` as a block is captured and assigned to the `content` accessor.
+Content passed to a `ViewComponent` as a block is captured and assigned to the `content` accessor.
 
 #### Quick start
 
-Use the component generator to create a new `ActionView::Component`.
+Use the component generator to create a new `ViewComponent`.
 
 The generator accepts the component name and the list of accepted properties as arguments:
 
@@ -117,34 +111,36 @@ bin/rails generate component Example title content
       create  app/components/example_component.html.erb
 ```
 
+`ViewComponent` includes template generators for the `erb`, `haml`, and `slim` template engines and will use the template engine specified in the Rails configuration (`config.generators.template_engine`) by default.
+
+The template engine can also be passed as an option to the generator:
+
+```bash
+bin/rails generate component Example title content --template-engine slim
+```
+
 #### Implementation
 
-An `ActionView::Component` is a Ruby file and corresponding template file (in any format supported by Rails) with the same base name:
+A `ViewComponent` is a Ruby file and corresponding template file with the same base name:
 
 `app/components/test_component.rb`:
 ```ruby
-class TestComponent < ActionView::Component::Base
-  validates :content, :title, presence: true
-
+class TestComponent < ViewComponent::Base
   def initialize(title:)
     @title = title
   end
-
-  private
-
-  attr_reader :title
 end
 ```
 
 `app/components/test_component.html.erb`:
 ```erb
-<span title="<%= title %>"><%= content %></span>
+<span title="<%= @title %>"><%= content %></span>
 ```
 
-We can render it in a view as:
+Which is rendered in a view as:
 
 ```erb
-<%= render(TestComponent, title: "my title") do %>
+<%= render(TestComponent.new(title: "my title")) do %>
   Hello, World!
 <% end %>
 ```
@@ -155,64 +151,18 @@ Which returns:
 <span title="my title">Hello, World!</span>
 ```
 
-##### Supported `render` syntaxes
-
-Components can be rendered via:
-
-`render(TestComponent, foo: :bar)`
-
-`render(component: TestComponent, locals: { foo: :bar })`
-
-**Rendering components through models**
-
-Passing model instances will cause `render` to look for its respective component class.
-
-The component is instantiated with the rendered model instance.
-
-Example for a `Post` model:
-
-`render(@post)`
-
-```ruby
-class PostComponent < ActionView::Component::Base
-  def initialize(post)
-    @post = post
-  end
-end
-```
-
-The following syntax has been deprecated and will be removed in v2.0.0:
-
-`render(TestComponent.new(foo: :bar))`
-
-#### Error case
-
-If the component is rendered with a blank title:
-
-```erb
-<%= render(TestComponent, title: "") do %>
-  Hello, World!
-<% end %>
-```
-
-An error will be raised:
-
-`ActiveModel::ValidationError: Validation failed: Title can't be blank`
+`ViewComponent` requires the presence of an `initialize` method in each component.
 
 #### Content Areas
 
-
 A component can declare additional content areas to be rendered in the component. For example:
 
 `app/components/modal_component.rb`:
 ```ruby
-class ModalComponent < ActionView::Component::Base
-  validates :user, :header, :body, presence: true
-
+class ModalComponent < ViewComponent::Base
   with_content_areas :header, :body
 
-  def initialize(user:)
-    @user = user
+  def initialize(*)
   end
 end
 ```
@@ -221,16 +171,16 @@ end
 ```erb
 <div class="modal">
   <div class="header"><%= header %></div>
-  <div class="body"><%= body %>"></div>
+  <div class="body"><%= body %></div>
 </div>
 ```
 
-We can render it in a view as:
+Which is rendered in a view as:
 
 ```erb
-<%= render(ModalComponent, user: {name: 'Jane'}) do |component| %>
+<%= render(ModalComponent.new) do |component| %>
   <% component.with(:header) do %>
-      Hello <%= user[:name] %>
+      Hello Jane
     <% end %>
   <% component.with(:body) do %>
     <p>Have a great day.</p>
@@ -247,223 +197,190 @@ Which returns:
 </div>
 ```
 
-Content for content areas can be passed as arguments to the render method or as named blocks passed to the `with` method.
-This allows a few different combinations of ways to render the component:
+### Inline Component
 
-##### Required render argument optionally overridden or wrapped by a named block
-
-`app/components/modal_component.rb`:
-```ruby
-class ModalComponent < ActionView::Component::Base
-  validates :header, :body, presence: true
+A component can be rendered without any template file as well.
 
-  with_content_areas :header, :body
+`app/components/inline_component.rb`:
 
-  def initialize(header:)
-    @header = header
+```ruby
+class InlineComponent < ViewComponent::Base
+  def call
+    if active?
+      link_to "Cancel integration", integration_path, method: :delete
+    else
+      link_to "Integrate now!", integration_path
+    end
   end
 end
 ```
 
-```erb
-<%= render(ModalComponent, header: "Hi!") do |component| %>
-  <% help_enabled? && component.with(:header) do %>
-    <span class="help_icon"><%= component.header %></span>
-  <% end %>
-  <% component.with(:body) do %>
-    <p>Have a great day.</p>
-  <% end %>
-<% end %>
-```
-
-##### Required argument passed by render argument or by named block
+### Conditional Rendering
 
-`app/components/modal_component.rb`:
-```ruby
-class ModalComponent < ActionView::Component::Base
-  validates :header, :body, presence: true
+Components can implement a `#render?` method to determine if they should be rendered.
 
-  with_content_areas :header, :body
+For example, given a component that displays a banner to users who haven't confirmed their email address, the logic for whether to render the banner would need to go in either the component template:
 
-  def initialize(header: nil)
-    @header = header
-  end
-end
+`app/components/confirm_email_component.html.erb`
 ```
-
-`app/views/render_arg.html.erb`:
-```erb
-<%= render(ModalComponent, header: "Hi!") do |component| %>
-  <% component.with(:body) do %>
-    <p>Have a great day.</p>
-  <% end %>
+<% if user.requires_confirmation? %>
+  <div class="alert">
+    Please confirm your email address.
+  </div>
 <% end %>
 ```
 
-`app/views/with_block.html.erb`:
+or the view that renders the component:
+
+`app/views/_banners.html.erb`
 ```erb
-<%= render(ModalComponent) do |component| %>
-  <% component.with(:header) do %>
-    <span class="help_icon">Hello</span> 
-  <% end %>
-  <% component.with(:body) do %>
-    <p>Have a great day.</p>
-  <% end %>
+<% if current_user.requires_confirmation? %>
+  <%= render(ConfirmEmailComponent.new(user: current_user)) %>
 <% end %>
 ```
 
-##### Optional argument passed by render argument, by named block, or neither
+Instead, the `#render?` hook expresses this logic in the Ruby class, simplifying the view:
 
-`app/components/modal_component.rb`:
+`app/components/confirm_email_component.rb`
 ```ruby
-class ModalComponent < ActionView::Component::Base
-  validates :body, presence: true
-
-  with_content_areas :header, :body
+class ConfirmEmailComponent < ViewComponent::Base
+  def initialize(user:)
+    @user = user
+  end
 
-  def initialize(header: nil)
-    @header = header
+  def render?
+    @user.requires_confirmation?
   end
 end
 ```
 
-`app/components/modal_component.html.erb`:
-```erb
-<div class="modal">
-  <% if header %>
-    <div class="header"><%= header %></div>
-  <% end %>
-  <div class="body"><%= body %>"></div>
+`app/components/confirm_email_component.html.erb`
+```
+<div class="banner">
+  Please confirm your email address.
 </div>
 ```
 
-`app/views/render_arg.html.erb`:
+`app/views/_banners.html.erb`
 ```erb
-<%= render(ModalComponent, header: "Hi!") do |component| %>
-  <% component.with(:body) do %>
-    <p>Have a great day.</p>
-  <% end %>
-<% end %>
+<%= render(ConfirmEmailComponent.new(user: current_user)) %>
 ```
 
-`app/views/with_block.html.erb`:
-```erb
-<%= render(ModalComponent) do |component| %>
-  <% component.with(:header) do %>
-    <span class="help_icon">Hello</span> 
-  <% end %>
-  <% component.with(:body) do %>
-    <p>Have a great day.</p>
-  <% end %>
-<% end %>
-```
-
-`app/views/no_header.html.erb`:
-```erb
-<%= render(ModalComponent) do |component| %>
-  <% component.with(:body) do %>
-    <p>Have a great day.</p>
-  <% end %>
-<% end %>
-```
+To assert that a component has not been rendered, use `refute_component_rendered` from `ViewComponent::TestHelpers`.
 
 ### Testing
 
-Components are unit tested directly. The `render_inline` test helper wraps the result in `Nokogiri.HTML`, allowing us to test the component above as:
+Unit test components directly, using the `render_inline` test helper and Capybara matchers:
 
 ```ruby
-require "action_view/component/test_case"
+require "view_component/test_case"
 
-class MyComponentTest < ActionView::Component::TestCase
+class MyComponentTest < ViewComponent::TestCase
   test "render component" do
-    assert_equal(
-      %(<span title="my title">Hello, World!</span>),
-      render_inline(TestComponent, title: "my title") { "Hello, World!" }.to_html
-    )
+    render_inline(TestComponent.new(title: "my title")) { "Hello, World!" }
+
+    assert_selector("span[title='my title']", "Hello, World!")
   end
 end
 ```
 
-In general, we’ve found it makes the most sense to test components based on their rendered HTML.
-
 #### Action Pack Variants
 
-To test a specific variant you can wrap your test with the `with_variant` helper method as:
+Use the `with_variant` helper to test specific variants:
 
 ```ruby
 test "render component for tablet" do
   with_variant :tablet do
-    assert_equal(
-      %(<span title="my title">Hello, tablets!</span>),
-      render_inline(TestComponent, title: "my title") { "Hello, tablets!" }.css("span").to_html
-    )
+    render_inline(TestComponent.new(title: "my title")) { "Hello, tablets!" }
+
+    assert_selector("span[title='my title']", "Hello, tablets!")
   end
 end
 ```
 
 ### Previewing Components
-`ActionView::Component::Preview` provides a way to see how components look by visiting a special URL that renders them.
-In the previous example, the preview class for `TestComponent` would be called `TestComponentPreview` and located in `test/components/previews/test_component_preview.rb`.
-To see the preview of the component with a given title, implement a method that renders the component.
-You can define as many examples as you want:
+`ViewComponent::Preview`, like `ActionMailer::Preview`, provides a way to preview components in isolation:
 
+`test/components/previews/test_component_preview.rb`
 ```ruby
-# test/components/previews/test_component_preview.rb
-
-class TestComponentPreview < ActionView::Component::Preview
+class TestComponentPreview < ViewComponent::Preview
   def with_default_title
-    render(TestComponent, title: "Test component default")
+    render(TestComponent.new(title: "Test component default"))
   end
 
   def with_long_title
-    render(TestComponent, title: "This is a really long title to see how the component renders this")
+    render(TestComponent.new(title: "This is a really long title to see how the component renders this"))
+  end
+
+  def with_content_block
+    render(TestComponent.new(title: "This component accepts a block of content") do
+      tag.div do
+        content_tag(:span, "Hello")
+      end
+    end
   end
 end
 ```
 
-The previews will be available in <http://localhost:3000/rails/components/test_component/with_default_title>
-and <http://localhost:3000/rails/components/test_component/with_long_title>.
+Which generates <http://localhost:3000/rails/components/test_component/with_default_title>,
+<http://localhost:3000/rails/components/test_component/with_long_title>,
+and <http://localhost:3000/rails/components/test_component/with_content_block>.
 
-Previews use the application layout by default, but you can also use other layouts from your app:
+The `ViewComponent::Preview` base class includes
+[`ActionView::Helpers::TagHelper`][tag-helper], which provides the [`tag`][tag]
+and [`content_tag`][content_tag] view helper methods.
 
-```ruby
-# test/components/previews/test_component_preview.rb
+[tag-helper]: https://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html
+[tag]: https://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-tag
+[content_tag]: https://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-content_tag
 
-class TestComponentPreview < ActionView::Component::Preview
+Previews default to the application layout, but can be overridden:
+
+`test/components/previews/test_component_preview.rb`
+```ruby
+class TestComponentPreview < ViewComponent::Preview
   layout "admin"
 
   ...
 end
 ```
 
-By default, the preview classes live in `test/components/previews`.
-This can be configured using the `preview_path` option.
-For example, if you want to use `lib/component_previews`, set the following in `config/application.rb`:
+Preview classes live in `test/components/previews`, can be configured using the `preview_path` option.
+
+To use `lib/component_previews`:
 
+`config/application.rb`
 ```ruby
 config.action_view_component.preview_path = "#{Rails.root}/lib/component_previews"
 ```
 
+#### Configuring TestController
+
+Component tests and previews assume the existence of an `ApplicationController` class, be can beconfigured using the `test_controller` option:
+
+`config/application.rb`
+```ruby
+config.action_view_component.test_controller = "BaseController"
+```
+
 ### Setting up RSpec
 
-If you're using RSpec, you can configure component specs to have access to test helpers. Add the following to
-`spec/rails_helper.rb`:
+To use RSpec, add the following:
 
+`spec/rails_helper.rb`
 ```ruby
-require "action_view/component/test_helpers"
+require "view_component/test_helpers"
 
 RSpec.configure do |config|
-    # ...
-
-    # Ensure that the test helpers are available in component specs
-    config.include ActionView::Component::TestHelpers, type: :component
+  config.include ViewComponent::TestHelpers, type: :component
 end
 ```
 
-Specs created by the generator should now have access to test helpers like `render_inline`.
+Specs created by the generator have access to test helpers like `render_inline`.
 
-To use component previews, set the following in `config/application.rb`:
+To use component previews:
 
+`config/application.rb`
 ```ruby
 config.action_view_component.preview_path = "#{Rails.root}/spec/components/previews"
 ```
@@ -480,7 +397,7 @@ Inline templates have been removed (for now) due to concerns raised by [@soutaro
 
 ### Isn't this just like X library?
 
-`ActionView::Component` is far from a novel idea! Popular implementations of view components in Ruby include, but are not limited to:
+`ViewComponent` is far from a novel idea! Popular implementations of view components in Ruby include, but are not limited to:
 
 - [trailblazer/cells](https://github.com/trailblazer/cells)
 - [dry-rb/dry-view](https://github.com/dry-rb/dry-view)
@@ -493,11 +410,50 @@ Inline templates have been removed (for now) due to concerns raised by [@soutaro
 - [Introducing ActionView::Component with Joel Hawksley, Ruby on Rails Podcast](http://5by5.tv/rubyonrails/276)
 - [Rails to Introduce View Components, Dev.to](https://dev.to/andy/rails-to-introduce-view-components-3ome)
 - [ActionView::Components in Rails 6.1, Drifting Ruby](https://www.driftingruby.com/episodes/actionview-components-in-rails-6-1)
-- [Demo repository, actionview-component-demo](https://github.com/joelhawksley/actionview-component-demo)
+- [Demo repository, view-component-demo](https://github.com/joelhawksley/view-component-demo)
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/github/actionview-component. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct. We recommend reading the [contributing guide](./CONTRIBUTING.md) as well.
+Bug reports and pull requests are welcome on GitHub at https://github.com/github/view_component. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct. We recommend reading the [contributing guide](./CONTRIBUTING.md) as well.
+
+## Contributors
+
+`actionview-component` is built by:
+
+|<img src="https://avatars.githubusercontent.com/joelhawksley?s=256" alt="joelhawksley" width="128" />|<img src="https://avatars.githubusercontent.com/tenderlove?s=256" alt="tenderlove" width="128" />|<img src="https://avatars.githubusercontent.com/jonspalmer?s=256" alt="jonspalmer" width="128" />|<img src="https://avatars.githubusercontent.com/juanmanuelramallo?s=256" alt="juanmanuelramallo" width="128" />|<img src="https://avatars.githubusercontent.com/vinistock?s=256" alt="vinistock" width="128" />|
+|:---:|:---:|:---:|:---:|:---:|
+|@joelhawksley|@tenderlove|@jonspalmer|@juanmanuelramallo|@vinistock|
+|Denver|Seattle|Boston||Toronto|
+
+|<img src="https://avatars.githubusercontent.com/metade?s=256" alt="metade" width="128" />|<img src="https://avatars.githubusercontent.com/asgerb?s=256" alt="asgerb" width="128" />|<img src="https://avatars.githubusercontent.com/xronos-i-am?s=256" alt="xronos-i-am" width="128" />|<img src="https://avatars.githubusercontent.com/dylnclrk?s=256" alt="dylnclrk" width="128" />|<img src="https://avatars.githubusercontent.com/kaspermeyer?s=256" alt="kaspermeyer" width="128" />|
+|:---:|:---:|:---:|:---:|:---:|
+|@metade|@asgerb|@xronos-i-am|@dylnclrk|@kaspermeyer|
+|London|Copenhagen|Russia, Kirov|Berkeley, CA|Denmark|
+
+|<img src="https://avatars.githubusercontent.com/rdavid1099?s=256" alt="rdavid1099" width="128" />|<img src="https://avatars.githubusercontent.com/kylefox?s=256" alt="kylefox" width="128" />|<img src="https://avatars.githubusercontent.com/traels?s=256" alt="traels" width="128" />|<img src="https://avatars.githubusercontent.com/rainerborene?s=256" alt="rainerborene" width="128" />|<img src="https://avatars.githubusercontent.com/jcoyne?s=256" alt="jcoyne" width="128" />|
+|:---:|:---:|:---:|:---:|:---:|
+|@rdavid1099|@kylefox|@traels|@rainerborene|@jcoyne|
+|Los Angeles|Edmonton|Odense, Denmark|Brazil|Minneapolis|
+
+|<img src="https://avatars.githubusercontent.com/elia?s=256" alt="elia" width="128" />|<img src="https://avatars.githubusercontent.com/cesariouy?s=256" alt="cesariouy" width="128" />|<img src="https://avatars.githubusercontent.com/spdawson?s=256" alt="spdawson" width="128" />|<img src="https://avatars.githubusercontent.com/rmacklin?s=256" alt="rmacklin" width="128" />|<img src="https://avatars.githubusercontent.com/michaelem?s=256" alt="michaelem" width="128" />|
+|:---:|:---:|:---:|:---:|:---:|
+|@elia|@cesariouy|@spdawson|@rmacklin|@michaelem|
+|Milan||United Kingdom||Berlin|
+
+|<img src="https://avatars.githubusercontent.com/mellowfish?s=256" alt="mellowfish" width="128" />|<img src="https://avatars.githubusercontent.com/horacio?s=256" alt="horacio" width="128" />|<img src="https://avatars.githubusercontent.com/dukex?s=256" alt="dukex" width="128" />|<img src="https://avatars.githubusercontent.com/dark-panda?s=256" alt="dark-panda" width="128" />|<img src="https://avatars.githubusercontent.com/smashwilson?s=256" alt="smashwilson" width="128" />|
+|:---:|:---:|:---:|:---:|:---:|
+|@mellowfish|@horacio|@dukex|@dark-panda|@smashwilson|
+|Spring Hill, TN|Buenos Aires|São Paulo||Gambrills, MD|
+
+|<img src="https://avatars.githubusercontent.com/blakewilliams?s=256" alt="blakewilliams" width="128" />|
+|:---:|
+|@blakewilliams|
+|Boston, MA|
+
+|<img src="https://avatars.githubusercontent.com/seanpdoyle?s=256" alt="seanpdoyle" width="128" />|
+|:---:|
+|@seanpdoyle|
+|New York, NY|
 
 ## License