actionview-component 1.2.1 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f41dda27814dde34bc2c802388e04ff4e96d02cd107b455406583d19fe93ee
-  data.tar.gz: 4f968af602146f71ec2749455090c80db72099e0668f2961520cdf9918924ecd
+  metadata.gz: 03a3c04aa78f3fcc16c350b49955870f60e712ad0383eb924e7053d7208431d0
+  data.tar.gz: 299741730bcfe4eb6640e5899e3973d4fd303dc28aadc79103eb72bdcd2382ec
 SHA512:
-  metadata.gz: 5076c4abed4915eb568eb423918ce9a8c66af85f1290a7a1c6ec7858d82db515e6731f66b0135ad8208ae6cf7da5ca554b45faa12cad09487b1516cc25a09709
-  data.tar.gz: a4d4040ae40657644b51971393b9ba0de2e4df7bfb47fbeb685f49fc1526d92bd15a2aa542be952b04aeb7b986d2b74a4568fc2cda9a3a82470cef6f1c05c947
+  metadata.gz: '01091f9da0436fcbfcbdfd602bcf7595c9c061738f49b9fb70305474218b6b928382daed58c4a3ebc1d08991815ecc965cc6a19b8c4384c35338d672ee5b456e'
+  data.tar.gz: 32fae5a27cb1f1f939ce5b59947b3785f1b4ee73a8e9b3b1a95eb1351800aa005518b61b6f24d8570790c1e45d128bf87ab28e4f14cecac1479d33a4ed30a524

data/.github/workflows/ruby_on_rails.yml

@@ -1,6 +1,6 @@
 name: Ruby on Rails
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+# v1.3.4
+
+* Template errors surface correct file and line number.
+
+    *Justin Coyne*
+
+* Allow access to `request` inside components.
+
+    *Joel Hawksley*
+
+# v1.3.3
+
+*   Do not raise error when sidecar files that are not templates exist.
+
+    *Joel Hawksley*
+
+# v1.3.2
+
+*   Support rendering views from inside component templates.
+
+    *Patrick Sinclair*
+
+# v1.3.1
+
+*   Fix bug where rendering nested content caused an error.
+
+    *Joel Hawksley, Aaron Patterson*
+
+# v1.3.0
+
+*   Components are rendered with enough controller context to support rendering of partials and forms.
+
+    *Patrick Sinclair, Joel Hawksley, Aaron Patterson*
+
 # v1.2.1
 
 *   `actionview-component` is now tested against Ruby 2.3/2.4 and Rails 5.0.0.

data/CONTRIBUTING.md

@@ -32,6 +32,7 @@ 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 `actionview-component.gemspec`.
 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`
@@ -39,7 +40,6 @@ If you are the current maintainer of this 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. Bump gem version in `actionview-component.gemspec`.
 1. Make a PR to github/actionview-component.
 1. Build a local gem: `gem build actionview-component.gemspec`
 1. Merge github/actionview-component PR

data/Gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 gemspec
 
-rails_version = "#{ENV['RAILS_VERSION'] || '5.2.3'}"
+rails_version = "#{ENV['RAILS_VERSION'] || '6.0.0'}"
 
 gem "rails", rails_version == "master" ? { github: "rails/rails" } : rails_version

data/Gemfile.lock

@@ -1,53 +1,66 @@
 PATH
   remote: .
   specs:
-    actionview-component (1.2.1)
+    actionview-component (1.3.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.1, >= 2.1.8)
     ast (2.4.0)
     builder (3.2.3)
     concurrent-ruby (1.1.5)
@@ -73,7 +86,7 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.1.0)
-    nio4r (2.4.0)
+    nio4r (2.5.2)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     parallel (1.17.0)
@@ -82,30 +95,32 @@ GEM
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 6.0.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (10.5.0)
     rubocop (0.74.0)
@@ -141,6 +156,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
+    zeitwerk (2.1.10)
 
 PLATFORMS
   ruby
@@ -150,7 +166,7 @@ DEPENDENCIES
   bundler (>= 1.14)
   haml (~> 5)
   minitest (= 5.1.0)
-  rails (= 5.2.3)
+  rails (= 6.0.0)
   rake (~> 10.0)
   rubocop (~> 0.59)
   rubocop-github (~> 0.13.0)

data/README.md

@@ -9,6 +9,10 @@ This gem is meant to serve as a precursor to upstreaming the `ActionView::Compon
 
 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 `6.1`, this gem will then exist to serve as a backport.
 
