rux 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba8846934ea39d67f4705ce5a0ec7a477e65eccc5fc5b63a6ff1f6a2233e9ca
-  data.tar.gz: a27256e117f07fe67fe286bc0730b265bccd91e98e18c6944aa968862b8c0e4b
+  metadata.gz: f1e472f55eed0269091c2f5efa3a1d27fb1d16ed1959c32a84633be8b192940d
+  data.tar.gz: 46e848d6871ff5ea01638d6e50e24968ad3aa9867324580417151287ed932b3d
 SHA512:
-  metadata.gz: 62c36cfb6e05f6379f659e89c6bc3bea79144ff6eae9de80491597686b967daabe6c84b5e55dbf24ef104b9e7267aa186c370c9fae18ba8c1fcf038a3805db20
-  data.tar.gz: 3c7c4a4b5f7ac00a344358df1e02f7bf5850aa76b0974f466b6759973f6b8400700cfc2050e6c9e1debff42ac8ad56eba9e5b018261bfa4e6dfd4b344dbbca70
+  metadata.gz: 1681c3f2cedc43ee87559663ada3f92d9061ed004cb4ea100a588d847b7de3cf2e4a490ec23f5d0cd653602d3f0fee1c97045c9c786e38249663a73534ab559c
+  data.tar.gz: 94c7c21726d2b38750162fb36ceb1f8ff9321fe99425efb078b51a042568b5914e5821341bb45fa5b18f1f6df1040f2fa706edd7ce32b834207a0046e8ac0479

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 1.4.0
+* Implement React-style contexts for passing arguments across arbitrary levels of component nesting.
+  - Define a new context via `Rux.create_context`.
+  - Read that context later via `Rux.use_context`.
+
+# 1.3.0
+* Automatically add generated files to an ignore file, eg. .gitignore.
+  - Pass the --ignore-path=PATH flag to ruxc to indicate the file to update.
+* Add the ruxlex executable that prints parser tokens for debugging purposes.
+* Preserve Ruby comments in generated files.
+* Fix the `as:` argument, which was being improperly generated in earlier versions.
+* General parser improvements.
+  - Allows fragments to be nested within other tags.
+  - Allows tags after ruby code in branch structures like `if..else`.
+* Allows HTML attributes to start with `@`.
+
 # 1.2.0
 * Improve output safety.
   - HTML tags are now automatically escaped when they come from Ruby code.

data/Gemfile

@@ -7,3 +7,10 @@ group :development, :test do
   gem 'rake'
   gem 'rspec'
 end
+
+group :development do
+  gem 'appraisal'
+  gem 'appraisal-run'
+end
+
+gem 'csv'

data/README.md

@@ -268,6 +268,51 @@ Notice that the rux attribute "first-name" is passed to `MyComponent#initialize`
 
 Attributes on regular tags, i.e. non-component tags like `<div>` and `<span>`, are not modified. In other words, `<div data-foo="foo">` does _not_ become `<div data_foo="foo">` because that would be very annoying.
 
