ripper_tree 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32e723df924fac02d663df047f40ea67ab760e23
-  data.tar.gz: 10838e66ce8303381411cb0bb455c58bfb58e79c
+  metadata.gz: efb38adab6fad648b10c3c7fb100c6c7443f40f3
+  data.tar.gz: 271b928334b81a47a0734cc2188841a2630d5e06
 SHA512:
-  metadata.gz: 44bd022c7d118863e4126cea39d3714bfcfa4d0981b7e2cd5c7b5f1bfa1aa670be73d17e6f5332a02de5db25e610418c10ab735db4cffcfed5c66dca50261716
-  data.tar.gz: 0db04716450e29710c0fce7a6adac01a5d8f9cd73760f4f575f60c77b8158eaa49f45ccbf4b0c225bd5f21f7e8d7fca75d4b1b177ad494757ac23a7e883add04
+  metadata.gz: a8528a1c45506f517620fe3226cf9293ee4ef8e31a772e51a8dce83ee9e77ae02d3fea3a1d4be80c180f34df2bf782a15ee93c7258052a59bcab93e4802bddc2
+  data.tar.gz: ef0b256a981a8d95ed08acbf1aa848e9488274d4fee84bbdab193c0325816a2f72ce94afef84652d852cf85577cc0c08696d88d98afe5fd2ad7e6cb85207ff41

data/README.md

@@ -31,9 +31,9 @@ result
 ```ruby
 :program
  └──── :binary
-         ├──── :@int [1] 1:0
+         ├──── :@int ["1"] 1:0
          ├──── :+
-         └──── :@int [1] 1:4
+         └──── :@int ["1"] 1:4
 ```
 
 if use in ruby code.
@@ -64,7 +64,7 @@ result
 
 :program
  └──── :command
-         ├──── :@ident [puts] 1:0
+         ├──── :@ident ["puts"] 1:0
          └──── :args_add_block
                  ├──── :string_literal
                  │       └──── :string_content
@@ -83,12 +83,12 @@ result
 ```ruby
 :program
  └──── :binary
-         ├──── :@int [1] 1:0
+         ├──── :@int ["1"] 1:0
          ├──── :+
          └──── :binary
-                 ├──── :@int [2] 1:2
+                 ├──── :@int ["2"] 1:2
                  ├──── :*
-                 └──── :@int [3] 1:4
+                 └──── :@int ["3"] 1:4
 ```
 
 ## Contributing

data/lib/ripper_tree/version.rb

@@ -1,3 +1,3 @@
 class RipperTree
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/ripper_tree.rb

@@ -6,11 +6,11 @@ class RipperTree
   T_LINE = '├────'
   I_LINE = '│'
   L_LINE = '└────'
-  VALUE_TOKEN = /@CHAR|@ident|@kw|@regexp_end|@period|@op|@int|@float|@rational|@label|@ivar|@imaginary|@const|@cvar|@gvar/.freeze
+  SCANNER_EVENT = /^(@CHAR|@const|@cvar|@float|@gvar|@ident|@imaginary|@int|@ivar|@kw|@label|@op|@period|@rational|@regexp_end|@tstring_content)$/
 
-  def self.create(src)
+  def self.create(code)
     new.tap do |rtree|
-      rtree.parse(Ripper.sexp(src))
+      rtree.parse(Ripper.sexp(code))
     end
   end
 
@@ -30,22 +30,18 @@ class RipperTree
     end_line ? ' ' * RipperTree::OPTIONS[:space_size] : I_LINE + ' ' * (RipperTree::OPTIONS[:space_size]-1)
   end
 
-  def output_id(id)
+  def output_event_id(id)
     "#{id.inspect}\n".colorize(:magenta)
   end
 
-  def output_string_node(node)
-    "#{node[0].inspect.colorize(:blue)} [#{node[1].inspect.colorize(:red)}] #{node[2].join(':')}\n"
-  end
-
   def output_value_node(node)
-    "#{node[0].inspect.colorize(:blue)} [#{node[1]}] #{node[2].join(':')}\n"
+    "#{node[0].inspect.colorize(:blue)} [#{node[1].inspect.colorize(:red)}] #{node[2].join(':')}\n"
   end
 
   def parse_method_arguments(parent, space: ' ')
     id = parent.first
 
-    @queue << output_id(id)
+    @queue << output_event_id(id)
 
     params = parent[1..-1].zip(%i(pars opts rest pars2 kws kwrest blk))
 
