to_source 0.2.0 → 0.2.5

data/Changelog.md

@@ -1,3 +1,39 @@
+# v0.2.5 2012-12-14
+
+* [fixed] Emit unary operators correctly
+* [fixed] Define with optional splat and block argument
+* [fixed] Emit arguments to break keyword
+* [change] Uglify output of binary operators with unneded paranteses. Correct output > nice output.
+* [fixed] Emit nested binary operators correctly.
+* [fixed] Emit element reference on self correctly. self[foo].
+
+# v0.2.4 2012-12-07
+
+* [feature] Allow to emit pattern variables as root node
+* [fixed] Emit send with splat and block argument correctly
+
+[Compare v0.2.3..v0.2.4](https://github.com/mbj/to_source/compare/v0.2.3...v0.2.4)
+
+# v0.2.3 2012-12-07
+
+* [fixed] Nuke dangling require  (sorry for not running specs after gemspec change)
+
+[Compare v0.2.2..v0.2.3](https://github.com/mbj/to_source/compare/v0.2.2...v0.2.3)
+
+# v0.2.2 2012-12-07
+
+* [fixed] Emit of pattern arguments with no formal arguments present
+* [fixed] Missed to require set
+
+[Compare v0.2.1..v0.2.2](https://github.com/mbj/to_source/compare/v0.2.1...v0.2.2)
+
+# v0.2.1 2012-12-07
+
+* [fixed] Emit of def on splat with block
+* [fixed] Emit of pattern args 
+
+[Compare v0.2.0..v0.2.1](https://github.com/mbj/to_source/compare/v0.2.0...v0.2.1)
+
 # v0.2.0 2012-12-07
 
 * [BRAKING CHANGE] Remove core extension Rubinius::AST::Node#to_source (mbj)
@@ -8,4 +44,4 @@
 * [feature] Introduce metric tools via devtools
 * [fixed] Lots of transitvity edge cases
 
-[Compare v0.1.3..v0.2.0](https://github.com/solnic/virtus/compare/v0.1.3...v0.2.0)
+[Compare v0.1.3..v0.2.0](https://github.com/mbj/to_source/ompare/v0.1.3...v0.2.0)

data/Gemfile

@@ -2,7 +2,6 @@ source :rubygems
 
 gemspec
 
-gem 'mutant-melbourne', :git => 'https://github.com/mbj/melbourne.git'
-gem 'devtools',         :git => 'https://github.com/mbj/devtools.git', :branch => 'rspec-2-mutant'
+gem 'devtools', :git => 'https://github.com/datamapper/devtools.git'
 
 eval File.read('Gemfile.devtools')

data/Gemfile.devtools

@@ -1,5 +1,5 @@
-group :development do 
-  gem 'rake',    '~> 0.9.2'
+group :development do
+  gem 'rake',    '~> 10.0'
   gem 'rspec',   '~> 2.12.0'
   gem 'yard',    '~> 0.8.3'
 end
@@ -26,27 +26,19 @@ group :metrics do
   gem 'flog',      '~> 2.5.1'
   gem 'reek',      '~> 1.2.8', :git => 'https://github.com/dkubb/reek.git'
   gem 'roodi',     '~> 2.1.0'
-  gem 'yardstick', '~> 0.7.0'
-  gem 'simplecov'
+  gem 'yardstick', '~> 0.8.0'
+  gem 'mutant',    '~> 0.2.5'
 
   platforms :ruby_18, :ruby_19 do
     # this indirectly depends on ffi which does not build on ruby-head
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 
-  platforms :mri_18 do
-    gem 'arrayfields', '~> 4.7.4'  # for metric_fu
-    gem 'fattr',       '~> 2.2.0'  # for metric_fu
-    gem 'json',        '~> 1.7.3'  # for metric_fu rake task
-    gem 'map',         '~> 6.0.1'  # for metric_fu
-    gem 'metric_fu',   '~> 2.1.1'
-    gem 'mspec',       '~> 1.5.17'
-    gem 'rcov',        '~> 1.0.0'
+  platforms :mri_19 do
+    gem 'simplecov',   '~> 0.7'
   end
 
   platforms :rbx do
     gem 'pelusa', '~> 0.2.1'
-    gem 'anima',  '~> 0.0.1', :git => 'https://github.com/mbj/anima.git'
-    gem 'mutant', '~> 0.0.1', :git => 'https://github.com/mbj/mutant.git'
   end
 end

data/README.md

@@ -1,9 +1,9 @@
 to_source
 =========
 
-[![Build Status](https://secure.travis-ci.org/mbj/to_source.png?branch=master)](http://travis-ci.org/mbj/to_source)
-[![Dependency Status](https://gemnasium.com/mbj/to_source.png)](https://gemnasium.com/mbj/to_source)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/mbj/to_source)
+[![Build Status](https://secure.travis-ci.org/txus/to_source.png?branch=master)](http://travis-ci.org/txus/to_source)
+[![Dependency Status](https://gemnasium.com/txus/to_source.png)](https://gemnasium.com/txus/to_source)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/txus/to_source)
 
 Reverse parser to generate source code from the Rubinius AST. Also works well under MRI. 
 

data/TODO

@@ -3,3 +3,5 @@
 * Do a metric driven refactor once flay flog and friends work.
 * Report bug about missing Rubinius::AST::SClass#body
 * Decide about to support 18-mode or not
+* Handle Rubinius::AST::PatternArguments
+* Fix emit of nested boolean uperators and parantheses!

data/lib/to_source/visitor.rb

@@ -16,6 +16,28 @@ module ToSource
       new(node).output
     end
 
+    # Return handler registry
+    #
+    # @return [Hash]
+    #
+    # @api private
+    #
+    def self.registry
+      @registry ||= {}
+    end
+
+    # Register handler class
+    #
+    # @param [Class:Rubinius::AST::Node] node_klass
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def self.register(node_klass)
+      registry[node_klass]=self
+    end
+
     # Return the source code of AST
     #
     # @return [String]
@@ -51,9 +73,14 @@ module ToSource
     # @api private
     #
     def dispatch(node)
-      name = node.node_name
-      name = "#{name}_def" if %w[ class module ].include?(name)
-      __send__(name, node)
+      handler = self.class.registry.fetch(node.class) do
+        name = node.node_name
+        name = "#{name}_def" if %w(class module).include?(name)
+        __send__(name, node)
+        nil
+      end
+
+      handler.run(self, node) if handler
     end
 
     # Emit file
@@ -121,6 +148,10 @@ module ToSource
     #
     def break(node)
       emit('break')
+      if node.value.class != Rubinius::AST::NilLiteral
+        emit(' ')
+        dispatch(node.value)
+      end
     end
 
     # Emit next
@@ -1020,21 +1051,50 @@ module ToSource
       end
     end
 
-    # Emit send literal
+    UNARY_OPERATORS = %w(
+      ! ~ -@ +@
+    ).map(&:to_sym).to_set.freeze
+
+    UNARY_MAPPING = {
+      :-@ => :-,
+      :+@ => :+,
+    }.freeze
+
+    # Emit unary operator
     #
     # @param [Rubinius::AST::Node] node
     #
-    # @return [undefined]
+    # @return [true]
+    #   if node was emitted
+    #
+    # @return [false]
+    #   otherwise
     #
     # @api private
     #
-    def send(node)
-      if node.name == :'!'
-        emit('!')
+    def unary_operator(node)
+      name = node.name
+
+      if UNARY_OPERATORS.include?(name)
+        emit(UNARY_MAPPING.fetch(name, name))
         dispatch(node.receiver)
-        return
+        return true
       end
 
+      false
+    end
+
+    # Emit send node
+    #
+    # @param [Rubinius::AST::Node] node
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def send(node)
+      return if unary_operator(node)
+
       if receiver(node)
         emit('.')
       end
@@ -1073,13 +1133,16 @@ module ToSource
       array_body(array)
       is_block_pass = block.kind_of?(Rubinius::AST::BlockPass)
 
+      empty = array.empty?
+
       if arguments.splat
-        emit(', ') unless array.empty?
+        emit(', ') unless empty
         dispatch(arguments.splat)
+        empty = false
       end
 
       if is_block_pass
-        emit(', ') unless array.empty? 
+        emit(', ') unless empty
         block_pass(block)
       end
 
@@ -1111,10 +1174,7 @@ module ToSource
     # @api private
     #
     def element_reference(node)
-      unless node.receiver.is_a?(Rubinius::AST::Self)
-        dispatch(node.receiver)
-      end
-
+      dispatch(node.receiver)
       arguments(node,'[',']')
     end
 
@@ -1130,6 +1190,7 @@ module ToSource
       if node.name == :[]
         return element_reference(node)
       end
+
       return if process_binary_operator(node)
 
       if receiver(node)
@@ -1297,7 +1358,7 @@ module ToSource
       emit(' do')
 
       arguments = node.arguments
-      unless arguments.names.empty?
+      unless arguments.required.empty?
         emit(' ')
         formal_arguments_generic(node.arguments,'|','|')
       end
@@ -1347,9 +1408,11 @@ module ToSource
     # @api private
     #
     def and(node)
+      emit('(')
       dispatch(node.left)
       emit(' && ')
       dispatch(node.right)
+      emit(')')
     end
 
     # Emit or
@@ -1361,9 +1424,11 @@ module ToSource
     # @api private
     #
     def or(node)
+      emit('(')
       dispatch(node.left)
       emit(' || ')
       dispatch(node.right)
+      emit(')')
     end
 
     # Emit and operation with assignment
@@ -1522,6 +1587,36 @@ module ToSource
       kend
     end
 
+    # Emit pattern variable
+    #
+    # @param [Rubinius::AST::PatternVariable] node
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def pattern_variable(node)
+      emit(node.name)
+    end
+
+    # Emit pattern arguments
+    #
+    # @param [Rubinius::AST::PatternArguments] node
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def pattern_arguments(node)
+      emit('(')
+      arguments = node.arguments.body
+      arguments.each_with_index do |argument, index|
+        dispatch(argument)
+        emit(', ') unless index == arguments.size - 1
+      end
+      emit(')')
+    end
+
     # Emit formal arguments as shared between ruby18 and ruby19 mode
     #
     # @param [Rubinius::AST::Node] node
@@ -1530,32 +1625,42 @@ module ToSource
     #
     # @api private
     #
-    def formal_arguments_generic(node,open,close)
-      return if node.names.empty? 
-      required, defaults, splat = node.required, node.defaults, node.splat
+    def formal_arguments_generic(node, open, close)
+      required, defaults, splat, block_arg = node.required, node.defaults, node.splat, node.block_arg
+      return unless required.any? or defaults or splat or block_arg
 
       emit(open)
-      emit(required.join(', '))
+
+      required.each_with_index do |node, index|
+        if node.kind_of?(Rubinius::AST::Node)
+          dispatch(node)
+        else
+          emit(node)
+        end
+        emit(', ') unless index == required.size-1
+      end
 
       empty = required.empty?
 
       if defaults
         emit(', ') unless empty
         dispatch(node.defaults)
+        empty = false
       end
 
       if splat
         emit(', ') unless empty
         emit('*')
+        empty = false
         unless splat == :@unnamed_splat
           emit(splat)
         end
       end
 
-      if node.block_arg
+      if block_arg
         emit(', ') unless empty
 
-        dispatch(node.block_arg)
+        dispatch(block_arg)
       end
 
       emit(close)
@@ -1694,6 +1799,7 @@ module ToSource
       emit('&')
       dispatch(node.body)
     end
+    alias_method :block_pass19, :block_pass
 
     # Emit return statement
     #
@@ -1736,12 +1842,13 @@ module ToSource
 
       operand = node.arguments.array[0]
 
+      emit('(')
       dispatch(node.receiver)
 
       emit(" #{name.to_s} ")
       dispatch(operand)
 
-      self
+      emit(')')
     end
   end
 end

data/lib/to_source.rb

@@ -1,5 +1,5 @@
+require 'set'
 require 'melbourne'
-require 'to_source/version'
 require 'to_source/visitor'
 
 # Namespace of library

data/spec/unit/to_source/visitor/class_methods/run_spec.rb

@@ -361,6 +361,10 @@ describe ToSource::Visitor,'.run' do
       assert_source 'foo[index]'
     end
 
+    context 'as element reference on self' do
+      assert_source 'self[foo]'
+    end
+
     context 'without arguments' do
       assert_source 'foo.bar'
     end
@@ -398,6 +402,23 @@ describe ToSource::Visitor,'.run' do
       end
     end
 
+    context 'with block that takes pattern and formal arguments' do
+      assert_source <<-RUBY
+        foo.bar do |(a, b), c|
+          d
+        end
+      RUBY
+    end
+
+
+    context 'with block that takes pattern and no formal arguments' do
+      assert_source <<-RUBY
+        foo.bar do |(a, b)|
+          d
+        end
+      RUBY
+    end
+
     context 'with block that takes arguments' do
       assert_source <<-RUBY 
         foo.bar do |a|
@@ -421,12 +442,15 @@ describe ToSource::Visitor,'.run' do
 
     context 'with formal splat and block' do
       assert_source <<-RUBY
-        foo.bar(foo, *args) do
-          some_stuff
-        end
+        foo(bar, *args)
       RUBY
     end
 
+    context 'with splat and block argument' do
+      assert_source <<-RUBY
+        foo(*args, &block)
+      RUBY
+    end
 
     context 'with passing block argument' do
       assert_source 'foo.bar(&baz)'
@@ -481,6 +505,10 @@ describe ToSource::Visitor,'.run' do
     assert_source 'break'
   end
 
+  context 'break with arguments' do
+    assert_source 'break a'
+  end
+
   context 'next' do
     assert_source 'next'
   end
@@ -514,38 +542,43 @@ describe ToSource::Visitor,'.run' do
   context 'binary operators' do
     %w(+ - * / & | && || << >> == === != <= < <=> > >= =~ !~ ^ **).each do |operator|
       context "on literals #{operator}" do
-        assert_source "1 #{operator} 2"
+        assert_source "(1 #{operator} 2)"
       end
 
       context "on self #{operator}" do
-        assert_source "self #{operator} b"
+        assert_source "(self #{operator} b)"
       end
 
       context "on calls #{operator}" do
-        assert_source "a #{operator} b"
+        assert_source "(a #{operator} b)"
       end
+
+    end
+
+    context 'nested binary operators' do
+      assert_source '(a || (b || c))'
     end
   end
 
   context 'expansion of shortcuts' do
     context 'on += operator' do
-      assert_converts 'a = a + 2', 'a += 2'
+      assert_converts 'a = (a + 2)', 'a += 2'
     end
 
     context 'on -= operator' do
-      assert_converts 'a = a - 2', 'a -= 2'
+      assert_converts 'a = (a - 2)', 'a -= 2'
     end
 
     context 'on **= operator' do
-      assert_converts 'a = a ** 2', 'a **= 2'
+      assert_converts 'a = (a ** 2)', 'a **= 2'
     end
 
     context 'on *= operator' do
-      assert_converts 'a = a * 2', 'a *= 2'
+      assert_converts 'a = (a * 2)', 'a *= 2'
     end
 
     context 'on /= operator' do
-      assert_converts 'a = a / 2', 'a /= 2'
+      assert_converts 'a = (a / 2)', 'a /= 2'
     end
 
     context 'on &&= operator' do
@@ -565,6 +598,18 @@ describe ToSource::Visitor,'.run' do
     context 'double negation' do
       assert_source '!!1'
     end
+
+    context 'unary match' do
+      assert_source '~a'
+    end
+
+    context 'unary minus' do
+      assert_source '-a'
+    end
+
+    context 'unary plus' do
+      assert_source '+a'
+    end
   end
 
   context 'if statement' do
@@ -953,6 +998,22 @@ describe ToSource::Visitor,'.run' do
         RUBY
       end
 
+      context 'with optional and splat argument' do
+        assert_source <<-RUBY
+          def foo(baz = true, *bor)
+            bar
+          end
+        RUBY
+      end
+
+      context 'with optional and splat and block argument' do
+        assert_source <<-RUBY
+          def foo(baz = true, *bor, &block)
+            bar
+          end
+        RUBY
+      end
+
       context 'with required optional and splat argument' do
         assert_source <<-RUBY
           def foo(bar, baz = true, *bor)
@@ -963,7 +1024,7 @@ describe ToSource::Visitor,'.run' do
 
       context 'with block argument' do
         assert_source <<-RUBY
-          def foor(&block)
+          def foo(&block)
             bar
           end
         RUBY
@@ -971,7 +1032,15 @@ describe ToSource::Visitor,'.run' do
 
       context 'with required and block arguments' do
         assert_source <<-RUBY
-          def foor(bar, &block)
+          def foo(bar, &block)
+            bar
+          end
+        RUBY
+      end
+
+      context 'with spat and block arguments' do
+        assert_source <<-RUBY
+          def foo(*bar, &block)
             bar
           end
         RUBY

data/to_source.gemspec

@@ -1,11 +1,7 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-
-require 'to_source/version'
-
 Gem::Specification.new do |s|
   s.name        = 'to_source'
-  s.version     = ToSource::VERSION
+  s.version     = '0.2.5'
   s.authors     = ['Josep M. Bach', 'Markus Schirp']
   s.email       = ['josep.m.bach@gmail.com', 'mbj@seonic.net']
   s.homepage    = 'http://github.com/txus/to_source'
@@ -18,5 +14,5 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency('adamantium',       '~> 0.0.3')
-  s.add_dependency('mutant-melbourne', '~> 2.0.1')
+  s.add_dependency('mutant-melbourne', '~> 2.0.3')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to_source
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adamantium
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.3
 description: Transform your Rubinius AST nodes back to source code. Reverse parsing!
 email:
 - josep.m.bach@gmail.com
@@ -70,7 +70,6 @@ files:
 - config/site.reek
 - config/yardstick.yml
 - lib/to_source.rb
-- lib/to_source/version.rb
 - lib/to_source/visitor.rb
 - spec/spec_helper.rb
 - spec/unit/to_source/visitor/class_methods/run_spec.rb

data/lib/to_source/version.rb

@@ -1,3 +0,0 @@
-module ToSource
-  VERSION = '0.2.0'
-end