unparser 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a121bb510d3b91c074428c68acea8438039c5aef
-  data.tar.gz: dba0b6b1581e9c836aba08636caa16eb4568b115
+  metadata.gz: 034e53fe83f3cb6b5d1c99e64f35b73d505812bf
+  data.tar.gz: 261ece646cfa726f17d70c2d82a44f837d6155b2
 SHA512:
-  metadata.gz: 2bacdbaebd34a249353a85597a13be21df7d9026676c0f44460a4dc7c9dc8922ca92c731cbc26af1b1716b242f2535b779be63f30bedd399b7b601b098165097
-  data.tar.gz: df148e906844b84143ae3ccf505b9d4b087babcae7e9df977cd8b0e8733a4e6618e5154378253bf8d30ba1ac75a272f090d312d6b07ab9ddc30e151a29c91bb9
+  metadata.gz: ff483fa78c83e951ff869033f025238d75dbbba20a747952a32ce034c3a88ee346a0aeab555053fb27b94a440a38b4a9a18b036d672b7e64545fec4d0bec788b
+  data.tar.gz: db9c2c31f83b67d7bf70893c774a53b764a4e02ff7f096555fe42c88ba1ee504e962ff6e0e4e20be3febfa08ad09884a0b0e363bab05034127aef404af552064

data/.rubocop.yml

@@ -5,3 +5,4 @@ AllCops:
     - 'Gemfile.devtools'
     - 'vendor/**'
     - 'benchmarks/**'
+    - 'tmp/**'

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-script: 'bundle exec rake spec'
+script: 'bundle exec rake ci'
 rvm:
   - 1.9.3
   - 2.0.0
@@ -9,6 +9,7 @@ rvm:
 matrix:
   allow_failures:
     - rvm: rbx
+    - rvm: ruby
 notifications:
   irc:
     channels:

data/Changelog.md

@@ -1,3 +1,8 @@
+# v0.1.10 2014-04-06
+
+* Fix emit of inline rescues in combination with control flow keywords.
+* Begin corpus testing on rake ci against rubyspec
+
 # v0.1.9 2014-01-14
 
 * Fix emit of proc { |(a) }

data/Gemfile

@@ -3,5 +3,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'morpher', git: 'https://github.com/mbj/morpher.git'
+
 gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
 eval_gemfile 'Gemfile.devtools'

data/Gemfile.devtools

@@ -1,9 +1,10 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.1.0'
-  gem 'rspec', '~> 2.14.1'
-  gem 'yard',  '~> 0.8.7'
+  gem 'rake',       '~> 10.2.1'
+  gem 'rspec',      '~> 2.14.1'
+  gem 'rspec-core', '~> 2.14.8'
+  gem 'yard',       '~> 0.8.7.4'
 
   platform :rbx do
     gem 'rubysl-singleton', '~> 2.0.0'
@@ -11,23 +12,23 @@ group :development do
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.3.0'
+  gem 'kramdown', '~> 1.3.3'
 end
 
 group :guard do
-  gem 'guard',         '~> 2.2.4'
+  gem 'guard',         '~> 2.6.0'
   gem 'guard-bundler', '~> 2.0.0'
-  gem 'guard-rspec',   '~> 4.2.0'
-  gem 'guard-rubocop', '~> 1.0.0'
+  gem 'guard-rspec',   '~> 4.2.8'
+  gem 'guard-rubocop', '~> 1.0.2'
 
   # file system change event handling
-  gem 'listen',     '~> 2.4.0'
+  gem 'listen',     '~> 2.7.1'
   gem 'rb-fchange', '~> 0.0.6', require: false
-  gem 'rb-fsevent', '~> 0.9.3', require: false
-  gem 'rb-inotify', '~> 0.9.0', require: false
+  gem 'rb-fsevent', '~> 0.9.4', require: false
+  gem 'rb-inotify', '~> 0.9.3', require: false
 
   # notification handling
