unparser 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b62c76f077c1633ea95d4b674eef40c4862bd841
-  data.tar.gz: 77d01fff24751db00c267068880942f8df8a588a
+  metadata.gz: bbd1a7e700a15704cf6045d49b60c819fa098a56
+  data.tar.gz: c4309776665a4ee2703ff6569d57423d17b20bd7
 SHA512:
-  metadata.gz: e0cf99eb3262e4d55e8899a1c924d5388cdb55d5991ce33da2ac2717a9cdf8c9bccabaf56c316c8615184627ede859e2cdbfe2472507a7d6985c7ead2e57c26f
-  data.tar.gz: 7b78d0c2cdedf07d26f7f7f166587a08f2142be202de2fe1bba51b6ce3a12aff60f0abdb8164342b4b7ae3c516959ae580e83c33e266263c46b6d5e2bdd584a7
+  metadata.gz: 96cad113e6bd2c968267edb3f3008e64bcb7c1e217f7256b182ebb3e7412a51a8bb7675204a9b897a926da7e3cdb8ed49a9f34c2516f2db901adcef65c302c68
+  data.tar.gz: a9a4694e7475058e25e97f107a835cf704533937ea9bfa08985593abb85dfd150daa48633497d354f1ed53ebee3c27bb8fbc04bf1833d2e096933adcad29b214

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.1.7 2013-12-31
+
+* Add back support for root nodes of type resbody https://github.com/mbj/unparser/issues/24
+
 # v0.1.6 2013-12-31
 
 * Emit 1.9 style hashes where possible: https://github.com/mbj/unparser/pull/23

data/lib/unparser.rb

@@ -4,6 +4,7 @@ require 'abstract_type'
 require 'procto'
 require 'concord'
 require 'parser/all'
+require 'parser/current'
 
 # Library namespace
 module Unparser

data/lib/unparser/cli.rb

@@ -1,12 +1,14 @@
 # encoding: utf-8
 
 require 'unparser'
-require 'mutant'
 require 'optparse'
+require 'diff/lcs'
+require 'diff/lcs/hunk'
 
 require 'unparser/cli/preprocessor'
 require 'unparser/cli/source'
 require 'unparser/cli/differ'
+require 'unparser/cli/color'
 
 module Unparser
   # Unparser CLI implementation
@@ -46,10 +48,14 @@ module Unparser
         add_options(builder)
       end
 
-      file_names = opts.parse!(arguments)
+      arguments = opts.parse!(arguments)
 
-      file_names.each do |file_name|
-        @sources << Source::File.new(file_name)
+      arguments.each do |name|
+        if File.directory?(name)
+          add_directory(name)
+        else
+          add_file(name)
+        end
       end
     end
 
@@ -109,5 +115,31 @@ module Unparser
       end
     end
 
+    # Add file
+    #
+    # @param [String] file_name
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def add_file(file_name)
+      @sources << Source::File.new(file_name)
+    end
+
+    # Add directory
+    #
+    # @param [String] directory_name
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def add_directory(directory_name)
+      Dir.glob(File.join(directory_name, '**/*.rb')).each do |file_name|
+        add_file(file_name)
+      end
+    end
+
   end # CLI
 end # Unparser

data/lib/unparser/cli/color.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+
+module Unparser
+  # Class to colorize strings
+  class Color
+    include Adamantium::Flat, Concord.new(:code)
+
+    # Format text with color
+    #
+    # @param [String] text
+    #
+    # @return [String]
+    #
+    # @api private
+    #
+    def format(text)
+      "\e[#{@code}m#{text}\e[0m"
+    end
+
+    NONE = Class.new(self) do
+
+      # Format null color
+      #
+      # @param [String] text
+      #
+      # @return [String]
+      #   the argument string
+      #
+      # @api private
+      #
+      def format(text)
+        text
+      end
+
+    private
+
+      # Initialize null color
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def initialize
+      end
+
+    end.new
+
+    RED   = Color.new(31)
+    GREEN = Color.new(32)
+    BLUE  = Color.new(34)
+
+  end # Color
+end # Unparser

data/lib/unparser/cli/differ.rb

@@ -2,14 +2,12 @@
 
 module Unparser
   class CLI
-    # Unparser CLI specific differ
-    class Differ < Mutant::Differ
-      include Procto.call(:colorized_diff)
+    # Class to create diffs from source code
+    class Differ
+      include Adamantium::Flat, Concord.new(:old, :new), Procto.call(:colorized_diff)
 
       # Return source diff
       #
-      # FIXME: Multiple diffs get screwed up!
-      #
       # @return [String]
       #   if there is a diff
       #
@@ -19,12 +17,114 @@ module Unparser
       # @api private
       #
       def diff
