rbexy 0.1.3 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74a5c438dc97044fb901226d33d6354b01f8e9d5cf7cab0665b97cae6cab8c5b
-  data.tar.gz: ec1fd65332ff5830128aaf4db980018fd4834906c73032b1d533d29697cf84a2
+  metadata.gz: 9b5edab6a6162d1d195a6e72652727a6be94934f6759eeaa4425ca252fc2be6a
+  data.tar.gz: 77112d7e4c606ad909d34777c1a549c904acef758cb64705aec70fea5ef9bf35
 SHA512:
-  metadata.gz: 14f7b82c8322f3bd0720f289cc2bc5b9088b0d16bd81b9fd40414361512ef4aac9a048733f04d14aab7be7c846c94e311b3775c2f05fe5ee4f2511d44b6192eb
-  data.tar.gz: f4073f33ad17c9d3959d3cd73138c74c9340a94c430910c41ae980a97bcb422039b29b34c23285d9ff6e70f6980fb34efdddde8dc3a6f8159e96ed86d24b4b28
+  metadata.gz: b018d547ad94191051c9dbf4dec6dc6032c71f55d5d9cbc96f0ceb5993ddec97f047a9301868499bb0fe038ca93fed7bb40af1c7a46b0d97c27cbceb1b70ddf7
+  data.tar.gz: 16058ae7865b3090b1975c66619787ab368268cc1c7dba50fb4899c0c206b0865de96b7e66c708eb65405b48b610d50d6b8cf701c3a04424e72f5a2ac69cee0d

data/.gitignore

@@ -1,2 +1,3 @@
 spec/dummy/log/
 pkg/
+spec/dummy/tmp/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbexy (0.1.3)
+    rbexy (0.2.2)
       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/lib/rbexy/component.rb

@@ -3,6 +3,8 @@ require "action_view"
 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)
@@ -15,7 +17,8 @@ module Rbexy
       # 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)
+        partial = false if component_name_stack.include?(name)
+        super(name, prefixes, partial, keys, details_options)
       end
     end
 
@@ -37,7 +40,6 @@ module Rbexy
     def setup(**props); end
 
     def render(&block)
-      @content = nil
       @content_block = block_given? ? block : nil
       call
     end
@@ -50,7 +52,7 @@ module Rbexy
     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)
@@ -77,9 +79,12 @@ module Rbexy
     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)
+      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

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/rails.rb

@@ -2,7 +2,6 @@ module Rbexy
   autoload :Component, "rbexy/component"
 
   module Rails
-    autoload :TemplateHandler, "rbexy/rails/template_handler"
     autoload :Engine, "rbexy/rails/engine"
   end
 end

data/lib/rbexy/rails/engine.rb

@@ -4,10 +4,17 @@ module Rbexy
   module Rails
     class Engine < ::Rails::Engine
       initializer "rbexy" do |app|
-        ActionView::Template.register_template_handler(:rbx, Rbexy::Rails::TemplateHandler)
+        template_handler = ::Rails.version.to_f >= 6.0 ?
+          proc { |template, source| Rbexy.compile(source) } :
+          proc { |template| Rbexy.compile(template.source) }
 
-        ActiveSupport.on_load :action_controller do
+        ActionView::Template.register_template_handler(:rbx, template_handler)
+
+        ActiveSupport.on_load :action_controller_base do
           helper Rbexy::ViewContextHelper
+          helper_method :rbexy_component_provider
+
+          def rbexy_component_provider; end
         end
 
         if defined?(ViewComponent)

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.3"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.2
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-18 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
@@ -235,7 +236,6 @@ files:
 - lib/rbexy/parser.rb
 - lib/rbexy/rails.rb
 - lib/rbexy/rails/engine.rb
-- lib/rbexy/rails/template_handler.rb
 - lib/rbexy/runtime.rb
 - lib/rbexy/version.rb
 - lib/rbexy/view_context_helper.rb

data/lib/rbexy/rails/template_handler.rb

@@ -1,9 +0,0 @@
-module Rbexy
-  module Rails
-    class TemplateHandler
-      def self.call(template, source)
-        Rbexy.compile(source)
-      end
-    end
-  end
-end