to_source 0.2.0 → 0.2.1

data/Changelog.md

@@ -1,3 +1,8 @@
+# v0.2.1 2012-12-07
+
+* [fixed] Emit of def on splat with block
+* [fixed] Emit of pattern args 
+
 # v0.2.0 2012-12-07
 
 * [BRAKING CHANGE] Remove core extension Rubinius::AST::Node#to_source (mbj)

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'
 
 eval File.read('Gemfile.devtools')

data/Gemfile.devtools

@@ -47,6 +47,5 @@ group :metrics do
   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/version.rb

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

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
@@ -1522,6 +1549,24 @@ module ToSource
       kend
     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|
+        emit(argument.name)
+        emit(', ') unless index == arguments.size - 1
+      end
+      emit(')')
+    end
+
     # Emit formal arguments as shared between ruby18 and ruby19 mode
     #
     # @param [Rubinius::AST::Node] node
@@ -1535,7 +1580,15 @@ module ToSource
       required, defaults, splat = node.required, node.defaults, node.splat
 
       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?
 
@@ -1547,6 +1600,7 @@ module ToSource
       if splat
         emit(', ') unless empty
         emit('*')
+        empty = false
         unless splat == :@unnamed_splat
           emit(splat)
         end

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

@@ -20,7 +20,7 @@ describe ToSource::Visitor,'.run' do
   end
 
   def self.assert_source(source)
-    let(:node)            { source.to_ast }
+    let(:node)            { puts source; source.to_ast }
     let(:source)          { source        }
     let(:expected_source) { source        }
 
@@ -398,6 +398,14 @@ describe ToSource::Visitor,'.run' do
       end
     end
 
+    context 'with block that takes pattern arguments' do
+      assert_source <<-RUBY
+        foo.bar do |(a, b), c|
+          d
+        end
+      RUBY
+    end
+
     context 'with block that takes arguments' do
       assert_source <<-RUBY 
         foo.bar do |a|
@@ -427,6 +435,13 @@ describe ToSource::Visitor,'.run' do
       RUBY
     end
 
+    context 'with splat and block argument' do
+      assert_source <<-RUBY
+        def foo.bar(*args, &block)
+          some_stuff
+        end
+      RUBY
+    end
 
     context 'with passing block argument' do
       assert_source 'foo.bar(&baz)'
@@ -524,6 +539,11 @@ describe ToSource::Visitor,'.run' do
       context "on calls #{operator}" do
         assert_source "a #{operator} b"
       end
+
+    end
+
+    pending 'nested binary operators' do
+      assert_source "(a or b) || c"
     end
   end
 
@@ -565,6 +585,22 @@ describe ToSource::Visitor,'.run' do
     context 'double negation' do
       assert_source '!!1'
     end
+
+    pending 'unary match' do
+      assert_source '~a'
+    end
+
+    pending 'unary match' do
+      assert_source '~a'
+    end
+
+    pending 'unary minus' do
+      assert_source '-a'
+    end
+
+    pending 'unary plus' do
+      assert_source '+a'
+    end
   end
 
   context 'if statement' do

data/to_source.gemspec

@@ -18,5 +18,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.1
   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-08 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