-        diffs.map do |piece|
-          Diff::LCS::Hunk.new(old, new, piece, max_length, old.length - new.length).diff(:unified) << "\n"
-        end.join
+        output = ""
+        lines = 5
+        hunk = oldhunk = nil
+        file_length_difference = new.length - old.length
+        diffs.each do |piece|
+          begin
+            hunk = Diff::LCS::Hunk.new(old, new, piece, lines, file_length_difference)
+            file_length_difference = hunk.file_length_difference
+
+            next unless oldhunk
+            next if (lines > 0) && hunk.merge(oldhunk)
+
+            output << oldhunk.diff(:unified) << "\n"
+          ensure
+            oldhunk = hunk
+          end
+        end
+        output << oldhunk.diff(:unified) << "\n"
+
+        output
       end
       memoize :diff
 
-    end # Differ
-  end # CLI
+      # Return colorized source diff
+      #
+      # @return [String]
+      #   if there is a diff
+      #
+      # @return [nil]
+      #   otherwise
+      #
+      # @api private
+      #
+      def colorized_diff
+        diff.lines.map do |line|
+          self.class.colorize_line(line)
+        end.join
+      end
+      memoize :colorized_diff
+
+      # Return new object
+      #
+      # @param [String] old
+      # @param [String] new
+      #
+      # @return [Differ]
+      #
+      # @api private
+      #
+      def self.build(old, new)
+        new(lines(old), lines(new))
+      end
+
+      # Break up source into lines
+      #
+      # @param [String] source
+      #
+      # @return [Array<String>]
+      #
+      # @api private
+      #
+      def self.lines(source)
+        source.lines.map { |line| line.chomp }
+      end
+      private_class_method :lines
+
+    private
+
+      # Return diffs
+      #
+      # @return [Array<Array>]
+      #
+      # @api private
+      #
+      def diffs
+        Diff::LCS.diff(old, new)
+      end
+      memoize :diffs
+
+      # Return max length
+      #
+      # @return [Fixnum]
+      #
+      # @api private
+      #
+      def max_length
+        [old, new].map(&:length).max
+      end
+
+      # Return colorized diff line
+      #
+      # @param [String] line
+      #
+      # @return [String]
+      #
+      # @api private
+      #
+      def self.colorize_line(line)
+        case line[0]
+        when '+'
+          Color::GREEN
+        when '-'
+          Color::RED
+        else
+          Color::NONE
+        end.format(line)
+      end
+
+    end # CLI
+  end # Differ
 end # Unparser

data/lib/unparser/cli/preprocessor.rb

@@ -91,8 +91,9 @@ module Unparser
         # @api private
         #
         def result
-          s(node.type, *mapped_children)
+          s(node.type, mapped_children)
         end
+
       end # Noop
 
       # Preprocessor for dynamic string nodes. Collapses adjacent string segments into one.
@@ -108,7 +109,7 @@ module Unparser
         #
         def result
           if collapsed_children.all? { |node| node.type == :str }
-            s(:str, collapsed_children.map { |node| node.children.first }.join)
+            s(:str, [collapsed_children.map { |node| node.children.first }.join])
           else
             node.updated(nil, collapsed_children)
           end
@@ -125,7 +126,7 @@ module Unparser
         def collapsed_children
           chunked_children.each_with_object([]) do |(type, nodes), aggregate|
             if type == :str
-              aggregate << s(:str, nodes.map { |node| node.children.first }.join)
+              aggregate << s(:str, [nodes.map { |node| node.children.first }.join])
             else
               aggregate.concat(nodes)
             end

data/lib/unparser/cli/source.rb

@@ -4,7 +4,7 @@ module Unparser
   class CLI
     # Source representation for CLI sources
     class Source
-      include AbstractType, Adamantium::Flat
+      include AbstractType, Adamantium::Flat, NodeHelpers
 
       # Test if source could be unparsed successfully
       #
@@ -16,7 +16,7 @@ module Unparser
       # @api private
       #
       def success?
-        original_ast == generated_ast
+        original_ast && generated_ast && original_ast == generated_ast
       end
 
       # Return error report
@@ -26,14 +26,15 @@ module Unparser
       # @api private
       #
       def error_report
-        diff = Differ.call(
-          original_ast.inspect.lines.map(&:chomp),
-          generated_ast.inspect.lines.map(&:chomp)
-        )
-        "#{diff}\nOriginal:\n#{original_source}\nGenerated:\n#{generated_source}"
+        if original_ast && generated_ast
+          error_report_with_ast_diff
+        else
+          error_report_with_parser_error
+        end
       end
       memoize :error_report
 
+
     private
 
       # Return generated source
@@ -47,14 +48,51 @@ module Unparser
       end
       memoize :generated_source
 
