component_embedded_ruby 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834b63b9cc7bf826b998ff5397391e477001e549da31d058243745db63d633e4
-  data.tar.gz: 6742bc330ce2dd5b9fdce7325759338bc966cc016955ca2156ee44e2187e1187
+  metadata.gz: 00cd94a77693e37fb2723ead82ea26bb40f2e03fd605b33cb41a0f1075bc6ef0
+  data.tar.gz: 00b7ebbfe21f7e9b057b83493016e71409a9657f85f30fd719f95c632827f8a8
 SHA512:
-  metadata.gz: 24c07b6614384d476903ab99d892373625cf017b3428c6a5ba2b00a328f07b0dd614ce178235e23d4a333662379719acdef3dc5f28be74eb0d1e68f4144e4cf8
-  data.tar.gz: 181d8e02bc4746860064231b6e19cc834c1b550c0c686aca1f12703bda0894030d9e1c444c2b104edec7e364606a675b8746e789331e52789c807ec2c812a3f7
+  metadata.gz: 6619a460eaf27c83545de59f2b8fa5475592d41af7e082371b2c616f6fcb686518dfeb0e5223c5de7a63ba2672abf4f3ab0e0d77ff02a4dbda8a22cbf146af52
+  data.tar.gz: 2f48caa5773e5ab51f52aebc485a32a344bf60feb6515c3287aa0cbe2be3bcd8f8ca2befc3a1384eb9e480209c3fa37a41513b3b86265d105174d07a5702ea3e

data/.github/workflows/ruby.yml

@@ -3,18 +3,35 @@ name: Ruby
 on: [push]
 
 jobs:
-  build:
-
+  test:
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        ruby_version: [2.5.x, 2.6.x, 2.7.x]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Ruby 2.6
       uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: ${{ matrix.ruby_version }}
     - name: Build and test with Rake
       run: |
-        gem install bundler
+        gem install bundler:1.17.3
         bundle install --jobs 4 --retry 3
         bundle exec rake
+    - name: Rubocop
+      run: |
+        bundle exec rubocop
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Rubocop
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rubocop

data/.rubocop.yml

@@ -0,0 +1,44 @@
+AllCops:
+  TargetRubyVersion: 2.5
+
+Metrics/MethodLength:
+  Max: 20
+  Exclude:
+    - 'test/**/*.rb'
+
+Metrics/ClassLength:
+  Max: 150
+  Exclude:
+    - 'test/**/*.rb'
+
+Metrics/AbcSize:
+  Enabled: false
+
+Security/Eval:
+  Exclude:
+    - 'test/**/*.rb'
+
+Lint/MissingSuper:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/NegatedWhile:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/CaseLikeIf:
+  Enabled: false
+
+Style/MultipleComparison:
+  Enabled: false
+
+Naming/MemoizedInstanceVariableName:
+  EnforcedStyleForLeadingUnderscores: required
+
+Naming/AccessorMethodName:
+  Exclude:
+    - 'test/**/*.rb'

data/Gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gem "rails", github: "rails/rails"
 

data/Gemfile.lock

@@ -86,11 +86,12 @@ GIT
 PATH
   remote: .
   specs:
-    component_embedded_ruby (0.2.0)
+    component_embedded_ruby (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.1)
     builder (3.2.4)
     coderay (1.1.2)
     concurrent-ruby (1.1.7)
@@ -115,6 +116,9 @@ GEM
     nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -126,7 +130,22 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
