frails 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e2019a4307891e5178133fc9f650899438107417cb2e27114fd312d76fb27ee
-  data.tar.gz: 81257e95be178039ff24d51d75edc4fb901e537a22376db859f7f22cebe66b4d
+  metadata.gz: c46b468e5c618fbfbcab851db75178b94bbf788ca6e4c7b93566b4ce464ee31a
+  data.tar.gz: 2cee5f81db2822473ffa13290e7a9e6ac63f30294fa184c02f9a5b0eaaff02ba
 SHA512:
-  metadata.gz: '095364fec3c7b02572e771e2ca5edbf82baecb1ebd36bc8eb94c2cc93a3238c0b8853daa8af32fec36532a34a18c4346ed45c128202c0a855d72129b3461d40b'
-  data.tar.gz: 7f75601a78753eecd204a8c45767bcf9529a3936145b236d9d216f0a2348ce1f90c95b0b1bed70cecbd2518166bac5f2434f40b8b7006696ab949281366b6428
+  metadata.gz: aa838a5fb3e936d75ded9a596498c961fc815d95e44af492150362bb72b20d1c15c4f0b535bb99967befeda92449bfe778c23cb53521cd875720b5095c674f75
+  data.tar.gz: 5f71ddc5d01739ef50da31ea5edc20b3d4f126e4b52c751eb0196e3324e5fc93f43cdc81fa46885b4a2d9df4536af9f39f0f963620bf4bde98f4f25b965cbdf5

data/.gitignore

@@ -8,4 +8,8 @@
 /spec/reports/
 /tmp/
 .DS_Store
-*.log
+*.log
+.byebug_history
+test/dummy/node_modules
+test/dummy/tmp
+test/dummy/log

data/.rubocop.yml

@@ -6,7 +6,7 @@ Style/ModuleFunction:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100
 Layout/IndentationConsistency:
   EnforcedStyle: indented_internal_methods

data/Gemfile

@@ -16,4 +16,10 @@ gemspec
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
 
-gem 'rubocop', require: false
+gem 'rubocop', require: false, group: :development
+
+group :test do
+  gem 'byebug'
+  gem 'm'
+  gem 'minitest', '~> 5.0'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frails (0.5.1)
+    frails (0.7.0)
       nokogiri (>= 1.10.4)
       rack-proxy (>= 0.6.5)
       rails (>= 6.0)
@@ -9,126 +9,130 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.0)
-      actionpack (= 6.0.0)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.0)
-      actionpack (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.0)
-      actionview (= 6.0.0)
-      activesupport (= 6.0.0)
-      rack (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       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)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.0)
-      activesupport (= 6.0.0)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.0)
-      activesupport (= 6.0.0)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
       globalid (>= 0.3.6)
