proc_to_ast 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5095ab2d916faa3c0fa5d451e7eb2aca7986033c
-  data.tar.gz: 6e5fb00aabf284d7b201398687ed7d7d85449e4d
+SHA256:
+  metadata.gz: 2f78e79219512a1b4ad81f78c1569f906701ceaca046bb8d3dadad4886fd80de
+  data.tar.gz: a81e8a47f87efd33d6d3ab3e764832621613a0b9e3ed2ffff187f2c476594409
 SHA512:
-  metadata.gz: 5573a429abb1df2000f597e755cca7b1871e4ec3cbb64109286463aed93672f1c2820bbfe40fbfe4eb74a046d78364f2f55a36049f65d2db56af1c474bce6cce
-  data.tar.gz: e17eaab3f8e06e26b55d77725301a53acfa38622cdaa87e65300923e7b811b85fc39c0d5e6e79b675eaaf2598b33781425f97ce3025b8cb2c5df0d8b3a808708
+  metadata.gz: e6e3adeabd531b4cbe84daef769756f68c35480f25a186d50e0cb57856a5616f9bf74cd457a6d58278596425a2b01ad6c3d542dd2baf136ba59c0e50e35b6f44
+  data.tar.gz: 6ff7c319838d4d501b02be15fa05dc7ae4a12d31433b28cca76dde54093cb0938b3753523c914e396421cac771f9284034330b506e7022d828c9bc7f8b7e605a

data/.github/workflows/rspec.yml

@@ -0,0 +1,27 @@
+name: RSpec
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.1', '3.2', '3.3']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -20,3 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
+
+rspec.output

data/README.md