+    rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
+    rubocop (1.0.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.0.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -137,6 +156,7 @@ GEM
     thor (1.0.1)
     tzinfo (2.0.2)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
     view_component (2.20.0)
       activesupport (>= 5.0.0, < 7.0)
     websocket-driver (0.7.3)
@@ -154,6 +174,7 @@ DEPENDENCIES
   pry (~> 0.12.2)
   rails!
   rake (~> 13.0)
+  rubocop (~> 1.0)
   view_component (> 2.15)
 
 BUNDLED WITH

data/README.md

@@ -9,7 +9,7 @@ Strict HTML templating with support for components.
     extra_classes %>`, instead this logic should be pushed up to components.
 * Component rendering has a single dependency, a `render` method being present
   in the rendering context.
-* Easy Rails integration by registering `crb` as a template handler.
+* automatic Rails support for `crb` extension
 
 ### Usage
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
@@ -7,4 +9,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "component_embedded_ruby"

data/component_embedded_ruby.gemspec

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "component_embedded_ruby/version"
 
@@ -9,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Blake Williams"]
   spec.email         = ["blake@blakewilliams.me"]
 
-  spec.summary       = %q{HTML templates with embedded Ruby components}
-  spec.description   = %q{HTML templates with embedded Ruby components}
+  spec.summary       = "HTML templates with embedded Ruby components"
+  spec.description   = "HTML templates with embedded Ruby components"
   spec.homepage      = "https://github.com/blakewilliams/component_embedded_ruby"
   spec.license       = "MIT"
 
@@ -26,17 +27,19 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.5"
 
   spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rails", "> 6.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rubocop", "~> 1.0"
   spec.add_development_dependency "view_component", "> 2.15"
-  spec.add_development_dependency "pry", "~> 0.12.2"
 end

data/lib/component_embedded_ruby.rb

@@ -1,12 +1,17 @@
+# frozen_string_literal: true
+
 require "component_embedded_ruby/version"
 require "component_embedded_ruby/lexer"
 require "component_embedded_ruby/parser"
 require "component_embedded_ruby/eval"
 require "component_embedded_ruby/node"
-require "component_embedded_ruby/renderer"
+require "component_embedded_ruby/compiler"
 require "component_embedded_ruby/template"
 require "component_embedded_ruby/unexpected_token_error"
 
+# Rails support
+require "component_embedded_ruby/rails_handler" if defined?(Rails::Railtie)
+
 module ComponentEmbeddedRuby
   class Error < StandardError; end
 end

data/lib/component_embedded_ruby/{renderer.rb → compiler.rb}

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
-  class Renderer
+  class Compiler
     def initialize(nodes, output_var_name: "__crb_out", skip_return: false)
       @nodes = Array(nodes)
       @functions = {}
@@ -8,25 +10,25 @@ module ComponentEmbeddedRuby
     end
 
     def to_ruby
-      <<~EOF
+      <<~RUBY
         #{output_var_name} = '';
 
         #{nodes.map(&method(:render)).join("\n")}
 
-        #{output_var_name if !@skip_return};
-      EOF
+        #{output_var_name unless @skip_return};
+      RUBY
     end
 
     private
 
-    def render(node)
+    def render(node) # rubocop:disable Metrics/PerceivedComplexity
       if node.component?
-        <<~EOF
+        <<~RUBY
           #{children_to_ruby(node)}
-          #{output_var_name}.<< render(#{node.component_class}.new(#{attributes_for_component(node).join(",")})) { |component|
-             __c_#{node.hash.to_s.gsub("-", "_")}
+          #{output_var_name}.<< render(#{node.component_class}.new(#{attributes_for_component(node).join(',')})) { |component|
+             __c_#{node.hash.to_s.gsub('-', '_')}
           };
-        EOF
+        RUBY
       elsif node.ruby?
         if node.output_ruby?
           "#{output_var_name}.<< (#{node.children.value}).to_s;\n"
@@ -36,22 +38,22 @@ module ComponentEmbeddedRuby
       elsif node.text?
         "#{output_var_name}.<< \"#{node.children}\";\n"
       elsif node.html?
-        <<~EOF
+        <<~RUBY
           #{output_var_name}.<< \"<#{node.tag}\";
           #{attributes_for_tag(node).join("\n")};
           #{output_var_name}.<< \">\";
           #{node.children.map(&method(:render)).join("\n")}
           #{output_var_name}.<< \"</#{node.tag}>\";
-        EOF
+        RUBY
       end
     end
 
-    attr_reader :output_var_name
+    attr_reader :output_var_name, :nodes
 
     def children_to_ruby(node)
       self.class.new(
         node.children,
-        output_var_name: "__c_#{node.hash.to_s.gsub("-", "_")}",
+        output_var_name: "__c_#{node.hash.to_s.gsub('-', '_')}",
         skip_return: true
       ).to_ruby
     end
@@ -69,17 +71,15 @@ module ComponentEmbeddedRuby
     def attributes_for_tag(node)
       node.attributes.map do |key, value|
         if value.is_a?(Eval)
-          <<~EOF
-          #{output_var_name}.<< " #{key}=\\"";
-          #{output_var_name}.<< (#{value.value}).to_s;
-          #{output_var_name}.<< "\\"";
-          EOF
+          <<~RUBY
+            #{output_var_name}.<< " #{key}=\\"";
+            #{output_var_name}.<< (#{value.value}).to_s;
+            #{output_var_name}.<< "\\"";
+          RUBY
         else
-          %W(#{output_var_name}.<< "key="";\n)
+          %W[#{output_var_name}.<< "key="";\n]
         end
       end
     end
-
-    attr_reader :nodes
   end
 end

data/lib/component_embedded_ruby/eval.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   class Eval
     attr_reader :value, :output

data/lib/component_embedded_ruby/lexer.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+
 require "component_embedded_ruby/lexer/input_reader"
+require "component_embedded_ruby/lexer/string_reader"
+require "component_embedded_ruby/lexer/ruby_code_reader"
 
 module ComponentEmbeddedRuby
   class Lexer
@@ -11,7 +15,7 @@ module ComponentEmbeddedRuby
       @tokens = []
     end
 
-    def lex
+    def lex # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       while !reader.eof?
         char = reader.current_char
 
@@ -24,7 +28,7 @@ module ComponentEmbeddedRuby
         elsif char == "="
           add_token(:equals, "=")
           reader.next
-        elsif char == "\""
+        elsif char == '"'
           add_token(:string, read_quoted_string)
         elsif char == "/"
           add_token(:slash, "/")
@@ -36,11 +40,13 @@ module ComponentEmbeddedRuby
           else
             add_token(:ruby, read_ruby_string)
           end
-        elsif is_letter?(char)
+        elsif letter?(char)
+          position = Position.new(reader.current_line, reader.current_column)
+
           if @tokens[-1]&.type == :close_carrot
-            add_token(:string, read_body_string)
+            add_token(:string, read_body_string, position)
           else
-            add_token(:identifier, read_string)
+            add_token(:identifier, read_string, position)
           end
         else
           reader.next
@@ -53,17 +59,16 @@ module ComponentEmbeddedRuby
     private
 
     attr_reader :reader
-    attr_accessor :position
 
-    def add_token(type, value)
-      token = Token.new(type, value, Position.new(reader.current_line, reader.current_column))
+    def add_token(type, value, position = Position.new(reader.current_line, reader.current_column))
+      token = Token.new(type, value, position)
       @tokens << token
     end
 
     def read_string
       string = ""
 
-      while is_letter?(reader.current_char) && !reader.eof?
+      while letter?(reader.current_char) && !reader.eof?
         string += reader.current_char
         reader.next
       end
@@ -79,6 +84,7 @@ module ComponentEmbeddedRuby
 
       while !unescaped_quote?
         raise "unterminated string" if reader.eof?
+
         string += reader.current_char
         reader.next
       end
@@ -103,41 +109,14 @@ module ComponentEmbeddedRuby
     end
 
     def read_ruby_string
-      inner_string_count = 0
-      inner_bracket_count = 0
-
-      string = ""
-
-      reader.next
-
-      previous_token = nil
-
-      loop do
-        break if inner_bracket_count == 0 && inner_string_count % 2 == 0 && reader.current_char == "}"
-        char = reader.current_char
-        string += char
-
-        # TODO handle " and ' separately
-        if inner_string_count % 2 == 0 && char == "{"
-          inner_bracket_count += 1
-        elsif inner_string_count % 2 == 0 && char == "}"
-          inner_bracket_count -= 1
-        elsif previous_token != "\\" && char == "\"" || char == "'"
-          inner_string_count -= 1
-        end
-
-        previous_token = char
-        reader.next
-      end
-
-      string
+      RubyCodeReader.new(reader).read_until_closing_tag
     end
 
     def unescaped_quote?
-      reader.current_char == "\"" && reader.peek_behind != "\\"
+      reader.current_char == '"' && reader.peek_behind != '\\'
     end
 
-    def is_letter?(char)
+    def letter?(char)
       ascii = char.ord
       (ascii >= 48 && ascii <= 57) || (ascii >= 65 && ascii <= 122) || ascii == 45 || ascii == 95 || ascii == 58
     end

data/lib/component_embedded_ruby/lexer/input_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   class Lexer
     class InputReader
@@ -7,8 +9,8 @@ module ComponentEmbeddedRuby
         @input = input.freeze
         @position = 0
 
-        @current_line = 0
-        @current_column = 0
+        @current_line = 1
+        @current_column = 1
       end
 
       def eof?
@@ -30,7 +32,7 @@ module ComponentEmbeddedRuby
       def next
         if current_char == "\n"
           @current_line += 1
-          @current_column = 0
+          @current_column = 1
         else
           @current_column += 1
         end

data/lib/component_embedded_ruby/lexer/ruby_code_reader.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module ComponentEmbeddedRuby
+  class Lexer
+    class RubyCodeReader
+      def initialize(input_reader)
+        @input_reader = input_reader
+      end
+
+      def read_until_closing_tag
+        string = ""
+
+        loop do
+          input_reader.next
+          current_char = input_reader.current_char
+
+          break if current_char == "}"
+
+          string += current_char
+
+          if current_char == "{"
+            string += RubyCodeReader.new(input_reader).read_until_closing_tag
+
+            # RubyCodeReader reads until "}", so we have to re-add that
+            # character when reading nested code
+            string += "}"
+          elsif current_char == "'" || current_char == '"'
+            # TODO: this *may* need to handle % syntax strings too
+            string += StringReader.new(
+              input_reader,
+              quote_type: current_char,
+              can_interpolate: current_char == '"'
+            ).read_until_closing_quote
+          end
+        end
+
+        string
+      end
+
+      private
+
+      attr_reader :input_reader
+    end
+  end
+end

data/lib/component_embedded_ruby/lexer/string_reader.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module ComponentEmbeddedRuby
+  class Lexer
+    class StringReader
+      def initialize(input_reader, quote_type:, can_interpolate:)
+        @input_reader = input_reader
+        @quote_type = quote_type
+        @can_interpolate = can_interpolate
+      end
+
+      def read_until_closing_quote
+        string = ""
+
+        previous_char = nil
+        current_char = input_reader.current_char
+
+        loop do
+          input_reader.next
+          previous_char = current_char
+          current_char = input_reader.current_char
+
+          string += current_char
+          break if current_char == quote_type && string[-1] != "\\"
+
+          if can_interpolate && string[-2..-1] == '#{' && string[-3] != "\\"
+            string += RubyCodeReader.new(input_reader).read_until_closing_tag
+            string += "}"
+          end
+        end
+
+        string
+      end
+
+      private
+
+      attr_reader :input_reader, :quote_type, :can_interpolate
+    end
+  end
+end

data/lib/component_embedded_ruby/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   class Node
     attr_reader :tag, :attributes, :children

data/lib/component_embedded_ruby/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "component_embedded_ruby/parser/base"
 require "component_embedded_ruby/parser/root_parser"
 require "component_embedded_ruby/parser/attribute_parser"

data/lib/component_embedded_ruby/parser/attribute_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   module Parser
     # Internal: Parses an HTML tag attributes into a hash of key values
@@ -17,9 +19,7 @@ module ComponentEmbeddedRuby
       def call
         attributes = {}
 
-        while current_token.type != :close_carrot && current_token.type != :slash
-          attributes.merge!(parse_attribute)
-        end
+        attributes.merge!(parse_attribute) while current_token.type == :identifier
 
         attributes
       end
@@ -37,7 +37,7 @@ module ComponentEmbeddedRuby
       end
 
       def parse_value
-        value_token = expect_any(:string, :ruby)
+        value_token = expect_any(:string, :ruby, expected_message: "a string or ruby code")
 
         if value_token.type == :string
           value_token.value

data/lib/component_embedded_ruby/parser/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   module Parser
     class Base
@@ -19,25 +21,17 @@ module ComponentEmbeddedRuby
 
       def expect(type)
         token = current_token
+        raise UnexpectedTokenError.new(type, current_token) if token.type != type
 
-        if token.type != type
-          raise UnexpectedTokenError.new(:string, current_token)
-        else
-          token_reader.next
-        end
-
+        token_reader.next
         token
       end
 
-      def expect_any(*types)
+      def expect_any(*types, expected_message:)
         token = current_token
+        raise UnexpectedTokenError.new(expected_message, token) unless types.include?(token.type)
 
-        if !types.include?(token.type)
-          raise UnexpectedTokenError.new(:string, token)
-        else
-          token_reader.next
-        end
-
+        token_reader.next
         token
       end
     end

data/lib/component_embedded_ruby/parser/root_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   module Parser
     # Internal: Used for parsing multiple adjacent tag, string, and emedded
@@ -12,7 +14,8 @@ module ComponentEmbeddedRuby
         results = []
 
         while current_token
-          if current_token.type == :open_carrot
+          case current_token.type
+          when :open_carrot
             # If we run into a </ we are likely at the end of parsing a tag so
             # this should return and let the `TagParser` complete parsing
             #
@@ -22,17 +25,15 @@ module ComponentEmbeddedRuby
             #     children, and will use another instance of `RootParser` to reads its children
             # 3. The new RootParser reads `Hello`, then runs into `</`, so it should return `["Hello"]`
             #     and allow the `TagParser` to finish reading `</h1>`
-            if peek_token.type == :slash
-              return results
-            else
-              results << TagParser.new(token_reader).call
-            end
-          elsif current_token.type == :string || current_token.type == :identifier
+            return results if peek_token.type == :slash
+
+            results << TagParser.new(token_reader).call
+          when :string, :identifier
             # If we're reading a string, or some other identifier that is on
             # its own, we can skip instantiating a new parser and parse it directly ourselves
             results << Node.new(nil, nil, current_token.value)
             token_reader.next
-          elsif current_token.type == :ruby || current_token.type == :ruby_no_eval
+          when :ruby, :ruby_no_eval
             # If we run into Ruby code that should be evaluated inside of the
             # template, we want to create an `Eval`. The compliation step
             # handles `Eval` objects specially since it's making template

data/lib/component_embedded_ruby/parser/tag_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   module Parser
     # Internal: Parses an HTML tag into a Node object
@@ -39,9 +41,7 @@ module ComponentEmbeddedRuby
           expect(:slash)
           close_tag = expect(:identifier).value
 
-          if close_tag != tag
-            raise "Mismatched tags. expected #{tag}, got #{current_token.value}"
-          end
+          raise "Mismatched tags. expected #{tag}, got #{current_token.value}" if close_tag != tag
 
           expect(:close_carrot)
 
@@ -51,23 +51,23 @@ module ComponentEmbeddedRuby
 
       private
 
+      def parse_children
+        if children?
+          RootParser.new(token_reader).call
+        else
+          []
+        end
+      end
+
       # If the next two elements are </, we can safely asume it's meant to
       # close the current tag and lets us avoid having to attempt parsing
       # children.
-      def has_children?
+      def children?
         return true if current_token.type != :open_carrot
         return true if peek_token&.type != :slash
 
         false
       end
-
-      def parse_children
-        if has_children?
-          RootParser.new(token_reader).call
-        else
-          []
-        end
-      end
     end
   end
 end

data/lib/component_embedded_ruby/parser/token_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   module Parser
     class TokenReader

data/lib/component_embedded_ruby/rails_handler.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ComponentEmbeddedRuby
+  class RailsHandler
+    def self.call(template, source = nil)
+      source ||= template.source
+
+      Template.new(source).to_ruby
+    end
+  end
+end
+
+ActionView::Template.register_template_handler(:crb, ComponentEmbeddedRuby::RailsHandler)

data/lib/component_embedded_ruby/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   class Template
     def initialize(template)
@@ -7,11 +9,11 @@ module ComponentEmbeddedRuby
     def to_ruby
       tokens = Lexer.new(@template).lex
       nodes = Parser.parse(tokens)
-      Renderer.new(nodes).to_ruby
+      Compiler.new(nodes).to_ruby
     end
 
     def to_s(binding: TOPLEVEL_BINDING)
-      eval(to_ruby, binding)
+      eval(to_ruby, binding) # rubocop:disable Security/Eval
     end
   end
 end

data/lib/component_embedded_ruby/unexpected_token_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
   class UnexpectedTokenError < StandardError
     attr_reader :expected, :got
@@ -8,14 +10,30 @@ module ComponentEmbeddedRuby
     end
 
     def message
-      "Unexpected token at column #{got.position}, got #{got.value}#{expected_message}."
+      <<~MESSAGE.strip
+        Unexpected token at line #{got.position.line}, column #{got.position.column}
+        Got `#{got.value}`#{expected_message}
+      MESSAGE
     end
 
     private
 
     def expected_message
-      if expected != nil
-        " but expected #{expected}"
+      " but expected #{user_readable_expected}" unless expected.nil?
+    end
+
+    def user_readable_expected
+      case expected
+      when :open_carrot
+        "`<`"
+      when :close_carrot
+        "`>`"
+      when :equals
+        "`=`"
+      when :slash
+        "`/`"
+      else
+        expected
       end
     end
   end

data/lib/component_embedded_ruby/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentEmbeddedRuby
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: component_embedded_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Blake Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: view_component
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: view_component
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2.15'
 description: HTML templates with embedded Ruby components
 email:
 - blake@blakewilliams.me
@@ -103,6 +117,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -113,9 +128,12 @@ files:
 - bin/setup
 - component_embedded_ruby.gemspec
 - lib/component_embedded_ruby.rb
+- lib/component_embedded_ruby/compiler.rb
 - lib/component_embedded_ruby/eval.rb
 - lib/component_embedded_ruby/lexer.rb
 - lib/component_embedded_ruby/lexer/input_reader.rb
+- lib/component_embedded_ruby/lexer/ruby_code_reader.rb
+- lib/component_embedded_ruby/lexer/string_reader.rb
 - lib/component_embedded_ruby/node.rb
 - lib/component_embedded_ruby/parser.rb
 - lib/component_embedded_ruby/parser/attribute_parser.rb
@@ -123,7 +141,7 @@ files:
 - lib/component_embedded_ruby/parser/root_parser.rb
 - lib/component_embedded_ruby/parser/tag_parser.rb
 - lib/component_embedded_ruby/parser/token_reader.rb
-- lib/component_embedded_ruby/renderer.rb
+- lib/component_embedded_ruby/rails_handler.rb
 - lib/component_embedded_ruby/template.rb
 - lib/component_embedded_ruby/unexpected_token_error.rb
 - lib/component_embedded_ruby/version.rb
@@ -141,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="