+      # Return error report with parser error
+      #
+      # @return [String]
+      #
+      # @api private
+      #
+      def error_report_with_parser_error
+        unless original_ast
+          return "Parsing of original source failed:\n#{original_source}"
+        end
+
+        unless generated_ast
+          return "Parsing of generated source failed:\nOriginal-AST:#{original_ast.inspect}\nSource:\n#{generated_source}"
+        end
+
+      end
+
+      # Return error report with AST difference
+      #
+      # @return [String]
+      #
+      # @api private
+      #
+      def error_report_with_ast_diff
+        diff = Differ.call(
+          original_ast.inspect.lines.map(&:chomp),
+          generated_ast.inspect.lines.map(&:chomp)
+        )
+        "#{diff}\nOriginal:\n#{original_source}\nGenerated:\n#{generated_source}"
+      end
+
       # Return generated AST
       #
       # @return [Parser::AST::Node]
+      #   if parser was sucessful for generated ast
+      #
+      # @return [nil]
+      #   otherwise
       #
       # @api private
       #
       def generated_ast
-        Preprocessor.run(Parser::CurrentRuby.parse(generated_source))
+        Preprocessor.run(parse(generated_source)) || s(:empty)
+      rescue Parser::SyntaxError
+        nil
       end
       memoize :generated_ast
 
@@ -65,10 +103,24 @@ module Unparser
       # @api private
       #
       def original_ast
-        Preprocessor.run(Parser::CurrentRuby.parse(original_source))
+        Preprocessor.run(parse(original_source)) || s(:empty)
+      rescue Parser::SyntaxError
+        nil
       end
       memoize :original_ast
 
+      # Parse source with current ruby
+      #
+      # @param [String] source
+      #
+      # @return [Parser::AST::Node]
+      #
+      # @api private
+      #
+      def parse(source)
+        Parser::CurrentRuby.parse(source)
+      end
+
       # CLI source from string
       class String < self
         include Concord.new(:original_source)

data/lib/unparser/emitter/literal/dynamic_body.rb

@@ -67,6 +67,8 @@ module Unparser
           [key, "\\#{value}"] unless key == WS
         end.compact
 
+        pairs << ['#{', '\#{']
+
         ESCAPES = ::Hash[pairs]
 
         REPLACEMENTS = ::Regexp.union(ESCAPES.keys)

data/lib/unparser/emitter/resbody.rb

@@ -5,49 +5,92 @@ module Unparser
     # Emitter for rescue body nodes
     class Resbody < self
 
-      handle :resbody
-
-      children :exception, :assignment, :body
-
-    private
-
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def dispatch
-        write(K_RESCUE)
-        emit_exception
-        emit_assignment
-        emit_body
-      end
+        children :exception, :assignment, :body
 
-      # Emit exception
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_exception
-        return unless exception
-        ws
-        delimited(exception.children)
-      end
+      class Standalone < self
+
+        handle :resbody
+
+      private
+
+        # Perform dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          write(K_RESCUE)
+          parentheses { visit(body) }
+        end
+
+        # Emit exception
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_exception
+          return unless exception
+          ws
+          delimited(exception.children)
+        end
 
-      # Emit assignment
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_assignment
-        return unless assignment
-        write(WS, T_ASR, WS)
-        visit(assignment)
+        # Emit assignment
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_assignment
+          return unless assignment
+          write(WS, T_ASR, WS)
+          visit(assignment)
+        end
       end
 
-    end # Resbody
+      class Embedded < self
+
+      private
+
+        # Perform dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          write(K_RESCUE)
+          emit_exception
+          emit_assignment
+          emit_body
+        end
+
+        # Emit exception
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_exception
+          return unless exception
+          ws
+          delimited(exception.children)
+        end
+
+        # Emit assignment
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_assignment
+          return unless assignment
+          write(WS, T_ASR, WS)
+          visit(assignment)
+        end
+
+      end # Resbody
+    end
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/rescue.rb

@@ -7,7 +7,11 @@ module Unparser
 
       handle :rescue
 
-      children :body
+      children :body, :rescue_body
+
+      RESCUE_BODIES_RANGE = (1..-2).freeze
+
+      EMBEDDED_TYPES = [:def, :defs, :kwbegin, :ensure].to_set.freeze
 
     private
 
@@ -18,13 +22,53 @@ module Unparser
       # @api private
       #
       def dispatch
