rbexy 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f380f26df4a04d8cc73a9a65b5abaad571a32670013eabb3465eaa7f08ab1de4
-  data.tar.gz: e729b87a8e1ec2918dce115b240bfbea991a11203d73f003a42cccb972544c93
+  metadata.gz: f2c4fd57eed2a80ab3e953e5ea7ca577723dad29e5af7d2fb1bc231171c359e6
+  data.tar.gz: 3f578fae5f23cab09d4b25744a933adcab8a119c72d3a937496298db9b235583
 SHA512:
-  metadata.gz: 795cead4247e37aed6d803f430318e8cb5f080ee431fc0f2f6820684b211a0a45d58ea9205b2cbd3c9e94dcf2021fe972596bd48109276334a2b32661813c9ef
-  data.tar.gz: 6ec46d0e829a2d2fb387b45c372cdd2fa5dcb9f04d5e872c8dea637ee9867af964d76eabd1f2b3f83b437db3c4da823359dba0a24bb149d0fae0f3bdfcc15204
+  metadata.gz: 7330738b406e5944b8b4c9d379f1527ec78745026e2505902149d32164ed8b074cbe8f485a2dcbdeae8e75e11339142e94d804bf1b0470d840313082fc73ce53
+  data.tar.gz: a900f8c4991796ef6719d4ed29bc6e7e60a7d04fdbee3fd29cc3ee38e50baa04597030dcac33c7e4c30f2af6b228e3e7cc863d348780732c77e0a4d80a5b9ba4

data/.gitignore

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

data/Gemfile.lock

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

data/lib/rbexy/component.rb

@@ -43,11 +43,10 @@ module Rbexy
     end
 
     def call
-      old_lookup_context = view_renderer.lookup_context
-      view_renderer.lookup_context = build_lookup_context(old_lookup_context)
+      replace_lookup_context
       view_renderer.render(self, partial: component_name, &nil)
     ensure
-      view_renderer.lookup_context = old_lookup_context
+      restore_lookup_context
     end
 
     def content
@@ -65,28 +64,36 @@ 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
+    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),
-        Rbexy.configuration.template_prefixes
-      )
-    end
-
-    def view_renderer
-      view_context.view_renderer
-    end
-
-    def component_name
-      self.class.name.underscore
+      LookupContext.new(paths, LookupContext.details_hash(existing_context))
     end
 
     def method_missing(meth, *args, &block)

data/lib/rbexy/configuration.rb

@@ -2,14 +2,9 @@ module Rbexy
   class Configuration
     attr_accessor :component_provider
     attr_accessor :template_paths
-    attr_accessor :template_prefixes
 
     def template_paths
       @template_paths ||= []
     end
-
-    def template_prefixes
-      @template_prefixes ||= []
-    end
   end
 end

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

@@ -4,9 +4,13 @@ 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
         end
 

data/lib/rbexy/version.rb

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

metadata

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