to_source 0.2.1 → 0.2.2

data/Changelog.md

@@ -1,8 +1,17 @@
+# 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)
@@ -13,4 +22,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/lib/to_source.rb

@@ -1,3 +1,4 @@
+require 'set'
 require 'melbourne'
 require 'to_source/version'
 require 'to_source/visitor'

data/lib/to_source/visitor.rb

@@ -1324,7 +1324,7 @@ module ToSource
       emit(' do')
 
       arguments = node.arguments
-      unless arguments.names.empty?
+      unless arguments.required.empty?
         emit(' ')
         formal_arguments_generic(node.arguments,'|','|')
       end
@@ -1575,9 +1575,9 @@ 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)
 
@@ -1606,10 +1606,10 @@ module ToSource
         end
       end
 
-      if node.block_arg
+      if block_arg
         emit(', ') unless empty
 
-        dispatch(node.block_arg)
+        dispatch(block_arg)
       end
 
       emit(close)

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)            { puts source; source.to_ast }
+    let(:node)            { source.to_ast }
     let(:source)          { source        }
     let(:expected_source) { source        }
 
@@ -398,7 +398,7 @@ describe ToSource::Visitor,'.run' do
       end
     end
 
-    context 'with block that takes pattern arguments' do
+    context 'with block that takes pattern and formal arguments' do
       assert_source <<-RUBY
         foo.bar do |(a, b), c|
           d
@@ -406,6 +406,15 @@ describe ToSource::Visitor,'.run' do
       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|

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.2'
   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.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adamantium
@@ -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.1'
-end