unparser 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3273de4b72cb214d459c8519c3a3e6c3a0d06e4e
-  data.tar.gz: dc7c765cef957d3fafcdfbf36691b56695c29443
+  metadata.gz: 7c9b95ccef00a5ebdeae86ae92b12af786f209ae
+  data.tar.gz: cab5a1dd18399aa00b3afcdd0ea371aee67dfae3
 SHA512:
-  metadata.gz: e27666e1e5c927f64ac11777754b9e9f6df2ad61c8c62c9ca801c026ceda16b75dee95f37ae8e6b313d8ac4ac03ba273f3f7fb355f40fd03c3843a1d2ab0ea5b
-  data.tar.gz: 7c65227ff6738eb937e677a0b17d5fd2d1908a336f187786a0ab42ca68e3c6e38c3e25e233595ad4579579b2076cdff5b7eb66c194daab369e9e2e8b6ba86279
+  metadata.gz: 369c2c1b754ef3d252464a84b334a0e1f8d1bdae36997c811619b9c1483db73232d8a953e08a5b2894b588bdf7d401ebe4ab667c471b1ce5e57572c4016e5809
+  data.tar.gz: cfc34c5e7d02ac2e58c60c41dd7f9f59c66a21eace1b1c9d42e3052a930c59067dc6c572bf7980ab4e53d0305940221424263ab8cff8b71901f7e4e572bb1573

data/Guardfile

@@ -4,7 +4,7 @@ guard :bundler do
   watch('Gemfile')
 end
 
-guard :rspec, :all_on_start => false, :all_after_pass => false, :cli => '--fail-fast --backtrace' do
+guard :rspec, :all_on_start => false, :all_after_pass => false, :cli => '--fail-fast --seed 1' do
   # run all specs if the spec_helper or supporting files files are modified
   watch('spec/spec_helper.rb')                      { 'spec/unit' }
   watch(%r{\Aspec/(?:lib|support|shared)/.+\.rb\z}) { 'spec/unit' }

data/README.md

