rbexy 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65318a8a1a6c9bc0dc13f0b653dd18df24af2eee0ba7b316c92987becfd10a5b
-  data.tar.gz: c5bfae261147560bd41b85a3d18b1f672d99294eec70038687315dadeaddcb4a
+  metadata.gz: deef1d8ce0aa71474ace3e813e28df01736d209b043734b7d83f7bb214a8eb5a
+  data.tar.gz: 31c8f2258bd54bab4a5f31cebcaf510f965b812fb7aca526098bb18878a41ce3
 SHA512:
-  metadata.gz: 9fec2040704b9d393992b7f9ba73be9ed4de414ba87d021b5aa80daff9b086594807f2ade26b55f3b7c23478d4476040862a019c5bef2538fe82cb5d7e3a20ed
-  data.tar.gz: 882a81ff03783bfd18e9d2ac09a494ac8cd434e293db3d7a83735c0c5f8fe391a319ea596a31ed3680d1a542e9dbcb656e5fd711f3779a828cea6ff993b37e61
+  metadata.gz: b11967dff6d336fc3360b731ec6178b255b43e5c502580185541361c7ca3b9df41b5cf1f5c408c7cb1b2719722ff237f687d3bcf0f472b07edbb6137317655ec
+  data.tar.gz: 4f5238c70548687dc966d4a440a424176619f2255fb00f0a0508a21cf6642f888c7070016efba63e0c18f54c47bfe4873612f843b1058560cfc6bb951d378aff

data/.gitignore

