rbexy 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de2d3389ec5f783be2e913921071bc0920baa342980360445e5756a8d6cd2d72
-  data.tar.gz: 7dfdd99aa0852253e491889010f87c5a2ca828a57b16fe8749d9231135c785a2
+  metadata.gz: 563f7d14586235a18249e38e8859824b7952617b4984ab794e69963c218b41b2
+  data.tar.gz: a20d77a9a3d2fc439d425033fcb3230d18f59a98990a50be022569de163e67cf
 SHA512:
-  metadata.gz: a6e669a7babe4bb38c7a31be00c0a98d1035c1c7fec980b713a4bb17a2ba461c127745a7b7fee50f6419830eb7e26bf505243662c08245973fac4a3c0ce20dd4
-  data.tar.gz: 91c71f51bd42958d86a5584a85a0a634fb35306e95e4a022bc82508c2d5d7cb05df901197d276a870bbcab19b6d1d632a0de4a43518d39f2dd9b00b08559f316
+  metadata.gz: 48a530ceee5c8b30f7c41900db8b5b0658351a5ab397af004bc9b38c1047d1bb62eecc0ee4807bc992d690d50dabf5d291a15aadc7c27975cc6901bae8985ec1
+  data.tar.gz: 4e5713408292969214aeb92909f522dd59f823f847ece59bb016e55e0993eb2d3c51fd0434ebaab3447f939f32833600da4c466fdacb5d3632b4201dea7c7e13

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.0)
+    rbexy (0.2.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/lib/rbexy/component.rb

@@ -64,6 +64,14 @@ module Rbexy
         raise(ContextNotFound, "no parent context `#{name}`")
     end
 
+    def view_renderer
+      view_context.view_renderer
+    end
+
+    def component_name
+      self.class.name.underscore
+    end
+
     private
 
     attr_reader :view_context, :content_block, :old_lookup_context
@@ -88,14 +96,6 @@ module Rbexy
       LookupContext.new(paths, LookupContext.details_hash(existing_context))
     end
 
-    def view_renderer
-      view_context.view_renderer
-    end
-
-    def component_name
-      self.class.name.underscore
-    end
-
     def method_missing(meth, *args, &block)
       if view_context.respond_to?(meth)
         view_context.send(meth, *args, &block)

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

@@ -115,7 +115,7 @@ module Rbexy
             expression_inner_single_quote
           elsif scanner.scan(Patterns.open_tag_def)
             potential_expression_inner_tag
-          elsif scanner.scan(Patterns.expression_content)
+          elsif expression_content?
             self.curr_expr += scanner.matched
           else
             raise SyntaxError, self
@@ -132,7 +132,7 @@ module Rbexy
             expression_inner_single_quote
           elsif scanner.scan(Patterns.open_tag_def)
             potential_expression_inner_tag
-          elsif scanner.scan(Patterns.expression_content)
+          elsif expression_content?
             self.curr_expr += scanner.matched
           else
             raise SyntaxError, self
@@ -237,6 +237,7 @@ module Rbexy
     end
 
     def potential_expression_inner_tag
+      # binding.pry
       if self.curr_expr =~ Patterns.expression_internal_tag_prefixes
         tokens << [:EXPRESSION_BODY, curr_expr]
         self.curr_expr = ""
@@ -275,5 +276,16 @@ module Rbexy
       self.curr_expr += scanner.getch
       stack.pop unless curr_expr.end_with?('\\')
     end
+
+    def expression_content?
+      # Patterns.expression_content ends at `<` characters, because we need to
+      # separately scan for allowed open_tag_defs within expressions. We should
+      # support any found open_tag_ends as expression content, as that means the
+      # open_tag_def was not considered allowed (or stack would be inside
+      # :tag_def instead of :expression) so we should thus also consider the
+      # open_tag_end to just be a part of the expression (maybe its in a string,
+      # etc).
+      scanner.scan(Patterns.expression_content) || scanner.scan(Patterns.open_tag_end)
+    end
   end
 end

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.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-10-13 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