rux 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba8846934ea39d67f4705ce5a0ec7a477e65eccc5fc5b63a6ff1f6a2233e9ca
-  data.tar.gz: a27256e117f07fe67fe286bc0730b265bccd91e98e18c6944aa968862b8c0e4b
+  metadata.gz: e2874b5336b991b08b274df04219d2c7b97247580f0587dfc3b6860e913d8af8
+  data.tar.gz: ba582dd96d6c58da357295e60267f4db9a6cdf47ddc99aa2740d590a1cec530d
 SHA512:
-  metadata.gz: 62c36cfb6e05f6379f659e89c6bc3bea79144ff6eae9de80491597686b967daabe6c84b5e55dbf24ef104b9e7267aa186c370c9fae18ba8c1fcf038a3805db20
-  data.tar.gz: 3c7c4a4b5f7ac00a344358df1e02f7bf5850aa76b0974f466b6759973f6b8400700cfc2050e6c9e1debff42ac8ad56eba9e5b018261bfa4e6dfd4b344dbbca70
+  metadata.gz: c6c663d6d237fb6fc044dc2ebfa9c706d54eb5cdd3bc7a50011d82578ac7aab36a8f6c1ca466754f44bfed73ce708fc57bbd0ea3951681febd79f2730e7fd1d7
+  data.tar.gz: fb52a3a10cb3db47817acc7d760210758bc733b3b74b4ebfc9d241039d8d38ce00d4622957fd26effa7593acefe4d9387ebce9bcc6bab7dd20d83e9523b62322

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 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/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/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.3.0'
 end

data/lib/rux.rb

@@ -38,9 +38,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

data/rux.gemspec

@@ -10,11 +10,13 @@ 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.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/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

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: rux
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.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,20 @@ 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.6'
+        version: '0.8'
 description: A jsx-inspired way to write view components.
 email:
 - camertron@gmail.com
 executables:
 - ruxc
+- ruxlex
 extensions: []
 extra_rdoc_files: []
 files:
@@ -52,6 +66,7 @@ files:
 - README.md
 - Rakefile
 - bin/ruxc
+- bin/ruxlex
 - lib/rux.rb
 - lib/rux/ast.rb
 - lib/rux/ast/attr_node.rb
@@ -97,7 +112,6 @@ files:
 homepage: http://github.com/camertron/rux
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +126,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: []