@@ -1,3 +1,4 @@
-spec/dummy/log/
+spec/dummy/log/*
 pkg/
-spec/dummy/tmp/
+spec/dummy/tmp/*
+spec/dummy/db/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbexy (0.2.3)
+    rbexy (0.3.0)
       actionview (>= 5.0, < 7.0)
       activesupport (>= 5.0, < 7.0)
       railties (>= 5.0, < 7.0)

data/docker-compose.yml

@@ -6,6 +6,7 @@ volumes:
 services:
   rbexy:
     build: .
+    image: rbexy
     volumes:
       - .:/app
       - bundle:/usr/local/bundle
@@ -13,3 +14,14 @@ services:
       - $HOME/.gitconfig:/root/.gitconfig:ro
       - $HOME/.gem/credentials:/root/.gem/credentials
     working_dir: /app
+  dummy:
+    image: rbexy
+    volumes:
+      - .:/app
+      - bundle:/usr/local/bundle
+    working_dir: /app/spec/dummy/
+    command: ./start.sh
+    ports:
+      - 3000:3000
+    environment:
+      - RAILS_LOG_STDOUT=1

data/lib/rbexy/component.rb

@@ -1,25 +1,20 @@
 require "action_view"
+require "active_support/core_ext/class/attribute"
 
 module Rbexy
   class Component < ActionView::Base
-    class LookupContext < ActionView::LookupContext
-      attr_accessor :component_name_stack
-
-      def self.details_hash(context)
-        context.registered_details.each_with_object({}) do |key, details_hash|
-          value = key == :locale ? [context.locale] : context.send(key)
-          details_hash[key] = value
-        end
+    class TemplatePath < String
+      def to_s
+        self
       end
+    end
 
-      # We override any calls to args_for_lookup and set partial=false so that
-      # the lookup context doesn't automatically add a `_` prefix to the
-      # template path, since we're using the Rails partial-rendering
-      # functionality but don't want our templates prefixed with a `_`
-      def args_for_lookup(name, prefixes, partial, keys, details_options)
-        partial = false if component_name_stack.include?(name)
-        super(name, prefixes, partial, keys, details_options)
-      end
+    def self.component_name
+      name.underscore
+    end
+
+    def component_name
+      self.class.component_name
     end
 
     def initialize(view_context, **props)
@@ -45,10 +40,9 @@ module Rbexy
     end
 
     def call
-      replace_lookup_context
-      view_renderer.render(self, partial: component_name, &nil)
-    ensure
-      restore_lookup_context
+      path = TemplatePath.new(component_name)
+      template = view_context.lookup_context.find(path)
+      template.render(self, {})
     end
 
     def content
@@ -66,40 +60,13 @@ module Rbexy
         raise(ContextNotFound, "no parent context `#{name}`")
     end
 
-    def view_renderer
-      view_context.view_renderer
-    end
-
-    def component_name
-      self.class.name.underscore
+    def compiled_method_container
+      Rbexy::Component
     end
 
     private
 
-    attr_reader :view_context, :content_block, :old_lookup_context
-
-    def replace_lookup_context
-      unless view_renderer.lookup_context.is_a? Rbexy::Component::LookupContext
-        @old_lookup_context = view_renderer.lookup_context
-        view_renderer.lookup_context = build_lookup_context(old_lookup_context)
-      end
-
-      (view_renderer.lookup_context.component_name_stack ||= []) << component_name
-    end
-
-    def restore_lookup_context
-      return unless old_lookup_context
-      view_renderer.lookup_context = old_lookup_context
-      @old_lookup_context = nil
-    end
-
-    def build_lookup_context(existing_context)
-      paths = existing_context.view_paths.dup.unshift(
-        *Rbexy.configuration.template_paths.map { |p| ActionView::OptimizedFileSystemResolver.new(p) }
-      )
-
-      LookupContext.new(paths, LookupContext.details_hash(existing_context))
-    end
+    attr_reader :view_context, :content_block
 
     def method_missing(meth, *args, &block)
       if view_context.respond_to?(meth)

data/lib/rbexy/configuration.rb

@@ -2,6 +2,7 @@ module Rbexy
   class Configuration
     attr_accessor :component_provider
     attr_accessor :template_paths
+    attr_accessor :enable_context
 
     def template_paths
       @template_paths ||= []

data/lib/rbexy/nodes.rb

@@ -85,11 +85,14 @@ module Rbexy
           base_tag
         end
 
+        context_open = Rbexy.configuration.enable_context ? "rbexy_context.push({});" : nil
+        context_close = Rbexy.configuration.enable_context ? "rbexy_context.pop;" : nil
+
         [
           "Rbexy::OutputBuffer.new.tap { |output|",
-            "rbexy_context.push({}) if defined?(Rbexy::Component) && self.is_a?(Rbexy::Component);",
-            "output << (#{tag});",
-            "rbexy_context.pop if defined?(Rbexy::Component) && self.is_a?(Rbexy::Component);",
+            context_open,
+            "output << (#{tag}).html_safe;",
+            context_close,
           "}.html_safe"
         ].join(" ")
       end

data/lib/rbexy/output_buffer.rb

@@ -1,7 +1,9 @@
+require "active_support/core_ext/string/output_safety"
+
 module Rbexy
-  class OutputBuffer < String
+  class OutputBuffer < ActiveSupport::SafeBuffer
     def <<(content)
-      value = content.is_a?(Array) ? content.join : content
+      value = content.is_a?(Array) ? content.join.html_safe : content
       super([nil, false].include?(value) ? "" : value.to_s)
     end
   end

data/lib/rbexy/rails.rb

@@ -4,5 +4,6 @@ module Rbexy
   module Rails
     autoload :Engine, "rbexy/rails/engine"
     autoload :ControllerHelper, "rbexy/rails/controller_helper"
+    autoload :ComponentTemplateResolver, "rbexy/rails/component_template_resolver"
   end
 end

data/lib/rbexy/rails/component_template_resolver.rb

@@ -0,0 +1,35 @@
+require "action_view"
+
+module Rbexy
+  module Rails
+    class ComponentTemplateResolver < ActionView::FileSystemResolver
+      # Rails 6 requires us to override `_find_all` in order to hook
+      def _find_all(name, prefix, partial, details, key, locals)
+        find_templates(name, prefix, partial, details, locals)
+      end
+
+      # Rails 5 only requires `find_templates` (which tbh is the proper way
+      # to implement subclasses of ActionView::Resolver)
+      def find_templates(name, prefix, partial, details, locals = [])
+        return [] unless name.is_a? Rbexy::Component::TemplatePath
+
+        templates_path = File.join(@path, prefix, name)
+        extensions = details[:handlers].join(",")
+
+        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 = ["rbexy_component", prefix, name].join("/")
+
+          ActionView::Template.new(
+            source,
+            template_path,
+            handler,
+            locals: [],
+            virtual_path: virtual_path
+          )
+        end
+      end
+    end
+  end
+end

data/lib/rbexy/rails/controller_helper.rb

@@ -1,3 +1,20 @@
+require "active_support/concern"
+
+module Rbexy
+  module Rails
     module ControllerHelper
+      extend ActiveSupport::Concern
+
       def rbexy_component_provider; end
+
+      class_methods do
+        def inherited(klass)
+          super
+          Rbexy.configuration.template_paths.each do |path|
+            prepend_view_path(Rbexy::Rails::ComponentTemplateResolver.new(path))
+          end
+        end
+      end
     end
+  end
+end

data/lib/rbexy/rails/engine.rb

@@ -24,6 +24,7 @@ module Rbexy
           require "rbexy/component_providers/rbexy_provider"
           config.component_provider = Rbexy::ComponentProviders::RbexyProvider.new
           config.template_paths << ::Rails.root.join("app", "components")
+          config.enable_context = true
         end
       end
     end

data/lib/rbexy/version.rb

@@ -1,3 +1,3 @@
 module Rbexy
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -235,6 +235,7 @@ files:
 - lib/rbexy/output_buffer.rb
 - lib/rbexy/parser.rb
 - lib/rbexy/rails.rb
+- lib/rbexy/rails/component_template_resolver.rb
 - lib/rbexy/rails/controller_helper.rb
 - lib/rbexy/rails/engine.rb
 - lib/rbexy/runtime.rb