Review comments

Author: andreimid

lib/ruby_ast_gen.rb

@@ -5,7 +5,7 @@
 
 require_relative 'ruby_ast_gen/version'
 require_relative 'ruby_ast_gen/node_handling'
-require_relative 'ruby_ast_gen/ErbToRubyTransformer'
+require_relative 'ruby_ast_gen/erb_to_ruby_transformer'
 
 module RubyAstGen
 
@@ -122,18 +122,7 @@ def self.parse_file(file_path, relative_input_path)
         File.read(file_path)
       else
         file_content = File.read(file_path)
-        begin
-          transformer = ErbToRubyTransformer.new
-          transformer.call(file_content)
-        rescue Error
-          # Wrap the file_content in HEREDOC so the AST parser gives a String output of the ERB file
-          # in case the transformation fell over
-          <<~RUBY
-            <<~HEREDOC
-              #{file_content}
-            HEREDOC
-          RUBY
-        end
+        get_erb_content(file_content)
       end
 
     buffer = Parser::Source::Buffer.new(file_path)
@@ -159,4 +148,19 @@ def self.erb_file?(file_path)
     ext = File.extname(file_path)
     ['.erb'].include?(ext) || file_path.end_with?('.erb')
   end
+
+  def self.get_erb_content(file_content)
+    begin
+      transformer = ErbToRubyTransformer.new
+      transformer.transform(file_content)
+    rescue Error
+      # Wrap the file_content in HEREDOC so the AST parser gives a String output of the ERB file
+      # in case the transformation fell over
+      <<~RUBY
+        <<~HEREDOC
+          #{file_content}
+        HEREDOC
+      RUBY
+    end
+  end
 end

lib/ruby_ast_gen/ErbToRubyTransformer.rb …/ruby_ast_gen/erb_to_ruby_transformer.rblib/ruby_ast_gen/ErbToRubyTransformer.rb renamed to lib/ruby_ast_gen/erb_to_ruby_transformer.rb lib/ruby_ast_gen/ErbToRubyTransformer.rb renamed to lib/ruby_ast_gen/erb_to_ruby_transformer.rb

@@ -10,7 +10,7 @@ def initialize
     @control_block_content = []
   end
 
-  def call(input)
+  def transform(input)
     ast = @parser.call(input)
     content = visit(ast)
     # Wrap everything in a HEREDOC

spec/ruby_ast_gen_spec.rb

@@ -10,6 +10,12 @@
     file
   }
 
+  let(:temp_erb_file) {
+    file = Tempfile.new('test_erb.erb')
+    temp_name = File.basename(file.path)
+    file
+  }
+
   after(:each) do
     temp_file.close
     temp_file.unlink
@@ -20,6 +26,11 @@ def code(s)
     temp_file.rewind
   end
 
+  def erb_code(s)
+    temp_erb_file.write(s)
+    temp_erb_file.rewind
+  end
+
   it "should parse a class successfully" do
     code(<<-CODE)
 class Foo
@@ -90,4 +101,54 @@ def foo(a, bar: "default")
     ast = RubyAstGen::parse_file(temp_file.path, temp_name)
     expect(ast).not_to be_nil
   end
+
+  it "should parse ERB structure with no ruby expressions" do
+    code(<<-CODE)
+app_name: <%= ENV['APP_NAME'] %>
+version: <%= ENV['APP_VERSION'] %>
+
+database:
+  host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT'] %>
+    CODE
+    ast = RubyAstGen::parse_file(temp_erb_file.path, temp_name)
+    expect(ast).not_to be_nil
+  end
+
+  it "should parse ERB structure with expressions" do
+    code(<<-CODE)
+app_name: <%= ENV['APP_NAME'] %>
+version: <%= ENV['APP_VERSION'] %>
+
+database:
+  host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT'] %>
+
+<% if ENV['USE_REDIS'] == 'true' %>
+redis:
+  host: <%= ENV['REDIS_HOST'] %>
+  port: <%= ENV['REDIS_PORT'] %>
+<% end %>
+    CODE
+    ast = RubyAstGen::parse_file(temp_erb_file.path, temp_name)
+    expect(ast).not_to be_nil
+  end
+
+  it "should still return some AST even if the ERB is invalid" do
+    code(<<-CODE)
+app_name: <%= ENV['APP_NAME'] %>
+version: <%= ENV['APP_VERSION'] %>
+
+database:
+  host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT'] %>
+
+<% if ENV['USE_REDIS'] == 'true' %>
+redis:
+  host: <%= ENV['REDIS_HOST'] %>
+  port: <%= ENV['REDIS_PORT'] %>
+    CODE
+    ast = RubyAstGen::parse_file(temp_erb_file.path, temp_name)
+    expect(ast).not_to be_nil
+  end
 end