rbexy 0.3.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deef1d8ce0aa71474ace3e813e28df01736d209b043734b7d83f7bb214a8eb5a
-  data.tar.gz: 31c8f2258bd54bab4a5f31cebcaf510f965b812fb7aca526098bb18878a41ce3
+  metadata.gz: a6728982815c307bb37a495c3d11450e9582bf1cd17eef5306c9e940c0c36eea
+  data.tar.gz: 5fdfa1cc3c5fc70b573aa730f827b2f5d38b8031f1adc6344b31926ce520b4af
 SHA512:
-  metadata.gz: b11967dff6d336fc3360b731ec6178b255b43e5c502580185541361c7ca3b9df41b5cf1f5c408c7cb1b2719722ff237f687d3bcf0f472b07edbb6137317655ec
-  data.tar.gz: 4f5238c70548687dc966d4a440a424176619f2255fb00f0a0508a21cf6642f888c7070016efba63e0c18f54c47bfe4873612f843b1058560cfc6bb951d378aff
+  metadata.gz: 46385e65a3cd976497efd8d6db789eee4a2c73668e085dd6772d8c6a9a835783f6bb80ef923463af97cfec5d5625fffd641229a5a97a1c24e024b75d996969af
+  data.tar.gz: 025e25a41d9cc5e848342c668721cdef046ab13e5cff9737acc69a66eaca6cdd3ac06493bfcbb42b735fcbd6e7ae243e8a65588d648d3442924306944addb714

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    rbexy (0.3.0)
-      actionview (>= 5.0, < 7.0)
-      activesupport (>= 5.0, < 7.0)
-      railties (>= 5.0, < 7.0)
+    rbexy (1.1.0)
+      actionview (>= 6.0, < 7.0)
+      activesupport (>= 6.0, < 7.0)
 
 GEM
   remote: https://rubygems.org/
@@ -201,7 +200,7 @@ PLATFORMS
 DEPENDENCIES
   guard-rspec (~> 4.7, >= 4.7.3)
   pry-byebug
-  rails (>= 5.0, < 7.0)
+  rails (>= 6.0, < 7.0)
   rake
   rbexy!
   rspec (~> 3.9)

data/README.md

@@ -48,6 +48,8 @@ Add it to your Gemfile and `bundle install`:
 gem "rbexy"
 ```
 
+_From 1.0 onward, we only support Rails 6. If you're using Rails 5, use the 0.x releases._
+
 In `config/application.rb`:
 
 ```ruby

data/lib/rbexy.rb

@@ -6,9 +6,9 @@ module Rbexy
   autoload :Nodes, "rbexy/nodes"
   autoload :Runtime, "rbexy/runtime"
   autoload :HashMash, "rbexy/hash_mash"
-  autoload :OutputBuffer, "rbexy/output_buffer"
   autoload :ComponentTagBuilder, "rbexy/component_tag_builder"
   autoload :ViewContextHelper, "rbexy/view_context_helper"
+  autoload :ComponentContext, "rbexy/component_context"
   autoload :Configuration, "rbexy/configuration"
 
   ContextNotFound = Class.new(StandardError)

data/lib/rbexy/component.rb

@@ -3,6 +3,8 @@ require "active_support/core_ext/class/attribute"
 
 module Rbexy
   class Component < ActionView::Base
+    autoload :BacktraceCleaner, "rbexy/component/backtrace_cleaner"
+
     class TemplatePath < String
       def to_s
         self
@@ -43,21 +45,13 @@ module Rbexy
       path = TemplatePath.new(component_name)
       template = view_context.lookup_context.find(path)
       template.render(self, {})
+    rescue ActionView::Template::Error => error
+      error.set_backtrace clean_template_backtrace(error.backtrace)
+      raise error
     end
 
     def content
-      content_block ? view_context.capture(self, &content_block) : ""
-    end
-
-    def create_context(name, value)
-      rbexy_context.last[name] = value
-    end
-
-    def use_context(name)
-      index = rbexy_context.rindex { |c| c.has_key?(name) }
-      index ?
-        rbexy_context[index][name] :
-        raise(ContextNotFound, "no parent context `#{name}`")
+      content_block ? content_block.call : ""
     end
 
     def compiled_method_container
@@ -75,5 +69,10 @@ module Rbexy
         super
       end
     end
+
+    def clean_template_backtrace(backtrace)
+      return backtrace if Rbexy.configuration.debug
+      BacktraceCleaner.new(backtrace).call
+    end
   end
 end

data/lib/rbexy/component/backtrace_cleaner.rb

