rbexy 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e21e51ccf4a683d3f4c26ef53af86382de7fd9b26e3db2a0790fdf6d7e3df800
-  data.tar.gz: f956dd52d3e20229df1290269f17fe28a7cd352cfa4b2c5649ede1f38f8bb9dd
+  metadata.gz: 20306c3d1c288a652a8a9d4d455c9378a22165ef7c07240e234159794cd02d18
+  data.tar.gz: 4c8e6b19cd8f47744aba8e2850fbc73425678252628a7c6c46e31abf66937e97
 SHA512:
-  metadata.gz: e792baa90cab354b588425c5a5851c5c23372c7cafcdb34e65d79bdd8a75b7271668dd02867a4987f6687ee704d4f8d63201e5192cb49a9fa27377610968fb07
-  data.tar.gz: 3d022540841d61746e14b909c70e3e7e769c78e6d03bbc5ca87dd6f611043a197309e83ab068a903089a201f88f7941edd5c1effc68497bb156ec203da2814bc
+  metadata.gz: 70920c8f7a9da04edccbe8de30b6b12ad10e9bfe3d6a4657d412e74cad1f23c705c3bd213c81d15859b18457917f4dd5672030fd4d0072dd06bbf894c2d8eb15
+  data.tar.gz: 0aa89cce16b4011a91b2ffeb89472ec687b40bcd9f97f061dd85e7f01507fe034e4b3388fb14da066921c98846187f3c77b154b3d1d03b145716a7e50e9a4657

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbexy (0.3.1)
+    rbexy (1.0.0)
       actionview (>= 5.0, < 7.0)
       activesupport (>= 5.0, < 7.0)
       railties (>= 5.0, < 7.0)
@@ -201,7 +201,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,7 +6,6 @@ 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 :Configuration, "rbexy/configuration"

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,10 +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) : ""
+      content_block ? content_block.call : ""
     end
 
     def create_context(name, value)
@@ -75,5 +80,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/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

@@ -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/runtime.rb

@@ -34,6 +34,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.1"
+  VERSION = "1.0.0"
 end

data/lib/rbexy/view_context_helper.rb

@@ -7,5 +7,13 @@ module Rbexy
     def rbexy_context
       @rbexy_context ||= [{}]
     end
+
+    def rbexy_prep_output(*content)
+      return if content.length == 0
+      content = content.first
+
+      value = content.is_a?(Array) ? content.join.html_safe : content
+      [nil, false].include?(value) ? "" : value.to_s
+    end
   end
 end

data/rbexy.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "actionview", ">= 5.0", "< 7.0"
   spec.add_dependency "railties", ">= 5.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.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -224,6 +224,7 @@ files:
 - example.rb
 - lib/rbexy.rb
 - lib/rbexy/component.rb
+- lib/rbexy/component/backtrace_cleaner.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 +233,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