rbexy 0.1.4 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1775f06e1058875736a53072d7d76c11f7320cea33176e5392afcdc8d1c95f76
-  data.tar.gz: ccc233edf9234293845e67ebd8e8a27cc640c9f778e9bbb9c8063efd79cde318
+  metadata.gz: 65318a8a1a6c9bc0dc13f0b653dd18df24af2eee0ba7b316c92987becfd10a5b
+  data.tar.gz: c5bfae261147560bd41b85a3d18b1f672d99294eec70038687315dadeaddcb4a
 SHA512:
-  metadata.gz: 877b65e6375f895a730420811d59b7e82937fb075709a3b42d8778d7b6e7a3e16119adffacf657184ca2cd21f30d5aecb0601a0250eb4a8095295d2cebb4a676
-  data.tar.gz: c77c30e0c6420d1154022daa40dec11ed5a9fd416d83df8d002f3b28cde6e7a64d39d8154734ffec80a56ef56e60b1bbdbd842da7f7e9bc0a77863d31dd255e1
+  metadata.gz: 9fec2040704b9d393992b7f9ba73be9ed4de414ba87d021b5aa80daff9b086594807f2ade26b55f3b7c23478d4476040862a019c5bef2538fe82cb5d7e3a20ed
+  data.tar.gz: 882a81ff03783bfd18e9d2ac09a494ac8cd434e293db3d7a83735c0c5f8fe391a319ea596a31ed3680d1a542e9dbcb656e5fd711f3779a828cea6ff993b37e61

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.4)
+    rbexy (0.2.3)
       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,7 @@ 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"
   end
 end

data/lib/rbexy/rails/controller_helper.rb

@@ -0,0 +1,3 @@
+    module ControllerHelper
+      def rbexy_component_provider; end
+    end

data/lib/rbexy/rails/engine.rb

@@ -4,10 +4,16 @@ 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) }
+
+        ActionView::Template.register_template_handler(:rbx, template_handler)
 
         ActiveSupport.on_load :action_controller_base do
           helper Rbexy::ViewContextHelper
+          helper_method :rbexy_component_provider
+          include ControllerHelper
         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.4"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.3
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-24 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,8 +235,8 @@ files:
 - lib/rbexy/output_buffer.rb
 - lib/rbexy/parser.rb
 - lib/rbexy/rails.rb
+- lib/rbexy/rails/controller_helper.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