rbexy 0.2.3 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65318a8a1a6c9bc0dc13f0b653dd18df24af2eee0ba7b316c92987becfd10a5b
-  data.tar.gz: c5bfae261147560bd41b85a3d18b1f672d99294eec70038687315dadeaddcb4a
+  metadata.gz: f8c0ebb095f668e7b85fbd14fe770be07fc9f42565b7f71a02e4001a5a0c88c6
+  data.tar.gz: 4670b8929fba14f2cdb197eca4c9d72f37ecdef6d1e84d33d43f18bdb09b0a07
 SHA512:
-  metadata.gz: 9fec2040704b9d393992b7f9ba73be9ed4de414ba87d021b5aa80daff9b086594807f2ade26b55f3b7c23478d4476040862a019c5bef2538fe82cb5d7e3a20ed
-  data.tar.gz: 882a81ff03783bfd18e9d2ac09a494ac8cd434e293db3d7a83735c0c5f8fe391a319ea596a31ed3680d1a542e9dbcb656e5fd711f3779a828cea6ff993b37e61
+  metadata.gz: 8e9920411ff9198828488d984cfd9e69c67e1ced6600a48d701c01153c4bc06419aaac58d2395ab61676798e9bb0a45137f40788d293fade0c0344c596e60c06
+  data.tar.gz: 3da407f7258c3d2f2ef33a157747f6bf0f9ac945ebf801ec064430d80237f802ae7deac36de07a905b055dc9bd7f1958e80774a57f73d036a931a1c4cdac8b81

data/.gitignore

