proc_to_ast 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925e6d8267b75283f13ded71a1f3b17c747a0e6a
-  data.tar.gz: d9d509c4e5e5ab3024d77ced8016e4a34c00aa7b
+  metadata.gz: 5095ab2d916faa3c0fa5d451e7eb2aca7986033c
+  data.tar.gz: 6e5fb00aabf284d7b201398687ed7d7d85449e4d
 SHA512:
-  metadata.gz: fb81eb0cdeae93b38caa1e77751aceba8804d09e4f5866e7507b0cfad3dbbb8f2eb190a33abfc0e2c5461e91ee11cc2828e7dd69666be00b17d040cc7c3466e5
-  data.tar.gz: 3e7be1ee19e6497959c8244437547587b18b2665456fdbbaf087c59d359c32a80ccf23dfde1e21400432a1a94fda6f2136a662a968a2304204cdced0cd55ccf3
+  metadata.gz: 5573a429abb1df2000f597e755cca7b1871e4ec3cbb64109286463aed93672f1c2820bbfe40fbfe4eb74a046d78364f2f55a36049f65d2db56af1c474bce6cce
+  data.tar.gz: e17eaab3f8e06e26b55d77725301a53acfa38622cdaa87e65300923e7b811b85fc39c0d5e6e79b675eaaf2598b33781425f97ce3025b8cb2c5df0d8b3a808708

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
-cache: bundler
+sudo: false
 rvm:
-  - 2.1.1
-  - 2.0.0
+  - 2.2.2
+  - 2.1
+  - 2.0
 notifications:
   email:
     on_success: change

data/lib/proc_to_ast.rb

@@ -20,31 +20,21 @@ module ProcToAst
     #
     # @param filename [String] reading file path
     # @param linenum [Integer] start line number
-    # @param retry_limit [Integer]
     # @return [Parser::AST::Node] Proc AST
-    def parse(filename, linenum, retry_limit = 20)
+    def parse(filename, linenum)
       @filename, @linenum = filename, linenum
-      file = File.open(filename, "rb")
-
-      (linenum - 1).times { file.gets }
       buf = []
-      try_count = 0
-
-      begin
-        try_count += 1
-
-        buf << file.gets
-        do_parse(buf.join)
-      rescue ::Parser::SyntaxError => e
-        node = trim_and_retry(buf)
-
-        return node unless node.nil?
-        retry if try_count < retry_limit
-
-        raise e
-      ensure
-        file.close
+      File.open(filename, "rb").each_with_index do |line, index|
+        next if index < linenum - 1
+        buf << line
+        begin
+          return do_parse(buf.join)
+        rescue ::Parser::SyntaxError
+          node = trim_and_retry(buf)
+          return node if node
+        end
       end
+      fail(::Parser::SyntaxError, 'Unknown error')
     end
 
     private
@@ -90,19 +80,17 @@ module ProcToAst
 end
 
 class Proc
-  # @param retry_limit [Integer]
   # @return [Parser::AST::Node] Proc AST
-  def to_ast(retry_limit = 20)
+  def to_ast
     filename, linenum = source_location
     parser = ProcToAst::Parser.new
-    parser.parse(filename, linenum, retry_limit)
+    parser.parse(filename, linenum)
   end
 
   # @param highlight [Boolean] enable output highlight
-  # @param retry_limit [Integer]
   # @return [String] proc source code
-  def to_source(highlight: false, retry_limit: 20)
-    source = Unparser.unparse(to_ast(retry_limit))
+  def to_source(highlight: false)
+    source = Unparser.unparse(to_ast)
     if highlight
       CodeRay.scan(source, :ruby).terminal
     else
@@ -110,8 +98,8 @@ class Proc
     end
   end
 
-  def to_raw_source(highlight: false, retry_limit: 20)
-    source = to_ast(retry_limit).loc.expression.source
+  def to_raw_source(highlight: false)
+    source = to_ast.loc.expression.source
 
     if highlight
       CodeRay.scan(source, :ruby).terminal

data/lib/proc_to_ast/version.rb

@@ -1,3 +1,3 @@
 module ProcToAst
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/spec/proc_to_ast_spec.rb

@@ -23,6 +23,32 @@ describe Proc do
         expect(pr.to_ast).to be_a(AST::Node)
       end
 
+      it "long proc" do
+        pr = Proc.new do |b|
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+          p 1
+        end
+
+        expect(pr.to_ast).to be_a(AST::Node)
+      end
+
       it "converts block passing method" do
         def receive_block(&block)
           block.to_ast

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc_to_ast
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Convert Proc object to AST::Node