to_source 0.2.3 → 0.2.4

data/Changelog.md

@@ -1,3 +1,10 @@
+# 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)

data/lib/to_source/visitor.rb

@@ -1047,7 +1047,7 @@ module ToSource
       end
     end
 
-    # Emit send literal
+    # Emit send node
     #
     # @param [Rubinius::AST::Node] node
     #
@@ -1100,13 +1100,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
 
@@ -1157,6 +1160,7 @@ module ToSource
       if node.name == :[]
         return element_reference(node)
       end
+
       return if process_binary_operator(node)
 
       if receiver(node)
@@ -1549,6 +1553,18 @@ 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
@@ -1561,7 +1577,7 @@ module ToSource
       emit('(')
       arguments = node.arguments.body
       arguments.each_with_index do |argument, index|
-        emit(argument.name)
+        dispatch(argument)
         emit(', ') unless index == arguments.size - 1
       end
       emit(')')
@@ -1748,6 +1764,7 @@ module ToSource
       emit('&')
       dispatch(node.body)
     end
+    alias_method :block_pass19, :block_pass
 
     # Emit return statement
     #

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

@@ -438,17 +438,13 @@ 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
-        def foo.bar(*args, &block)
-          some_stuff
-        end
+        foo(*args, &block)
       RUBY
     end
 
@@ -1008,7 +1004,7 @@ describe ToSource::Visitor,'.run' do
 
       context 'with block argument' do
         assert_source <<-RUBY
-          def foor(&block)
+          def foo(&block)
             bar
           end
         RUBY
@@ -1016,7 +1012,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,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'to_source'
-  s.version     = '0.2.3'
+  s.version     = '0.2.4'
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to_source
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors: