rbexy 0.1.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c4fd57eed2a80ab3e953e5ea7ca577723dad29e5af7d2fb1bc231171c359e6
-  data.tar.gz: 3f578fae5f23cab09d4b25744a933adcab8a119c72d3a937496298db9b235583
+  metadata.gz: deef1d8ce0aa71474ace3e813e28df01736d209b043734b7d83f7bb214a8eb5a
+  data.tar.gz: 31c8f2258bd54bab4a5f31cebcaf510f965b812fb7aca526098bb18878a41ce3
 SHA512:
-  metadata.gz: 7330738b406e5944b8b4c9d379f1527ec78745026e2505902149d32164ed8b074cbe8f485a2dcbdeae8e75e11339142e94d804bf1b0470d840313082fc73ce53
-  data.tar.gz: a900f8c4991796ef6719d4ed29bc6e7e60a7d04fdbee3fd29cc3ee38e50baa04597030dcac33c7e4c30f2af6b228e3e7cc863d348780732c77e0a4d80a5b9ba4
+  metadata.gz: b11967dff6d336fc3360b731ec6178b255b43e5c502580185541361c7ca3b9df41b5cf1f5c408c7cb1b2719722ff237f687d3bcf0f472b07edbb6137317655ec
+  data.tar.gz: 4f5238c70548687dc966d4a440a424176619f2255fb00f0a0508a21cf6642f888c7070016efba63e0c18f54c47bfe4873612f843b1058560cfc6bb951d378aff

data/.gitignore

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

data/Gemfile.lock

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

data/README.md

@@ -375,6 +375,16 @@ Rbexy.configure do |config|
 end
 ```
 
+Or in Rails you can customize the component provider just for a controller:
+
+```ruby
+class ThingsController < ApplicationController
+  def rbexy_component_provider
+    MyComponentProvider.new
+  end
+end
+```
+
 See `lib/rbexy/component_providers/` for example implementations.
 
 ## Usage outside of Rails

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/component_providers/namespaced_rbexy_provider.rb

@@ -0,0 +1,20 @@
+module Rbexy
+  module ComponentProviders
+    class NamespacedRbexyProvider < Rbexy::ComponentProviders::RbexyProvider
+      attr_reader :namespaces
+
+      def initialize(*namespaces)
+        @namespaces = namespaces
+      end
+
+      def find(name)
+        namespaces.each do |namespace|
+          result = super("#{namespace}::#{name}")
+          return result if result != nil
+        end
+
+        super
+      end
+    end
+  end
+end

data/lib/rbexy/component_providers/rbexy_provider.rb

@@ -10,8 +10,6 @@ module Rbexy
         find(name).new(context, **props).render(&block)
       end
 
-      private
-
       def find(name)
         ActiveSupport::Inflector.constantize("#{name}Component")
       rescue NameError => e

data/lib/rbexy/component_providers/view_component_provider.rb

@@ -10,8 +10,6 @@ module Rbexy
         find(name).new(**props).render_in(context, &block)
       end
 
-      private
-
       def find(name)
         ActiveSupport::Inflector.constantize("#{name}Component")
       rescue NameError => e

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

@@ -2,7 +2,8 @@ module Rbexy
   autoload :Component, "rbexy/component"
 
   module Rails
-    autoload :TemplateHandler, "rbexy/rails/template_handler"
     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

@@ -12,6 +12,8 @@ module Rbexy
 
         ActiveSupport.on_load :action_controller_base do
           helper Rbexy::ViewContextHelper
+          helper_method :rbexy_component_provider
+          include ControllerHelper
         end
 
         if defined?(ViewComponent)
@@ -22,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/runtime.rb

@@ -11,7 +11,11 @@ module Rbexy
 
     DefaultTagBuilder = ActionView::Helpers::TagHelper::TagBuilder
 
-    def self.create_tag_builder(context, provider = Rbexy.configuration.component_provider)
+    def self.create_tag_builder(context, provider = nil)
+      provider = provider ||
+        provider_from_context(context) ||
+        Rbexy.configuration.component_provider
+
       if provider
         ComponentTagBuilder.new(context, provider)
       else
@@ -19,6 +23,12 @@ module Rbexy
       end
     end
 
+    def self.provider_from_context(context)
+      if context.respond_to?(:rbexy_component_provider)
+        context.rbexy_component_provider
+      end
+    end
+
     def initialize(component_provider = nil)
       @rbexy_tag = self.class.create_tag_builder(self, component_provider)
     end

data/lib/rbexy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,6 +224,7 @@ files:
 - example.rb
 - lib/rbexy.rb
 - lib/rbexy/component.rb
+- lib/rbexy/component_providers/namespaced_rbexy_provider.rb
 - lib/rbexy/component_providers/rbexy_provider.rb
 - lib/rbexy/component_providers/view_component_provider.rb
 - lib/rbexy/component_tag_builder.rb
@@ -234,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