@@ -0,0 +1,59 @@
+module Rbexy
+  class Component
+    class BacktraceCleaner
+      attr_reader :backtrace
+
+      def initialize(backtrace)
+        @backtrace = backtrace
+        @found_templates = {}
+      end
+
+      def call
+        backtrace
+          .reject(&method(:internal_implementation_detail?))
+          .map(&method(:strip_rbx_internals_block_mention))
+      end
+
+      private
+
+      attr_reader :found_templates
+
+      def internal_implementation_detail?(line)
+        if template = template_name_if_rbx_internals(line)
+          redundant_internal_block?(line, template)
+        else
+          internal_method_call?(line)
+        end
+      end
+
+      def internal_method_call?(line)
+        line =~ /lib\/rbexy\/.*\.rb/ ||
+          line =~ /lib\/action_view\/.*\.rb/ ||
+          line =~ /lib\/active_support\/notifications\.rb/
+      end
+
+      def redundant_internal_block?(line, template)
+        if found_templates[template]
+          true
+        else
+          found_templates[template] = true
+          false
+        end
+      end
+
+      def strip_rbx_internals_block_mention(line)
+        if template_name_if_rbx_internals(line)
+          line.gsub(/block (\(\d+ levels\))? ?in /, "")
+        else
+          line
+        end
+      end
+
+      def template_name_if_rbx_internals(line)
+        if /\/(?<template>[^\/]*)\.rbx:\d+:in `(block |_)/ =~ line
+          template
+        end
+      end
+    end
+  end
+end

data/lib/rbexy/component_context.rb

@@ -0,0 +1,18 @@
+module Rbexy
+  module ComponentContext
+    def rbexy_context
+      @rbexy_context ||= [{}]
+    end
+
+    def create_context(name, value)
+      rbexy_context.last[name] = value
+    end
+
+    def use_context(name)
+      index = rbexy_context.rindex { |c| c.has_key?(name) }
+      index ?
+        rbexy_context[index][name] :
+        raise(ContextNotFound, "no parent context `#{name}`")
+    end
+  end
+end

data/lib/rbexy/configuration.rb

@@ -3,6 +3,7 @@ module Rbexy
     attr_accessor :component_provider
     attr_accessor :template_paths
     attr_accessor :enable_context
+    attr_accessor :debug
 
     def template_paths
       @template_paths ||= []

data/lib/rbexy/lexer.rb