-  gem 'libnotify',               '~> 0.8.0', require: false
+  gem 'libnotify',               '~> 0.8.2', require: false
   gem 'rb-notifu',               '~> 0.0.4', require: false
   gem 'terminal-notifier-guard', '~> 1.5.3', require: false
 end
@@ -36,25 +37,35 @@ group :metrics do
   gem 'coveralls', '~> 0.7.0'
   gem 'flay',      '~> 2.4.0'
   gem 'flog',      '~> 4.2.0'
-  gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.16.0'
+  gem 'reek',      '~> 1.3.7'
+  gem 'rubocop',   '~> 0.19.1'
   gem 'simplecov', '~> 0.8.2'
-  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
+  gem 'yardstick', '~> 0.9.9'
+
+  platforms :mri do
+    gem 'mutant',       '~> 0.5.9'
+    gem 'mutant-rspec', '~> 0.5.3'
+  end
 
   platforms :ruby_19, :ruby_20 do
-    gem 'mutant',          '~> 0.3.0', git: 'https://github.com/mbj/mutant.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 
   platform :rbx do
     gem 'json',               '~> 1.8.1'
-    gem 'racc',               '~> 1.4.10'
+    gem 'racc',               '~> 1.4.11'
     gem 'rubysl-logger',      '~> 2.0.0'
     gem 'rubysl-open-uri',    '~> 2.0.0'
-    gem 'rubysl-prettyprint', '~> 2.0.2'
+    gem 'rubysl-prettyprint', '~> 2.0.3'
   end
 end
 
 group :benchmarks do
   gem 'rbench', '~> 0.2.3'
 end
+
+platform :jruby do
+  group :jruby do
+    gem 'jruby-openssl', '~> 0.8.5'
+  end
+end

data/README.md

