unparser 0.1.5 → 0.1.6

data/lib/unparser/emitter/send/arguments.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+module Unparser
+  class Emitter
+    class Send
+
+      # Emitter for arguments of send nodes
+      class Arguments < Emitter
+
+      private
+
+        # Perform dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          return if children.empty?
+
+          parentheses do
+            delimited(effective_arguments)
+          end
+        end
+
+        # Return effective arguments
+        #
+        # @return [Parser::AST::Node]
+        #
+        # @api private
+        #
+        def effective_arguments
+          last = children.length - 1
+          children.each_with_index.map do |argument, index|
+            if last == index && argument.type == :hash && argument.children.any?
+              argument.updated(:hash_body)
+            else
+              argument
+            end
+          end
+        end
+
+      end # Arguments
+    end # Send
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/send/attribute_assignment.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+module Unparser
+  class Emitter
+    class Send
+      # Emitter for send as attribute assignment
+      class AttributeAssignment < self
+
+        # Perform regular dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          emit_receiver
+          emit_selector
+          visit_terminated(arguments.first)
+        end
+
+        # Emit receiver
+        #
+        # @return [Parser::AST::Node]
+        #
+        # @api private
+        #
+        def emit_receiver
+          visit_terminated(receiver)
+          write(T_DOT)
+        end
+
+      end # AttributeAssignment
+    end # Send
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/send/binary.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Send

data/lib/unparser/emitter/send/index.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Send

data/lib/unparser/emitter/send/regular.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Send
@@ -18,9 +20,9 @@ module Unparser
           emit_arguments
         end
 
-        # Return receiver
+        # Emit receiver
         #
-        # @return [Parser::AST::Node]
+        # @return [undefined]
         #
         # @api private
         #

data/lib/unparser/emitter/send/unary.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Send
@@ -20,7 +22,7 @@ module Unparser
         def dispatch
           name = selector
           write(MAP.fetch(name, name).to_s)
-          visit(receiver)
+          visit_terminated(receiver)
         end
 
       end # Unary

data/lib/unparser/emitter/splat.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for splats

data/lib/unparser/emitter/super.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
 

data/lib/unparser/emitter/undef.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for undef nodes

data/lib/unparser/emitter/variable.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
 

data/lib/unparser/emitter/yield.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
 

data/lib/unparser/finalize.rb

@@ -1 +1,3 @@
+# encoding: utf-8
+
 Unparser::Emitter::REGISTRY.freeze

data/lib/unparser/node_helpers.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+
+module Unparser
+  module NodeHelpers
+
+    # Helper for building nodes
+    #
+    # @param [Symbol]
+    #
+    # @return [Parser::AST::Node]
+    #
+    # @api private
+    #
+    def s(type, *children)
+      Parser::AST::Node.new(type, *children)
+    end
+
+  end # NodeHelpers
+end # Unparser

data/spec/spec_helper.rb

@@ -1,12 +1,22 @@
+# encoding: utf-8
+
 require 'unparser'
 require 'devtools/spec_helper'
 
+require 'parser/current'
 require 'parser/ruby21'
 
 module SpecHelper
   def s(type, *children)
     Parser::AST::Node.new(type, children)
   end
