rbexy 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 563f7d14586235a18249e38e8859824b7952617b4984ab794e69963c218b41b2
-  data.tar.gz: a20d77a9a3d2fc439d425033fcb3230d18f59a98990a50be022569de163e67cf
+  metadata.gz: e21e51ccf4a683d3f4c26ef53af86382de7fd9b26e3db2a0790fdf6d7e3df800
+  data.tar.gz: f956dd52d3e20229df1290269f17fe28a7cd352cfa4b2c5649ede1f38f8bb9dd
 SHA512:
-  metadata.gz: 48a530ceee5c8b30f7c41900db8b5b0658351a5ab397af004bc9b38c1047d1bb62eecc0ee4807bc992d690d50dabf5d291a15aadc7c27975cc6901bae8985ec1
-  data.tar.gz: 4e5713408292969214aeb92909f522dd59f823f847ece59bb016e55e0993eb2d3c51fd0434ebaab3447f939f32833600da4c466fdacb5d3632b4201dea7c7e13
+  metadata.gz: e792baa90cab354b588425c5a5851c5c23372c7cafcdb34e65d79bdd8a75b7271668dd02867a4987f6687ee704d4f8d63201e5192cb49a9fa27377610968fb07
+  data.tar.gz: 3d022540841d61746e14b909c70e3e7e769c78e6d03bbc5ca87dd6f611043a197309e83ab068a903089a201f88f7941edd5c1effc68497bb156ec203da2814bc

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.0)
+    rbexy (0.3.1)
       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,22 +1,20 @@
 require "action_view"
+require "active_support/core_ext/class/attribute"
 
 module Rbexy
   class Component < ActionView::Base
-    class LookupContext < ActionView::LookupContext
-      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)
-        super(name, prefixes, false, keys, details_options)
-      end
+    def self.component_name
+      name.underscore
+    end
+
+    def component_name
+      self.class.component_name
     end
 
     def initialize(view_context, **props)
@@ -37,20 +35,18 @@ module Rbexy
     def setup(**props); end
 
     def render(&block)
-      @content = nil
       @content_block = block_given? ? block : nil
       call
     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
-      @content ||= content_block ? view_context.capture(self, &content_block) : ""
+      content_block ? view_context.capture(self, &content_block) : ""
     end
 
     def create_context(name, value)
@@ -64,37 +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
-      return if 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
-
-    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/lexer.rb

@@ -22,7 +22,7 @@ module Rbexy
       text_content: /[^<{#]+/,
       comment: /^\p{Blank}*#.*(\n|\z)/,
       whitespace: /\s+/,
-      attr: /[A-Za-z0-9\-_\.]+/,
+      attr: /[A-Za-z0-9\-_\.:]+/,
       open_attr_splat: /{\*\*/,
       attr_assignment: /=/,
       double_quote: /"/,

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

@@ -3,5 +3,7 @@ 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

@@ -0,0 +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

@@ -13,8 +13,7 @@ module Rbexy
         ActiveSupport.on_load :action_controller_base do
           helper Rbexy::ViewContextHelper
           helper_method :rbexy_component_provider
-
-          def rbexy_component_provider; end
+          include ControllerHelper
         end
 
         if defined?(ViewComponent)
@@ -25,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.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -235,6 +235,8 @@ 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
 - lib/rbexy/version.rb