@@ -1,3 +1,4 @@
-spec/dummy/log/
+spec/dummy/log/*
 pkg/
-spec/dummy/tmp/
+spec/dummy/tmp/*
+spec/dummy/db/*

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    rbexy (0.2.3)
-      actionview (>= 5.0, < 7.0)
-      activesupport (>= 5.0, < 7.0)
-      railties (>= 5.0, < 7.0)
+    rbexy (1.0.2)
+      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/docker-compose.yml

@@ -6,6 +6,7 @@ volumes:
 services:
   rbexy:
     build: .
+    image: rbexy
     volumes:
       - .:/app
       - bundle:/usr/local/bundle
@@ -13,3 +14,14 @@ services:
       - $HOME/.gitconfig:/root/.gitconfig:ro
       - $HOME/.gem/credentials:/root/.gem/credentials
     working_dir: /app
+  dummy:
+    image: rbexy
+    volumes:
+      - .:/app
+      - bundle:/usr/local/bundle
+    working_dir: /app/spec/dummy/
+    command: ./start.sh
+    ports:
+      - 3000:3000
+    environment:
+      - RAILS_LOG_STDOUT=1

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

@@ -1,27 +1,24 @@
 require "action_view"
+require "active_support/core_ext/class/attribute"
 
 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)
-          details_hash[key] = value
-        end
-      end
+    autoload :BacktraceCleaner, "rbexy/component/backtrace_cleaner"
 
-      # We override any calls to args_for_lookup and set partial=false so that
-      # the lookup context doesn't automatically add a `_` prefix to the
-      # 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)
-        partial = false if component_name_stack.include?(name)
-        super(name, prefixes, partial, keys, details_options)
+    class TemplatePath < String
+      def to_s
+        self
       end
     end
 
+    def self.component_name
+      name.underscore
+    end
+
+    def component_name
+      self.class.component_name
+    end
+
     def initialize(view_context, **props)
       super(
         view_context.lookup_context,
@@ -45,14 +42,16 @@ module Rbexy
     end
 
     def call
-      replace_lookup_context
-      view_renderer.render(self, partial: component_name, &nil)
-    ensure
-      restore_lookup_context
+      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)
@@ -66,40 +65,13 @@ module Rbexy
         raise(ContextNotFound, "no parent context `#{name}`")
     end
 
-    def view_renderer
-      view_context.view_renderer
-    end
-
-    def component_name
-      self.class.name.underscore
+    def compiled_method_container
+      Rbexy::Component
     end
 
     private
 
-    attr_reader :view_context, :content_block, :old_lookup_context
-
-    def replace_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
-      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))
-    end
+    attr_reader :view_context, :content_block
 
     def method_missing(meth, *args, &block)
       if view_context.respond_to?(meth)
@@ -108,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

@@ -2,6 +2,8 @@ module Rbexy
   class Configuration
     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,23 +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
+        end + ".html_safe"
 
-        [
-          "Rbexy::OutputBuffer.new.tap { |output|",
-            "rbexy_context.push({}) if defined?(Rbexy::Component) && self.is_a?(Rbexy::Component);",
-            "output << (#{tag});",
-            "rbexy_context.pop if defined?(Rbexy::Component) && self.is_a?(Rbexy::Component);",
-          "}.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.rb

@@ -4,5 +4,6 @@ module Rbexy
   module Rails
     autoload :Engine, "rbexy/rails/engine"
     autoload :ControllerHelper, "rbexy/rails/controller_helper"
+    autoload :ComponentTemplateResolver, "rbexy/rails/component_template_resolver"
   end
 end

data/lib/rbexy/rails/component_template_resolver.rb

@@ -0,0 +1,35 @@
+require "action_view"
+
+module Rbexy
+  module Rails
+    class ComponentTemplateResolver < ActionView::FileSystemResolver
+      # Rails 6 requires us to override `_find_all` in order to hook
+      def _find_all(name, prefix, partial, details, key, locals)
+        find_templates(name, prefix, partial, details, locals)
+      end
+
+      # Rails 5 only requires `find_templates` (which tbh is the proper way
+      # to implement subclasses of ActionView::Resolver)
+      def find_templates(name, prefix, partial, details, locals = [])
+        return [] unless name.is_a? Rbexy::Component::TemplatePath
+
+        templates_path = File.join(@path, prefix, name)
+        extensions = details[:handlers].join(",")
+
+        Dir["#{templates_path}.*{#{extensions}}"].map do |template_path|
+          source = File.binread(template_path)
+          handler = ActionView::Template.handler_for_extension(File.extname(template_path)[1..-1])
+          virtual_path = ["rbexy_component", prefix, name].join("/")
+
+          ActionView::Template.new(
+            source,
+            template_path,
+            handler,
+            locals: [],
+            virtual_path: virtual_path
+          )
+        end
+      end
+    end
+  end
+end

data/lib/rbexy/rails/controller_helper.rb

@@ -1,3 +1,20 @@
+require "active_support/concern"
+
+module Rbexy
+  module Rails
     module ControllerHelper
+      extend ActiveSupport::Concern
+
       def rbexy_component_provider; end
+
+      class_methods do
+        def inherited(klass)
+          super
+          Rbexy.configuration.template_paths.each do |path|
+            prepend_view_path(Rbexy::Rails::ComponentTemplateResolver.new(path))
+          end
+        end
+      end
     end
+  end
+end

data/lib/rbexy/rails/engine.rb

@@ -24,6 +24,7 @@ module Rbexy
           require "rbexy/component_providers/rbexy_provider"
           config.component_provider = Rbexy::ComponentProviders::RbexyProvider.new
           config.template_paths << ::Rails.root.join("app", "components")
+          config.enable_context = true
         end
       end
     end

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.2.3"
+  VERSION = "1.0.2"
 end

data/lib/rbexy/view_context_helper.rb

@@ -7,5 +7,17 @@ module Rbexy
     def rbexy_context
       @rbexy_context ||= [{}]
     end
+
+    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.2.3
+  version: 1.0.2
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-24 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,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,9 +213,9 @@ 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
 - lib/rbexy/rails/controller_helper.rb
 - lib/rbexy/rails/engine.rb
 - lib/rbexy/runtime.rb

data/lib/rbexy/output_buffer.rb

@@ -1,8 +0,0 @@
-module Rbexy
-  class OutputBuffer < String
-    def <<(content)
-      value = content.is_a?(Array) ? content.join : content
-      super([nil, false].include?(value) ? "" : value.to_s)
-    end
-  end
-end