proc_to_ast 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af92479d75ab4508025af6183f02826935da753f
-  data.tar.gz: e7d4661d31825657ab4d3f87b5f5f773a083d89f
+  metadata.gz: 7154d3d9104765cba5474b644a7401f3afa599cf
+  data.tar.gz: 2524064259c19cccdb92bb071d42390f874874fe
 SHA512:
-  metadata.gz: bb3e438c238c4e153e9cb24adfcc11fc090a6dc713bad95dcd72748062983a62fc0eae58cc9a79721a365e4ffa7022babeb74188b3208acc010d0d13717a2048
-  data.tar.gz: ea3ca120b291b266d5bda7b2fc0541400e38d696c80ac836d36d9b48bc90f3171e976c3f2e18efbe107ee2480ae5870cca16e45330db32832c12712f34f3438c
+  metadata.gz: 5fae7228287b64ab740e6e1b725c75f95ffeaf30560fa3ef6a085b60e52de05ab70df542184026922e6b75eac79fe01bafd0f340d5f4fb5a8601ebfefa730a4f
+  data.tar.gz: b983db0c5643c7589ee5329958a5f0b627e67bdbcf7a54656c25a69dfc610186ff752f3f1b364914319651aad58c69fdf6d3c2f2445d91c189daf77de950a8bc

data/lib/proc_to_ast.rb

@@ -34,7 +34,7 @@ module ProcToAst
         try_count += 1
 
         buf << file.gets
-        do_parse(buf)
+        do_parse(buf.join)
       rescue ::Parser::SyntaxError => e
         node = trim_and_retry(buf)
 
@@ -49,9 +49,8 @@ module ProcToAst
 
     private
 
-    def do_parse(buf)
+    def do_parse(source)
       parser.reset
-      source = buf.join.force_encoding(parser.default_encoding)
 
       source_buffer = ::Parser::Source::Buffer.new(@filename, @linenum)
       source_buffer.source = source
@@ -65,22 +64,15 @@ module ProcToAst
       end
     end
 
-    # Remove tail comma or Hash syntax, and retry parsing
+    # Remove tail comma and wrap dummy method, and retry parsing
+    # For proc inner Array or Hash
     def trim_and_retry(buf)
       *lines, last = buf
 
       # For inner Array or Hash or Arguments list.
-      lines << last.gsub(/,\s*/, "")
-
-      lines[0] = lines[0]
-        .gsub(/[0-9a-zA-Z_]+:\s*/, "")
-        .gsub(/[^\s]+\s*=>\s*/, "")
-
-      begin
-        do_parse(lines)
-      rescue ::Parser::SyntaxError
-        nil
-      end
+      lines << last.gsub(/,\s*$/, "")
+      do_parse("a(#{lines.join})") # wrap dummy method
+    rescue ::Parser::SyntaxError
     end
 
     def traverse_node(node)

data/lib/proc_to_ast/version.rb

@@ -1,3 +1,3 @@
 module ProcToAst
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/proc_to_ast_spec.rb

@@ -70,11 +70,22 @@ describe Proc do
         expect(array[3].to_source).to eq("proc do |a|\n  [a]\nend")
       end
 
+      it "inner two dimension array" do
+        array = [
+          [1, 2, -> { 3 }],
+          [4, 5, -> { 6 }]
+        ]
+        expect(array[0][2].to_ast).to be_a(AST::Node)
+        expect(array[1][2].to_ast).to be_a(AST::Node)
+      end
+
       it "inner hash" do
         hash_oneline = {a: -> { 1 }}
         expect(hash_oneline[:a].to_ast).to be_a(AST::Node)
         expect(hash_oneline[:a].to_source).to eq("lambda do\n  1\nend")
+      end
 
+      it "inner multiline hash" do
         hash = {
           a: -> { 1 },
           :b => -> { 2 },
@@ -92,6 +103,15 @@ describe Proc do
         expect(hash[:d].to_ast).to be_a(AST::Node)
         expect(hash[:d].to_source).to eq("lambda do\n  4\nend")
       end
+
+      it "inner another hash" do
+        hash = {
+          a: 1, :b => -> { 2 },
+        }
+
+        expect(hash[:b].to_ast).to be_a(AST::Node)
+        expect(hash[:b].to_source).to eq("lambda do\n  2\nend")
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proc_to_ast
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - joker1007