+## Context
+
+Occasionally you might find it necessary to pass values across multiple component boundaries. A grandparent component might want to pass values to its grandchildren but not the parent components (i.e. the grandparent's direct children).
+
+For example, imagine you'd like to support multiple themes on your website, like dark and light mode. While it would be possible to add a `theme:` argument to all your components, doing so could be quite invasive - you'd have to modify every single one.
+
+Contexts are modeled after the React concept by the same name. They allow you to set values at one level of the component hierarchy and consume them at a deeper one, without having to pass the values through every intermediate level.
+
+First, create a new context, passing an optional default value or default block. Note that the value stored in a context can be anything, i.e. any Ruby object.
+
+```ruby
+# with a default value
+ThemeContext = Rux.create_context("dark")
+
+# with a default block
+ThemeContext = Rux.create_context { "dark" }
+```
+
+NOTE: passing a default block takes precedence over default values. In other words, if you pass both an argument _and_ a block to `create_context`, only the block will be used to produce default values.
+
+The `create_context` method returns a component class. Rux requires that all components start with an uppercase letter, i.e. be a Ruby constant, which is why we assigned it to the `ThemeContext` constant in the example above. You can now render the context component like you would any other component:
+
+```ruby
+<ThemeContext value="light">
+  <Heading>Welcome!</Heading>
+  <WelcomePage />
+</ThemeContext>
+```
+
+Now that we've defined a context and rendered it, any component rendered inside `ThemeContext` (i.e. any of its children) can access the context like this:
+
+```ruby
+class WelcomePage < ViewComponent::Base
+  def call
+    theme = Rux.use_context(ThemeContext)
+
+    <div>
+      <h2 style={theme == "dark" ? "color: #FFF" : "color: #000"}>
+        Welcome to my site!
+      </h2>
+    </div>
+  end
+end
+```
+
 ## How it Works
 
 Translating rux code (Ruby + HTML tags) into Ruby code happens in three phases: lexing, parsing, and emitting. The lexer phase is implemented as a wrapper around the lexer from the [Parser gem](https://github.com/whitequark/parser) that looks for specific patterns in the token stream. When it finds an opening HTML tag, it hands off lexing to the rux lexer. When the tag ends, the lexer continues emitting Ruby tokens, and so on.

data/bin/ruxc

@@ -5,6 +5,7 @@ $:.push(File.expand_path('./lib'))
 require 'pathname'
 require 'optparse'
 require 'rux'
+require 'onload'
 
 class RuxCLI
   def self.parse(argv)
@@ -15,7 +16,8 @@ class RuxCLI
 
     options = {
       pretty: true,
-      stdout: false
+      stdout: false,
+      ignore_path: nil,
     }
 
     if argv.first != '-h' && argv.first != '--help'
@@ -41,6 +43,14 @@ class RuxCLI
         end
       end
 
+      oneline(<<~DESC).tap do |desc|
+        Update the given git ignore file with transpiled file paths.
+      DESC
+        opts.on('-i', '--ignore-path=PATH', desc) do |ignore_path|
+          options[:ignore_path] = ignore_path
+        end
+      end
+
       opts.on('-h', '--help', 'Prints this help info') do
         puts opts
         exit
@@ -91,8 +101,17 @@ class RuxCLI
     @options[:stdout]
   end
 
+  def ignore_file
+    return nil unless ignore_path
+    @ignore_file ||= Onload::IgnoreFile.load(ignore_path)
+  end
+
   private
 
+  def ignore_path
+    @options[:ignore_path]
+  end
+
   def directory?
     File.directory?(in_path)
   end
@@ -101,7 +120,11 @@ end
 cli = RuxCLI.parse(ARGV)
 cli.validate
 
-cli.each_file do |in_file, out_file, rbi_file|
+at_exit do
+  cli.ignore_file&.persist!
+end
+
+cli.each_file do |in_file, out_file|
   rux_file = Rux::File.new(in_file)
 
   if cli.write_to_stdout?
@@ -109,5 +132,7 @@ cli.each_file do |in_file, out_file, rbi_file|
   else
     rux_file.write(out_file, pretty: cli.pretty?)
     puts "Wrote #{out_file}"
+
+    cli.ignore_file&.add(out_file)
   end
 end

data/bin/ruxlex

@@ -0,0 +1,13 @@
+#! /usr/bin/env ruby
+
+$:.push(File.expand_path('./lib'))
+
+require 'rux'
+
+code = STDIN.read
+result = Rux::Lexer.lex(code)
+
+result.each do |(type, (str, loc))|
+  loc_str = loc.to_range.to_s.rjust(12, " ")
+  puts "#{loc_str} #{type} #{str.inspect}"
+end

data/lib/rux/context.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "use_context"
+require "securerandom"
+
+module Rux
+  class ContextBase
+    include UseContext::ContextMethods
+
+    class << self
+      attr_accessor :default_value, :default_value_block
+
+      def context_key
+        @context_key ||= "#{context_name}_context"
+      end
+
+      def context_name
+        @context_name ||= self.name || SecureRandom.hex
+      end
+    end
+
+    attr_reader :value
+
+    def initialize(**kwargs)
+      if kwargs.include?(:value)
+        @value = kwargs[:value]
+      else
+        @value = if self.class.default_value_block
+          self.class.default_value_block.call
+        else
+          self.class.default_value
+        end
+      end
+    end
+
+    def render_in(_view_context, &block)
+      provide_context(self.class.context_key, { value: value }) do
+        block.call if block
+      end
+    end
+  end
+
+  module Context
+    class << self
+      include UseContext::ContextMethods
+
+      def create(default_value = nil, &default_value_block)
+        Class.new(ContextBase).tap do |klass|
+          klass.default_value = default_value
+          klass.default_value_block = default_value_block
+        end
+      end
+
+      def use(context_class)
+        use_context(context_class.context_key, :value)
+      end
+    end
+  end
+end

data/lib/rux/default_visitor.rb

@@ -32,7 +32,7 @@ module Rux
     def visit_tag(node)
       ''.tap do |result|
         block_arg = if (as = node.attrs.get('as'))
-          visit(as)
+          visit(as.value)
         end
 
         block_arg ||= "rux_block_arg#{@render_stack.size}"
@@ -71,10 +71,7 @@ module Rux
           result << "|#{block_arg}| " if block_arg && node.component?
           result << "Rux.create_buffer.tap { |_rux_buf_| "
 
-          node.children.each do |child|
-            result << append_statement_for(child)
-          end
-
+          result << visit_tag_children(node).join
           result << " }.to_s }"
         end
 
@@ -88,11 +85,17 @@ module Rux
       end
     end
 
+    def visit_tag_children(node)
+      node.children.map do |child|
+        append_statement_for(child)
+      end
+    end
+
     def append_statement_for(node)
       if node.is_a?(AST::TextNode)
-        "_rux_buf_.safe_append(#{visit(node).strip});"
+        "_rux_buf_.safe_append(#{visit(node).strip.chomp(';')});"
       else
-        "_rux_buf_.append(#{visit(node).strip});"
+        "_rux_buf_.append(#{visit(node).strip.chomp(';')});"
       end
     end
 

data/lib/rux/lex/states.csv

@@ -1,50 +1,51 @@
-,[<],[a-zA-Z0-9_-_---:-:],[>],[/],(space),[=],"[""]",['],"[^""]",[^'],[{],[}],(default)
-start,tag_open_test,,,,,,,,,,literal_ruby_code_start,,literal_body
-tag_open_test,,tag_open_start[0],fragment_open,tag_close_start,,,,,,,,,
-tag_open_start*,,tag_open_body,,,,,,,,,,,
-tag_open_body,,tag_open_body,tag_open[0],tag_self_closing[0],tag_open[0],,,,,,,,
-tag_open*,,,tag_open_end,,attribute_spaces_body,,,,,,,,
-tag_open_end*,,,,,,,,,,,,,
-tag_close_start*,,tag_close_body,fragment_close,,,,,,,,,,
-tag_close_body,,tag_close_body,tag_close[0],,tag_close[0],,,,,,,,
-tag_close*,,,tag_close_end,tag_self_closing[0],tag_close_spaces_body,,,,,,,,
-tag_close_spaces_body,,,tag_close_spaces[0],,tag_close_spaces_body,,,,,,,,
-tag_close_spaces*,,,tag_close_end,,,,,,,,,,
-tag_close_end*,,,,,,,,,,,,,
-tag_self_closing*,,,,tag_self_closing_start,,,,,,,,,
-tag_self_closing_start,,,tag_self_closing_end,,,,,,,,,,
-tag_self_closing_end*,,,,,,,,,,,,,
-fragment_open*,,,,,,,,,,,,,
-fragment_close*,,,,,,,,,,,,,
-,,,,,,,,,,,,,
-attribute_spaces_body,,attribute_spaces[0],attribute_spaces[0],attribute_spaces[0],attribute_spaces_body,,,,,,attribute_spaces[0],,
-attribute_spaces*,,attribute_name_body,tag_close_start,tag_self_closing_start,,,,,,,attribute_ruby_code_start,,
-attribute_name_body,,attribute_name_body,attribute_name[0],attribute_name[0],attribute_name[0],attribute_name[0],,,,,,,
-attribute_name*,,,tag_open_end,tag_self_closing_start,attribute_equals_spaces_body,attribute_equals,,,,,,,
-attribute_equals_spaces_body,,,attribute_equals_spaces[0],,attribute_equals_spaces_body,attribute_equals_spaces[0],,,,,,,attribute_equals_spaces[0]
-attribute_equals_spaces*,,,tag_open_end,tag_self_closing_start,,attribute_equals,,,,,,,attribute_name_body
-attribute_equals*,,attribute_value_uq_body,,,attribute_value_spaces_body[0],,attribute_value_dq_start,attribute_value_sq_start,,,attribute_value_ruby_code_start,,
-attribute_value_spaces_body,,attribute_value_spaces[0],attribute_value_spaces[0],attribute_value_spaces[0],attribute_value_spaces_body,,attribute_value_spaces[0],attribute_value_spaces[0],,,attribute_value_spaces[0],,
-attribute_value_spaces*,,attribute_value_uq_body,tag_open_end,tag_self_closing_start,,,attribute_value_dq_start,attribute_value_sq_start,,,attribute_value_ruby_code_start,,
-attribute_value_dq_start*,,,,,,,,,attribute_value_dq_body,,,,
-attribute_value_sq_start*,,,,,,,,,,attribute_value_sq_body,,,
-attribute_value_dq_body,,,,,,,attribute_dq_value[0],,attribute_value_dq_body,,,,
-attribute_value_sq_body,,,,,,,,attribute_sq_value[0],,attribute_value_sq_body,,,
-attribute_value_uq_body,,attribute_value_uq_body,attribute_uq_value[0],attrIbute_uq_value[0],attribute_uq_value[0],,,,,,,,
-attribute_value_dq_end*,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
-attribute_value_sq_end*,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
-attribute_value_ruby_code_start*,,,,,,,,,,,,,attribute_value_ruby_code
-attribute_value_ruby_code*,,,,,,,,,,,,attribute_value_ruby_code_end,
-attribute_value_ruby_code_end*,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
-attribute_dq_value*,,,,,,,attribute_value_dq_end,,,,,,
-attribute_sq_value*,,,,,,,,attribute_value_sq_end,,,,,
-attribute_uq_value*,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
-attribute_ruby_code_start*,,,,,,,,,,,,,attribute_ruby_code[0]
-attribute_ruby_code*,,,,,,,,,,,,attribute_ruby_code_end,
-attribute_ruby_code_end*,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
-,,,,,,,,,,,,,
-literal_body,literal[0],,,,,,,,,,literal[0],,literal_body
-literal*,,,,,,,,,,,literal_ruby_code_start,,
-literal_ruby_code_start*,,,,,,,,,,,,,literal_ruby_code[0]
-literal_ruby_code*,,,,,,,,,,,,literal_ruby_code_end,
-literal_ruby_code_end*,,,,,,,,,,,,,
+,[<],[@-@.-.],[a-zA-Z0-9_-_---:-:],[>],[/],(space),[=],"[""]",['],"[^""]",[^'],[{],[}],(default)
+start,tag_open_test,,,,,,,,,,,literal_ruby_code_start,,literal_body
+tag_open_test,,,tag_open_start[0],fragment_open,tag_close_start,,,,,,,,,
+tag_open_start*,,,tag_open_body,,,,,,,,,,,
+tag_open_body,,,tag_open_body,tag_open[0],tag_self_closing[0],tag_open[0],,,,,,,,
+tag_open*,,,,tag_open_end,,attribute_spaces_body,,,,,,,,
+tag_open_end*,,,,,,,,,,,,,,
+tag_close_start*,,,tag_close_body,fragment_close,,,,,,,,,,
+tag_close_body,,,tag_close_body,tag_close[0],,tag_close[0],,,,,,,,
+tag_close*,,,,tag_close_end,tag_self_closing[0],tag_close_spaces_body,,,,,,,,
+tag_close_spaces_body,,,,tag_close_spaces[0],,tag_close_spaces_body,,,,,,,,
+tag_close_spaces*,,,,tag_close_end,,,,,,,,,,
+tag_close_end*,,,,,,,,,,,,,,
+tag_self_closing*,,,,,tag_self_closing_start,,,,,,,,,
+tag_self_closing_start,,,,tag_self_closing_end,,,,,,,,,,
+tag_self_closing_end*,,,,,,,,,,,,,,
+fragment_open*,,,,,,,,,,,,,,
+fragment_close*,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,
+attribute_spaces_body,,attribute_spaces[0],attribute_spaces[0],attribute_spaces[0],attribute_spaces[0],attribute_spaces_body,,,,,,attribute_spaces[0],,
+attribute_spaces*,,attribute_name_sigil,attribute_name_body,tag_open_end,tag_self_closing_start,,,,,,,attribute_ruby_code_start,,
+attribute_name_sigil,,,,,,,,,,,,,,attribute_name_body
+attribute_name_body,,,attribute_name_body,attribute_name[0],attribute_name[0],attribute_name[0],attribute_name[0],,,,,,,
+attribute_name*,,,,tag_open_end,tag_self_closing_start,attribute_equals_spaces_body,attribute_equals,,,,,,,
+attribute_equals_spaces_body,,,,attribute_equals_spaces[0],,attribute_equals_spaces_body,attribute_equals_spaces[0],,,,,,,attribute_equals_spaces[0]
+attribute_equals_spaces*,,,,tag_open_end,tag_self_closing_start,,attribute_equals,,,,,,,attribute_name_sigil
+attribute_equals*,,,attribute_value_uq_body,,,attribute_value_spaces_body[0],,attribute_value_dq_start,attribute_value_sq_start,,,attribute_value_ruby_code_start,,
+attribute_value_spaces_body,,,attribute_value_spaces[0],attribute_value_spaces[0],attribute_value_spaces[0],attribute_value_spaces_body,,attribute_value_spaces[0],attribute_value_spaces[0],,,attribute_value_spaces[0],,
+attribute_value_spaces*,,,attribute_value_uq_body,tag_open_end,tag_self_closing_start,,,attribute_value_dq_start,attribute_value_sq_start,,,attribute_value_ruby_code_start,,
+attribute_value_dq_start*,,,,,,,,,,attribute_value_dq_body,,,,
+attribute_value_sq_start*,,,,,,,,,,,attribute_value_sq_body,,,
+attribute_value_dq_body,,,,,,,,attribute_dq_value[0],,attribute_value_dq_body,,,,
+attribute_value_sq_body,,,,,,,,,attribute_sq_value[0],,attribute_value_sq_body,,,
+attribute_value_uq_body,,,attribute_value_uq_body,attribute_uq_value[0],attrIbute_uq_value[0],attribute_uq_value[0],,,,,,,,
+attribute_value_dq_end*,,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
+attribute_value_sq_end*,,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
+attribute_value_ruby_code_start*,,,,,,,,,,,,,,attribute_value_ruby_code
+attribute_value_ruby_code*,,,,,,,,,,,,,attribute_value_ruby_code_end,
+attribute_value_ruby_code_end*,,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
+attribute_dq_value*,,,,,,,,attribute_value_dq_end,,,,,,
+attribute_sq_value*,,,,,,,,,attribute_value_sq_end,,,,,
+attribute_uq_value*,,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
+attribute_ruby_code_start*,,,,,,,,,,,,,,attribute_ruby_code[0]
+attribute_ruby_code*,,,,,,,,,,,,,attribute_ruby_code_end,
+attribute_ruby_code_end*,,,attribute_name,tag_open_end,tag_self_closing_start,attribute_spaces_body,,,,,,,,
+,,,,,,,,,,,,,,
+literal_body,literal[0],,,,,,,,,,,literal[0],,literal_body
+literal*,,,,,,,,,,,,literal_ruby_code_start,,
+literal_ruby_code_start*,,,,,,,,,,,,,,literal_ruby_code[0]
+literal_ruby_code*,,,,,,,,,,,,,literal_ruby_code_end,
+literal_ruby_code_end*,,,,,,,,,,,,,,

data/lib/rux/lexer.rb

@@ -1,3 +1,5 @@
+require 'parser'
+
 module Rux
   class Lexer
     class EOFError < StandardError; end
@@ -5,6 +7,13 @@ module Rux
 
     attr_reader :source_buffer
 
+    class << self
+      def lex(str)
+        buffer = ::Parser::Source::Buffer.new('(source)', source: str)
+        new(buffer).to_a
+      end
+    end
+
     def initialize(source_buffer)
       @source_buffer = source_buffer
       @stack = [RubyLexer.new(source_buffer, 0)]
@@ -17,6 +26,10 @@ module Rux
       [nil, ['$eof']]
     end
 
+    def to_a
+      @generator.to_a
+    end
+
     private
 
     def each_token

data/lib/rux/parser.rb

@@ -8,14 +8,18 @@ module Rux
     class << self
       def parse_file(path)
         buffer = ::Parser::Source::Buffer.new(path).read
-        lexer = ::Rux::Lexer.new(buffer)
-        new(lexer).parse
+        new(make_lexer(buffer)).parse
       end
 
       def parse(str)
         buffer = ::Parser::Source::Buffer.new('(source)', source: str)
-        lexer = ::Rux::Lexer.new(buffer)
-        new(lexer).parse
+        new(make_lexer(buffer)).parse
+      end
+
+      private
+
+      def make_lexer(buffer)
+        ::Rux::Lexer.new(buffer)
       end
     end
 
@@ -137,6 +141,8 @@ module Rux
       if is?(:tRUX_LITERAL, :tRUX_LITERAL_RUBY_CODE_START)
         lit = literal
         node.children << lit if lit
+      elsif is?(:tRUX_FRAGMENT_OPEN)
+        node.children << fragment
       else
         node.children << tag
       end

data/lib/rux/ruby_lexer.rb

@@ -1,4 +1,18 @@
 module Rux
+  class TokenArrayProxy < Array
+    def initialize(rux_token_queue)
+      @rux_token_queue = rux_token_queue
+    end
+
+    def push(token)
+      if token[0] == :tCOMMENT
+        @rux_token_queue.push(token)
+      end
+
+      super
+    end
+  end
+
   class RubyLexer < ::Parser::Lexer
     # These are populated when ::Parser::Lexer loads and are therefore
     # not inherited. We have to copy them over manually.
@@ -15,6 +29,8 @@ module Rux
       @generator = to_enum(:each_token)
       @rux_token_queue = []
       @p = init_pos
+
+      self.tokens = TokenArrayProxy.new(@rux_token_queue)
     end
 
     alias_method :advance_orig, :advance
@@ -27,6 +43,7 @@ module Rux
       @ts = @te = @p = pos
       @eof = false
       @rux_token_queue.clear
+      clear_queue
       populate_queue
     end
 
@@ -44,13 +61,7 @@ module Rux
     end
 
     def each_token(&block)
-      # We detect whether or not we're at the beginning of a rux tag by looking
-      # ahead by 1 token; that's why the first element in @rux_token_queue is
-      # yielded immediately. If the lexer _starts_ at a rux tag however,
-      # lookahead is a lot more difficult. To mitigate, we insert a dummy skip
-      # token here. That way, at_rux? checks the right tokens in the queue and
-      # correctly identifies the start of a rux tag.
-      @rux_token_queue << [:tSKIP, ['$skip', make_range(@p, @p)]]
+      clear_queue
 
       @eof = false
       curlies = 1
@@ -74,7 +85,7 @@ module Rux
         type, (_, pos) = token
 
         case type
-          when :tLCURLY, :tLBRACE
+          when :tLCURLY, :tLBRACE, :tLAMBEG
             curlies += 1
           when :tRCURLY, :tRBRACE
             curlies -= 1
@@ -111,6 +122,18 @@ module Rux
       end
     end
 
+    def clear_queue
+      @rux_token_queue.clear
+
+      # We detect whether or not we're at the beginning of a rux tag by looking
+      # ahead by 1 token; that's why the first element in @rux_token_queue is
+      # yielded immediately. If the lexer _starts_ at a rux tag however,
+      # lookahead is a lot more difficult. To mitigate, we insert a dummy skip
+      # token here. That way, at_rux? checks the right tokens in the queue and
+      # correctly identifies the start of a rux tag.
+      @rux_token_queue << [:tSKIP, ['$skip', make_range(@p, @p)]]
+    end
+
     def at_rux?
       at_lt? && !at_inheritance?
     end

data/lib/rux/rux_lexer.rb

@@ -123,7 +123,7 @@ module Rux
 
         unless cur_trans
           raise Rux::Lexer::TransitionError,
-            "no transition found from #{cur_state} at position #{@p} while "\
+            "no transition found from #{cur_state} for #{chr.inspect} at position #{@p} while "\
             'lexing rux code'
         end
 

data/lib/rux/version.rb

@@ -1,3 +1,3 @@
 module Rux
-  VERSION = '1.2.0'
+  VERSION = '1.4.0'
 end

data/lib/rux.rb

@@ -20,6 +20,7 @@ module Rux
   autoload :AST,               'rux/ast'
   autoload :Buffer,            'rux/buffer'
   autoload :Component,         'rux/component'
+  autoload :Context,           'rux/context'
   autoload :DefaultTagBuilder, 'rux/default_tag_builder'
   autoload :DefaultVisitor,    'rux/default_visitor'
   autoload :File,              'rux/file'
@@ -38,9 +39,8 @@ module Rux
       ruby_code = visitor.visit(Parser.parse(str))
       return ruby_code unless pretty
 
-      ::Unparser.unparse(
-        ::Parser::CurrentRuby.parse(ruby_code)
-      )
+      ast, comments = *::Parser::CurrentRuby.parse_with_comments(ruby_code)
+      ::Unparser.unparse(ast, comments: comments)
     end
 
     def default_visitor
@@ -66,6 +66,14 @@ module Rux
     def library_paths
       @library_paths ||= []
     end
+
+    def create_context(...)
+      Rux::Context.create(...)
+    end
+
+    def use_context(...)
+      Rux::Context.use(...)
+    end
   end
 
   self.tag_builder = self.default_tag_builder

data/rux.gemspec

@@ -10,11 +10,14 @@ Gem::Specification.new do |s|
   s.description = s.summary = 'A jsx-inspired way to write view components.'
   s.platform = Gem::Platform::RUBY
 
+  s.add_dependency 'onload', '~> 1.1'
   s.add_dependency 'parser', '~> 3.0'
-  s.add_dependency 'unparser', '~> 0.6'
+  s.add_dependency 'unparser', '~> 0.8'
+  s.add_dependency 'use_context', '~> 1.2'
 
   s.require_path = 'lib'
   s.executables << 'ruxc'
+  s.executables << 'ruxlex'
 
   s.files = Dir['{lib,spec}/**/*', 'Gemfile', 'LICENSE', 'CHANGELOG.md', 'README.md', 'Rakefile', 'rux.gemspec']
 end

data/spec/context_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe 'context', type: :render do
+  FooContext = Rux.create_context("foo")
+  FooContextWithBlock = Rux.create_context { "foo from block" }
+
+  class FooComponent < ViewComponent::Base
+    def call
+      context = Rux.use_context(FooContext)
+      Rux::SafeString.new("<p>#{context}</p>")
+    end
+  end
+
+  class FooComponentWithBlock < ViewComponent::Base
+    def call
+      context = Rux.use_context(FooContextWithBlock)
+      Rux::SafeString.new("<p>#{context}</p>")
+    end
+  end
+
+  describe '#context_key' do
+    it 'uses the class name in the key' do
+      expect(FooContext.context_key).to eq("FooContext_context")
+      expect(FooContextWithBlock.context_key).to eq("FooContextWithBlock_context")
+    end
+
+    it "uses a random ID if the class doesn't have a name" do
+      no_name = Rux.create_context
+      expect(no_name.context_key).to match(/[a-f0-9-]{32}_context/)
+    end
+
+    it 'returns the same value when called multiple times' do
+      no_name = Rux.create_context
+      key = no_name.context_key
+      expect(no_name.context_key).to eq(key)
+    end
+  end
+
+  describe 'rendering' do
+    it 'uses the given context value' do
+      result = render(<<~RUX)
+        <FooContext value="bar">
+          <FooComponent />
+        </FooContext>
+      RUX
+
+      expect(result).to eq("<p>bar</p>")
+    end
+
+    it 'uses the default value when no value is provided' do
+      result = render(<<~RUX)
+        <FooContext>
+          <FooComponent />
+        </FooContext>
+      RUX
+
+      expect(result).to eq("<p>foo</p>")
+    end
+
+    it 'calls the default block when provided' do
+      result = render(<<~RUX)
+        <FooContextWithBlock>
+          <FooComponentWithBlock />
+        </FooContextWithBlock>
+      RUX
+
+      expect(result).to eq("<p>foo from block</p>")
+    end
+
+    it 'allows context to be temporarily overridden' do
+      result = render(<<~RUX)
+        <FooContext value="bar">
+          <FooComponent />
+          <FooContext value="baz">
+            <FooComponent />
+          </FooContext>
+          <FooComponent />
+        </FooContext>
+      RUX
+
+      expect(result).to eq("<p>bar</p><p>baz</p><p>bar</p>")
+    end
+  end
+end

data/spec/parser/attributes_spec.rb

@@ -94,4 +94,28 @@ describe 'attributes', type: :parser do
       Rux.tag("div", { :"data-foo" => "bar" })
     RUBY
   end
+
+  it 'yields the component instance to the block using the as: argument for the variable name' do
+    code = <<~RUX
+      <Hello as={hello}>
+        {hello.foo}
+      </Hello>
+    RUX
+    expect(compile(code)).to eq(<<~RUBY.strip)
+      render(Hello.new) { |hello|
+        Rux.create_buffer.tap { |_rux_buf_|
+          _rux_buf_.append(hello.foo)
+        }.to_s
+      }
+    RUBY
+  end
+
+  it 'allows attributes to start with @' do
+    code = <<~RUX
+      <div @click="alert('foo')" />
+    RUX
+    expect(compile(code)).to eq(<<~RUBY.strip)
+      Rux.tag("div", { :@click => "alert('foo')" })
+    RUBY
+  end
 end

data/spec/parser/fragment_spec.rb

@@ -44,4 +44,21 @@ describe 'fragments', type: :parser do
       }
     RUBY
   end
+
+  it 'allows fragments nested inside other tags' do
+    code = <<~RUX
+      <div>
+        <>{"foo"}</>
+      </div>
+    RUX
+    expect(compile(code)).to eq(<<~RUBY.strip)
+      Rux.tag("div") {
+        Rux.create_buffer.tap { |_rux_buf_|
+          _rux_buf_.append(Rux.create_buffer.tap { |_rux_buf_|
+            _rux_buf_.append("foo")
+          }.to_s)
+        }.to_s
+      }
+    RUBY
+  end
 end

data/spec/parser_spec.rb

@@ -10,7 +10,7 @@ describe 'parsing', type: :parser do
   it 'raises an error when no state transition can be found' do
     expect { compile('<Hello <foo>') }.to(
       raise_error(Rux::Lexer::TransitionError,
-        'no transition found from tRUX_ATTRIBUTE_SPACES_BODY at position 7 '\
+        'no transition found from tRUX_ATTRIBUTE_SPACES_BODY for "<" at position 7 '\
           'while lexing rux code')
     )
   end
@@ -63,4 +63,53 @@ describe 'parsing', type: :parser do
       }
     RUBY
   end