@@ -22,7 +22,7 @@ module Rbexy
       text_content: /[^<{#]+/,
       comment: /^\p{Blank}*#.*(\n|\z)/,
       whitespace: /\s+/,
-      attr: /[A-Za-z0-9\-_\.]+/,
+      attr: /[A-Za-z0-9\-_\.:]+/,
       open_attr_splat: /{\*\*/,
       attr_assignment: /=/,
       double_quote: /"/,
@@ -237,7 +237,6 @@ 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 = ""

data/lib/rbexy/nodes.rb

@@ -18,11 +18,7 @@ module Rbexy
       end
 
       def compile
-        [
-          "Rbexy::OutputBuffer.new.tap { |output|",
-            children.map(&:compile).map { |c| "output << (#{c})"}.join(";"),
-          "}.html_safe"
-        ].join(" ")
+        "#{children.map(&:compile).map { |c| "@output_buffer << rbexy_prep_output(#{c})"}.join(";")};@output_buffer"
       end
     end
 
@@ -75,26 +71,24 @@ module Rbexy
         base_tag = "rbexy_tag.#{Util.safe_tag_name(name)}(#{compile_members})"
         tag = if children.length > 0
           [
-            "#{base_tag} {",
-              "Rbexy::OutputBuffer.new.tap { |output|",
-                children.map(&:compile).map { |c| "output << (#{c})"}.join(";"),
-              "}.html_safe",
-            "}"
-          ].join(" ")
+            "#{base_tag} { capture {",
+              children.map(&:compile).map { |c| "@output_buffer << rbexy_prep_output(#{c})" }.join(";"),
+            "} }"
+          ].join
         else
           base_tag
-        end
-
-        context_open = Rbexy.configuration.enable_context ? "rbexy_context.push({});" : nil
-        context_close = Rbexy.configuration.enable_context ? "rbexy_context.pop;" : nil
+        end + ".html_safe"
 
-        [
-          "Rbexy::OutputBuffer.new.tap { |output|",
-            context_open,
-            "output << (#{tag}).html_safe;",
-            context_close,
-          "}.html_safe"
-        ].join(" ")
+        if Rbexy.configuration.enable_context
+          [
+            "(",
+              "rbexy_context.push({});",
+              "#{tag}.tap { rbexy_context.pop }",
+            ")"
+          ].join
+        else
+          tag
+        end
       end
 
       def compile_members

data/lib/rbexy/rails/controller_helper.rb

@@ -4,14 +4,21 @@ module Rbexy
   module Rails
     module ControllerHelper
       extend ActiveSupport::Concern
+      include ComponentContext
 
       def rbexy_component_provider; end
 
+      included do
+        helper ViewContextHelper
+        helper_method :rbexy_component_provider
+        helper_method :rbexy_context, :create_context, :use_context
+      end
+
       class_methods do
         def inherited(klass)
           super
           Rbexy.configuration.template_paths.each do |path|
-            prepend_view_path(Rbexy::Rails::ComponentTemplateResolver.new(path))
+            prepend_view_path(ComponentTemplateResolver.new(path))
           end
         end
       end

data/lib/rbexy/rails/engine.rb

@@ -4,25 +4,21 @@ module Rbexy
   module Rails
     class Engine < ::Rails::Engine
       initializer "rbexy" do |app|
-        template_handler = ::Rails.version.to_f >= 6.0 ?
-          proc { |template, source| Rbexy.compile(source) } :
-          proc { |template| Rbexy.compile(template.source) }
+        template_handler = proc { |template, source| Rbexy.compile(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)
-          ViewComponent::Base.include Rbexy::ViewContextHelper
+          ViewComponent::Base.include ViewContextHelper
         end
 
         Rbexy.configure do |config|
           require "rbexy/component_providers/rbexy_provider"
-          config.component_provider = Rbexy::ComponentProviders::RbexyProvider.new
+          config.component_provider = ComponentProviders::RbexyProvider.new
           config.template_paths << ::Rails.root.join("app", "components")
           config.enable_context = true
         end

data/lib/rbexy/runtime.rb

@@ -8,6 +8,7 @@ module Rbexy
     include ActionView::Context
     include ActionView::Helpers::TagHelper
     include ViewContextHelper
+    include ComponentContext
 
     DefaultTagBuilder = ActionView::Helpers::TagHelper::TagBuilder
 
@@ -34,6 +35,7 @@ module Rbexy
     end
 
     def evaluate(code)
+      @output_buffer = ActionView::OutputBuffer.new
       instance_eval(code)
     rescue => e
       e.set_backtrace(e.backtrace.map { |l| l.gsub("(eval)", "(rbx template string)") })

data/lib/rbexy/version.rb

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

data/lib/rbexy/view_context_helper.rb

@@ -4,8 +4,16 @@ module Rbexy
       @rbexy_tag ||= Runtime.create_tag_builder(self)
     end
 
-    def rbexy_context
-      @rbexy_context ||= [{}]
+    def rbexy_prep_output(*value)
+      return if value.length == 0
+      value = value.first
+
+      value = rbexy_is_html_safe_array?(value) ? value.join.html_safe : value
+      [nil, false].include?(value) ? "" : value.to_s
+    end
+
+    def rbexy_is_html_safe_array?(value)
+      value.is_a?(Array) && value.all? { |v| v.respond_to?(:html_safe?) && v.html_safe? }
     end
   end
 end

data/rbexy.gemspec

@@ -25,11 +25,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 5.0", "< 7.0"
-  spec.add_dependency "actionview", ">= 5.0", "< 7.0"
-  spec.add_dependency "railties", ">= 5.0", "< 7.0"
+  spec.add_dependency "activesupport", ">= 6.0", "< 7.0"
+  spec.add_dependency "actionview", ">= 6.0", "< 7.0"
 
-  spec.add_development_dependency "rails", ">= 5.0", "< 7.0"
+  spec.add_development_dependency "rails", ">= 6.0", "< 7.0"
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "guard-rspec", "~> 4.7", ">= 4.7.3"
   spec.add_development_dependency "rspec-rails", "~> 4.0", ">= 4.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -46,27 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -76,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -86,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -224,6 +204,8 @@ files:
 - example.rb
 - lib/rbexy.rb
 - lib/rbexy/component.rb
+- lib/rbexy/component/backtrace_cleaner.rb
+- lib/rbexy/component_context.rb
 - lib/rbexy/component_providers/namespaced_rbexy_provider.rb
 - lib/rbexy/component_providers/rbexy_provider.rb
 - lib/rbexy/component_providers/view_component_provider.rb
@@ -232,7 +214,6 @@ files:
 - lib/rbexy/hash_mash.rb
 - lib/rbexy/lexer.rb
 - lib/rbexy/nodes.rb
-- lib/rbexy/output_buffer.rb
 - lib/rbexy/parser.rb
 - lib/rbexy/rails.rb
 - lib/rbexy/rails/component_template_resolver.rb

data/lib/rbexy/output_buffer.rb

@@ -1,10 +0,0 @@
-require "active_support/core_ext/string/output_safety"
-
-module Rbexy
-  class OutputBuffer < ActiveSupport::SafeBuffer
-    def <<(content)
-      value = content.is_a?(Array) ? content.join.html_safe : content
-      super([nil, false].include?(value) ? "" : value.to_s)
-    end
-  end
-end