+        if standalone?
+          emit_standalone
+        else
+          emit_embedded
+        end
+      end
+
+      # Test if rescue node ist standalone
+      #
+      # @return [true]
+      #   if rescue node is standalone
+      #
+      # @return [false]
+      #   otherwise
+      #
+      # @api private
+      #
+      def standalone?
+        !EMBEDDED_TYPES.include?(parent_type) && body
+      end
+
+      # Emit standalone form
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def emit_standalone
+        visit(body)
+        ws
+        run(Resbody::Standalone, rescue_body)
+      end
+
+      # Emit embedded form
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def emit_embedded
         if body
           visit_indented(body)
         else
           nl
         end
         rescue_bodies.each do |child|
-          visit(child)
+          run(Resbody::Embedded, child)
         end
         emit_else
       end
@@ -36,7 +80,7 @@ module Unparser
       # @api private
       #
       def rescue_bodies
-        children[1..-2]
+        children[RESCUE_BODIES_RANGE]
       end
 
       # Emit else

data/lib/unparser/node_helpers.rb

@@ -11,8 +11,8 @@ module Unparser
     #
     # @api private
     #
-    def s(type, *children)
-      Parser::AST::Node.new(type, *children)
+    def s(type, children = [])
+      Parser::AST::Node.new(type, children)
     end
 
   end # NodeHelpers

data/spec/unit/unparser_spec.rb

@@ -91,6 +91,8 @@ describe Unparser do
         assert_source %q("foo\nbar")
         assert_source %q("foo bar #{}")
         assert_source %q("foo\nbar #{}")
+        assert_source %q("#{}\#{}")
+        assert_source %q("\#{}#{}")
         # Within indentation
         assert_generates <<-'RUBY', <<-'RUBY'
           if foo
@@ -632,6 +634,10 @@ describe Unparser do
           baz
         end
       RUBY
+
+      assert_source 'foo rescue(bar)'
+      assert_source 'foo rescue(return(bar))'
+      assert_source 'x = foo rescue(return(bar))'
     end
 
     context 'super' do
@@ -770,12 +776,30 @@ describe Unparser do
 
         assert_source <<-'RUBY'
           def foo
+            foo
+          rescue
             bar
           ensure
             baz
           end
         RUBY
 
+        assert_source <<-'RUBY'
+          def foo
+            bar
+          ensure
+            baz
+          end
+        RUBY
+
+        assert_source <<-'RUBY'
+          def self.foo
+            bar
+          rescue
+            baz
+          end
+        RUBY
+
         assert_source <<-'RUBY'
           def foo
             bar

data/unparser.gemspec

@@ -1,26 +1,28 @@
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name     = 'unparser'
-  s.version  = '0.1.6'
+Gem::Specification.new do |gem|
+  gem.name     = 'unparser'
+  gem.version  = '0.1.7'
 
-  s.authors  = ['Markus Schirp']
-  s.email    = 'mbj@schir-dso.com'
-  s.summary  = 'Generate equivalent source for parser gem AST nodes'
-  s.description = s.summary
-  s.homepage = 'http://github.com/mbj/unparser'
-  s.license  = 'MIT'
+  gem.authors  = ['Markus Schirp']
+  gem.email    = 'mbj@schir-dso.com'
+  gem.summary  = 'Generate equivalent source for parser gem AST nodes'
+  gem.description = gem.summary
+  gem.homepage = 'http://github.com/mbj/unparser'
+  gem.license  = 'MIT'
 
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
-  s.require_paths    = %w(lib)
-  s.extra_rdoc_files = %w(README.md)
-  s.executables      = [ 'unparser' ]
+  gem.files            = `git ls-files`.split("\n")
+  gem.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
+  gem.require_paths    = %w(lib)
+  gem.extra_rdoc_files = %w(README.md)
+  gem.executables      = [ 'unparser' ]
 
-  s.add_dependency('parser',        '~> 2.1.0')
-  s.add_dependency('procto',        '~> 0.0.2')
-  s.add_dependency('concord',       '~> 0.1.4')
-  s.add_dependency('adamantium',    '~> 0.1')
-  s.add_dependency('equalizer',     '~> 0.0.7')
-  s.add_dependency('abstract_type', '~> 0.0.7')
+  gem.required_ruby_version
+
+  gem.add_dependency('parser',        '~> 2.1.0')
+  gem.add_dependency('procto',        '~> 0.0.2')
+  gem.add_dependency('concord',       '~> 0.1.4')
+  gem.add_dependency('adamantium',    '~> 0.1')
+  gem.add_dependency('equalizer',     '~> 0.0.7')
+  gem.add_dependency('abstract_type', '~> 0.0.7')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -125,6 +125,7 @@ files:
 - lib/unparser.rb
 - lib/unparser/buffer.rb
 - lib/unparser/cli.rb
+- lib/unparser/cli/color.rb
 - lib/unparser/cli/differ.rb
 - lib/unparser/cli/preprocessor.rb
 - lib/unparser/cli/source.rb