-    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)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.0)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2)
     ast (2.4.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    builder (3.2.4)
+    byebug (11.1.1)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    loofah (2.3.0)
+    jaro_winkler (1.5.4)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    m (1.5.1)
+      method_source (>= 0.6.7)
+      rake (>= 0.9.2.2)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.12.2)
+    minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.4)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
-    parser (2.6.4.1)
+    parallel (1.19.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
-    rack (2.0.7)
+    rack (2.2.2)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 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)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.0)
+      railties (= 6.0.2.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.0)
-      actionpack (= 6.0.0)
-      activesupport (= 6.0.0)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.0)
-    rubocop (0.74.0)
+    rake (13.0.1)
+    rubocop (0.79.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
@@ -140,22 +144,25 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    zeitwerk (2.2.0)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug
   frails!
+  m
+  minitest (~> 5.0)
   rubocop
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -8,6 +8,13 @@ Frails is a modern asset pipeline for [Rails](https://rubyonrails.org), built on
 - Full Webpack control without fighting with the likes of Webpacker.
 - Embrace modern front end practices.
 
+PLUS...
+
+- Side loaded layouts, views and partials.
+- Components
+  - React + SSR
+  - Ruby/HTML
+
 ## Installation
 
 Frails is designed to work only within a Rails application, so must be installed in an existing Rails app. It also requires Node.js and a valid `package.json` file in your app root.

data/Rakefile

@@ -5,8 +5,8 @@ require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
-  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
 end
 
 task default: :test

data/lib/frails.rb

@@ -27,6 +27,10 @@ module Frails
   def manifest_path
     ENV['FRAILS_MANIFEST_PATH'] || 'manifest.json'
   end
+
+  def components_path
+    @components_path ||= Rails.root.join('app', 'components')
+  end
 end
 
 require 'frails/log_subscriber'

data/lib/frails/component.rb

@@ -3,9 +3,20 @@
 module Frails::Component
 end
 
+module ActionView
+  extend ActiveSupport::Autoload
+
+  # Make sure ActionView::SyntaxErrorInTemplate is loaded.
+  eager_autoload do
+    autoload_at 'action_view/template/error' do
+      autoload :SyntaxErrorInTemplate
+    end
+  end
+end
+
 require 'frails/component/renderer_concerns'
-require 'frails/component/component_renderer'
-require 'frails/component/react_component_renderer'
-require 'frails/component/abstract_component'
-require 'frails/component/plain_component'
-require 'frails/component/react_component'
+require 'frails/component/renderer'
+require 'frails/component/react_renderer'
+require 'frails/component/abstract'
+require 'frails/component/base'
+require 'frails/component/react'

data/lib/frails/component/{abstract_component.rb → abstract.rb}

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-class Frails::Component::AbstractComponent
+class Frails::Component::Abstract
   include ActiveSupport::Callbacks
 
   define_callbacks :render
 
-  def initialize(view, options)
-    @view, @options = view, options
+  def initialize(view, path, options)
+    @view = view
+    @path = path
+    @options = options
 
     expand_instance_vars
   end
@@ -24,19 +26,19 @@ class Frails::Component::AbstractComponent
   # rubocop:disable Lint/ShadowedException, Style/MissingRespondToMissing
   def method_missing(method, *args, &block)
     super
-  rescue NoMethodError, NameError => e1
+  rescue NoMethodError, NameError => e
     # the error is not mine, so just releases it as is.
-    raise e1 if e1.name != method
+    raise e if e.name != method
 
     begin
       @view.send method, *args, &block
-    rescue NoMethodError => e2
-      raise e2 if e2.name != method
+    rescue NoMethodError => e
+      raise e if e.name != method
 
       raise NoMethodError.new("undefined method `#{method}' for either #{self} or #{@view}",
                               method)
-    rescue NameError => e2
-      raise e2 if e2.name != method
+    rescue NameError => e
+      raise e if e.name != method
 
       raise NameError.new("undefined local variable `#{method}' for either #{self} or #{@view}",
                           method)

data/lib/frails/component/{plain_component.rb → base.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-class Frails::Component::PlainComponent < Frails::Component::AbstractComponent
-  PRIVATE_METHODS = %i[render method_missing locals].freeze
+class Frails::Component::Base < Frails::Component::Abstract
+  PRIVATE_METHODS = %i[render method_missing locals to_partial_path].freeze
 
-  def initialize(view, options)
+  def initialize(view, path, options)
     super
 
     @locals = @options.fetch(:locals, @options)
@@ -16,4 +16,8 @@ class Frails::Component::PlainComponent < Frails::Component::AbstractComponent
     end
     hash.merge @locals
   end
+
+  def to_partial_path
+    "#{@path}/index"
+  end
 end

data/lib/frails/component/{react_component.rb → react.rb}

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
-class Frails::Component::ReactComponent < Frails::Component::AbstractComponent
+class Frails::Component::React < Frails::Component::Abstract
   attr_accessor :class_name, :props, :tag, :prerender, :content_loader
 
-  def initialize(view, options)
-    @view, @options = view, options
+  def initialize(view, path, options)
+    super
 
     @class_name = @options.fetch(:class, nil)
     @props = @options.fetch(:props, {})
     @tag = @options.fetch(:tag, :div)
     @prerender = @options.fetch(:prerender, false)
     @content_loader = @options.fetch(:content_loader, false)
-
-    expand_instance_vars
   end
 end

data/lib/frails/component/{react_component_renderer.rb → react_renderer.rb}

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
-class Frails::Component::ReactComponentRenderer
+require 'frails/utils'
+
+class Frails::Component::ReactRenderer
   include Frails::Component::RendererConcerns
 
   def render(context, options, &block)
     @view = context
-    @component = options.delete(:component).to_s
-    @presenter = presenter_class.new(@view, options)
+    @component = options.delete(:component)
+
+    klass = presenter_class
+    @presenter = klass.new(@view, @component, options)
 
     @children = @view.capture(&block) if block_given?
 
@@ -20,20 +24,22 @@ class Frails::Component::ReactComponentRenderer
         @prerender = @presenter.prerender
         @content_loader = @presenter.content_loader
         @props = camelize_keys(@presenter.props)
-        @props[:children] = @children if @children
+        @props[:children] = @children if instance_variable_defined?(:@children)
 
         @prerender && render_inline_styles
 
-        rendered_tag = content_tag do
-          @prerender ? React::Renderer.new.render(@component, @props).html_safe : loader
-        end
+        rendered_tag = if @prerender
+                         content_tag { React::Renderer.new.render(@component, @props).html_safe }
+                       else
+                         loader || content_tag { nil }
+                       end
 
         @prerender ? move_console_replay_script(rendered_tag) : rendered_tag
       end
     end
 
     def presenter_class
-      super || Frails::Component::ReactComponent
+      super || Frails::Component::React
     end
 
     def data_for_content_tag
@@ -47,17 +53,21 @@ class Frails::Component::ReactComponentRenderer
     end
 
     def content_tag(&block)
-      classes = "js__reactComponent #{@presenter.class_name}"
-      @view.content_tag @presenter.tag, class: classes, data: data_for_content_tag, &block
+      class_names = "js__reactComponent #{@presenter.class_name}"
+      @view.content_tag @presenter.tag, class: class_names, data: data_for_content_tag, &block
     end
 
     def camelize_keys(data)
-      data.deep_transform_keys { |key| key.to_s.camelize :lower }
+      data.deep_transform_keys do |key|
+        Frails::Utils.camelize key.to_s, :lower, convert_slashes: false
+      end
     end
 
     def loader
-      @content_loader ? @view.render(@content_loader) : nil
-        end
+      return unless @content_loader
+
+      @view.render @content_loader, class_name: 'js__reactComponent', data: data_for_content_tag
+    end
 
     # Grab the server-rendered console replay script and move it outside the container div.
     #

data/lib/frails/component/{component_renderer.rb → renderer.rb}

@@ -1,18 +1,43 @@
 # frozen_string_literal: true
 
-class Frails::Component::ComponentRenderer < ActionView::PartialRenderer
+class Frails::Component::Renderer < ActionView::PartialRenderer
   include Frails::Component::RendererConcerns
 
+  # Overwritten to make sure we don't lookup partials. Even though this inherits from the
+  # PartialRenderer, component templates do not have the underscore prefix that partials have.
+  #
+  # Additionally, this will ensure that ONLY the app/components directory is used as the only view
+  # path to search within when looking up the component template.
+  def find_template(path, locals)
+    path_count = @lookup_context.view_paths.size
+    @lookup_context.view_paths.unshift Frails.components_path
+    old_paths = @lookup_context.view_paths.pop(path_count)
+
+    prefixes = path.include?('/') ? [] : @lookup_context.prefixes
+    result = @lookup_context.find_template(path, prefixes, false, locals, @details)
+
+    @lookup_context.view_paths.unshift(*old_paths)
+    @lookup_context.view_paths.pop
+
+    result
+  end
+
   def render(context, options, &block)
     @view = context
-    @component = options.delete(:component).to_s
-    @presenter = presenter_class.new(@view, options)
+    @component = options.delete(:component)
+
+    klass = presenter_class
+    @presenter = klass.new(@view, @component, options)
+
+    @children = block_given? ? @view.capture(&block) : nil
+    options[:partial] = @presenter
 
     result = @presenter.run_callbacks :render do
       if @presenter.respond_to?(:render)
         @presenter.render(&block)
       else
         options[:locals] = @presenter.locals
+        options[:locals][:children] = @children
         super context, options, block
       end
     end
@@ -23,7 +48,7 @@ class Frails::Component::ComponentRenderer < ActionView::PartialRenderer
   private
 
     def presenter_class
-      super || Frails::Component::PlainComponent
+      super || Frails::Component::Base
     end
 
     def apply_styles(content)
@@ -68,7 +93,7 @@ class Frails::Component::ComponentRenderer < ActionView::PartialRenderer
     def stylesheet_path
       @stylesheet_path ||= begin
         style_file = "#{@component}/index.css"
-        Rails.root.join('app', 'components', style_file).relative_path_from(Rails.root)
+        Frails.components_path.join(style_file).relative_path_from(Rails.root)
       end
     end
 end

data/lib/frails/component/renderer_concerns.rb

@@ -6,7 +6,13 @@ module Frails::Component::RendererConcerns
   private
 
     def presenter_class
-      klass_file = Rails.root.join('app', 'components', "#{@component}_component.rb")
+      if @component.is_a?(Class) && @component < Frails::Component::Base
+        klass = @component
+        @component = @component.to_s.underscore
+        return klass
+      end
+
+      klass_file = Frails.components_path.join("#{@component}_component.rb")
       klass_file.exist? && "#{@component.to_s.camelcase}Component".constantize
     end
 
@@ -17,13 +23,13 @@ module Frails::Component::RendererConcerns
       # Don't inline the styles if already inlined.
       return if inlined_stylesheets.include?(@component)
 
-      Frails.manifest.read!(stylesheet_entry_file, :stylesheet) do |path, src|
+      Frails.manifest.read(stylesheet_entry_file, :stylesheet) do |path, src|
         @view.content_for :component_styles do
           @view.content_tag(:style, src, { data: { href: path } }, false)
         end
-      end
 
-      inlined_stylesheets << @component
+        inlined_stylesheets << @component
+      end
     end
 
     def inlined_stylesheets

data/lib/frails/component/test_helpers.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Frails
+  module Component
+    module TestHelpers
+      def render_inline(options = {}, locals = {}, &block)
+        Nokogiri::HTML(controller.view_context.render(options, locals, &block))
+      end
+
+      def controller
+        @controller ||= ApplicationController.new.tap { |c| c.request = request }
+      end
+
+      def request
+        @request ||= ActionDispatch::TestRequest.create
+      end
+    end
+  end
+end

data/lib/frails/helper.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
 module Frails::Helper
-  def render(options = {}, locals = {}, &block)
+  def render(options = {}, *locals, &block)
     sload_assets = respond_to?(:side_load_assets?) ? side_load_assets? : false
 
     case options
     when Hash
       in_rendering_context(options) do
-        options[:side_load_assets] = sload_assets
-
         return view_renderer.render_component(self, options, &block) if options.key?(:component)
 
+        options[:side_load_assets] = sload_assets
         if block_given?
           view_renderer.render_partial(self, options.merge(partial: options[:layout]), &block)
         else
@@ -18,8 +17,12 @@ module Frails::Helper
         end
       end
     else
+      if options.is_a?(Class) && options < Frails::Component::Base
+        return view_renderer.render_component(self, { component: options, locals: locals }, &block)
+      end
+
       view_renderer.render_partial(self, side_load_assets: sload_assets, partial: options,
-                                         locals: locals, &block)
+                                         locals: locals.extract_options!, &block)
     end
   end
 

data/lib/frails/manifest.rb

@@ -69,8 +69,8 @@ class Frails::Manifest
       end
 
       begin
-        open("http://#{Frails.dev_server.host_with_port}#{path}").read
-      rescue OpenURI::HTTPError => e
+        URI.open("http://#{Frails.dev_server.host_with_port}#{path}").read
+      rescue OpenURI::HTTPError
         handle_missing_entry path
       end
     end

data/lib/frails/monkey/action_view/renderer.rb

@@ -4,7 +4,7 @@ module Frails
   module Monkey
     module ActionView
       module Renderer
-        def render_to_object(context, options) # :nodoc:
+        def render_to_object(context, options)
           if options.key?(:partial)
             render_partial_to_object(context, options)
           elsif options.key?(:component)
@@ -15,19 +15,18 @@ module Frails
         end
 
         # Direct access to partial rendering.
-        def render_component(context, options, &block) #:nodoc:
+        def render_component(context, options, &block)
           render_component_to_object(context, options, &block).body
         end
 
         def render_component_to_object(context, options, &block)
           component = options[:component].to_s
 
-          result = if Rails.root.join('app', 'components', component, 'index.entry.jsx').exist?
-                     Frails::Component::ReactComponentRenderer.new.render(context, options, &block)
+          result = if Frails.components_path.join(component, 'index.entry.jsx').exist?
+                     Frails::Component::ReactRenderer.new.render(context, options, &block)
                    else
-                     options[:partial] = "#{component}/index"
-                     Frails::Component::ComponentRenderer.new(@lookup_context)
-                                                         .render(context, options, &block)
+                     Frails::Component::Renderer.new(@lookup_context)
+                                                .render(context, options, &block)
                    end
 
           ::ActionView::AbstractRenderer::RenderedTemplate.new result, nil, nil

data/lib/frails/utils.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Frails
+  module Utils
+    def self.camelize(term, first_letter = :upper, convert_slashes: true)
+      # If we are not converting slashes, and `first_letter` is `:lower`, this ensures that the
+      # first letter after a slash is not capitalized.
+      string = if !convert_slashes && first_letter == :lower
+                 term.split('/').map { |str| str.camelize :lower }.join('/')
+               else
+                 term.camelize first_letter
+               end
+
+      # Reverses the effect of ActiveSupport::Inflector.camelize converting slashes into `::`. If
+      # the keyword argument `convert_slashes:` is false (default: true), we can avoid
+      # converting slashes to `::`.
+      string.gsub!('::', '/') unless convert_slashes
+
+      string
+    end
+  end
+end

data/lib/frails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Frails
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/yarn.lock

@@ -26,9 +26,9 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 glob@^7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Joel Moss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -75,12 +75,13 @@ files:
 - index.js
 - lib/frails.rb
 - lib/frails/component.rb
-- lib/frails/component/abstract_component.rb
-- lib/frails/component/component_renderer.rb
-- lib/frails/component/plain_component.rb
-- lib/frails/component/react_component.rb
-- lib/frails/component/react_component_renderer.rb
+- lib/frails/component/abstract.rb
+- lib/frails/component/base.rb
+- lib/frails/component/react.rb
+- lib/frails/component/react_renderer.rb
+- lib/frails/component/renderer.rb
 - lib/frails/component/renderer_concerns.rb
+- lib/frails/component/test_helpers.rb
 - lib/frails/dev_server.rb
 - lib/frails/dev_server_proxy.rb
 - lib/frails/helper.rb
@@ -93,6 +94,7 @@ files:
 - lib/frails/monkey/action_view/template_renderer.rb
 - lib/frails/railtie.rb
 - lib/frails/side_load_assets.rb
+- lib/frails/utils.rb
 - lib/frails/version.rb
 - lib/install/template.rb
 - lib/tasks/frails.rake
@@ -122,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Modern [F]ront End on [Rails] and Webpack