rbexy 2.0.0.beta2 → 2.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e56bce79c603651029c2d7949028d0d9fcaf5922cf3935576a58b7bf9dd68c79
-  data.tar.gz: d3abd4a15687d4b9a625468ce480f4b4f3cc6f170233007193a6fcf9b1da48fe
+  metadata.gz: 97a3fcda88057f9554949f70bbc5dcd30910354e6eb4a4cd1a83e0b53bd30322
+  data.tar.gz: fe5f40ad4f4820233e2c555e9c0d13852774c75e40d03e1ac6357157e87d6a22
 SHA512:
-  metadata.gz: 0fc85f83715174cc86621989a2237c968d3824f92b9d39adcf89f5971f2865d032ccc5fca313eba44396b90bf3d0b3ba99054dbdb4006e63dc1f2b6e18907cf9
-  data.tar.gz: c89aed3077b4e0e57d58ec8c40f76a57bf086754fbd17f38f873c1a2f553f0d4d0dfc0b6a182f14f860de7ddf8a0be3b521b9062738c1c1dc35f60ce1074f847
+  metadata.gz: d819a2cdd14c75b73b0fc88aabb57cff4666232601a0cf7aeb554a7841313bfdb9f6a56f43d672bec493e14b4a5fcd6f01613ead04ea1609d36e75368352576a
+  data.tar.gz: 18c2566b9851268b689e43800dd0a9876224c181cd089750416fc2202c65613cc57717c3a354c5da90cecbd6cb2258ec911e56aff59dc44739ee1bf14b5bccce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbexy (2.0.0.beta2)
+    rbexy (2.0.0.beta7)
       actionview (>= 6.0, < 7.0)
       activesupport (>= 6.0, < 7.0)
 

data/README.md