+## 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).
+
 ## Compatibility
 
 `actionview-component` is tested for compatibility with combinations of Ruby `2.3`/`2.4`/`2.5`/`2.6` and Rails `5.0.0`/`5.2.3`/`6.0.0`/`6.1.0.alpha`.

data/actionview-component.gemspec

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "actionview-component"
-  spec.version       = "1.2.1"
+  spec.version       = "1.3.4"
   spec.authors       = ["GitHub Open Source"]
   spec.email         = ["opensource+actionview-component@github.com"]
 

data/lib/action_view/component/base.rb

@@ -30,6 +30,8 @@ module ActionView
   module Component
     class Base < ActionView::Base
       include ActiveModel::Validations
+      include ActiveSupport::Configurable
+      include ActionController::RequestForgeryProtection
 
       # Entrypoint for rendering components. Called by ActionView::Base#render.
       #
@@ -58,6 +60,11 @@ module ActionView
       #
       def render_in(view_context, *args, &block)
         self.class.compile
+        @view_context = view_context
+        @view_renderer ||= view_context.view_renderer
+        @lookup_context ||= view_context.lookup_context
+        @view_flow ||= view_context.view_flow
+
         @content = view_context.capture(&block) if block_given?
         validate!
         call
@@ -65,6 +72,14 @@ module ActionView
 
       def initialize(*); end
 
+      def render(options = {}, args = {}, &block)
+        if options.is_a?(String) || (options.is_a?(Hash) && options.has_key?(:partial))
+          view_context.render(options, args, &block)
+        else
+          super
+        end
+      end
+
       class << self
         def inherited(child)
           child.include Rails.application.routes.url_helpers unless child < Rails.application.routes.url_helpers
@@ -78,7 +93,12 @@ module ActionView
         def compile
           return if @compiled && ActionView::Base.cache_template_loading
 
-          class_eval("def call; @output_buffer = ActionView::OutputBuffer.new; #{compiled_template}; end")
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def call
+              @output_buffer = ActionView::OutputBuffer.new
+              #{compiled_template}
+            end
+          RUBY
 
           @compiled = true
         end
@@ -101,19 +121,19 @@ module ActionView
 
           filename = self.instance_method(:initialize).source_location[0]
           filename_without_extension = filename[0..-(File.extname(filename).length + 1)]
-          sibling_files = Dir["#{filename_without_extension}.*"] - [filename]
+          sibling_template_files = Dir["#{filename_without_extension}.????.{#{ActionView::Template.template_handler_extensions.join(',')}}"] - [filename]
 
-          if sibling_files.length > 1
+          if sibling_template_files.length > 1
             raise StandardError.new("More than one template found for #{self}. There can only be one sidecar template file per component.")
           end
 
-          if sibling_files.length == 0
+          if sibling_template_files.length == 0
             raise NotImplementedError.new(
               "Could not find a template file for #{self}."
             )
           end
 
-          sibling_files[0]
+          sibling_template_files[0]
         end
       end
 
@@ -136,7 +156,15 @@ module ActionView
 
       private
 
-      attr_reader :content
+      def controller
+        @controller ||= view_context.controller
+      end
+
+      def request
+        @request ||= controller.request
+      end
+
+      attr_reader :content, :view_context
     end
   end
 end

data/lib/action_view/component/test_helpers.rb

@@ -4,7 +4,15 @@ module ActionView
   module Component
     module TestHelpers
       def render_inline(component, **args, &block)
-        Nokogiri::HTML(ApplicationController.new.view_context.render(component, args, &block))
+        Nokogiri::HTML(controller.view_context.render(component, args, &block))
+      end
+
+      def controller
+        @controller ||= ApplicationController.new.tap { |c| c.request = request }
+      end
+
+      def request
+        @request ||= ActionDispatch::TestRequest.create
       end
 
       def render_component(component, **args, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview-component
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.4
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler