actionview-component 1.5.3 → 1.8.0

data/lib/action_view/component/template_error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ActionView
+  module Component
+    class TemplateError < StandardError
+      def initialize(errors)
+        super(errors.join(", "))
+      end
+    end
+  end
+end

data/lib/action_view/component/test_case.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "active_support/test_case"
+
+module ActionView
+  module Component
+    class TestCase < ActiveSupport::TestCase
+      include ActionView::Component::TestHelpers
+    end
+  end
+end

data/lib/action_view/component/test_helpers.rb

@@ -4,11 +4,11 @@ module ActionView
   module Component
     module TestHelpers
       def render_inline(component, **args, &block)
-        Nokogiri::HTML(controller.view_context.render(component, args, &block)).css("body > *")
+        Nokogiri::HTML.fragment(controller.view_context.render(component, args, &block))
       end
 
       def controller
-        @controller ||= ApplicationController.new.tap { |c| c.request = request }
+        @controller ||= Base.test_controller.constantize.new.tap { |c| c.request = request }.extend(Rails.application.routes.url_helpers)
       end
 
       def request

data/lib/action_view/component/version.rb

@@ -4,8 +4,8 @@ module ActionView
   module Component
     module VERSION
       MAJOR = 1
-      MINOR = 5
-      PATCH = 3
+      MINOR = 8
+      PATCH = 0
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end

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

@@ -10,11 +10,11 @@ module Rails
       check_class_collision suffix: "Component"
 
       def create_component_file
-        template "component.rb", File.join("app/components",  "#{file_name}_component.rb")
+        template "component.rb", File.join("app/components", class_path, "#{file_name}_component.rb")
       end
 
       def create_template_file
-        template "component.html.erb", File.join("app/components",  "#{file_name}_component.html.erb")
+        template "component.html.erb", File.join("app/components", class_path, "#{file_name}_component.html.erb")
       end
 
       private

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

@@ -6,7 +6,7 @@ module Rspec
       source_root File.expand_path("templates", __dir__)
 
       def create_test_file
-        template "component_spec.rb", File.join("spec/components", "#{file_name}_component_spec.rb")
+        template "component_spec.rb", File.join("spec/components", class_path, "#{file_name}_component_spec.rb")
       end
 
       private

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

@@ -7,7 +7,7 @@ module TestUnit
       check_class_collision suffix: "ComponentTest"
 
       def create_test_file
-        template "component_test.rb", File.join("test/components", "#{file_name}_component_test.rb")
+        template "component_test.rb", File.join("test/components", class_path, "#{file_name}_component_test.rb")
       end
 
       private

data/lib/rails/generators/test_unit/templates/component_test.rb.tt

@@ -1,12 +1,10 @@
 require "test_helper"
 
-class <%= class_name %>ComponentTest < ActiveSupport::TestCase
-  include ActionView::Component::TestHelpers
-
+class <%= class_name %>ComponentTest < ActionView::Component::TestCase
   test "component renders something useful" do
     # assert_equal(
     #   %(<span title="my title">Hello, components!</span>),
-    #   render_inline(<%= class_name %>, attr: "value") { "Hello, components!" }.css("span").to_html
+    #   render_inline(<%= class_name %>Component, attr: "value") { "Hello, components!" }.css("span").to_html
     # )
   end
 end

data/lib/railties/lib/rails.rb

@@ -2,5 +2,4 @@
 
 module Rails
   autoload :ComponentsController
-  autoload :ComponentExamplesController
 end

data/lib/railties/lib/rails/components_controller.rb

@@ -4,6 +4,7 @@ require "rails/application_controller"
 
 class Rails::ComponentsController < Rails::ApplicationController # :nodoc:
   prepend_view_path File.expand_path("templates/rails", __dir__)
+  prepend_view_path "#{Rails.root}/app/views/" if defined?(Rails.root)
 
   around_action :set_locale, only: :previews
   before_action :find_preview, only: :previews
@@ -25,7 +26,10 @@ class Rails::ComponentsController < Rails::ApplicationController # :nodoc:
       render template: "components/previews"
     else
       @example_name = File.basename(params[:path])
-      render template: "components/preview", layout: false
+      @render_args = @preview.render_args(@example_name)
+      layout = @render_args[:layout]
+      opts = layout.nil? ? {} : { layout: layout }
+      render template: "components/preview", **opts
     end
   end
 

data/lib/railties/lib/rails/templates/rails/components/preview.html.erb

@@ -1 +1 @@
-<%= raw @preview.call(@example_name) %>
+<%= render(@render_args[:component], **@render_args[:args], &@render_args[:block])%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview-component
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.8.0
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: better_html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +129,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE"
+- ".github/PULL_REQUEST_TEMPLATE"
 - ".github/workflows/ruby_on_rails.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -129,9 +145,13 @@ files:
 - actionview-component.gemspec
 - lib/action_view/component.rb
 - lib/action_view/component/base.rb
-- lib/action_view/component/monkey_patch.rb
+- lib/action_view/component/conversion.rb
 - lib/action_view/component/preview.rb
+- lib/action_view/component/previewable.rb
 - lib/action_view/component/railtie.rb
+- lib/action_view/component/render_monkey_patch.rb
+- lib/action_view/component/template_error.rb
+- lib/action_view/component/test_case.rb
 - lib/action_view/component/test_helpers.rb
 - lib/action_view/component/version.rb
 - lib/rails/generators/component/USAGE
@@ -143,12 +163,10 @@ files:
 - lib/rails/generators/test_unit/component_generator.rb
 - lib/rails/generators/test_unit/templates/component_test.rb.tt
 - lib/railties/lib/rails.rb
-- lib/railties/lib/rails/component_examples_controller.rb
 - lib/railties/lib/rails/components_controller.rb
 - lib/railties/lib/rails/templates/rails/components/index.html.erb
 - lib/railties/lib/rails/templates/rails/components/preview.html.erb
 - lib/railties/lib/rails/templates/rails/components/previews.html.erb
-- lib/railties/lib/rails/templates/rails/examples/show.html.erb
 - script/bootstrap
 - script/console
 - script/install

data/lib/action_view/component/monkey_patch.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-# Monkey patch ActionView::Base#render to support ActionView::Component
-#
-# A version of this monkey patch was upstreamed in https://github.com/rails/rails/pull/36388
-# We'll need to upstream an updated version of this eventually.
-class ActionView::Base
-  module RenderMonkeyPatch
-    def render(options = {}, args = {}, &block)
-      if options.respond_to?(:render_in)
-        ActiveSupport::Deprecation.warn(
-          "passing component instances (`render MyComponent.new(foo: :bar)`) has been deprecated and will be removed in v2.0.0. Use `render MyComponent, foo: :bar` instead."
-        )
-
-        options.render_in(self, &block)
-      elsif options.is_a?(Class) && options < ActionView::Component::Base
-        options.new(args).render_in(self, &block)
-      elsif options.is_a?(Hash) && options.has_key?(:component)
-        options[:component].new(options[:locals]).render_in(self, &block)
-      else
-        super
-      end
-    end
-  end
-
-  prepend RenderMonkeyPatch
-end

data/lib/railties/lib/rails/component_examples_controller.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/application_controller"
-load "config/application.rb" unless Rails.root
-
-class Rails::ComponentExamplesController < ActionController::Base # :nodoc:
-  prepend_view_path File.expand_path("templates/rails", __dir__)
-  append_view_path Rails.root.join("app/views")
-end

data/lib/railties/lib/rails/templates/rails/examples/show.html.erb

@@ -1 +0,0 @@
-<%= raw @example %>