@@ -301,7 +301,7 @@ By default, we'll look for a template file in the same directory as the class an
 <h1>{@title}</h1>
 ```
 
-You can call this component from another `.rbx` template file (`<PageHeader title="Hello" />`)—either one rendered by another component class or a Rails view file like `app/views/products/index.rbx`. Or you can call it from ERB (or any other template language) like `PageHeaderComponent.new(self, title: "Hello").render`.
+You can call this component from another `.rbx` template file (`<PageHeader title="Hello" />`)—either one rendered by another component class or a Rails view file like `app/views/products/index.rbx`. Or you can call it from ERB (or any other template language) like `PageHeaderComponent.new(self, title: "Hello").render_in`.
 
 Your components and their templates run in the same context as traditional Rails views, so you have access to all of the view helpers you're used to as well as any custom helpers you've defined in `app/helpers/`.
 

data/lib/rbexy/cache_component.rb

@@ -0,0 +1,17 @@
+module Rbexy
+  class CacheComponent < Rbexy::Component
+    def setup(key:)
+      @key = key
+    end
+
+    def call
+      @current_template = view_context.instance_variable_get(:@current_template)
+
+      capture do
+        cache @key, virtual_path: @current_template.virtual_path do
+          @output_buffer << content
+        end
+      end
+    end
+  end
+end

data/lib/rbexy/component.rb

@@ -1,4 +1,5 @@
 require "action_view"
+require "active_support/core_ext/class/attribute"
 
 module Rbexy
   class Component < ActionView::Base
@@ -10,12 +11,22 @@ module Rbexy
       end
     end
 
-    def self.component_name
-      name.underscore
+    class_attribute :component_file_location
+
+    def self.inherited(klass)
+      klass.component_file_location = caller_locations(1, 10).reject { |l| l.label == "inherited" }[0].absolute_path
     end
 
-    def component_name
-      self.class.component_name
+    def self.template_path
+      TemplatePath.new(component_name)
+    end
+
+    def self.call_component?
+      method_defined?(:call)
+    end
+
+    def self.component_name
+      name.underscore
     end
 
     def initialize(view_context, **props)
@@ -27,7 +38,7 @@ module Rbexy
 
       @view_context = view_context
 
-      setup(**props)
+      after_initialize(**props)
     end
 
     # Override in your subclass to handle props, setup your component, etc.
@@ -35,18 +46,15 @@ module Rbexy
     # call super(view_context).
     def setup(**props); end
 
-    def render(&block)
+    def render_in(_context = view_context, &block)
       @content_block = block_given? ? block : nil
-      call
+      self.class.call_component? ? call : _render
     end
 
-    def call
-      path = TemplatePath.new(component_name)
-      template = view_context.lookup_context.find(path)
-      template.render(self, {})
-    rescue ActionView::Template::Error => error
-      error.set_backtrace clean_template_backtrace(error.backtrace)
-      raise error
+    # Explicitly delegate `render` to the view_context rather than super,
+    # so `render partial: "..."` calls run in the expected context.
+    def render(*args)
+      view_context.render(*args)
     end
 
     def content
@@ -61,6 +69,15 @@ module Rbexy
 
     attr_reader :view_context, :content_block
 
+    def _render
+      path = self.class.template_path
+      template = view_context.lookup_context.find(path)
+      template.render(self, {})
+    rescue ActionView::Template::Error => error
+      error.set_backtrace clean_template_backtrace(error.backtrace)
+      raise error
+    end
+
     def method_missing(meth, *args, &block)
       view_context.send(meth, *args, &block)
     end
@@ -73,5 +90,9 @@ module Rbexy
       return backtrace if Rbexy.configuration.debug
       BacktraceCleaner.new(backtrace).call
     end
+
+    def after_initialize(**props)
+      setup(**props)
+    end
   end
 end

data/lib/rbexy/component_resolver.rb

@@ -19,6 +19,13 @@ module Rbexy
       tspan tt u ul unknown use var video view wbr xmp
     ).to_set
 
+    def self.try_constantize
+      yield
+    rescue NameError => e
+      raise e unless e.message =~ /wrong constant name/ || e.message =~ /uninitialized constant/
+      nil
+    end
+
     attr_reader :component_namespaces
 
     def initialize
@@ -43,18 +50,11 @@ module Rbexy
     private
 
     def find(name)
-      find!(name)
-    rescue NameError => e
-      raise e unless e.message =~ /wrong constant name/ || e.message =~ /uninitialized constant/
-      nil
+      self.class.try_constantize { ActiveSupport::Inflector.constantize("#{name.gsub(".", "::")}Component") }
     end
 
     def matching_namespaces(template)
       component_namespaces.select { |path, ns| template.identifier.start_with?(path) }.values.flatten.uniq
     end
-
-    def find!(name)
-      ActiveSupport::Inflector.constantize("#{name.gsub(".", "::")}Component")
-    end
   end
 end

data/lib/rbexy/configuration.rb

@@ -22,7 +22,7 @@ module Rbexy
     def component_rendering_templates
       @component_rendering_templates ||= {
         children: "{capture{%{children}}}",
-        component: "::%{component_class}.new(%{view_context},%{kwargs}).render%{children_block}"
+        component: "::%{component_class}.new(%{view_context},%{kwargs}).render_in%{children_block}"
       }
     end
   end

data/lib/rbexy/nodes/component_element.rb

@@ -36,7 +36,7 @@ module Rbexy
         members.each_with_object("") do |member, result|
           case member
           when ExpressionGroup
-            result << "**#{member.compile},"
+            result << "**#{member.compile}.transform_keys { |k| ActiveSupport::Inflector.underscore(k).to_sym },"
           when Newline
             result << member.compile
           else

data/lib/rbexy/rails.rb

@@ -1,9 +1,11 @@
 module Rbexy
   autoload :Component, "rbexy/component"
+  autoload :CacheComponent, "rbexy/cache_component"
 
   module Rails
     autoload :Engine, "rbexy/rails/engine"
     autoload :ControllerHelper, "rbexy/rails/controller_helper"
     autoload :ComponentTemplateResolver, "rbexy/rails/component_template_resolver"
+    autoload :RbxDependencyTracker, "rbexy/rails/rbx_dependency_tracker"
   end
 end

data/lib/rbexy/rails/component_template_resolver.rb

@@ -1,7 +1,14 @@
+require "active_support/digest"
+
 module Rbexy
   module Rails
     class ComponentTemplateResolver < ActionView::FileSystemResolver
-      VIRTUAL_ROOT = "rbexy_component".freeze
+      COMMENT_SYNTAX = {
+        rbx: "# %s",
+        erb: "<%%# %s %%>",
+        haml: "-# %s",
+        slim: "/ %s"
+      }
 
       # Rails 6 requires us to override `_find_all` in order to hook
       def _find_all(name, prefix, partial, details, key, locals)
@@ -14,22 +21,72 @@ module Rbexy
         return [] unless name.is_a? Rbexy::Component::TemplatePath
 
         templates_path = File.join(@path, prefix, name)
+        component_name = prefix.present? ? File.join(prefix, name) : name
+        virtual_path = Rbexy::Component::TemplatePath.new(component_name)
+
         extensions = details[:handlers].join(",")
+        templates = find_rbx_templates(templates_path, extensions, component_name, virtual_path)
+
+        if templates.none?
+          templates = find_call_component_cachebuster_templates(templates_path, component_name, virtual_path)
+        end
+
+        templates
+      end
 
+      def find_rbx_templates(templates_path, extensions, component_name, virtual_path)
         Dir["#{templates_path}.*{#{extensions}}"].map do |template_path|
           source = File.binread(template_path)
-          handler = ActionView::Template.handler_for_extension(File.extname(template_path)[1..-1])
-          virtual_path = File.join(VIRTUAL_ROOT, prefix, name)
+          extension = File.extname(template_path)[1..-1]
+          handler = ActionView::Template.handler_for_extension(extension)
 
           ActionView::Template.new(
-            source,
+            "#{source}#{component_class_cachebuster(component_name, extension)}",
             template_path,
             handler,
+            format: extension.to_sym,
             locals: [],
             virtual_path: virtual_path
           )
         end
       end
+
+      def find_call_component_cachebuster_templates(templates_path, component_name, virtual_path)
+        component_class = find_component_class(component_name)
+        return [] unless component_class && component_class.call_component?
+
+        [
+          ActionView::Template.new(
+            cachebuster_digest_as_comment(component_class.component_file_location, :rbx),
+            "#{templates_path}.rbexycall",
+            ActionView::Template.handler_for_extension(:rbx),
+            format: :rbx,
+            locals: [],
+            virtual_path: virtual_path
+          )
+        ]
+      end
+
+      def component_class_cachebuster(component_name, template_format)
+        component_class = find_component_class(component_name)
+        return unless component_class
+
+        cachebuster_digest_as_comment(component_class.component_file_location, template_format)
+      end
+
+      def find_component_class(component_name)
+        Rbexy::ComponentResolver.try_constantize { component_name.classify.constantize }
+      end
+
+      def cachebuster_digest_as_comment(filename, format)
+        comment_template = COMMENT_SYNTAX[format.to_sym]
+        return "" unless comment_template
+
+        source = File.binread(filename)
+        digest = ActiveSupport::Digest.hexdigest(source)
+
+        "\n#{comment_template % digest}"
+      end
     end
   end
 end

data/lib/rbexy/rails/engine.rb

@@ -1,12 +1,14 @@
 require "rbexy/rails"
+require "action_view/dependency_tracker"
 
 module Rbexy
   module Rails
     class Engine < ::Rails::Engine
       initializer "rbexy" do |app|
-        template_handler = proc { |template, source| Rbexy.compile(template) }
+        template_handler = proc { |template, source| Rbexy.compile(Rbexy::Template.new(source, template.identifier)) }
 
         ActionView::Template.register_template_handler(:rbx, template_handler)
+        ActionView::DependencyTracker.register_tracker(:rbx, RbxDependencyTracker)
 
         ActiveSupport.on_load :action_controller_base do
           include ControllerHelper

data/lib/rbexy/rails/rbx_dependency_tracker.rb

@@ -0,0 +1,37 @@
+module Rbexy
+  module Rails
+    class RbxDependencyTracker
+      def self.supports_view_paths?
+        true
+      end
+
+      def self.call(name, template, view_paths = nil)
+        new(name, template, view_paths).dependencies
+      end
+
+      def initialize(name, template, view_paths = nil)
+        @name, @template, @view_paths = name, template, view_paths
+      end
+
+      def dependencies
+        rails_render_helper_dependencies + rbexy_dependencies
+      end
+
+      private
+
+      attr_reader :name, :template, :view_paths
+
+      def rails_render_helper_dependencies
+        ActionView::DependencyTracker::ERBTracker.call(name, template, view_paths)
+      end
+
+      def rbexy_dependencies
+        Lexer.new(template, Rbexy.configuration.element_resolver).tokenize
+          .select { |t| t[0] == :TAG_DETAILS && t[1][:type] == :component }
+          .map { |t| t[1][:component_class] }
+          .uniq
+          .map(&:template_path)
+      end
+    end
+  end
+end

data/lib/rbexy/runtime.rb

@@ -11,7 +11,7 @@ module Rbexy
     end
 
     def self.splat_attrs(attrs_hash)
-      tag_builder.tag_options(attrs_hash).html_safe
+      tag_builder.tag_options(attrs_hash)&.html_safe
     end
 
     def self.expr_out(*value)

data/lib/rbexy/version.rb

@@ -1,3 +1,3 @@
 module Rbexy
-  VERSION = "2.0.0.beta2"
+  VERSION = "2.0.0.beta7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta7
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-09 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -217,6 +217,7 @@ files:
 - docker-compose.yml
 - lib/rbexy.rb
 - lib/rbexy/ast_transformer.rb
+- lib/rbexy/cache_component.rb
 - lib/rbexy/component.rb
 - lib/rbexy/component/backtrace_cleaner.rb
 - lib/rbexy/component_context.rb
@@ -244,6 +245,7 @@ files:
 - lib/rbexy/rails/component_template_resolver.rb
 - lib/rbexy/rails/controller_helper.rb
 - lib/rbexy/rails/engine.rb
+- lib/rbexy/rails/rbx_dependency_tracker.rb
 - lib/rbexy/refinements.rb
 - lib/rbexy/refinements/array.rb
 - lib/rbexy/refinements/array/find_map.rb