@@ -7,6 +7,10 @@ unparser
 
 Generate equivalent source for ASTs from whitequarks awesome [parser](https://github.com/whitequark/parser).
 
+This library is in early development stage and still has some bugs/missing features.
+Nevertheless it is able to regenerate it own source and serves well for
+[mutant](https://github.cm/mbj/mutant) mutators and the in-memory vendoring for self hosting mutant.
+
 Usage
 -----
 

data/Rakefile

@@ -1,24 +1,2 @@
 require 'devtools'
 Devtools.init_rake_tasks
-
-class Rake::Task
-  def overwrite(&block)
-    @actions.clear
-    enhance(&block)
-  end
-end
-
-Rake.application.load_imports
-
-Rake::Task['metrics:mutant'].overwrite do
-  begin
-    require 'mutant'
-  rescue LoadError
-  end
-  if defined?(Mutant) and !ENV.key?('CI')
-    status = Mutant::CLI.run(%W(--rspec-full ::Unparser))
-    unless status.zero?
-      fail "Not mutation covered :("
-    end
-  end
-end

data/TODO

@@ -1,2 +1,3 @@
 * Refactor Emitter::Send, it is ugly.
 * Remove duplicated logic with empty or non empty bodies
+* Handle kwbegin and begin separately

data/bin/test-unparser

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+trap('INT') do |status|
+  exit! 128+status
+end
+
+require 'unparser'
+require 'parser/current'
+
+ARGV.each do |file|
+  source    = File.read(file)
+  node      = Parser::CurrentRuby.parse(source)
+  generated = Unparser.unparse(node)
+  unparsed  = Parser::CurrentRuby.parse(generated)
+  unless unparsed == node
+    $stderr.puts "Node:"
+    $stderr.puts node.inspect
+    $stderr.puts "Unparsed-Node:"
+    $stderr.puts unparsed.inspect
+    $stderr.puts "Original:"
+    $stderr.puts source
+    $stderr.puts "Generated:"
+    $stderr.puts generated
+    fail "BUG!"
+  end
+end

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 353
+total_score: 363

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 11.8
+threshold: 9.8

data/config/reek.yml

@@ -99,7 +99,8 @@ DataClump:
   max_copies: 1
   min_clump_size: 3
 ControlParameter:
-  exclude: []
+  exclude:
+    - Unparser::Emitter#emit_body # false positive
   enabled: true
 NilCheck:
   enabled: false

data/lib/unparser/emitter.rb

@@ -8,10 +8,45 @@ module Unparser
     # Registry for node emitters
     REGISTRY = {}
 
+    NOINDENT = [:rescue, :ensure].to_set
+
     DEFAULT_DELIMITER = ', '.freeze
 
     CURLY_BRACKETS = IceNine.deep_freeze(%w({ }))
 
+    # Define remaining children
+    #
+    # @param [Enumerable<Symbol>] names
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def self.define_remaining_children(names)
+      define_method(:remaining_children) do
+        children[names.length..-1]
+      end
+      private :remaining_children
+    end
+    private_class_method :define_remaining_children
+
+    # Define named child
+    #
+    # @param [Symbol] name
+    # @param [Fixnum] index
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def self.define_child(name, index)
+      define_method(name) do
+        children.at(index)
+      end
+      protected name
+    end
+    private_class_method :define_child
+
     # Create name helpers
     #
     # @return [undefined]
@@ -19,11 +54,10 @@ module Unparser
     # @api private
     #
     def self.children(*names)
+      define_remaining_children(names)
+
       names.each_with_index do |name, index|
-        define_method(name) do
-          children[index]
-        end
-        private name
+        define_child(name, index)
       end
     end
     private_class_method :children
@@ -213,16 +247,6 @@ module Unparser
       end
     end
 
-    # Write begin keyword
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def k_begin
-      write(K_BEGIN)
-    end
-
     # Write end keyword
     #
     # @return [undefined]
@@ -278,12 +302,28 @@ module Unparser
     #
     # @api private
     #
-    def emit_body
+    def emit_body(body = self.body)
       unless body
         nl
         return
       end
-      indented { visit(body) }
+      visit_indented(body)
+    end
+
+    # Visit indented node
+    #
+    # @param [Parser::AST::Node] node
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def visit_indented(node)
+      if NOINDENT.include?(node.type)
+        visit(node)
+      else
+        indented { visit(node) }
+      end
     end
 
     # Emitter that fully relies on parser source maps

data/lib/unparser/emitter/begin.rb

@@ -17,56 +17,70 @@ module Unparser
       # @api private
       #
       def dispatch
-        k_begin
-        indented { visit(body) }
-        children[1..-2].each do |child|
+        visit_indented(body)
+        rescue_bodies.each do |child|
           visit(child)
         end
-        k_end
+        emit_else
       end
-    end # Rescue
-
-    # Emitter for enusre nodes
-    class Ensure < self
-
-      handle :ensure
 
-      children :body, :ensure_body
-
-    private
+      # Return rescue bodies
+      #
+      # @return [Enumerable<Parser::AST::Node>]
+      #
+      # @api private
+      #
+      def rescue_bodies
+        children[1..-2]
+      end
 
-      # Perform dispatch
+      # Emit else
       #
       # @return [undefined]
       #
       # @api private
       #
-      def dispatch
-        k_begin
-        emit_body
-        write(K_ENSURE)
-        emit_ensure_body
-        k_end
+      def emit_else
+        return unless else_branch
+        write(K_ELSE)
+        visit_indented(else_branch)
       end
 
-      # Emit body
+      # Return else body
       #
-      # @return [undefined]
+      # @return [Parser::AST::Node]
+      #   if else body is present
+      #
+      # @return [nil]
+      #   otherwise
       #
       # @api private
       #
-      def emit_body
-        indented { visit(body) }
+      def else_branch
+        children.last
       end
 
-      # Emit ensure body
+    end # Rescue
+
+    # Emitter for ensure nodes
+    class Ensure < self
+
+      handle :ensure
+
+      children :body, :ensure_body
+
+    private
+
+      # Perform dispatch
       #
       # @return [undefined]
       #
       # @api private
       #
-      def emit_ensure_body
-        indented { visit(ensure_body) }
+      def dispatch
+        visit_indented(body)
+        write(K_ENSURE)
+        visit_indented(ensure_body)
       end
 
     end # Ensure
@@ -90,11 +104,7 @@ module Unparser
         write(K_RESCUE)
         emit_exception
         emit_assignment
-        if body
-          indented { visit(body) }
-        else
-          nl
-        end
+        emit_body
       end
 
       # Emit exception
@@ -126,40 +136,10 @@ module Unparser
     # Emitter for begin nodes
     class Begin < self
 
-      handle :begin, :kwbegin
+      children :body
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def dispatch
-        if children.length == 1 and !parent.needs_begin?
-          visit(first_child)
-        else
-          emit_normal
-        end
-      end
-
-      # Emit normal begin block
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_normal
-        if parent.needs_begin?
-          k_begin
-          indented { emit_inner }
-          k_end
-        else
-          emit_inner
-        end
-      end
-
       # Emit inner nodes
       #
       # @return [undefined]
@@ -175,6 +155,60 @@ module Unparser
         end
       end
 
-    end # Body
+      # Emitter for implicit begins
+      class Implicit < self
+
+        handle :begin
+
+      private
+
+        # Perform dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          emit_inner
+        end
+
+      end # Implicit
+
+      # Emitter for explicit begins
+      class Explicit < self
+
+        handle :kwbegin
+
+      private
+
+        # Perform dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          write(K_BEGIN)
+          emit_body
+          k_end
+        end
+
+        # Emit body
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_body
+          if NOINDENT.include?(body.type)
+            emit_inner
+          else
+            indented { emit_inner }
+          end
+        end
+
+      end # Explicit
+
+    end # Begin
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/case.rb

@@ -33,7 +33,7 @@ module Unparser
         else_branch = children.last
         return unless else_branch
         write(K_ELSE)
-        indented { visit(else_branch) }
+        visit_indented(else_branch)
       end
 
       # Emit whens
@@ -80,11 +80,7 @@ module Unparser
         write(K_WHEN, WS)
         emit_captures
         body = children.last
-        if body
-          indented { visit(body) }
-        else
-          nl
-        end
+        emit_body(body)
       end
 
       # Emit captures

data/lib/unparser/emitter/for.rb

@@ -35,16 +35,6 @@ module Unparser
         write(WS, K_DO)
       end
 
-      # Emit body
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_body
-        indented { visit(body) }
-      end
-
     end # For
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/hookexe.rb

@@ -27,16 +27,6 @@ module Unparser
         end
       end
 
-      # Emit body
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_body
-        indented { visit(body) }
-      end
-
     end # Hookexe
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/if.rb

@@ -65,7 +65,7 @@ module Unparser
       #
       def emit_if_branch
         return unless if_branch
-        indented { visit(if_branch) }
+        visit_indented(if_branch)
       end
 
       # Emit else branch
@@ -77,7 +77,7 @@ module Unparser
       def emit_else_branch
         return unless else_branch
         write(K_ELSE) unless unless?
-        indented { visit(else_branch) }
+        visit_indented(else_branch)
       end
 
     end # If

data/spec/integration/unparser/spike_spec.rb

@@ -354,6 +354,19 @@ describe Unparser, 'spike' do
       end
     RUBY
 
+    assert_source <<-RUBY
+      begin
+        begin
+          foo
+          bar
+        rescue
+        end
+      rescue
+        baz
+        bar
+      end
+    RUBY
+
     assert_source <<-RUBY
       begin
         foo
@@ -427,6 +440,15 @@ describe Unparser, 'spike' do
       end
     RUBY
 
+    assert_source <<-RUBY
+      begin
+        bar
+      rescue
+      else
+        baz
+      end
+    RUBY
+
     assert_source <<-RUBY
       begin
         bar
@@ -565,6 +587,22 @@ describe Unparser, 'spike' do
         end
       RUBY
 
+      assert_source <<-RUBY
+        def foo
+          bar
+        ensure
+          baz
+        end
+      RUBY
+
+      assert_source <<-RUBY
+        def foo
+          bar
+        rescue
+          baz
+        end
+      RUBY
+
       assert_source <<-RUBY
         def foo(bar)
           bar
@@ -662,7 +700,6 @@ describe Unparser, 'spike' do
     end
 
     context 'on singleton' do
-
       assert_source <<-RUBY
         def self.foo
         end

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = 'unparser'
-  s.version  = '0.0.6'
+  s.version  = '0.0.7'
 
   s.authors  = ['Markus Schirp']
   s.email    = 'mbj@schir-dso.com'
@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.require_paths    = %w(lib)
   s.extra_rdoc_files = %w(README.md)
-  s.executables      = [ 'unparse' ]
+  s.executables      = [ 'test-unparser' ]
 
-  s.add_dependency('parser',        '~> 2.0.0.beta9')
+  s.add_dependency('parser',        '~> 2.0.0.beta10')
   s.add_dependency('concord',       '~> 0.1.0')
   s.add_dependency('adamantium',    '~> 0.0.7')
   s.add_dependency('equalizer',     '~> 0.0.5')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-02 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.beta9
+        version: 2.0.0.beta10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta9
+        version: 2.0.0.beta10
 - !ruby/object:Gem::Dependency
   name: concord
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schir-dso.com
 executables:
-- unparse
+- test-unparser
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -100,7 +100,7 @@ files:
 - README.md
 - Rakefile
 - TODO
-- bin/unparse
+- bin/test-unparser
 - config/devtools.yml
 - config/flay.yml
 - config/flog.yml

data/bin/unparse

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-trap('INT') do |status|
-  exit! 128+status
-end
-
-require 'unparser'
-require 'parser/current'
-
-ARGV.each do |file|
-  source = File.read(file)
-  node = Parser::CurrentRuby.parse(source)
-  $stderr.puts "File: #{file}"
-  $stderr.puts node.inspect
-  puts Unparser.unparse(node)
-end