to_source 0.2.6 → 0.2.7

data/Changelog.md

@@ -1,7 +1,15 @@
+# v0.2.7 2013-01-2
+
+* [fixed] Emit super with blocks correctly
+
+[Compare v0.2.6..v0.2.7](https://github.com/mbj/to_source/compare/v0.2.6...v0.2.7)
+
 # v0.2.6 2013-01-1
 
 * [fixed] Emit super vs super() correctly
 
+[Compare v0.2.5..v0.2.6](https://github.com/mbj/to_source/compare/v0.2.5...v0.2.6)
+
 # v0.2.5 2012-12-14
 
 * [fixed] Emit unary operators correctly
@@ -11,6 +19,8 @@
 * [fixed] Emit nested binary operators correctly.
 * [fixed] Emit element reference on self correctly. self[foo].
 
+[Compare v0.2.4..v0.2.5](https://github.com/mbj/to_source/compare/v0.2.4...v0.2.5)
+
 # v0.2.4 2012-12-07
 
 * [feature] Allow to emit pattern variables as root node

data/lib/to_source/visitor.rb

@@ -889,6 +889,9 @@ module ToSource
     #
     def z_super(node)
       emit('super')
+      if node.block
+        dispatch(node.block)
+      end
     end
 
     # Emit super
@@ -900,13 +903,12 @@ module ToSource
     # @api private
     #
     def super(node)
-      z_super(node)
+      emit('super')
       # Stupid hack to ensure super() is emitted, this lib needs a redesign!
       arguments = node.arguments
-      empty = arguments.array.empty? && !arguments.splat && !node.block.kind_of?(Rubinius::AST::BlockPass19)
-      emit('(') if empty
+      empty = arguments.array.empty? && !arguments.splat && !node.block
+      emit('()') if empty
       arguments(node)
-      emit(')') if empty
     end
 
     # Emit concat args

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

@@ -484,18 +484,50 @@ describe ToSource::Visitor,'.run' do
       assert_source 'super'
     end
 
+    context 'without arguments and block' do
+      assert_source <<-RUBY
+        super do
+          foo
+        end
+      RUBY
+    end
+
     context 'with explicit zero arguments' do
       assert_source 'super()'
     end
 
+    context 'with explicit zero arguments and block' do
+      assert_source <<-RUBY
+        super() do
+          foo
+        end
+      RUBY
+    end
+
     context 'with argument' do
       assert_source 'super(a)'
     end
 
+    context 'with argument and block' do
+      assert_source <<-RUBY
+        super(a) do
+          foo
+        end
+      RUBY
+    end
+
     context 'with arguments' do
       assert_source 'super(a, b)'
     end
 
+    context 'with arguments and block' do
+      assert_source <<-RUBY
+        super(a, b) do
+          foo
+        end
+      RUBY
+    end
+
     context 'with block argument' do
       assert_source 'super(&block)'
     end

data/to_source.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'to_source'
-  s.version     = '0.2.6'
+  s.version     = '0.2.7'
   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.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors: