unparser 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791317b7c757ff21dccc078c1dc82a53690194bb
-  data.tar.gz: 41cdfad7c83f3e88eae3cdf3351bb3830014345f
+  metadata.gz: 46f62b35c534e13da34486c1650bb14e406fe48b
+  data.tar.gz: 3bdedfa5f88178cd4ebeafedb72e2ce47a5552a2
 SHA512:
-  metadata.gz: ed041a27c4747aacd924ed08fc8118eb13be9d82ca598c597f9dbbc9d5e8de28c67a2812b285cf4cacb7c0b4dc2925c52c3f1940060cde6eeb0788b5d1c1137d
-  data.tar.gz: 1c55d2b791abf9ca336d78745f08f56e75d1ed92106c0fd08317f3d69524080a72a5b2a3e2102c0dd93e31ef027c267334d3e1caa0e7726fd3cc733d58be5f09
+  metadata.gz: cdfc4fb2f77e221b2af12dc14cb7504e3220e6e08c4da8919617f9b3cd9f9082d6b69129bf46aa7caba119681aed1255240eaf97b888a3b274c2432def82155e
+  data.tar.gz: efd08e3645878e75d316e07b2fb58de2c254c6588183e725c48af4739079856d41d547354114e33acd2c29c010fffea17cb211065c8823fde55692adc475e30a

data/README.md

@@ -21,6 +21,15 @@ require 'unparser'
 Unparser.unparse(your_ast) # => "the code"
 ```
 
+To preserve the comments from the source:
+
+```ruby
+require 'parser/current'
+require 'unparser'
+ast, comments = Parser::CurrentRuby.parse_with_comments(your_source)
+Unparser.unparse(ast, comments) # => "the code # with comments"
+```
+
 Equivalent vs identical:
 
 ```ruby
@@ -45,10 +54,11 @@ Installation
 
 Install the gem `unparser` via your prefered method.
 
-Credits
--------
+People
+------
 
 * [Markus Schirp (mbj)](https://github.com/mbj) Author
+* [Trent Ogren](https://github.com/misfo) Adding comment reproduction
 
 Contributing
 -------------

data/lib/unparser.rb

@@ -7,20 +7,23 @@ module Unparser
 
   EMPTY_STRING = ''.freeze
 
-  # Unparse ast into string
+  # Unparse an AST (and, optionally, comments) into a string
   #
   # @param [Parser::Node, nil] node
+  # @param [Array] comment_array
   #
   # @return [String]
   #
   # @api private
   #
-  def self.unparse(node)
+  def self.unparse(node, comment_array = [])
     if node.nil?
       node = Parser::AST::Node.new(:empty)
     end
     buffer = Buffer.new
-    Emitter.emitter(node, Emitter::Root.new(buffer)).write_to_buffer
+    comments = Comments.new(comment_array)
+    root = Emitter::Root.new(buffer, comments)
+    Emitter.emitter(node, root).write_to_buffer
     buffer.content
   end
 
@@ -42,6 +45,7 @@ module Unparser
 end # Unparser
 
 require 'unparser/buffer'
+require 'unparser/comments'
 require 'unparser/constants'
 require 'unparser/emitter'
 require 'unparser/emitter/literal'

data/lib/unparser/buffer.rb

@@ -32,6 +32,19 @@ module Unparser
       self
     end
 
+    # Append a string without an indentation prefix
+    #
+    # @param [String] string
+    #
+    # @return [self]
+    #
+    # @api private
+    #
+    def append_without_prefix(string)
+      @content << string
+      self
+    end
+
     # Increase indent
     #
     # @return [self]
@@ -39,7 +52,6 @@ module Unparser
     # @api private
     #
     def indent
-      nl
       @indent+=1
       self
     end
@@ -51,7 +63,6 @@ module Unparser
     # @api private
     #
     def unindent
-      nl
       @indent-=1
       self
     end
@@ -67,6 +78,20 @@ module Unparser
       self
     end
 
+    # Test for a fresh line
+    #
+    # @return [true]
+    #   if the buffer content ends with a fresh line
+    #
+    # @return [false]
+    #   otherwise
+    #
+    # @api private
+    #
+    def fresh_line?
+      @content.empty? || @content[-1] == NL
+    end
+
     # Return content of buffer
     #
     # @return [String]
@@ -77,6 +102,18 @@ module Unparser
       @content.dup.freeze
     end
 
+    # Capture the content written to the buffer within the block
+    #
+    # @return [String]
+    #
+    # @api private
+    #
+    def capture_content
+      size_before = @content.size
+      yield
+      @content[size_before..-1]
+    end
+
   private
 
     # Write prefix

data/lib/unparser/comments.rb

@@ -0,0 +1,112 @@
+module Unparser
+
+  # Holds the comments that remain to be emitted
+  #
+  # @api private
+  #
+  class Comments
+
+    # Initialize object
+    #
+    # @param [Array] comments
+    #
+    # @return [undefined]
+    #
+    def initialize(comments)
+      @comments = comments.dup
+      @eol_text_to_skip = nil
+    end
+
+    # Consume part or all of the node
+    #
+    # @param [Parser::AST::Node] node
+    # @param [Symbol] source_part
+    #
+    # @return [undefined]
+    #
+    def consume(node, source_part = :expression)
+      return unless node.location
+      @last_range_consumed = node.location.public_send(source_part)
+    end
+
+    # Skip any EOL comment with the specified text next time they're taken
+    #
+    # @param [String] comment_text
+    #
+    # @return [undefined]
+    #
+    def skip_eol_comment(comment_text)
+      @eol_text_to_skip = comment_text
+    end
+
+    # Take end-of-line comments
+    #
+    # @return [Array]
+    #
+    def take_eol_comments
+      text_to_skip = @eol_text_to_skip
+      @eol_text_to_skip = nil
+      return [] if @last_range_consumed.nil?
+      comments = take_up_to_line(@last_range_consumed.end.line)
+      eol_comments = unshift_documents(comments)
+      eol_comments.reject {|comment| comment.text == text_to_skip }
+    end
+
+    # Take all remaining comments
+    #
+    # @return [Array]
+    #
+    def take_all
+      take_while { true }
+    end
+
+    # Take comments appear in the source before the specified part of the node
+    #
+    # @param [Parser::AST::Node] node
+    # @param [Symbol] source_part
+    #
+    # @return [Array]
+    #
+    def take_before(node, source_part)
+      loc = node.location
+      range = loc.public_send(source_part) if loc.respond_to?(source_part)
+      return [] if range.nil?
+      take_while { |comment| comment.location.expression.end_pos <= range.begin_pos }
+    end
+
+  private
+
+    # Take comments while the provided block returns true
+    #
+    # @yield [comment]
+    #
+    # @return [Array]
+    #
+    def take_while
+      number_to_take = @comments.index {|comment| !yield(comment) } || @comments.size
+      @comments.shift(number_to_take)
+    end
+
+    # Take comments up to the line number
+    #
+    # @param [Fixnum] line
+    #
+    # @return [Array]
+    #
+    def take_up_to_line(line)
+      take_while { |comment| comment.location.expression.line <= line }
+    end
+
+    # Unshift document comments and return the rest
+    #
+    # @param [Array] comments
+    #
+    # @return [Array]
+    #
+    def unshift_documents(comments)
+      doc_comments, other_comments = comments.partition(&:document?)
+      doc_comments.reverse_each {|comment| @comments.unshift(comment) }
+      other_comments
+    end
+  end
+end

data/lib/unparser/emitter.rb

@@ -84,7 +84,10 @@ module Unparser
     # @api private
     #
     def write_to_buffer
+      emit_comments_before if buffer.fresh_line?
       dispatch
+      comments.consume(node)
+      emit_eof_comments if parent.is_a?(Root)
       self
     end
     memoize :write_to_buffer
@@ -147,6 +150,17 @@ module Unparser
     end
     memoize :buffer, :freezer => :noop
 
+    # Return comments
+    #
+    # @return [Comments] comments
+    #
+    # @api private
+    #
+    def comments
+      parent.comments
+    end
+    memoize :comments, :freezer => :noop
+
   private
 
     # Emit contents of block within parentheses
@@ -276,9 +290,73 @@ module Unparser
     # @api private
     #
     def nl
+      emit_eol_comments
       buffer.nl
     end
 
+    # Write comments that appeared before source_part in the source
+    #
+    # @param [Symbol] source_part
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def emit_comments_before(source_part = :expression)
+      comments_before = comments.take_before(node, source_part)
+      unless comments_before.empty?
+        emit_comments(comments_before)
+        buffer.nl
+      end
+    end
+
+    # Write end-of-line comments
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def emit_eol_comments
+      comments.take_eol_comments.each do |comment|
+        write(WS, comment.text)
+      end
+    end
+
+    # Write end-of-file comments
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def emit_eof_comments
+      emit_eol_comments
+      comments_left = comments.take_all
+      unless comments_left.empty?
+        buffer.nl
+        emit_comments(comments_left)
+      end
+    end
+
+    # Write each comment to a separate line
+    #
+    # @param [Array] comment_array
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def emit_comments(comment_array)
+      max = comment_array.size - 1
+      comment_array.each_with_index do |comment, index|
+        if comment.type == :document
+          buffer.append_without_prefix(comment.text.chomp)
+        else
+          write(comment.text)
+        end
+        buffer.nl if index < max
+      end
+    end
+
     # Write strings into buffer
     #
     # @return [undefined]
@@ -298,6 +376,9 @@ module Unparser
     # @api private
     #
     def k_end
+      buffer.indent
+      emit_comments_before(:end)
+      buffer.unindent
       write(K_END)
     end
 
@@ -334,7 +415,9 @@ module Unparser
     def indented
       buffer = self.buffer
       buffer.indent
+      nl
       yield
+      nl
       buffer.unindent
     end
 
@@ -348,7 +431,9 @@ module Unparser
     #
     def emit_body(body = self.body)
       unless body
+        buffer.indent
         nl
+        buffer.unindent
         return
       end
       visit_indented(body)
@@ -376,7 +461,7 @@ module Unparser
     #   if parent is present
     #
     # @return [nil]
-    #   otherwiseo
+    #   otherwise
     #
     # @api private
     #
@@ -396,14 +481,19 @@ module Unparser
       Parser::AST::Node.new(type, *children)
     end
 
-    # Helper to introduce comment
+    # Helper to introduce an end-of-line comment
     #
     # @return [undefined]
     #
     # @api private
     #
-    def comment
-     write(WS, COMMENT, WS)
+    def eol_comment
+      write(WS)
+      comment = buffer.capture_content do
+        write(COMMENT, WS)
+        yield
+      end
+      comments.skip_eol_comment(comment)
     end
 
     # Emitter that fully relies on parser source maps

data/lib/unparser/emitter/block.rb

@@ -19,6 +19,7 @@ module Unparser
       def dispatch
         visit(send)
         write(WS, K_DO)
+        comments.consume(node, :begin)
         emit_block_arguments
         emit_body
         k_end

data/lib/unparser/emitter/class.rb

@@ -22,8 +22,7 @@ module Unparser
         emit_body
         k_end
         unless parent_type == :send
-          comment
-          visit(name)
+          eol_comment { visit(name) }
         end
       end
 

data/lib/unparser/emitter/def.rb

@@ -32,6 +32,7 @@ module Unparser
       def dispatch
         write(K_DEF, WS)
         emit_name
+        comments.consume(node, :name)
         emit_arguments
         emit_body
         k_end

data/lib/unparser/emitter/module.rb

@@ -21,8 +21,7 @@ module Unparser
         emit_body
         k_end
         if parent_type != :send
-          comment
-          visit(name)
+          eol_comment { visit(name) }
         end
       end
 

data/lib/unparser/emitter/root.rb

@@ -2,7 +2,7 @@ module Unparser
   class Emitter
     # Root emitter a special case
     class Root < self
-      include Concord::Public.new(:buffer)
+      include Concord::Public.new(:buffer, :comments)
     end # Root
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/send.rb

@@ -159,7 +159,7 @@ module Unparser
         assignment? && !arguments?
       end
 
-      # Test for assigment
+      # Test for assignment
       #
       # @return [true]
       #   if node represents attribute / element assignment

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

@@ -17,16 +17,6 @@ module Unparser
           emit_arguments
         end
 
-        # Emit block within parentheses
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def parentheses(&block)
-          super(*INDEX_PARENS, &block)
-        end
-
         # Emit receiver
         #
         # @return [undefined]
@@ -49,7 +39,7 @@ module Unparser
           # @api private
           #
           def emit_arguments
-            parentheses do
+            parentheses(*INDEX_PARENS) do
               delimited(arguments)
             end
           end
@@ -66,7 +56,7 @@ module Unparser
           #
           def emit_arguments
             index, *assignment = arguments
-            parentheses do
+            parentheses(*INDEX_PARENS) do
               delimited([index])
             end
             return if assignment.empty? # mlhs

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

@@ -13,6 +13,7 @@ describe Unparser::Buffer, '#append' do
   # Yeah duplicate, mutant will be improved ;)
   it 'should prefix with indentation if line is empty' do
     object.append('foo')
+    object.nl
     object.indent
     object.append('bar')
     object.append('baz')

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

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Unparser::Buffer, '#append_without_prefix' do
+  subject { object.append_without_prefix(string) }
+
+  let(:object) { described_class.new }
+  let(:string) { 'foo' }
+
+  specify do
+    expect { subject }.to change { object.content }.from('').to('foo')
+  end
+
+  it 'should not prefix with indentation' do
+    object.append_without_prefix('foo')
+    object.nl
+    object.indent
+    object.append_without_prefix('bar')
+    object.append_without_prefix('baz')
+    expect(object.content).to eql("foo\nbarbaz")
+  end
+
+  it_should_behave_like 'a command method'
+end

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

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Unparser::Buffer, '#capture_content' do
+
+  let(:object) { described_class.new }
+
+  it 'should capture only the content appended within the block' do
+    object.append('foo')
+    object.nl
+    object.indent
+    captured = object.capture_content do
+      object.append('bar')
+      object.nl
+    end
+    expect(captured).to eql("  bar\n")
+  end
+end

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

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Unparser::Buffer, '#fresh_line?' do
+  let(:object) { described_class.new }
+
+  it 'should return true while buffer is empty' do
+    expect(object.fresh_line?).to eql(true)
+  end
+
+  it 'should return false after content has been appended' do
+    object.append('foo')
+    expect(object.fresh_line?).to eql(false)
+  end
+
+  it 'should return true after a nl has been appended' do
+    object.append('foo')
+    object.nl
+    expect(object.fresh_line?).to eql(true)
+  end
+end

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

@@ -7,8 +7,10 @@ describe Unparser::Buffer, '#indent' do
 
   it 'should indent with two chars' do
     object.append('foo')
+    object.nl
     object.indent
     object.append('bar')
+    object.nl
     object.indent
     object.append('baz')
     expect(object.content).to eql("foo\n  bar\n    baz")

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

@@ -7,8 +7,10 @@ describe Unparser::Buffer, '#unindent' do
 
   it 'unindents two chars' do
     object.append('foo')
+    object.nl
     object.indent
     object.append('bar')
+    object.nl
     object.unindent
     object.append('baz')
     expect(object.content).to eql("foo\n  bar\nbaz")

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

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'parser/current'
+
+describe Unparser::Comments, '#consume' do
+
+  let(:ast_and_comments) do
+    Parser::CurrentRuby.parse_with_comments(<<-RUBY)
+      def hi # EOL 1
+      end # EOL 2
+    RUBY
+  end
+  let(:ast)      { ast_and_comments[0] }
+  let(:comments) { ast_and_comments[1] }
+  let(:object)   { described_class.new(comments) }
+
+  it 'should cause further EOL comments to be returned' do
+    expect(object.take_eol_comments).to eql([])
+    object.consume(ast, :name)
+    expect(object.take_eol_comments).to eql([comments[0]])
+    object.consume(ast, :end)
+    expect(object.take_eol_comments).to eql([comments[1]])
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'parser/current'
+
+describe Unparser::Comments, '#skip_eol_comment' do
+
+  let(:ast_and_comments) do
+    Parser::CurrentRuby.parse_with_comments(<<-RUBY)
+      def hi # comment
+      end # comment
+    RUBY
+  end
+  let(:ast)              { ast_and_comments[0] }
+  let(:comments)         { ast_and_comments[1] }
+  let(:object)           { described_class.new(comments) }
+
+  it 'should skip the specified comment only for one subsequent take' do
+    object.consume(ast, :name)
+    object.skip_eol_comment("# comment")
+    expect(object.take_eol_comments).to eql([])
+    object.consume(ast, :end)
+    expect(object.take_eol_comments).to eql([comments[1]])
+  end
+
+  it 'should not skip comments with different text' do
+    object.skip_eol_comment("# not the comment")
+    object.consume(ast, :end)
+    expect(object.take_eol_comments).to eql(comments)
+  end
+end

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

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'parser/current'
+
+describe Unparser::Comments, '#take_all' do
+
+  let(:ast_and_comments) do
+    Parser::CurrentRuby.parse_with_comments(<<-RUBY)
+      def hi # EOL 1
+      end # EOL 2
+    RUBY
+  end
+  let(:ast)      { ast_and_comments[0] }
+  let(:comments) { ast_and_comments[1] }
+  let(:object)   { described_class.new(comments) }
+
+  it 'should take all comments' do
+    expect(object.take_all).to eql(comments)
+    expect(object.take_all).to eql([])
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'parser/current'
+
+describe Unparser::Comments, '#take_before' do
+
+  let(:ast_and_comments) do
+    Parser::CurrentRuby.parse_with_comments(<<-RUBY)
+      def hi # EOL 1
+        # comment
+      end # EOL 2
+    RUBY
+  end
+  let(:ast)      { ast_and_comments[0] }
+  let(:comments) { ast_and_comments[1] }
+  let(:object)   { described_class.new(comments) }
+
+  it 'should return no comments 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
+    expect(object.take_before(ast, :end)).to eql(comments.first(2))
+    expect(object.take_all).to eql([comments[2]])
+  end
+end

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

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'parser/current'
+
+describe Unparser::Comments, '#take_eol_comments' do
+
+  let(:ast_and_comments) do
+    Parser::CurrentRuby.parse_with_comments(<<-RUBY)
+def hi # EOL 1
+=begin
+doc comment
+=end
+end # EOL 2
+    RUBY
+  end
+  let(:ast)              { ast_and_comments[0] }
+  let(:comments)         { ast_and_comments[1] }
+  let(:object)           { described_class.new(comments) }
+
+  it 'should return no comments if nothing has been consumed' do
+    expect(object.take_eol_comments).to eql([])
+  end
+
+  it 'should return comments once their line has been consumed' do
+    object.consume(ast, :name)
+    expect(object.take_eol_comments).to eql([comments[0]])
+  end
+
+  it 'should leave doc comments to be taken later' do
+    object.consume(ast)
+    expect(object.take_eol_comments).to eql([comments[0], comments[2]])
+    expect(object.take_all).to eql([comments[1]])
+  end
+end

data/spec/unit/unparser_spec.rb

@@ -25,6 +25,7 @@ describe Unparser do
     end
 
     def self.strip(ruby)
+      return ruby if ruby.empty?
       lines = ruby.lines
       line = lines.first
       match = /\A[ ]*/.match(line)
@@ -35,34 +36,39 @@ describe Unparser do
       source.chomp
     end
 
-    def assert_round_trip(input, parser)
-      ast = parser.parse(input)
-      generated = Unparser.unparse(ast)
+    def assert_round_trip(input, parser_class)
+      ast, comments = parser_class.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|
+      with_versions(versions) do |version, parser_class|
         it "should generate #{ast.inspect} as #{expected} under #{version}" do
+          comments = []
           if ast.kind_of?(String)
-            ast = parser.parse(ast)
+            ast, comments = parser_class.parse_with_comments(input)
           end
-          generated = Unparser.unparse(ast)
+          generated = Unparser.unparse(ast, comments)
           generated.should eql(expected)
         end
       end
     end
 
-    def self.assert_generates(ast, expected, versions = RUBIES)
-      with_versions(versions) do |version, parser|
-        it "should generate #{ast.inspect} as #{expected} under #{version}" do
-          if ast.kind_of?(String)
-            ast = parser.parse(ast)
-          end
-          generated = Unparser.unparse(ast)
+    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 = parser.parse(generated)
-          Unparser.unparse(ast).should eql(expected)
+          ast, comments = parser_class.parse_with_comments(generated)
+          Unparser.unparse(ast, comments).should eql(expected)
         end
       end
     end
@@ -1034,6 +1040,7 @@ describe Unparser do
       assert_source 'a &&= b'
       assert_source 'a ||= 2'
       assert_source '(a ||= 2).bar'
+      assert_source '(h ||= {})[k] = v'
     end
 
     context 'flip flops' do
@@ -1190,5 +1197,72 @@ describe Unparser do
         end
       RUBY
     end
+
+    context 'comments' do
+      assert_source <<-RUBY
+        # comment before
+        a_line_of_code
+      RUBY
+
+      assert_source <<-RUBY
+        a_line_of_code # comment after
+      RUBY
+
+      assert_source <<-RUBY
+        nested do # first
+          # second
+          something # comment
+          # another
+        end
+        # last
+      RUBY
+
+      assert_source <<-RUBY
+        def noop
+          # do nothing
+        end
+      RUBY
+
+      assert_source <<-RUBY
+        =begin
+          block comment
+        =end
+        nested do
+        =begin
+        another block comment
+        =end
+          something
+        =begin
+        last block comment
+        =end
+        end
+      RUBY
+
+      assert_generates(<<-RUBY, <<-RUBY)
+        1 + # first
+          2 # second
+      RUBY
+        1 + 2 # first # second
+      RUBY
+      assert_generates(<<-RUBY, <<-RUBY)
+        1 +
+          # first
+          2 # second
+      RUBY
+        1 + 2 # first # second
+      RUBY
+      assert_generates(<<-RUBY, <<-RUBY)
+        1 +
+        =begin
+          block comment
+        =end
+          2
+      RUBY
+        1 + 2
+        =begin
+          block comment
+        =end
+      RUBY
+    end
   end
 end

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = 'unparser'
-  s.version  = '0.1.2'
+  s.version  = '0.1.3'
 
   s.authors  = ['Markus Schirp']
   s.email    = 'mbj@schir-dso.com'
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w(README.md)
   s.executables      = [ 'test-unparser' ]
 
-  s.add_dependency('parser',        '~> 2.0.0.pre6')
+  s.add_dependency('parser',        '~> 2.0.0.pre7')
   s.add_dependency('concord',       '~> 0.1.1'     )
   s.add_dependency('adamantium',    '~> 0.1.0'     )
   s.add_dependency('equalizer',     '~> 0.0.7'     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre6
+        version: 2.0.0.pre7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre6
+        version: 2.0.0.pre7
 - !ruby/object:Gem::Dependency
   name: concord
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,7 @@ files:
 - config/yardstick.yml
 - lib/unparser.rb
 - lib/unparser/buffer.rb
+- lib/unparser/comments.rb
 - lib/unparser/constants.rb
 - lib/unparser/emitter.rb
 - lib/unparser/emitter/alias.rb
@@ -162,10 +163,18 @@ files:
 - lib/unparser/finalize.rb
 - spec/spec_helper.rb
 - spec/unit/unparser/buffer/append_spec.rb
+- spec/unit/unparser/buffer/append_without_prefix_spec.rb
+- spec/unit/unparser/buffer/capture_content_spec.rb
 - spec/unit/unparser/buffer/content_spec.rb
+- spec/unit/unparser/buffer/fresh_line_spec.rb
 - spec/unit/unparser/buffer/indent_spec.rb
 - spec/unit/unparser/buffer/nl_spec.rb
 - spec/unit/unparser/buffer/unindent_spec.rb
+- spec/unit/unparser/comments/consume_spec.rb
+- spec/unit/unparser/comments/skip_eol_comment_spec.rb
+- spec/unit/unparser/comments/take_all_spec.rb
+- spec/unit/unparser/comments/take_before_spec.rb
+- spec/unit/unparser/comments/take_eol_comments_spec.rb
 - spec/unit/unparser/emitter/class_methods/handle_spec.rb
 - spec/unit/unparser/emitter/source_map/class_methods/emit_spec.rb
 - spec/unit/unparser_spec.rb
@@ -197,10 +206,18 @@ summary: Generate equivalent source for parser gem AST nodes
 test_files:
 - spec/spec_helper.rb
 - spec/unit/unparser/buffer/append_spec.rb
+- spec/unit/unparser/buffer/append_without_prefix_spec.rb
+- spec/unit/unparser/buffer/capture_content_spec.rb
 - spec/unit/unparser/buffer/content_spec.rb
+- spec/unit/unparser/buffer/fresh_line_spec.rb
 - spec/unit/unparser/buffer/indent_spec.rb
 - spec/unit/unparser/buffer/nl_spec.rb
 - spec/unit/unparser/buffer/unindent_spec.rb
+- spec/unit/unparser/comments/consume_spec.rb
+- spec/unit/unparser/comments/skip_eol_comment_spec.rb
+- spec/unit/unparser/comments/take_all_spec.rb
+- spec/unit/unparser/comments/take_before_spec.rb
+- spec/unit/unparser/comments/take_eol_comments_spec.rb
 - spec/unit/unparser/emitter/class_methods/handle_spec.rb
 - spec/unit/unparser/emitter/source_map/class_methods/emit_spec.rb
 - spec/unit/unparser_spec.rb