@@ -1,6 +1,6 @@
 # proc_to_ast
 [![Gem Version](https://badge.fury.io/rb/proc_to_ast.svg)](http://badge.fury.io/rb/proc_to_ast)
-[![Build Status](https://travis-ci.org/joker1007/proc_to_ast.svg?branch=master)](https://travis-ci.org/joker1007/proc_to_ast)
+[![RSpec](https://github.com/joker1007/proc_to_ast/actions/workflows/rspec.yml/badge.svg)](https://github.com/joker1007/proc_to_ast/actions/workflows/rspec.yml)
 
 Add `#to_ast` method to Proc.
 

data/lib/proc_to_ast/parser_gem.rb

@@ -0,0 +1,119 @@
+require "proc_to_ast/version"
+
+require "parser/current"
+require "unparser"
+require "rouge"
+
+module ProcToAst
+  class MultiMatchError < StandardError; end
+
+  class Parser
+    attr_reader :parser
+
+    @formatter = Rouge::Formatters::Terminal256.new
+    @lexer = Rouge::Lexers::Ruby.new
+
+    class << self
+      def highlight(source)
+        @formatter.format(@lexer.lex(source))
+      end
+    end
+
+    def initialize
+      @parser = ::Parser::CurrentRuby.default_parser
+      @parser.diagnostics.consumer = ->(diagnostic) {} # suppress error message
+    end
+
+    # Read file and try parsing
+    # if success parse, find proc AST
+    #
+    # @param filename [String] reading file path
+    # @param linenum [Integer] start line number
+    # @return [Parser::AST::Node] Proc AST
+    def parse(filename, linenum)
+      @filename, @linenum = filename, linenum
+      buf = []
+      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
+
+    def do_parse(source)
+      parser.reset
+
+      source_buffer = ::Parser::Source::Buffer.new(@filename, @linenum)
+      source_buffer.source = source
+      node = parser.parse(source_buffer)
+      block_nodes = traverse_node(node)
+
+      if block_nodes.length == 1
+        block_nodes.first
+      else
+        raise ProcToAst::MultiMatchError
+      end
+    end
+
+    # 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*$/, "")
+      do_parse("a(#{lines.join})") # wrap dummy method
+    rescue ::Parser::SyntaxError
+    end
+
+    def traverse_node(node)
+      if node.type != :block
+        node.children.flat_map { |child|
+          if child.is_a?(AST::Node)
+            traverse_node(child)
+          end
+        }.compact
+      else
+        [node]
+      end
+    end
+  end
+end
+
+class Proc
+  # @return [Parser::AST::Node] Proc AST
+  def to_ast
+    filename, linenum = source_location
+    parser = ProcToAst::Parser.new
+    parser.parse(filename, linenum)
+  end
+
+  # @param highlight [Boolean] enable output highlight
+  # @return [String] proc source code
+  def to_source(highlight: false)
+    source = Unparser.unparse(to_ast)
+    if highlight
+      ProcToAst::Parser.highlight(source)
+    else
+      source
+    end
+  end
+
+  def to_raw_source(highlight: false)
+    source = to_ast.loc.expression.source.force_encoding("UTF-8")
+
+    if highlight
+      ProcToAst::Parser.highlight(source)
+    else
+      source
+    end
+  end
+end

data/lib/proc_to_ast/version.rb

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

data/lib/proc_to_ast.rb

@@ -1,110 +1 @@
-require "proc_to_ast/version"
-
-require 'parser/current'
-require 'unparser'
-require 'coderay'
-
-module ProcToAst
-  class MultiMatchError < StandardError; end
-
-  class Parser
-    attr_reader :parser
-
-    def initialize
-      @parser = ::Parser::CurrentRuby.default_parser
-      @parser.diagnostics.consumer = ->(diagnostic) {} # suppress error message
-    end
-
-    # Read file and try parsing
-    # if success parse, find proc AST
-    #
-    # @param filename [String] reading file path
-    # @param linenum [Integer] start line number
-    # @return [Parser::AST::Node] Proc AST
-    def parse(filename, linenum)
-      @filename, @linenum = filename, linenum
-      buf = []
-      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
-
-    def do_parse(source)
-      parser.reset
-
-      source_buffer = ::Parser::Source::Buffer.new(@filename, @linenum)
-      source_buffer.source = source
-      node = parser.parse(source_buffer)
-      block_nodes = traverse_node(node)
-
-      if block_nodes.length == 1
-        block_nodes.first
-      else
-        raise ProcToAst::MultiMatchError
-      end
-    end
-
-    # 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*$/, "")
-      do_parse("a(#{lines.join})") # wrap dummy method
-    rescue ::Parser::SyntaxError
-    end
-
-    def traverse_node(node)
-      if node.type != :block
-        node.children.flat_map { |child|
-          if child.is_a?(AST::Node)
-            traverse_node(child)
-          end
-        }.compact
-      else
-        [node]
-      end
-    end
-  end
-end
-
-class Proc
-  # @return [Parser::AST::Node] Proc AST
-  def to_ast
-    filename, linenum = source_location
-    parser = ProcToAst::Parser.new
-    parser.parse(filename, linenum)
-  end
-
-  # @param highlight [Boolean] enable output highlight
-  # @return [String] proc source code
-  def to_source(highlight: false)
-    source = Unparser.unparse(to_ast)
-    if highlight
-      CodeRay.scan(source, :ruby).terminal
-    else
-      source
-    end
-  end
-
-  def to_raw_source(highlight: false)
-    source = to_ast.loc.expression.source
-
-    if highlight
-      CodeRay.scan(source, :ruby).terminal
-    else
-      source
-    end
-  end
-end
+require "proc_to_ast/parser_gem"

data/proc_to_ast.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "parser"
   spec.add_runtime_dependency "unparser"
-  spec.add_runtime_dependency "coderay"
+  spec.add_runtime_dependency "rouge"
 
   spec.add_development_dependency "bundler", ">= 1.5"
   spec.add_development_dependency "rake"

data/spec/proc_to_ast_spec.rb

@@ -91,9 +91,9 @@ describe Proc do
           end
         ]
         expect(array[1].to_ast).to be_a(AST::Node)
-        expect(array[1].to_source).to eq("lambda do\n  2\nend")
-        expect(array[2][0].to_source).to eq("lambda do\n  3\nend")
-        expect(array[3].to_source).to eq("proc do |a|\n  [a]\nend")
+        expect(array[1].to_source).to eq("lambda {\n  2\n}")
+        expect(array[2][0].to_source).to eq("lambda {\n  3\n}")
+        expect(array[3].to_source).to eq("proc { |a,|\n  [a]\n}")
       end
 
       it "inner two dimension array" do
@@ -108,7 +108,7 @@ describe Proc do
       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")
+        expect(hash_oneline[:a].to_source).to eq("lambda {\n  1\n}")
       end
 
       it "inner multiline hash" do
@@ -121,13 +121,13 @@ describe Proc do
           d: -> { 4 }
         }
         expect(hash[:a].to_ast).to be_a(AST::Node)
-        expect(hash[:a].to_source).to eq("lambda do\n  1\nend")
+        expect(hash[:a].to_source).to eq("lambda {\n  1\n}")
         expect(hash[:b].to_ast).to be_a(AST::Node)
-        expect(hash[:b].to_source).to eq("lambda do\n  2\nend")
+        expect(hash[:b].to_source).to eq("lambda {\n  2\n}")
         expect(hash[:c].to_ast).to be_a(AST::Node)
-        expect(hash[:c].to_source).to eq("lambda do\n  3\nend")
+        expect(hash[:c].to_source).to eq("lambda {\n  3\n}")
         expect(hash[:d].to_ast).to be_a(AST::Node)
-        expect(hash[:d].to_source).to eq("lambda do\n  4\nend")
+        expect(hash[:d].to_source).to eq("lambda {\n  4\n}")
       end
 
       it "inner another hash" do
@@ -136,7 +136,7 @@ describe Proc do
         }
 
         expect(hash[:b].to_ast).to be_a(AST::Node)
-        expect(hash[:b].to_source).to eq("lambda do\n  2\nend")
+        expect(hash[:b].to_source).to eq("lambda {\n  2\n}")
       end
     end
   end
@@ -147,8 +147,20 @@ describe Proc do
         p a
       }
 
-      expect(fuga.to_source).to eq("lambda do |a|\n  p(a)\nend")
-      expect(fuga.to_source(highlight: true)).to eq("lambda \e[32mdo\e[0m |a|\n  p(a)\n\e[32mend\e[0m")
+      expect(fuga.to_source).to eq("lambda { |a,|\n  p(a)\n}")
+      expect(fuga.to_source(highlight: true)).to eq("\e[01mlambda\e[00m\e[38;5;230m \e[39m\e[38;5;87m{\e[39m\e[38;5;230m \e[39m\e[38;5;87;01m|\e[39;00m\e[38;5;230ma\e[39m\e[38;5;87m,\e[39m\e[38;5;87;01m|\e[39;00m\e[38;5;230m\e[39m\n\e[38;5;230m  \e[39m\e[01mp\e[00m\e[38;5;87m(\e[39m\e[38;5;230ma\e[39m\e[38;5;87m)\e[39m\e[38;5;230m\e[39m\n\e[38;5;230m\e[39m\e[38;5;87m}\e[39m")
+    end
+
+    it "charset is UTF-8" do
+      fuga = ->(a) {
+        p a
+      }
+      expect(fuga.to_source.encoding).to eq(Encoding::UTF_8)
+    end
+
+    it "can handle multibyte characters" do
+      pr = ->(a) { a + "ほげほげ" }
+      expect(pr.to_source).to eq("lambda { |a,|\n  a + \"\\xE3\\x81\\xBB\\xE3\\x81\\x92\\xE3\\x81\\xBB\\xE3\\x81\\x92\"\n}")
     end
   end
 
@@ -158,5 +170,16 @@ describe Proc do
 
       expect(pr.to_raw_source).to eq("->(a) { a + 1 }")
     end
+
+    it "charset is UTF-8" do
+      pr = ->(a) { a + 1 }
+      expect(pr.to_raw_source.encoding).to eq(Encoding::UTF_8)
+    end
+
+    it "can handle multibyte characters" do
+      pr = ->(a) { a + "ほげほげ" }
+      expect(pr.to_raw_source).to eq("->(a) { a + \"ほげほげ\" }")
+      expect(pr.to_raw_source(highlight: true)).to eq("\e[38;5;87;01m->\e[39;00m\e[38;5;87m(\e[39m\e[38;5;230ma\e[39m\e[38;5;87m)\e[39m\e[38;5;230m \e[39m\e[38;5;87m{\e[39m\e[38;5;230m \e[39m\e[38;5;230ma\e[39m\e[38;5;230m \e[39m\e[38;5;87;01m+\e[39;00m\e[38;5;230m \e[39m\e[38;5;229;01m\"ほげほげ\"\e[39;00m\e[38;5;230m \e[39m\e[38;5;87m}\e[39m")
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'proc_to_ast'
+require 'proc_to_ast/parser_gem'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc_to_ast
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - joker1007
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,14 +101,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/proc_to_ast.rb
+- lib/proc_to_ast/parser_gem.rb
 - lib/proc_to_ast/version.rb
 - proc_to_ast.gemspec
 - spec/proc_to_ast_spec.rb
@@ -117,7 +118,7 @@ homepage: https://github.com/joker1007/proc_to_ast
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,9 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Convert Proc object to AST::Node
 test_files:

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.2.2
-  - 2.1
-  - 2.0
-notifications:
-  email:
-    on_success: change