+
+  it 'preserves comments' do
+    code = <<~RUX
+      # frozen_string_literal: true
+
+      class Foo
+        def call
+          <p>Hello</p>
+        end
+      end
+    RUX
+    expect(compile(code)).to eq(<<~RUBY)
+      # frozen_string_literal: true
+      class Foo
+        def call
+          Rux.tag("p") {
+            Rux.create_buffer.tap { |_rux_buf_|
+              _rux_buf_.safe_append("Hello")
+            }.to_s
+          }
+        end
+      end
+    RUBY
+  end
+
+  it 'allows a tag after ruby code in a branch situation' do
+    code = <<~RUX
+      <div>
+        {if foo
+          <>foo</>
+        else
+          <div></div>
+        end}
+      </div>
+    RUX
+    expect(compile(code)).to eq(<<~RUBY.strip)
+      Rux.tag("div") {
+        Rux.create_buffer.tap { |_rux_buf_|
+          _rux_buf_.append(if foo
+            Rux.create_buffer.tap { |_rux_buf_|
+              _rux_buf_.safe_append("foo")
+            }.to_s
+          else
+            Rux.tag("div")
+          end)
+        }.to_s
+      }
+    RUBY
+  end
 end

data/spec/render_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'rendering', type: :render do
-  it 'handles a HTML tags inside ruby code' do
+  it 'handles HTML tags inside ruby code' do
     result = render(<<~RUBY)
       <div>
         {3.times.map do

data/spec/support/view_component/base.rb

@@ -7,8 +7,7 @@ module ViewComponent
     end
 
     def to_s
-      @component_instance.content = @content_block.call(@component_instance) if @content_block
-      @component_instance.call
+      @component_instance.render_in(nil, &@content_block)
     end
   end
 
@@ -40,14 +39,18 @@ module ViewComponent
       end
     end
 
-    attr_accessor :content
-
     def render(component, &block)
-      if block
-        component.content = block.call(component)
-      end
+      component.render_in(nil, &block)
+    end
+
+    def render_in(_view_context, &block)
+      @content_block = block
+      content  # fill in slots
+      call
+    end
 
-      component.call
+    def content
+      @content ||= @content_block&.call(self)
     end
 
     private

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: rux
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: onload
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -30,19 +43,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: use_context
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.2'
 description: A jsx-inspired way to write view components.
 email:
 - camertron@gmail.com
 executables:
 - ruxc
+- ruxlex
 extensions: []
 extra_rdoc_files: []
 files:
@@ -52,6 +80,7 @@ files:
 - README.md
 - Rakefile
 - bin/ruxc
+- bin/ruxlex
 - lib/rux.rb
 - lib/rux/ast.rb
 - lib/rux/ast/attr_node.rb
@@ -65,6 +94,7 @@ files:
 - lib/rux/ast/tag_node.rb
 - lib/rux/ast/text_node.rb
 - lib/rux/buffer.rb
+- lib/rux/context.rb
 - lib/rux/default_tag_builder.rb
 - lib/rux/default_visitor.rb
 - lib/rux/file.rb
@@ -81,6 +111,7 @@ files:
 - lib/rux/version.rb
 - lib/rux/visitor.rb
 - rux.gemspec
+- spec/context_spec.rb
 - spec/parser/attributes_spec.rb
 - spec/parser/fragment_spec.rb
 - spec/parser/html_safety_spec.rb
@@ -97,7 +128,6 @@ files:
 homepage: http://github.com/camertron/rux
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A jsx-inspired way to write view components.
 test_files: []