@@ -55,7 +51,7 @@ class RipperTree
       @queue << get_line(end_line: params.empty?, space: space)
 
       if param.instance_of?(Array)
-        @queue << output_id(arg_type)
+        @queue << output_event_id(arg_type)
 
         if arg_type == :kwrest
           s = space + get_space(end_line: params.empty? && param.empty?)
@@ -112,31 +108,28 @@ class RipperTree
   end
 
   def parse(parent, space: ' ')
-    if parent.first.instance_of?(Array)
+    event_id, *nodes = parent
+
+    if event_id.instance_of?(Array)
       parse(parent.first, space: space)
       return
     end
 
-    id = parent.first
-
-    case id
-      when /@tstring_content/
-        @queue << output_string_node(parent)
-        return
-      when VALUE_TOKEN
+    case event_id
+      when SCANNER_EVENT
         @queue << output_value_node(parent)
         return
       when /array/
-        @queue << output_id(id)
-        children = parent[1].nil? ? [] : parent[1]
+        @queue << output_event_id(event_id)
+        nodes = parent[1].nil? ? [] : parent[1]
 
-        until children.empty?
-          child = children.shift
-          next if child == :args_add_star
-          next if child == []
+        until nodes.empty?
+          node = nodes.shift
+          next if node == :args_add_star
+          next if node == []
 
-          @queue << get_line(end_line: children.empty?, space: space)
-          parse(child, space: space + get_space(end_line: children.empty?))
+          @queue << get_line(end_line: nodes.empty?, space: space)
+          parse(node, space: space + get_space(end_line: nodes.empty?))
         end
 
         return
@@ -144,40 +137,30 @@ class RipperTree
         parse_method_arguments(parent, space: space)
         return
       when /void_stmt/
-        @queue << output_id(id)
+        @queue << output_event_id(event_id)
         return
       else
-        @queue << output_id(id)
-    end
+        @queue << output_event_id(event_id)
 
-    child_count = parent[1..-1].count { |e| e.instance_of?(Array) }
+        until nodes.empty?
+          node = nodes.shift
 
-    if child_count.zero?
-      unless parent[1..-1].all?(&:nil?)
-        @queue << "#{space}#{parent[1..-1].map(&:inspect).join(', ')}"
-      end
-    else
-      children = parent[1..-1]
-
-      until children.empty?
-        child = children.shift
-
-        if child.instance_of?(Array)
-          if child.all? { |e| e.instance_of?(Array) }
-            until child.empty?
-              node = child.shift
-              @queue << get_line(end_line: children.empty? && child.empty?, space: space)
-              parse(node, space: space + get_space(end_line: children.empty? && child.empty?))
+          if node.instance_of?(Array) && !node.empty?
+            if node.all? { |e| e.instance_of?(Array) }
+              until node.empty?
+                event = node.shift
+                @queue << get_line(end_line: nodes.empty? && node.empty?, space: space)
+                parse(event, space: space + get_space(end_line: nodes.empty? && node.empty?))
+              end
+            else
+              @queue << get_line(end_line: nodes.empty?, space: space)
+              parse(node, space: space + get_space(end_line: nodes.empty?))
             end
           else
-            @queue << get_line(end_line: children.empty?, space: space)
-            parse(child, space: space + get_space(end_line: children.empty?))
+            @queue << get_line(end_line: nodes.empty?, space: space)
+            @queue << "#{node.inspect}\n"
           end
-        else
-          @queue << get_line(end_line: children.empty?, space: space)
-          @queue << "#{child.inspect}\n"
         end
-      end
     end
   end
 end

data/ripper_tree.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["siman-man"]
   spec.email         = ["k128585@ie.u-ryukyu.ac.jp"]
 
-  spec.summary       = %q{tree command like viewer}
-  spec.description   = %q{tree command like viewer}
+  spec.summary       = %q{RipperTree is like tree command for Ripper#sexp.}
+  spec.description   = %q{RipperTree is like tree command for Ripper#sexp.}
   spec.homepage      = "https://github.com/siman-man/ripper_tree"
   spec.license       = "MIT"
   spec.required_ruby_version = '>= 2.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ripper_tree
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - siman-man
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: tree command like viewer
+description: RipperTree is like tree command for Ripper#sexp.
 email:
 - k128585@ie.u-ryukyu.ac.jp
 executables:
@@ -111,5 +111,5 @@ rubyforge_project:
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: tree command like viewer
+summary: RipperTree is like tree command for Ripper#sexp.
 test_files: []