to_source 0.2.13 → 0.2.14

data/Changelog.md

@@ -1,35 +1,41 @@
-# v0.2.13 2013-01-9
+# v0.2.14 2013-01-09
+
+* [fixed] Emit send with arguments and body correctly
+
+[Compare v0.2.13..v0.2.14](https://github.com/mbj/to_source/compare/v0.2.13...v0.2.14)
+
+# v0.2.13 2013-01-09
 
 * [fixed] Emit send with arguments and body correctly
 
 [Compare v0.2.12..v0.2.13](https://github.com/mbj/to_source/compare/v0.2.12...v0.2.13)
 
-# v0.2.12 2013-01-9
+# v0.2.12 2013-01-09
 
 * [fixed] Emit edge cases with dynamic literals correctly
 
 [Compare v0.2.11..v0.2.12](https://github.com/mbj/to_source/compare/v0.2.11...v0.2.12)
 
-# v0.2.11 2013-01-9
+# v0.2.11 2013-01-09
 
 * [fixed] Allow all nodes to be entrypoints
 
 [Compare v0.2.10..v0.2.11](https://github.com/mbj/to_source/compare/v0.2.10...v0.2.11)
 
-# v0.2.10 2013-01-7
+# v0.2.10 2013-01-07
 
 * [Changed] Rewrote internals compleatly, no outer API change
 * [fixed] Emit indentation of complex nested structures with rescue statements correctly
 
 [Compare v0.2.9..v0.2.10](https://github.com/mbj/to_source/compare/v0.2.9...v0.2.10)
 
-# v0.2.9 2013-01-4
+# v0.2.9 2013-01-04
 
 * [fixed] Handle regexp literals containing slashes in non shash delimiters %r(/) correctly
 
 [Compare v0.2.8..v0.2.9](https://github.com/mbj/to_source/compare/v0.2.8...v0.2.9)
 
-# v0.2.8 2013-01-3
+# v0.2.8 2013-01-03
 
 * [Changed] Emit many times more ugly code, but correctnes > beautifulnes
 * [fixed] Emit break with parantheses
@@ -38,13 +44,13 @@
 
 [Compare v0.2.7..v0.2.8](https://github.com/mbj/to_source/compare/v0.2.7...v0.2.8)
 
-# v0.2.7 2013-01-2
+# v0.2.7 2013-01-02
 
 * [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
+# v0.2.6 2013-01-01
 
 * [fixed] Emit super vs super() correctly
 

data/TODO

@@ -1,4 +1,5 @@
 * Do not emit parantheses around non keywords in binary operations (this will beautify source again)
+* Unify code for all binary emitters
 * Add YARD coverage again
 * Fix all dm2 metric tools issues
 * Mutation coverage!

data/lib/to_source/emitter/assignment.rb

@@ -49,6 +49,7 @@ module ToSource
     class AssignmentOperator < self
 
       def dispatch
+        emit('(')
         visit(node.left)
         space
         emit(self.class::SYMBOL)
@@ -56,6 +57,7 @@ module ToSource
         emit('(')
         visit(node.right.value)
         emit(')')
+        emit(')')
       end
 
       class Or < self

data/lib/to_source/emitter/binary_operator.rb

@@ -6,11 +6,21 @@ module ToSource
 
       def dispatch
         emit('(')
-        visit(node.left)
-        emit(')')
+        emit_left
         space
         emit(self.class::SYMBOL)
         space
+        emit_right
+        emit(')')
+      end
+
+      def emit_left
+        emit('(')
+        visit(node.left)
+        emit(')')
+      end
+
+      def emit_right
         emit('(')
         visit(node.right)
         emit(')')

data/lib/to_source/emitter/binary_operator_method.rb

@@ -6,16 +6,26 @@ module ToSource
 
       def dispatch
         emit('(')
-        visit(left)
-        emit(')')
+        emit_left
         space
         emit(node.name)
         space
+        emit_right
+        emit(')')
+      end
+
+      def emit_right
         emit('(')
         visit(right)
         emit(')')
       end
 
+      def emit_left
+        emit('(')
+        visit(left)
+        emit(')')
+      end
+
       def left
         node.receiver
       end

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

@@ -654,65 +654,73 @@ describe ToSource,'.to_source' do
     end
   end
 
-  context 'binary operators' do
+  context 'binary operators methods' 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)"
+      context "on send #{operator}" do
+        assert_source "((a) #{operator} (b))"
       end
     end
 
     context 'binary operator and keywords' do
-      assert_source '(a) || (break(foo))'
+      assert_source '((a) || (break(foo)))'
+    end
+
+    context 'sending methods to result of binary operator' do
+      assert_source '((a) || (b)).foo'
     end
 
     context 'nested binary operators' do
-      assert_source '(a) || ((b) || (c))'
+      assert_source '((a) || (((b) || (c))))'
     end
   end
 
   { :or => :'||', :and => :'&&' }.each do |word, symbol|
     context "word form form equivalency of #{word} and #{symbol}" do
-      assert_converts "(a) #{symbol} (break(foo))", "a #{word} break foo"
+      assert_converts "((a) #{symbol} (break(foo)))", "a #{word} break foo"
     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
   end
 
   context 'shortcuts' do
     context 'on &&= operator' do
-      assert_source 'a &&= (b)'
+      assert_source '(a &&= (b))'
     end
 
     context 'on ||= operator' do
-      assert_source 'a ||= (2)'
+      assert_source '(a ||= (2))'
+    end
+
+    context 'calling methods on shortcuts' do
+      assert_source '(a ||= (2)).bar'
     end
   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.13'
+  s.version            = '0.2.14'
   s.authors            = ['Markus Schirp']
   s.email              = ['mbj@seonic.net']
   s.homepage           = 'http://github.com/mbj/to_source'

metadata

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