@@ -9,7 +9,7 @@ Generate equivalent source for ASTs from whitequarks [parser](https://github.com
 
 This library is able to reproduce 100% of ruby 1.9 and 2.0 syntax. Including its own source code.
 
-It serves well for [mutant](https://github.cm/mbj/mutant) mutators and the in-memory vendoring for self hosting.
+It serves well for [mutant](https://github.com/mbj/mutant) mutators and the in-memory vendoring for self hosting.
 
 This library dropped the reproduction of 1.8 syntax in the 0.1.0 release.
 It currently does not have support for 2.1 specific syntax.
@@ -50,6 +50,60 @@ Parser::CurrentRuby.parse(generated) == node # true, but identical AST
 
 Summary: unparser does not reproduce your source! It produces equivalent source.
 
+Testing:
+--------
+
+Unparser currently successfully round trips almost all ruby code around. Using MRI-2.0.0.
+If there is a non round trippable example that is NOT subjected to known [Limitations](#limitations).
+please report a bug.
+
+On CI unparser is currently tested against rubyspec with minor [excludes](https://github.com/mbj/unparser/blob/master/spec/integrations.yml).
+
+Limitations:
+------------
+
+Source parsed with magic encoding headers other than UTF-8 and that have literal strings.
+where parts can be represented in UTF-8 will fail to get reproduced.
+
+Please note: If you are on 1.9.3 or any 1.9 mode ruby and use UTF-8 encoded source via the magic encoding header:
+Unparser does not reproduce these.
+
+A fix might be possible and requires some guessing or parser metadata the raw AST does not carry.
+
+Example:
+
+Original-Source:
+```ruby
+# -*- encoding: binary -*-
+
+"\x98\x76\xAB\xCD\x45\x32\xEF\x01\x01\x23\x45\x67\x89\xAB\xCD\xEF"
+```
+
+Original-AST:
+```
+(str "\x98v\xAB\xCDE2\xEF\x01\x01#Eg\x89\xAB\xCD\xEF")
+```
+
+Generated-Source:
+
+```ruby
+"\x98v\xAB\xCDE2\xEF\x01\x01#Eg\x89\xAB\xCD\xEF"
+```
+
+Generated-AST:
+
+```
+(str "\x98v\xAB\xCDE2\xEF\u0001\u0001#Eg\x89\xAB\xCD\xEF")
+```
+
+Diff:
+
+```
+@@ -1,2 +1,2 @@
+-(str "\x98v\xAB\xCDE2\xEF\x01\x01#Eg\x89\xAB\xCD\xEF")
++(str "\x98v\xAB\xCDE2\xEF\u0001\u0001#Eg\x89\xAB\xCD\xEF")
+```
+
 Installation
 ------------
 

data/circle.yml

@@ -1,6 +1,6 @@
----
-ruby:
-  version: 2.0.0-p353
+machine:
+  ruby:
+    version: 2.0.0
 test:
   override:
     - bundle exec rake ci

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 700
+total_score: 720

data/config/reek.yml

@@ -17,6 +17,8 @@ TooManyInstanceVariables:
 TooManyMethods:
   exclude:
   - Unparser::Emitter # TODO: 13 methods, mostly helpers for deduplicate sublcasses
+  - Unparser::Buffer  # TODO: 11 methods, mostly helpers for deduplicate sublcasses
+  - Unparser::CLI::Source # 11 methods
   enabled: true
   max_methods: 10
 UncommunicativeMethodName:
@@ -41,7 +43,8 @@ FeatureEnvy:
   - Unparser::CLI::Differ#collapsed_hunks
   - Unparser::Emitter::Send::Arguments#effective_arguments
   # Helper methods, false positive
-  - Unparser::StripHelper#strip
+  - Unparser::CLI::Source#strip
+  - Unparser::CLI::Source#report_unparser
   - Unparser::CLI#sources
   enabled: true
 ClassVariable:
@@ -73,7 +76,9 @@ TooManyStatements:
   max_statements: 6
   enabled: true
   exclude:
-  - Unparser::CLI::Source#error_report
+  - Unparser::CLI#add_options
+  - Unparser::CLI#initialize
+  - Unparser::CLI::Source#report_unparser
 DuplicateMethodCall:
   allow_calls: []
   exclude: []
@@ -83,7 +88,7 @@ UtilityFunction:
   max_helper_calls: 1
   exclude:
   # Intent to be helper methods
-  - Unparser::StripHelper#strip
+  - Unparser::CLI::Source#strip
   - Unparser::CLI#sources
   enabled: true
 Attribute:

data/config/rubocop.yml

@@ -13,7 +13,7 @@ ParameterLists:
 
 MethodLength:
   CountComments: false
-  Max: 15
+  Max: 17
 
 # Avoid more than `Max` levels of nesting.
 BlockNesting:

data/lib/unparser.rb

@@ -34,7 +34,6 @@ module Unparser
 
 end # Unparser
 
-require 'unparser/strip_helper'
 require 'unparser/buffer'
 require 'unparser/node_helpers'
 require 'unparser/preprocessor'

data/lib/unparser/ast.rb

@@ -87,7 +87,7 @@ module Unparser
     def self.local_variable_assignments_in_scope(node)
       Enumerator.new(
         node,
-        LocalVariableScope.method(:not_reset_scope?),
+        LocalVariableScope.method(:not_reset_scope?)
       ).types(LocalVariableScope::ASSIGN_NODES)
     end
 
@@ -102,7 +102,7 @@ module Unparser
     def self.local_variables_read_in_scope(node)
       Enumerator.new(
         node,
-        LocalVariableScope.method(:not_close_scope?),
+        LocalVariableScope.method(:not_close_scope?)
       ).type(:lvar).map(&FIRST_CHILD).to_set
     end
 

data/lib/unparser/buffer.rb

@@ -30,7 +30,7 @@ module Unparser
       if @content[-1] == NL
         prefix
       end
-      @content << string
+      write(string)
       self
     end
 
@@ -43,7 +43,7 @@ module Unparser
     # @api private
     #
     def append_without_prefix(string)
-      @content << string
+      write(string)
       self
     end
 
@@ -76,7 +76,7 @@ module Unparser
     # @api private
     #
     def nl
-      @content << NL
+      write(NL)
       self
     end
 
@@ -127,7 +127,15 @@ module Unparser
     # @api private
     #
     def prefix
-      @content << INDENT_SPACE * @indent
+      write(INDENT_SPACE * @indent)
+    end
+
+    # Write to content buffer
+    #
+    # @param [String] fragment
+    #
+    def write(fragment)
+      @content << fragment
     end
 
   end # Buffer

data/lib/unparser/cli.rb

@@ -42,6 +42,7 @@ module Unparser
 
       @success   = true
       @fail_fast = false
+      @verbose   = false
 
       opts = OptionParser.new do |builder|
         add_options(builder)
@@ -63,12 +64,15 @@ module Unparser
     def add_options(builder)
       builder.banner = 'usage: unparse [options] FILE [FILE]'
       builder.separator('')
-      builder.on('-e', '--evaluate SOURCE') do |original_source|
-        @sources << Source::String.new(original_source)
+      builder.on('-e', '--evaluate SOURCE') do |source|
+        @sources << Source::String.new(source)
       end
       builder.on('--start-with FILE') do |file|
         @start_with = sources(file).first
       end
+      builder.on('-v', '--verbose') do |file|
+        @verbose = true
+      end
       builder.on('--ignore FILE') do |file|
         @ignore.merge(sources(file))
       end
@@ -107,9 +111,10 @@ module Unparser
     #
     def process_source(source)
       if source.success?
+        puts source.report if @verbose
         puts "Success: #{source.identification}"
       else
-        puts source.error_report
+        puts source.report
         puts "Error: #{source.identification}"
         @success = false
       end

data/lib/unparser/cli/source.rb

@@ -6,6 +6,34 @@ module Unparser
     class Source
       include AbstractType, Adamantium::Flat, NodeHelpers
 
+      # Source state generated after first unparse
+      class Generated
+        include Concord::Public.new(:source, :ast, :error)
+
+        # Test if source was generated successfully
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def success?
+          !error
+        end
+
+        # Build generateg source
+        #
+        # @param [Parser::AST::Node]
+        #
+        # @api private
+        #
+        def self.build(ast)
+          source = Unparser.unparse(ast)
+          new(source, ast, nil)
+        rescue => exception
+          new(nil, ast, exception)
+        end
+      end
+
       # Test if source could be unparsed successfully
       #
       # @return [true]
@@ -16,7 +44,7 @@ module Unparser
       # @api private
       #
       def success?
-        original_ast && generated_ast && original_ast == generated_ast
+        generated.success? && original_ast && generated_ast && original_ast == generated_ast
       end
 
       # Return error report
@@ -25,17 +53,21 @@ module Unparser
       #
       # @api private
       #
-      def error_report
+      def report
         case
         when original_ast && generated_ast
-          error_report_with_ast_diff
+          report_with_ast_diff
         when !original_ast
-          error_report_original
+          report_original
+        when !generated.success?
+          report_unparser
         when !generated_ast
-          error_report_generated
+          report_generated
+        else
+          raise
         end
       end
-      memoize :error_report
+      memoize :report
 
     private
 
@@ -45,10 +77,24 @@ module Unparser
       #
       # @api private
       #
-      def generated_source
-        Unparser.unparse(original_ast)
+      def generated
+        Source::Generated.build(original_ast)
+      end
+      memoize :generated
+
+      # Return stripped source
+      #
+      # @param [String] string
+      #
+      # @return [String]
+      #
+      # @api private
+      #
+      def strip(source)
+        source = source.rstrip
+        indent = source.scan(/^\s*/).first
+        source.gsub(/^#{indent}/, '')
       end
-      memoize :generated_source
 
       # Return error report for parsing original
       #
@@ -56,26 +102,42 @@ module Unparser
       #
       # @api private
       #
-      def error_report_original
+      def report_original
         strip(<<-MESSAGE)
           Parsing of original source failed:
           #{original_source}
         MESSAGE
       end
 
+      # Report unparser bug
+      #
+      # @return [String]
+      #
+      # @api private
+      #
+      def report_unparser
+        message = ['Unparsing parsed AST failed']
+        error = generated.error
+        message << error
+        error.backtrace.take(20).each(&message.method(:<<))
+        message << 'Original-AST:'
+        message << original_ast.inspect
+        message.join("\n")
+      end
+
       # Return error report for parsing generated
       #
       # @return [String]
       #
       # @api private
       #
-      def error_report_generated
+      def report_generated
         strip(<<-MESSAGE)
           Parsing of generated source failed:
           Original-AST:
           #{original_ast.inspect}
           Source:
-          #{generated_source}
+          #{generated.source}
         MESSAGE
       end
 
@@ -85,12 +147,12 @@ module Unparser
       #
       # @api private
       #
-      def error_report_with_ast_diff
+      def report_with_ast_diff
         strip(<<-MESSAGE)
-          #{diff}
+          #{ast_diff}
           Original-Source:\n#{original_source}
           Original-AST:\n#{original_ast.inspect}
-          Generated-Source:\n#{generated_source}
+          Generated-Source:\n#{generated.source}
           Generated-AST:\n#{generated_ast.inspect}
         MESSAGE
       end
@@ -119,7 +181,7 @@ module Unparser
       # @api private
       #
       def generated_ast
-        Preprocessor.run(parse(generated_source))
+        generated.success? && Preprocessor.run(parse(generated.source))
       rescue Parser::SyntaxError
         nil
       end

data/lib/unparser/constants.rb

@@ -106,7 +106,7 @@ module Unparser
       int float self kwbegin const regexp args lvar
       ivar gvar cvar if case module class sclass super
       yield zsuper break next defined? str block while loop until
-      def defs true false nil array hash sym return
+      def defs true false nil array hash sym return match_current_line
     )
 
     DEFAULT_DELIMITER = ', '.freeze

data/lib/unparser/emitter/begin.rb

@@ -45,16 +45,6 @@ module Unparser
           end
         end
 
-        # Emit inner delimited by semicolons
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def emit_inner_semi
-          delimited(children, ';')
-        end
-
       end # Implicit
 
       # Emitter for explicit begins

data/lib/unparser/emitter/ensure.rb

@@ -19,7 +19,11 @@ module Unparser
       # @api private
       #
       def dispatch
-        visit_indented(body)
+        if body
+          visit_indented(body)
+        else
+          nl
+        end
         write(K_ENSURE)
         if ensure_body
           visit_indented(ensure_body)

data/lib/unparser/emitter/flipflop.rb

@@ -7,7 +7,7 @@ module Unparser
 
       MAP = IceNine.deep_freeze(
         iflipflop: '..',
-        eflipflop: '...',
+        eflipflop: '...'
       ).freeze
 
       handle(*MAP.keys)

data/lib/unparser/emitter/flow_modifier.rb

@@ -8,7 +8,7 @@ module Unparser
       MAP = {
         return: K_RETURN,
         next:   K_NEXT,
-        break:  K_BREAK,
+        break:  K_BREAK
       }
 
       handle(*MAP.keys)

data/lib/unparser/emitter/if.rb

@@ -28,7 +28,7 @@ module Unparser
       # Test for postcondition
       #
       # @return [true]
-      #   if node must be emitted in postconditin style
+      #   if node must be emitted in postcondition style
       #
       # @return [false]
       #   otherwise
@@ -36,7 +36,7 @@ module Unparser
       # @api private
       #
       def postcondition?
-        return false unless !!if_branch ^ !!else_branch
+        return false unless if_branch.nil? ^ else_branch.nil?
 
         body = if_branch || else_branch
 
@@ -100,7 +100,7 @@ module Unparser
       # @api private
       #
       def emit_condition
-        visit(condition)
+        visit_terminated(condition)
       end
 
       # Emit if branch

data/lib/unparser/emitter/repetition.rb

@@ -91,7 +91,7 @@ module Unparser
       #
       def emit_normal
         emit_keyword
-        visit(condition)
+        visit_terminated(condition)
         emit_body
         k_end
       end

data/lib/unparser/emitter/resbody.rb

@@ -5,7 +5,7 @@ module Unparser
     # Emitter for rescue body nodes
     class Resbody < self
 
-        children :exception, :assignment, :body
+      children :exception, :assignment, :body
 
       # Emitter for resbody in standalone form
       class Standalone < self

data/lib/unparser/emitter/rescue.rb

@@ -49,7 +49,7 @@ module Unparser
         if parent_type == :ensure
           !parent.node.children.first.equal?(node)
         else
-          !EMBEDDED_TYPES.include?(parent_type) && body
+          !EMBEDDED_TYPES.include?(parent_type)
         end
       end
 

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

@@ -14,10 +14,13 @@ module Unparser
         #
         def dispatch
           emit_receiver
-          emit_selector
+          emit_attribute
+          emit_operator
           visit_terminated(arguments.first)
         end
 
+      private
+
         # Emit receiver
         #
         # @return [Parser::AST::Node]
@@ -29,6 +32,36 @@ module Unparser
           write(T_DOT)
         end
 
+        # Emit attribute
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_attribute
+          write(attribute_name)
+        end
+
+        # Emit assignment operator
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_operator
+          write(WS, T_ASN, WS)
+        end
+
+        # Return attribute name
+        #
+        # @return [String]
+        #
+        # @api private
+        #
+        def attribute_name
+          string_selector[0..-2]
+        end
+
       end # AttributeAssignment
     end # Send
   end # Emitter

data/spec/integration/unparser/corpus_spec.rb

@@ -0,0 +1,116 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe 'Unparser on ruby corpus' do
+  before do
+    if RUBY_VERSION == '1.9.3'
+      pending 'Corpus test not active for 1.9.3 because of limitations in encoding singalling, see Readme'
+    end
+  end
+  ROOT = Pathname.new(__FILE__).parent.parent.parent.parent
+
+  TMP = ROOT.join('tmp')
+
+  class Project
+    include Anima.new(:name, :repo_uri, :exclude)
+
+    # Perform verification via unparser cli
+    #
+    # @return [self]
+    #   if successful
+    #
+    # @raise [Exception]
+    #   otherwise
+    #
+    def verify
+      checkout
+      command = %W(unparser #{repo_path})
+      exclude.each do |name|
+        command.concat(%W(--ignore #{repo_path.join(name)}))
+      end
+      system(command) do
+        raise "Verifing #{name} failed!"
+      end
+      self
+    end
+
+    # Checkout repository
+    #
+    # @return [self]
+    #
+    # @api private
+    #
+    def checkout
+      TMP.mkdir unless TMP.directory?
+      if repo_path.exist?
+        Dir.chdir(repo_path) do
+          system(%w(git pull origin master))
+          system(%w(git clean -f -d -x))
+        end
+      else
+        system(%W(git clone #{repo_uri} #{repo_path}))
+      end
+      self
+    end
+
+  private
+
+    # Return repository path
+    #
+    # @return [Pathname]
+    #
+    # @api private
+    #
+    def repo_path
+      TMP.join(name)
+    end
+
+    # Helper method to execute system commands
+    #
+    # @param [Array<String>] arguments
+    #
+    # @api private
+    #
+    def system(arguments)
+      unless Kernel.system(*arguments)
+        if block_given?
+          yield
+        else
+          raise 'System command failed!'
+        end
+      end
+    end
+
+    LOADER = Morpher.build do
+      s(:block,
+        s(:guard, s(:primitive, Array)),
+        s(:map,
+          s(:block,
+            s(:guard, s(:primitive, Hash)),
+            s(:hash_transform,
+              s(:key_symbolize, :repo_uri, s(:guard, s(:primitive, String))),
+              s(:key_symbolize, :name,     s(:guard, s(:primitive, String))),
+              s(:key_symbolize, :exclude,  s(:map, s(:guard, s(:primitive, String))))
+            ),
+            s(:load_attribute_hash,
+              # NOTE: The domain param has no DSL currently!
+              Morpher::Evaluator::Transformer::Domain::Param.new(
+                Project,
+                [:repo_uri, :name, :exclude]
+              )
+            )
+          )
+        )
+      )
+    end
+
+    ALL = LOADER.call(YAML.load_file(ROOT.join('spec', 'integrations.yml')))
+  end
+
+  Project::ALL.each do |project|
+    specify "unparsing #{project.name}" do
+      project.verify
+    end
+  end
+end

data/spec/integrations.yml

@@ -0,0 +1,23 @@
+---
+- name: rubyspec
+  repo_uri: 'https://github.com/rubyspec/rubyspec.git'
+  exclude:
+    # Binary encoded source subjected to limitations see Readme
+    - core/array/pack/{b,h,u}_spec.rb
+    - language/versions/*1.8*
+    - core/array/pack/shared/float.rb
+    - core/array/pack/shared/integer.rb
+    - core/array/pack/{c,m,w}_spec.rb
+    - core/regexp/shared/new.rb
+    - core/regexp/shared/quote.rb
+    - core/encoding/compatible_spec.rb
+    - core/io/readpartial_spec.rb
+    - core/env/element_reference_spec.rb
+    - core/dir/pwd_spec.rb
+    - core/string/casecmp_spec.rb
+    - core/string/unpack/{b,c,h,m,u,w}_spec.rb
+    - core/string/unpack/b_spec.rb
+    - core/string/unpack/shared/float.rb
+    - core/string/unpack/shared/integer.rb
+    - core/symbol/casecmp_spec.rb
+    - optional/capi/integer_spec.rb

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
-# encoding: utf-8
+# encoding: UTF-8
 
+require 'yaml'
+require 'pathname'
 require 'unparser'
+require 'anima'
+require 'morpher'
 require 'devtools/spec_helper'
 
 require 'parser/current'
@@ -20,8 +24,6 @@ module SpecHelper
 end
 
 RSpec.configure do |config|
-  config.extend(Unparser::StripHelper)
-  config.include(Unparser::StripHelper)
   config.include(SpecHelper)
   config.extend(SpecHelper)
 end

data/spec/unit/unparser_spec.rb

@@ -503,9 +503,9 @@ 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[1]'
+      assert_source 'foo.bar = (baz || foo)'
+      assert_source 'foo.bar = baz.bar'
       assert_source 'foo << (bar * baz)'
       assert_source <<-'RUBY'
         foo ||= (a, _ = b)
@@ -596,8 +596,8 @@ describe Unparser do
 
       assert_source 'foo.bar(&baz)'
       assert_source 'foo.bar(:baz, &baz)'
-      assert_source 'foo.bar=:baz'
-      assert_source 'self.foo=:bar'
+      assert_source 'foo.bar = :baz'
+      assert_source 'self.foo = :bar'
 
       assert_source 'foo.bar(baz: boz)'
       assert_source 'foo.bar(foo, "baz" => boz)'
@@ -722,6 +722,12 @@ describe Unparser do
         end
       RUBY
 
+      assert_source <<-'RUBY'
+        begin
+        ensure
+        end
+      RUBY
+
       assert_source <<-'RUBY'
         begin
         rescue
@@ -788,6 +794,35 @@ describe Unparser do
       assert_source 'foo rescue(bar)'
       assert_source 'foo rescue(return bar)'
       assert_source 'x = foo rescue(return bar)'
+
+      %w(while until if).each do |keyword|
+        assert_source <<-RUBY
+          #{keyword} (
+            foo rescue(false)
+          )
+          end
+        RUBY
+
+        assert_generates <<-RUBY, <<-GENERATED
+          foo rescue(false) #{keyword} true
+        RUBY
+          #{keyword} true
+            foo rescue(false)
+          end
+        GENERATED
+      end
+
+      assert_generates <<-'RUBY', <<-GENERATED
+        case (foo rescue(false))
+        when true
+        end
+      RUBY
+        case (
+          foo rescue(false)
+        )
+        when true
+        end
+      GENERATED
     end
 
     context 'super' do
@@ -1357,7 +1392,7 @@ describe Unparser do
     context 'flip flops' do
       context 'inclusive' do
         assert_source <<-'RUBY'
-          if (i == 4)..(i == 4)
+          if ((i == 4)..(i == 4))
             foo
           end
         RUBY
@@ -1365,7 +1400,7 @@ describe Unparser do
 
       context 'exclusive' do
         assert_source <<-'RUBY'
-          if (i == 4)...(i == 4)
+          if ((i == 4)...(i == 4))
             foo
           end
         RUBY

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name     = 'unparser'
-  gem.version  = '0.1.9'
+  gem.version  = '0.1.10'
 
   gem.authors  = ['Markus Schirp']
   gem.email    = 'mbj@schir-dso.com'
@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version
 
-  gem.add_dependency('parser',        '~> 2.1.0')
+  gem.add_dependency('parser',        '~> 2.1.7')
   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('adamantium',    '~> 0.2.0')
+  gem.add_dependency('equalizer',     '~> 0.0.9')
   gem.add_dependency('abstract_type', '~> 0.0.7')
 end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Markus Schirp
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.7
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
+        version: 2.1.7
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: procto
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: procto
+        version: 0.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: concord
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: concord
+        version: 0.1.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.4
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: adamantium
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
-- !ruby/object:Gem::Dependency
-  name: adamantium
+        version: 0.2.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
+        version: 0.2.0
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: equalizer
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: equalizer
+        version: 0.0.9
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
-  type: :runtime
+        version: 0.0.9
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: abstract_type
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.7
-- !ruby/object:Gem::Dependency
-  name: abstract_type
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.7
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.7
+  type: :runtime
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schir-dso.com
 executables:
@@ -102,10 +102,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - Changelog.md
 - Gemfile
 - Gemfile.devtools
@@ -186,8 +186,9 @@ files:
 - lib/unparser/finalize.rb
 - lib/unparser/node_helpers.rb
 - lib/unparser/preprocessor.rb
-- lib/unparser/strip_helper.rb
 - rubyspec.sh
+- spec/integration/unparser/corpus_spec.rb
+- spec/integrations.yml
 - spec/spec_helper.rb
 - spec/unit/unparser/buffer/append_spec.rb
 - spec/unit/unparser/buffer/append_without_prefix_spec.rb
@@ -208,27 +209,29 @@ homepage: http://github.com/mbj/unparser
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.0
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
 test_files:
+- spec/integration/unparser/corpus_spec.rb
+- spec/integrations.yml
 - spec/spec_helper.rb
 - spec/unit/unparser/buffer/append_spec.rb
 - spec/unit/unparser/buffer/append_without_prefix_spec.rb
@@ -244,4 +247,3 @@ test_files:
 - spec/unit/unparser/comments/take_eol_comments_spec.rb
 - spec/unit/unparser/emitter/class_methods/handle_spec.rb
 - spec/unit/unparser_spec.rb
-has_rdoc: 

data/lib/unparser/strip_helper.rb

@@ -1,23 +0,0 @@
-# encoding: UTF-8
-
-module Unparser
-  # Helpers for stripping source
-  module StripHelper
-
-    INDENT_PATTERN = /^\s*/.freeze
-
-    # String indentation of source away
-    #
-    # @param [String] source
-    #
-    # @return [String]
-    #
-    # @api private
-    #
-    def strip(source)
-      indent = source.rstrip.scan(INDENT_PATTERN).min_by(&:length)
-      source.gsub(/^#{indent}/, '')
-    end
-
-  end # StripHelper
-end # Unparser