+
+  def strip(source)
+    source = source.rstrip
+    indent = source.scan(/^\s*/).min_by(&:length)
+    source.gsub(/^#{indent}/, '')
+  end
+
 end
 
 RSpec.configure do |config|

data/spec/unit/unparser/buffer/append_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser::Buffer, '#append' do

data/spec/unit/unparser/buffer/append_without_prefix_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser::Buffer, '#append_without_prefix' do

data/spec/unit/unparser/buffer/capture_content_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser::Buffer, '#capture_content' do

data/spec/unit/unparser/buffer/content_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser::Buffer, '#content' do
@@ -16,7 +18,7 @@ describe Unparser::Buffer, '#content' do
       first  = object.content
       second = object.content
       expect(first).to eql(second)
-      expect(first).to_not be(second)
+      expect(first).not_to be(second)
     end
   end
 

data/spec/unit/unparser/buffer/fresh_line_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser::Buffer, '#fresh_line?' do

data/spec/unit/unparser/buffer/indent_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser::Buffer, '#indent' do
@@ -5,7 +7,7 @@ describe Unparser::Buffer, '#indent' do
 
   subject { object.indent }
 
-  it 'should indent with two chars' do
+  it 'should indent with two spaces' do
     object.append('foo')
     object.nl
     object.indent

data/spec/unit/unparser/buffer/nl_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser::Buffer, '#nl' do

data/spec/unit/unparser/buffer/unindent_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser::Buffer, '#unindent' do

data/spec/unit/unparser/comments/consume_spec.rb

@@ -1,5 +1,6 @@
+# encoding: utf-8
+
 require 'spec_helper'
-require 'parser/current'
 
 describe Unparser::Comments, '#consume' do
 

data/spec/unit/unparser/comments/take_all_spec.rb

@@ -1,5 +1,6 @@
+# encoding: utf-8
+
 require 'spec_helper'
-require 'parser/current'
 
 describe Unparser::Comments, '#take_all' do
 

data/spec/unit/unparser/comments/take_before_spec.rb

@@ -1,5 +1,6 @@
+# encoding: utf-8
+
 require 'spec_helper'
-require 'parser/current'
 
 describe Unparser::Comments, '#take_before' do
 
@@ -17,11 +18,11 @@ describe Unparser::Comments, '#take_before' do
       RUBY
     end
 
-    it 'should return no comments none are before the node' do
+    it 'should return no comments if none are before the node' do
       expect(object.take_before(ast, :expression)).to eql([])
     end
 
-    it 'should only the comments that are before the specified part of the node' do
+    it 'should return only the comments that are before the specified part of the node' do
       expect(object.take_before(ast, :end)).to eql(comments.first(2))
       expect(object.take_all).to eql([comments[2]])
     end
@@ -36,11 +37,11 @@ describe Unparser::Comments, '#take_before' do
       RUBY
     end
 
-    it 'should return no comments none are before the node' do
+    it 'should return no comments if none are before the node' do
       expect(object.take_before(ast, :expression)).to eql([])
     end
 
-    it 'should only the comments that are before the specified part of the node' do
+    it 'should return only the comments that are before the specified part of the node' do
       expect(object.take_before(ast, :end)).to eql([])
     end
   end

data/spec/unit/unparser/comments/take_eol_comments_spec.rb

@@ -1,5 +1,6 @@
+# encoding: utf-8
+
 require 'spec_helper'
-require 'parser/current'
 
 describe Unparser::Comments, '#take_eol_comments' do
 

data/spec/unit/unparser/emitter/class_methods/handle_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser::Emitter, '.handle' do

data/spec/unit/unparser_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Unparser do
@@ -19,62 +21,45 @@ describe Unparser do
 
     def self.with_versions(versions)
       versions.each do |version|
-        parser = parser_for_ruby_version(version)
-        yield version, parser
+        yield parser_for_ruby_version(version)
       end
     end
 
-    def self.strip(ruby)
-      return ruby if ruby.empty?
-      lines = ruby.lines
-      match = /\A[ ]*/.match(lines.first)
-      length = match[0].length
-      source = lines.map do |line|
-        line[(length..-1)]
-      end.join
-      source.chomp
-    end
-
-    def assert_round_trip(input, parser_class)
-      ast, comments = parser_class.parse_with_comments(input)
+    def assert_round_trip(input, parser)
+      ast, comments = parser.parse_with_comments(input)
       generated = Unparser.unparse(ast, comments)
       generated.should eql(input)
     end
 
-    def self.assert_generates_one_way(ast, expected, versions = RUBIES)
-      with_versions(versions) do |version, parser_class|
-        it "should generate #{ast.inspect} as #{expected} under #{version}" do
-          comments = []
-          if ast.kind_of?(String)
-            ast, comments = parser_class.parse_with_comments(input)
-          end
-          generated = Unparser.unparse(ast, comments)
-          generated.should eql(expected)
-        end
-      end
+    def assert_generates_from_string(parser, string, expected)
+      string = strip(string)
+      ast_with_comments = parser.parse_with_comments(string)
+      assert_generates_from_ast(parser, ast_with_comments, expected)
+    end
+
+    def assert_generates_from_ast(parser, ast_with_comments, expected)
+      generated = Unparser.unparse(*ast_with_comments)
+      generated.should eql(expected)
+      ast, comments = parser.parse_with_comments(generated)
+      Unparser.unparse(ast, comments).should eql(expected)
     end
 
     def self.assert_generates(ast_or_string, expected, versions = RUBIES)
-      ast_or_string = strip(ast_or_string) if ast_or_string.is_a?(String)
-      expected = strip(expected)
-      with_versions(versions) do |version, parser_class|
-        it "should generate #{ast_or_string.inspect} as #{expected} under #{version}" do
-          ast, comments = if ast_or_string.kind_of?(String)
-                            parser_class.parse_with_comments(ast_or_string)
-                          else
-                            [ast_or_string, []]
-                          end
-          generated = Unparser.unparse(ast, comments)
-          generated.should eql(expected)
-          ast, comments = parser_class.parse_with_comments(generated)
-          Unparser.unparse(ast, comments).should eql(expected)
+      with_versions(versions) do |parser|
+        it "should generate #{ast_or_string} as #{expected} under #{parser.inspect}" do
+          if ast_or_string.kind_of?(String)
+            expected = strip(expected)
+            assert_generates_from_string(parser, ast_or_string, expected)
+          else
+            assert_generates_from_ast(parser, [ast_or_string, []], expected)
+          end
         end
       end
     end
 
     def self.assert_round_trip(input, versions = RUBIES)
-      with_versions(versions) do |version, parser|
-        it "should round trip #{input.inspect} under #{version}" do
+      with_versions(versions) do |parser|
+        it "should round trip #{input} under #{parser.inspect}" do
           assert_round_trip(input, parser)
         end
       end
@@ -92,15 +77,35 @@ describe Unparser do
         assert_generates '0x1', '1'
         assert_generates '1_000', '1000'
         assert_generates '1e10',  '10000000000.0'
-        assert_generates '?c', '"c"'
       end
 
       context 'string' do
-        assert_generates %q("foo" "bar"), %q("foobar")
-        assert_generates %q(%Q(foo"#{@bar})), %q("foo\"#{@bar}")
+        assert_generates '?c', '"c"'
+        assert_source %q("foo" "bar")
+        assert_generates %q(%Q(foo"#{@bar})), %q("foo\\"#{@bar}")
         assert_source %q("\"")
         assert_source %q("foo#{1}bar")
         assert_source %q("\"#{@a}")
+        assert_source %q("\\\\#{}")
+        assert_source %q("foo bar")
+        assert_source %q("foo\nbar")
+        assert_source %q("foo bar #{}")
+        assert_source %q("foo\nbar #{}")
+        # Within indentation
+        assert_generates <<-'RUBY', <<-'RUBY'
+          if foo
+            "
+            #{foo}
+            "
+          end
+        RUBY
+          if foo
+            "\n  #{foo}\n  "
+          end
+        RUBY
+
+        assert_source %q("foo#{@bar}")
+        assert_source %q("fo\no#{bar}b\naz")
       end
 
       context 'execute string' do
@@ -128,14 +133,17 @@ describe Unparser do
         assert_source "/\n/"
         assert_source '/\n/'
         assert_source "/\n/x"
+        # Within indentation
+        assert_source <<-RUBY
+          if foo
+            /
+            /
+          end
+        RUBY
         assert_generates '%r(/)', '/\//'
         assert_generates '%r(\))', '/)/'
         assert_generates '%r(#{@bar}baz)', '/#{@bar}baz/'
-      end
-
-      context 'dynamic string' do
-        assert_source %q("foo#{@bar}")
-        assert_source     %q("fo\no#{bar}b\naz")
+        assert_source '/\/\//x'
       end
 
       context 'dynamic symbol' do
@@ -175,8 +183,15 @@ describe Unparser do
 
       context 'hash' do
         assert_source '{}'
-        assert_source '{1 => 2}'
-        assert_source '{1 => 2, 3 => 4}'
+        assert_source '{ 1 => 2 }'
+        assert_source '{ 1 => 2, 3 => 4 }'
+
+        context 'with symbol keys' do
+          assert_source '{ a: 1, b: 2 }'
+          assert_source '{ a: :a }'
+          assert_source '{ :"a b" => 1 }'
+          assert_source '{ :-@ => 1 }'
+        end
       end
     end
 
@@ -192,11 +207,6 @@ describe Unparser do
       assert_source '::TOPLEVEL::CONST'
     end
 
-    context 'break' do
-      assert_source 'break'
-      assert_source 'break(a)'
-    end
-
     context 'next' do
       assert_source 'next'
       assert_source 'next(bar)'
@@ -231,6 +241,7 @@ describe Unparser do
         assert_source '$a = 1'
         assert_source 'CONST = 1'
         assert_source 'Name::Spaced::CONST = 1'
+        assert_source '::Foo = ::Bar'
       end
 
       context 'multiple' do
@@ -247,7 +258,6 @@ describe Unparser do
         assert_source '$a, $b = 1, 2'
         assert_source 'a, b = foo'
         assert_source 'a, (b, c) = 1, [2, 3]'
-        assert_generates_one_way s(:mlhs, s(:lvasgn, :a), s(:lvasgn, :b)), 'a, b'
       end
     end
 
@@ -259,6 +269,26 @@ describe Unparser do
       assert_source <<-'RUBY'
         return(1)
       RUBY
+
+      assert_source <<-'RUBY'
+        return(1), (2)
+      RUBY
+
+      assert_generates <<-'RUBY', <<-'RUBY'
+        return(a ? b : c)
+      RUBY
+        return(if a
+          b
+        else
+          c
+        end)
+      RUBY
+    end
+
+    context 'break' do
+      assert_source 'break'
+      assert_source 'break(a)'
+      assert_source 'break(a), (b)'
     end
 
     context 'send' do
@@ -359,6 +389,13 @@ describe Unparser do
       assert_source '(array[i] = 1).foo'
       assert_source 'array[1..2].foo'
       assert_source '(a.attribute ||= foo).bar'
+      assert_source 'foo.bar=baz[1]'
+      assert_source 'foo.bar=(baz || foo)'
+      assert_source 'foo.bar=baz.bar'
+      assert_source 'foo << (bar * baz)'
+      assert_source <<-'RUBY'
+        foo ||= (a, _ = b)
+      RUBY
 
       assert_source <<-'RUBY'
         begin
@@ -439,6 +476,11 @@ describe Unparser do
       assert_source 'foo.bar(:baz, &baz)'
       assert_source 'foo.bar=(:baz)'
       assert_source 'self.foo=(:bar)'
+
+      assert_source 'foo.bar(baz: boz)'
+      assert_source 'foo.bar(foo, "baz" => boz)'
+      assert_source 'foo.bar({ foo: boz }, boz)'
+      assert_source 'foo.bar(foo, {})'
     end
 
     context 'begin; end' do
@@ -1134,6 +1176,7 @@ describe Unparser do
     context 'unary operators' do
       assert_source '!1'
       assert_source '!!1'
+      assert_source '!!(foo || bar)'
       assert_source '!(!1).baz'
       assert_source '~a'
       assert_source '-a'
@@ -1215,6 +1258,16 @@ describe Unparser do
         # last
       RUBY
 
+      assert_generates <<-'RUBY', <<-'RUBY'
+        foo if bar
+        # comment
+      RUBY
+        if bar
+          foo
+        end
+        # comment
+      RUBY
+
       assert_source <<-'RUBY'
         def noop
           # do nothing