rux 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1e472f55eed0269091c2f5efa3a1d27fb1d16ed1959c32a84633be8b192940d
-  data.tar.gz: 46e848d6871ff5ea01638d6e50e24968ad3aa9867324580417151287ed932b3d
+  metadata.gz: 2418beae606c99c851a3000546d6fffe20fb30e02049b41a2c2cbd8ecae427dc
+  data.tar.gz: 974fc8d3502737b5737f30b07c818e04918eb55b9693ea8b3d5ef629a71a1dc6
 SHA512:
-  metadata.gz: 1681c3f2cedc43ee87559663ada3f92d9061ed004cb4ea100a588d847b7de3cf2e4a490ec23f5d0cd653602d3f0fee1c97045c9c786e38249663a73534ab559c
-  data.tar.gz: 94c7c21726d2b38750162fb36ceb1f8ff9321fe99425efb078b51a042568b5914e5821341bb45fa5b18f1f6df1040f2fa706edd7ce32b834207a0046e8ac0479
+  metadata.gz: b6ba53663a7d8fb7195962d37586beee45a9ea97f1fcbc73b0366f68c640e54ae8f11a0daafee299500c84c06526d9683ad0bb09a065f929b43096eaaae77c9d
+  data.tar.gz: d25ada54406d57355e85d6824ab2ac2141771e613aa9a7dabfc24f7e2732124a4e369bca0fd61025248b0661c8e80183f0016c04480253870cc3fe2f94afcb9c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.4.1
+* Fix bug preventing use of curly brace-delimited block syntax, eg. `[1, 2].each { ... }`.
+
 # 1.4.0
 * Implement React-style contexts for passing arguments across arbitrary levels of component nesting.
   - Define a new context via `Rux.create_context`.

data/README.md

@@ -2,6 +2,8 @@
 
 ![Unit Tests](https://github.com/camertron/rux/actions/workflows/unit_tests.yml/badge.svg?branch=master)
 
+/rʌks/, rhymes with "ducks" and "trucks"
+
 Rux is a JSX-inspired way to write HTML tags in your Ruby code. It can be used to render view components in Rails via the [rux-rails gem](https://github.com/camertron/rux-rails). This repo however contains only the rux parser itself.
 
 ## Introduction

data/lib/rux/debug_lexer.rb

@@ -0,0 +1,23 @@
+module Rux
+  class DebugLexer
+    def initialize(...)
+      @lexer = Lexer.new(...)
+      @tokens = @lexer.to_a
+      @counter = -1
+    end
+
+    def source_buffer
+      @lexer.source_buffer
+    end
+
+    def advance
+      @counter += 1
+
+      if @counter >= @tokens.size
+        [nil, ['$eof']]
+      else
+        @tokens[@counter]
+      end
+    end
+  end
+end

data/lib/rux/parser.rb

@@ -19,7 +19,12 @@ module Rux
       private
 
       def make_lexer(buffer)
-        ::Rux::Lexer.new(buffer)
+        if ENV["RUX_DEBUG"]
+          require "rux/debug_lexer"
+          ::Rux::DebugLexer.new(buffer)
+        else
+          ::Rux::Lexer.new(buffer)
+        end
       end
     end
 
@@ -50,19 +55,21 @@ module Rux
             curlies -= 1
         end
 
-        break if curlies == 0
-
         if rb = ruby
           children << rb
         elsif type_of(current) == :tRUX_TAG_OPEN_START
           children << tag
         elsif type_of(current) == :tRUX_FRAGMENT_OPEN
           children << fragment
+        elsif type_of(current) == :tRUX_LITERAL_RUBY_CODE_END
+          # do nothing - let #literal_ruby_code consume the end token
         else
           raise UnexpectedTokenError,
             'expected ruby code or the start of a rux tag but found '\
               "#{type_of(current)} instead"
         end
+
+        break if curlies == 0
       end
 
       AST::ListNode.new(children)
@@ -306,7 +313,7 @@ module Rux
     def consume(*types)
       if !types.include?(type_of(current))
         raise UnexpectedTokenError,
-          "expected [#{types.map(&:to_s).join(', ')}], got '#{type_of(current)}'"
+          "expected [#{types.map(&:to_s).join(', ')}], got '#{type_of(current)}' at #{pos_of(current)}"
       end
 
       @current = get_next

data/lib/rux/version.rb

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

data/spec/render_spec.rb

@@ -25,6 +25,24 @@ describe 'rendering', type: :render do
     expect(result).to eq("<div><p>Welcome!</p><p>Welcome!</p><p>Welcome!</p></div>")
   end
 
+  it 'handles curly brace block syntax' do
+    result = render(<<~RUBY)
+      [1, 2, 3].map { |i| <div>{i}</div> }
+    RUBY
+
+    expect(result).to eq(["<div>1</div>", "<div>2</div>", "<div>3</div>"])
+  end
+
+  it 'handles curly brace block syntax with wrapping tag' do
+    result = render(<<~RUBY)
+      <span>
+        {[1, 2, 3].map { |i| <div>{i}</div> }}
+      </span>
+    RUBY
+
+    expect(result).to eq("<span><div>1</div><div>2</div><div>3</div></span>")
+  end
+
   it 'correctly handles keyword arguments (ruby 3)' do
     result = render(<<~RUBY)
       <ArgsComponent a="a" b="b" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rux
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Cameron Dutro
@@ -95,6 +95,7 @@ files:
 - lib/rux/ast/text_node.rb
 - lib/rux/buffer.rb
 - lib/rux/context.rb
+- lib/rux/debug_lexer.rb
 - lib/rux/default_tag_builder.rb
 - lib/rux/default_visitor.rb
 - lib/rux/file.rb