to_source 0.2.12 → 0.2.13

data/Changelog.md

@@ -1,4 +1,10 @@
-# v0.2.11 2013-01-9
+# v0.2.13 2013-01-9
+
+* [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
 
 * [fixed] Emit edge cases with dynamic literals correctly
 

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
-threshold: 18
-total_score: 296
+threshold: 40
+total_score: 619

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 14.4
+threshold: 22.2

data/config/site.reek

@@ -8,9 +8,8 @@ UncommunicativeParameterName:
   - !ruby/regexp /[0-9]$/
   - !ruby/regexp /[A-Z]/
 LargeClass:
-  max_methods: 10
-  exclude: 
-  - "Mutant::Matcher::Method" # 13 methods
+  max_methods: 11
+  exclude: []
   enabled: true
   max_instance_variables: 3
 UncommunicativeMethodName:
@@ -23,8 +22,7 @@ UncommunicativeMethodName:
   - !ruby/regexp /[A-Z]/
 LongParameterList:
   max_params: 2
-  exclude: 
-  - "Mutant::Context::Constant#initialize" # 3 params
+  exclude: []
   enabled: true
   overrides: {}
 FeatureEnvy:
@@ -38,9 +36,12 @@ BooleanParameter:
   enabled: true
 IrresponsibleModule:
   exclude: []
-  enabled: true
+  enabled: false
 UncommunicativeModuleName:
-  accept: []
+  accept: 
+  - ToSource::Emitter::Match3
+  - ToSource::Emitter::OpAssign1
+  - ToSource::Emitter::OpAssign2
   exclude: []
   enabled: true
   reject:
@@ -52,7 +53,7 @@ NestedIterators:
   enabled: true
   max_allowed_nesting: 1
 LongMethod:
-  max_statements: 6
+  max_statements: 7
   exclude: []
   enabled: true
 Duplication:

data/config/yardstick.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 100
+threshold: 63.4

data/lib/to_source.rb

@@ -30,9 +30,9 @@ require 'to_source/emitter/scoped_name'
 require 'to_source/emitter/send'
 require 'to_source/emitter/send_with_arguments'
 require 'to_source/emitter/block_pass'
+require 'to_source/emitter/block_argument'
 require 'to_source/emitter/iter'
 require 'to_source/emitter/pattern_arguments'
-require 'to_source/emitter/block_argument'
 require 'to_source/emitter/unary_operator_method'
 require 'to_source/emitter/binary_operator_method'
 require 'to_source/emitter/binary_operator'
@@ -43,13 +43,12 @@ require 'to_source/emitter/defined'
 require 'to_source/emitter/attribute_assignment'
 require 'to_source/emitter/element_assignment'
 require 'to_source/emitter/if'
-require 'to_source/emitter/while'
+require 'to_source/emitter/loop'
 require 'to_source/emitter/ensure'
 require 'to_source/emitter/receiver_case'
 require 'to_source/emitter/when'
 require 'to_source/emitter/splat_when'
 require 'to_source/emitter/unless'
-require 'to_source/emitter/until'
 require 'to_source/emitter/class'
 require 'to_source/emitter/module'
 require 'to_source/emitter/op_assign2'

data/lib/to_source/emitter.rb

@@ -65,6 +65,19 @@ module ToSource
       emitter.new(node, buffer)
     end
 
+    def self.delegate(*names)
+      names.each do |name|
+        define_delegator(name)
+      end
+    end
+
+    def self.define_delegator(name)
+      define_method(name) do
+        node.public_send(name)
+      end
+      private name
+    end
+
     attr_reader :buffer
 
     def initialize(node, buffer)

data/lib/to_source/emitter/literal.rb

@@ -29,9 +29,10 @@ module ToSource
       private
 
         def dispatch
-          visit(node.start)
+          util = node
+          visit(util.start)
           emit(token)
-          visit(node.finish)
+          visit(util.finish)
         end
 
         def token
@@ -54,26 +55,26 @@ module ToSource
 
         handle(Rubinius::AST::HashLiteral)
 
-        def dispatch
-          body = node.array.each_slice(2).to_a
-
-          max = body.length - 1
+      private
 
+        def dispatch
           emit '{'
+          emit_body
+          emit '}'
+        end
 
-          body.each_with_index do |slice, index|
-            key, value = slice
-
+        def emit_body
+          body = node.array.each_slice(2).to_a
+          max  = body.length - 1
+          body.each_with_index do |(key, value), index|
             visit(key)
-            emit ' => '
+            emit(' => ')
             visit(value)
 
             if index < max 
-              emit ', ' 
+              emit(', ')
             end
           end
-
-          emit '}'
         end
 
       end

data/lib/to_source/emitter/loop.rb

@@ -0,0 +1,37 @@
+module ToSource
+  class Emitter
+    class Loop < self
+
+    private
+
+      def dispatch
+        emit(self.class::KEYWORD)
+        space
+        visit(condition)
+        indent
+        visit(body)
+        unindent
+        emit_end
+      end
+
+      def condition
+        node.condition
+      end
+
+      def body
+        node.body
+      end
+
+      class While < self
+        handle(Rubinius::AST::While)
+        KEYWORD = :while
+      end
+
+      class Until < self
+        handle(Rubinius::AST::Until)
+        KEYWORD = :until
+      end
+
+    end
+  end
+end

data/lib/to_source/emitter/match3.rb

@@ -7,9 +7,10 @@ module ToSource
     private
 
       def dispatch
-        visit(node.value)
+        util = node
+        visit(util.value)
         emit(' =~ ')
-        visit(node.pattern)
+        visit(util.pattern)
       end
 
     end

data/lib/to_source/emitter/module.rb

@@ -7,11 +7,11 @@ module ToSource
     private
 
       def dispatch
-        emit(:module)
-        space
-        visit(node.name)
+        util = node
+        emit('module ')
+        visit(util.name)
         indent
-        visit(node.body)
+        visit(util.body)
         unindent
         emit_end
       end

data/lib/to_source/emitter/multiple_assignment.rb

@@ -7,11 +7,18 @@ module ToSource
     private
 
       def dispatch
-        body = node.left.body
-        run(Util::DelimitedBody, node.left.body)
+        emit_left
         emit(' = ')
+        emit_right
+      end
+
+      def emit_left
+        run(Util::DelimitedBody, node.left.body)
+      end
+
+      def emit_right
         right = node.right
-        if node.right.kind_of?(Rubinius::AST::ArrayLiteral)
+        if right.kind_of?(Rubinius::AST::ArrayLiteral)
           run(Util::DelimitedBody, right.body)
         else
           visit(right)

data/lib/to_source/emitter/op_assign1.rb

@@ -7,11 +7,12 @@ module ToSource
     private
 
       def dispatch
-        visit(node.receiver)
+        util = node
+        visit(util.receiver)
         emit('[')
-        visit(node.arguments.array.first)
+        visit(util.arguments.array.first)
         emit('] ||= ')
-        visit(node.value)
+        visit(util.value)
       end
 
     end

data/lib/to_source/emitter/op_assign2.rb

@@ -7,11 +7,12 @@ module ToSource
     private
 
       def dispatch
-        visit(node.receiver)
+        util = node
+        visit(util.receiver)
         emit('.')
-        emit(node.name)
+        emit(util.name)
         emit(' |= ')
-        visit(node.value)
+        visit(util.value)
       end
 
     end

data/lib/to_source/emitter/rescue.rb

@@ -8,11 +8,12 @@ module ToSource
     private
 
       def dispatch
+        util = node
         emit('begin')
         indent
-        visit(node.body)
+        visit(util.body)
         unindent
-        visit(node.rescue)
+        visit(util.rescue)
         emit_end
       end
 

data/lib/to_source/emitter/rescue_condition.rb

@@ -8,7 +8,7 @@ module ToSource
 
       def dispatch
         emit('rescue')
-        emit_condition
+        emit_conditions
         emit_splat
         emit_assignment
         emit_body
@@ -21,23 +21,23 @@ module ToSource
         unindent
       end
 
-      def emit_condition
+      def emit_conditions
         conditions = node.conditions || return
-
         body = conditions.body
 
         first = body.first
         unless body.one? and first.kind_of?(Rubinius::AST::ConstantAccess) and first.name == :StandardError
-          emit(' ')
+          space
           run(Util::DelimitedBody, body)
         end
       end
 
       def emit_splat
-        splat = node.splat || return
-        emit(',') if node.conditions
-        emit(' ')
-        visit(node.splat)
+        util = node
+        splat = util.splat || return
+        emit(',') if util.conditions
+        space
+        visit(splat)
       end
 
       def emit_assignment
@@ -47,8 +47,8 @@ module ToSource
       end
 
       def emit_next
-        condition = node.next || return
-        visit(node.next)
+        next_rescue = node.next || return
+        visit(next_rescue)
       end
 
     end

data/lib/to_source/emitter/scoped_name.rb

@@ -6,10 +6,14 @@ module ToSource
       handle(Rubinius::AST::ScopedModuleName)
       handle(Rubinius::AST::ScopedConstant)
 
+    private
+
+      delegate(:parent, :name)
+
       def dispatch
-        visit(node.parent)
+        visit(parent)
         emit('::')
-        emit(node.name)
+        emit(name)
       end
 
     end

data/lib/to_source/emitter/send.rb

@@ -24,22 +24,42 @@ module ToSource
       end
 
       def normal_dispatch
-        unless node.privately
-          visit(node.receiver)
-          emit('.')
-        end
-
-        emit(node.name)
+        emit_receiver
+        emit_name
+        emit_block_pass
         emit_block
       end
 
+      def block?
+        !!block
+      end
+
+      delegate(:block, :name, :receiver)
+
+      def block_pass?
+        block? && block.kind_of?(Rubinius::AST::BlockPass19)
+      end
+
+      def emit_name
+        emit(name)
+      end
+
+      def emit_receiver
+        return if node.privately
+        visit(receiver)
+        emit('.')
+      end
+
       def emit_block
-        block = node.block
-        return unless block
-        pass = block.kind_of?(Rubinius::AST::BlockPass19)
-        emit('(') if pass
-        visit(node.block)
-        emit(')') if pass
+        return unless block? and !block_pass?
+        visit(block)
+      end
+
+      def emit_block_pass
+        return unless block_pass?
+        emit('(')
+        visit(block)
+        emit(')')
       end
 
     end

data/lib/to_source/emitter/send_with_arguments.rb

@@ -1,22 +1,26 @@
 module ToSource
   class Emitter
-    class SendWithArguments < self
+    class SendWithArguments < Send
 
       handle(Rubinius::AST::SendWithArguments)
 
     private
 
       def dispatch
-        if node.name == :[]
-          run(ElementReference, node)
+        if element_reference?
+          run(ElementReference)
           return
         end
         if binary_operator_method?
-          run(BinaryOperatorMethod, node)
+          run(BinaryOperatorMethod)
           return
         end
         normal_dispatch
       end
+      
+      def element_reference?
+        name == :[]
+      end
 
       BINARY_OPERATORS = %w(
         + - * / & | && || << >> == 
@@ -28,17 +32,11 @@ module ToSource
         BINARY_OPERATORS.include?(node.name)
       end
 
-      def emit_receiver
-        unless node.privately
-          visit(node.receiver)
-          emit('.')
-        end
-      end
-
       def normal_dispatch
         emit_receiver
-        emit(node.name)
+        emit_name
         emit_arguments
+        emit_block
       end
 
       def emit_arguments
@@ -49,12 +47,9 @@ module ToSource
       end
 
       def emit_block_pass(emitter)
-        block = node.block
-
-        if block && block.kind_of?(Rubinius::AST::BlockPass19)
-          emit(', ') if emitter.any?
-          visit(block)
-        end
+        return unless block_pass?
+        emit(', ') if emitter.any?
+        visit(block)
       end
 
     end

data/lib/to_source/emitter/singleton_class.rb

@@ -5,17 +5,20 @@ module ToSource
 
       handle(Rubinius::AST::SClass)
 
+    private
+
       def dispatch
-        emit(:class)
-        space
-        emit(:<<)
-        space
+        emit('class << ')
         visit(node.receiver)
+        emit_body
+        emit_end
+      end
+
+      def emit_body
         indent
         # FIXME: attr_reader missing on Rubinius::AST::SClass
         visit(node.instance_variable_get(:@body))
         unindent
-        emit_end
       end
 
     end

data/lib/to_source/emitter/unary_operator_method.rb

@@ -1,6 +1,6 @@
 module ToSource
   class Emitter
-    class UnaryOperatorMethod < self
+    class UnaryOperatorMethod < Send
 
       UNARY_MAPPING = {
         :-@ => :-,
@@ -12,7 +12,7 @@ module ToSource
       def dispatch
         name = node.name
         emit(UNARY_MAPPING.fetch(name, name))
-        visit(node.receiver)
+        visit(receiver)
       end
 
     end

data/lib/to_source/emitter/unless.rb

@@ -1,16 +1,26 @@
 module ToSource
   class Emitter
     class Unless < self
+
+    private
       
       def dispatch
         emit('unless ')
-        visit(node.condition)
+        visit(condition)
         indent
-        visit(node.else)
+        visit(else_body)
         unindent
         emit_end
       end
 
+      def condition
+        node.condition
+      end
+
+      def else_body
+        node.else
+      end
+
     end
   end
 end

data/lib/to_source/emitter/util.rb

@@ -6,8 +6,9 @@ module ToSource
       private
 
         def dispatch
-          max = node.length - 1
-          node.each_with_index do |member, index|
+          body = node
+          max = body.length - 1
+          body.each_with_index do |member, index|
             visit(member)
             emit(', ') if index < max
           end

data/lib/to_source/emitter/yield.rb

@@ -9,7 +9,7 @@ module ToSource
         arguments = node.arguments
         unless arguments.array.empty?
           emit('(')
-          visit(node.arguments)
+          visit(arguments)
           emit(')')
         end
       end

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

@@ -439,15 +439,6 @@ describe ToSource,'.to_source' do
       assert_source 'foo.bar(:baz, :yeah)'
     end
 
-    context 'with block' do
-      assert_source <<-RUBY
-        foo.bar do
-          3
-          4
-        end
-      RUBY
-    end
-
     context 'to self' do
 
       context 'explicitly' do
@@ -473,6 +464,15 @@ describe ToSource,'.to_source' do
       end
     end
 
+    context 'with block' do
+      assert_source <<-RUBY
+        foo.bar do
+          3
+          4
+        end
+      RUBY
+    end
+
     context 'with block that takes pattern and formal arguments' do
       assert_source <<-RUBY
         foo.bar do |(a, b), c|
@@ -499,6 +499,14 @@ describe ToSource,'.to_source' do
       RUBY
     end
 
+    context 'with arguments and block' do
+      assert_source <<-RUBY 
+        foo.bar(baz) do
+          4
+        end
+      RUBY
+    end
+
     context 'with splat argument' do
       assert_source 'foo.bar(*args)'
     end
@@ -835,6 +843,14 @@ describe ToSource,'.to_source' do
     end
   end
 
+  context 'loop' do
+    assert_source <<-RUBY
+      loop do
+        foo
+      end
+    RUBY
+  end
+
   context 'while' do
     context 'single statement in body' do
       assert_source <<-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.12'
+  s.version            = '0.2.13'
   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.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -135,6 +135,7 @@ files:
 - lib/to_source/emitter/keyword_value.rb
 - lib/to_source/emitter/literal.rb
 - lib/to_source/emitter/literal/dynamic.rb
+- lib/to_source/emitter/loop.rb
 - lib/to_source/emitter/match3.rb
 - lib/to_source/emitter/module.rb
 - lib/to_source/emitter/multiple_assignment.rb
@@ -160,10 +161,8 @@ files:
 - lib/to_source/emitter/toplevel.rb
 - lib/to_source/emitter/unary_operator_method.rb
 - lib/to_source/emitter/unless.rb
-- lib/to_source/emitter/until.rb
 - lib/to_source/emitter/util.rb
 - lib/to_source/emitter/when.rb
-- lib/to_source/emitter/while.rb
 - lib/to_source/emitter/yield.rb
 - lib/to_source/emitter/z_super.rb
 - lib/to_source/state.rb

data/lib/to_source/emitter/until.rb

@@ -1,20 +0,0 @@
-module ToSource
-  class Emitter
-    class Until < self
-
-      handle(Rubinius::AST::Until)
-
-    private
-
-      def dispatch
-        emit('until ')
-        visit(node.condition)
-        indent
-        visit(node.body)
-        unindent
-        emit_end
-      end
-
-    end
-  end
-end

data/lib/to_source/emitter/while.rb

@@ -1,20 +0,0 @@
-module ToSource
-  class Emitter
-    class While < self
-
-      handle(Rubinius::AST::While)
-
-    private
-
-      def dispatch
-        emit('while ')
-        visit(node.condition)
-        indent
-        visit(node.body)
-        unindent
-        emit_end
-      end
-
-    end
-  end
-end