to_source 0.2.15 → 0.2.16

data/lib/to_source/emitter/when.rb

@@ -1,32 +1,57 @@
 module ToSource
   class Emitter
+    # Emitter for when nodes
     class When < self
 
       handle(Rubinius::AST::When)
 
     private
 
+      # Perform dispatch
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
       def dispatch
         emit('when ')
         emit_single
         emit_conditions
         emit_splat
-        indent
-        visit(node.body)
-        unindent
+        indented do
+          visit(node.body)
+        end
       end
 
+      # Emit single
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
       def emit_single
         single = node.single
         visit(single) if single
       end
 
+      # Emit splat
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
       def emit_splat
         splat = node.splat
         return unless splat
         visit(splat)
       end
 
+      # Emit conditions
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
       def emit_conditions
         conditions = node.conditions 
         return unless conditions

data/lib/to_source/emitter/yield.rb

@@ -1,9 +1,18 @@
 module ToSource
   class Emitter
+    # Emitter for yield nodes
     class Yield < self
 
       handle(Rubinius::AST::Yield)
 
+    private
+
+      # Perform dispatch
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
       def dispatch
         emit('yield')
         arguments = node.arguments

data/lib/to_source/emitter/z_super.rb

@@ -1,11 +1,18 @@
 module ToSource
   class Emitter
+    # Emitter for zsuper nodes
     class ZSuper < self
 
       handle(Rubinius::AST::ZSuper)
 
     private
 
+      # Perform dispatch
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
       def dispatch
         emit('super')
         block = node.block

data/lib/to_source/state.rb

@@ -1,55 +1,139 @@
 module ToSource
+  # Emitter state
   class State
 
+    # Return last command
+    #
+    # @return [Command]
+    #
+    # @api private
+    #
     attr_reader :last
+
+    # Return current indentation level
+    #
+    # @return [Fixnum]
+    #
+    # @api private
+    #
     attr_reader :identation
+
+    # Return buffer
+    #
+    # @return [Array]
+    #
+    # @api private
+    #
     attr_reader :buffer
 
+    # Initialize object
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
     def initialize
       @last        = Command::NULL
       @indentation = 0
       @buffer      = []
     end
 
+    # Execute command 
+    #
+    # @param [Command] command
+    #
+    # @return [self]
+    #
+    # @api private
+    #
     def execute(command)
       command.run(self)
       @last = command
+      self
     end
 
-    def last_keyword?
-      last.kind_of?(Command::Token::Keyword)
-    end
-
+    # Write string to buffer
+    #
+    # @param [String] string
+    #
+    # @return [self]
+    #
+    # @api private
+    #
     def write(string)
       @buffer << string
+      self
     end
 
-    def space
-      write(' ')
+    # Return source
+    #
+    # @return [String]
+    # 
+    # @api private
+    #
+    def source
+      buffer.join('')
     end
 
+    # Push command
+    #
+    # @param [Command] command
+    #
+    # @return [self]
+    #
+    # @api private
+    #
     def push(command)
       indent
       write(command.content)
+      self
     end
-
+ 
+    # Indent line if needed
+    #
+    # @return [self]
+    #
+    # @api private
+    #
     def indent
       return unless blank?
       write(' ' * @indentation)
+      self
     end
 
+    # Test for blank line
+    #
+    # @return [true]
+    #   if line is blank
+    #
+    # @return [false]
+    #   otherwise
+    #
+    # @api private
+    #
     def blank?
       buffer.last == "\n"
     end
 
+    # Write newline
+    #
+    # @return [self]
+    #
+    # @api private
+    #
     def new_line
       write("\n")
+      self
     end
 
-    def source
-      buffer.join('')
-    end
-
+    # Perform shift by width
+    #
+    # @param [Fixnum] width
+    #
+    # @return [self]
+    #
+    # @api private
+    #
     def shift(width)
       @indentation += width
       @indentation = 0 if @indentation < 0

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

@@ -814,6 +814,19 @@ describe ToSource,'.to_source' do
   end
 
   context 'case statement' do
+    context 'without else branch' do
+      assert_source <<-RUBY
+        case 
+        when bar
+          baz
+        when baz
+          bar
+        end
+      RUBY
+    end
+  end
+
+  context 'receiver case statement' do
     context 'without else branch' do
       assert_source <<-RUBY
         case foo

data/to_source.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name               = 'to_source'
-  s.version            = '0.2.15'
+  s.version            = '0.2.16'
   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.15
+  version: 0.2.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adamantium
@@ -104,7 +104,6 @@ files:
 - config/site.reek
 - config/yardstick.yml
 - lib/to_source.rb
-- lib/to_source/buffer.rb
 - lib/to_source/command.rb
 - lib/to_source/emitter.rb
 - lib/to_source/emitter/access.rb
@@ -118,6 +117,7 @@ files:
 - lib/to_source/emitter/block.rb
 - lib/to_source/emitter/block_argument.rb
 - lib/to_source/emitter/block_pass.rb
+- lib/to_source/emitter/case.rb
 - lib/to_source/emitter/class.rb
 - lib/to_source/emitter/concat_arguments.rb
 - lib/to_source/emitter/default_arguments.rb
@@ -143,7 +143,6 @@ files:
 - lib/to_source/emitter/op_assign1.rb
 - lib/to_source/emitter/op_assign2.rb
 - lib/to_source/emitter/pattern_arguments.rb
-- lib/to_source/emitter/receiver_case.rb
 - lib/to_source/emitter/rescue.rb
 - lib/to_source/emitter/rescue_condition.rb
 - lib/to_source/emitter/scope.rb

data/lib/to_source/buffer.rb

@@ -1,40 +0,0 @@
-module ToSource
-  class Buffer
-    include Adamantium::Flat
-
-    attr_reader :lines
-
-    def initialize(lines = [])
-      @lines = lines
-    end
-
-    def to_s
-      @lines.join("\n")
-    end
-
-    def indent
-      new(lines.map { |line| "  #{line}" })
-    end
-
-    def body(body)
-      self
-    end
-
-    def class_open(name, superclass)
-      push('class')
-    end
-
-    def push(token)
-      new(lines.dup << token)
-    end
-
-    def end
-      push('end')
-    end
-
-    def new(*args)
-      self.class.new(*args)
-    end
-
-  end
-end

data/lib/to_source/emitter/receiver_case.rb

@@ -1,35 +0,0 @@
-module ToSource
-  class Emitter
-    class ReceiverCase < self
-
-      handle(Rubinius::AST::ReceiverCase)
-
-      def dispatch
-        emit('case ')
-        visit(node.receiver)
-        emit_whens
-        emit_else
-        emit_end
-      end
-
-      def emit_else
-        body = node.else
-        return if body.kind_of?(Rubinius::AST::NilLiteral)
-        emit('else')
-        indent
-        visit(body)
-        unindent
-      end
-
-      def emit_whens
-        first = true
-        node.whens.each do |member|
-          new_line if first
-          first = false
-          visit(member)
-        end
-      end
-
-    end
-  end
-end