unparser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 213c690e6dae589a2d99f816fcb7a663c2e5b557
-  data.tar.gz: ff3c326def1c6da82fd4f7d85e8fd8cb8ae8b4f1
+  metadata.gz: 76fd3cadb7aa3c25e62d45e012c2377b6fecc0e9
+  data.tar.gz: 9a5b5833a38bffedb47db8c578c83a09607e2ce9
 SHA512:
-  metadata.gz: 8fd4fd4dfb549045719c944e5c696f51678a475dac3ab80be179bf632884bde20c137948a822069788cc76ec7474d6e8e6548e6c7468e8e4c2b3549b3dc52a75
-  data.tar.gz: 09ea9e85f869c3e9d9a829b05e52389204278116abf5417f98f223d311ce2e1b3e0bcb54a78ff942e4bd124d80abb0518c767776506ff35d3f983f78cc8d9d5f
+  metadata.gz: 091f158bbe82fb41ef74e0d5367672083a21b95df31ad7493423fc13267348b1fed8331c8b3058ee0e18fad31a28498ed90c791852074d94fba986ef4a65b957
+  data.tar.gz: a1b024cabf31dfceacdf8320d832859f6cf8ec2c4a3970373a90400e81a2d501fa2a6bd0d4fcd2bfc73a961a72f35d2386246f2884ea66c5315430768317b177

data/.travis.yml

@@ -3,10 +3,12 @@ script: 'bundle exec rake spec'
 rvm:
   - 1.9.3
   - 2.0.0
-  - ruby-head
   - jruby-19mode
   - jruby-head
   - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 notifications:
   irc:
     channels:

data/Changelog.md

@@ -1,3 +1,11 @@
+# v0.0.3 2013-06-17
+
+* Adjust to changes in parser 2.0.0.beta5 => beta6
+
+# v0.0.2 2013-06-17
+
+Crappy release
+
 # v0.0.1 2013-06-15
 
 Initial release

data/Guardfile

@@ -4,7 +4,7 @@ guard :bundler do
   watch('Gemfile')
 end
 
-guard :rspec, :all_on_start => false, :all_after_pass => false, :cli => '--fail-fast' do
+guard :rspec, :all_on_start => false, :all_after_pass => false, :cli => '--fail-fast --backtrace' do
   # run all specs if the spec_helper or supporting files files are modified
   watch('spec/spec_helper.rb')                      { 'spec/unit' }
   watch(%r{\Aspec/(?:lib|support|shared)/.+\.rb\z}) { 'spec/unit' }

data/README.md

@@ -7,6 +7,8 @@ unparser
 
 Generate equivalent inputs for ASTs from whitequarks awesome [parser](https://github.com/whitequark/parser).
 
+Only supports 1.9 syntax currently!
+
 Usage
 -----
 

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 14
-total_score: 342
+total_score: 341

data/config/reek.yml

@@ -15,7 +15,7 @@ TooManyInstanceVariables:
   max_instance_variables: 3
 TooManyMethods:
   exclude:
-  - Unparser::Emitter # TODO: 13 methods, mostly helpers for deduplicate sublcasses 
+  - Unparser::Emitter # TODO: 13 methods, mostly helpers for deduplicate sublcasses
   enabled: true
   max_methods: 10
 UncommunicativeMethodName:
@@ -28,7 +28,7 @@ UncommunicativeMethodName:
   - !ruby/regexp /[A-Z]/
 LongParameterList:
   max_params: 3
-  exclude: 
+  exclude:
   - Unparser#self.transquote
   enabled: true
   overrides: {}
@@ -62,7 +62,7 @@ NestedIterators:
   max_allowed_nesting: 1
 TooManyStatements:
   max_statements: 5
-  exclude: 
+  exclude:
   - Unparser::Emitter::Block#dispatch # 6 statements
   - Unparser::Emitter::Def#dispatch # 6 statements
   - Unparser::Emitter::Class#dispatch # 6 statements
@@ -88,7 +88,7 @@ UncommunicativeVariableName:
   - !ruby/regexp /[0-9]$/
   - !ruby/regexp /[A-Z]/
 RepeatedConditional:
-  exclude: 
+  exclude:
   - Unparser::Emitter::Send # TODO Fixme
   - Unparser::Emitter::If
   enabled: true
@@ -101,6 +101,8 @@ DataClump:
 ControlParameter:
   exclude: []
   enabled: true
+NilCheck:
+  enabled: false
 LongYieldList:
   max_params: 1
   exclude: []

data/lib/unparser.rb

@@ -9,13 +9,16 @@ module Unparser
 
   # Unparse ast into string
   #
-  # @param [Parser::Node] node
+  # @param [Parser::Node, nil] node
   #
   # @return [String]
   #
   # @api private
   #
   def self.unparse(node)
+    if node.nil?
+      node = Parser::AST::Node.new(:empty)
+    end
     buffer = Buffer.new
     Emitter.visit(node, buffer)
     buffer.content
@@ -84,5 +87,6 @@ require 'unparser/emitter/for'
 require 'unparser/emitter/repetition'
 require 'unparser/emitter/root'
 require 'unparser/emitter/match'
+require 'unparser/emitter/empty'
 
 Unparser::Emitter::REGISTRY.freeze

data/lib/unparser/constants.rb

@@ -15,20 +15,22 @@ module Unparser
       **
     ).map(&:to_sym).to_set.freeze
 
-    WS      = ' '.freeze
-    NL      = "\n".freeze
-    O_DOT   = '.'.freeze
-    O_LT    = '<'.freeze
-    O_DLT   = '<<'.freeze
-    O_AMP   = '&'.freeze
-    O_ASN   = '='.freeze
-    O_SPLAT = '*'.freeze
-    O_ASR   = '=>'.freeze
-    O_PIPE  = '|'.freeze
-    O_DCL   = '::'.freeze
-    O_NEG   = '!'.freeze
-    O_OR    = '||'.freeze
-    O_AND   = '&&'.freeze
+    WS       = ' '.freeze
+    NL       = "\n".freeze
+    T_DOT    = '.'.freeze
+    T_LT     = '<'.freeze
+    T_DLT    = '<<'.freeze
+    T_AMP    = '&'.freeze
+    T_ASN    = '='.freeze
+    T_SPLAT  = '*'.freeze
+    T_DSPLAT = '**'.freeze
+    T_ASR    = '=>'.freeze
+    T_PIPE   = '|'.freeze
+    T_DCL    = '::'.freeze
+    T_NEG    = '!'.freeze
+    T_OR     = '||'.freeze
+    T_AND    = '&&'.freeze
+    T_COLON  = ':'.freeze
 
     M_PO  = '('.freeze
     M_PC  = ')'.freeze

data/lib/unparser/emitter/argument.rb

@@ -65,7 +65,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(O_AMP, name.to_s)
+        write(T_AMP, name.to_s)
       end
 
     end # Blockarg
@@ -86,15 +86,79 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(name.to_s, WS, O_ASN, WS)
+        write(name.to_s, WS, T_ASN, WS)
         visit(value)
       end
     end
 
+    # Keyword rest argument emitter
+    class KeywordRest < self
+
+      handle :kwrestarg
+
+      children :name
+
+    private
+
+      # Perform dispatch
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def dispatch
+        write(T_DSPLAT, name.to_s)
+      end
+    end # KeywordRest
+
+    # Optional keyword argument emitter
+    class KeywordOptional < self
+      handle :kwoptarg
+
+      children :name, :value
+
+    private
+
+      # Perform dispatch
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def dispatch
+        write(name.to_s, T_COLON, WS)
+        visit(value)
+      end
+
+    end # KeywordOptional
+
+    # Keyword argument emitter
+    class Kwarg < self
+      handle :kwarg
+
+      children :name
+
+    private
+
+      # Perform dispatch
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def dispatch
+        write(name.to_s, T_COLON)
+      end
+
+    end # Restarg
+
     # Rest argument emitter
     class Restarg < self
+
       handle :restarg
 
+      children :name
+
     private
 
       # Perform dispatch
@@ -104,7 +168,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(O_SPLAT, first_child.to_s)
+        write(T_SPLAT, name.to_s)
       end
 
     end # Restarg
@@ -114,6 +178,8 @@ module Unparser
 
       handle :arg
 
+      children :name
+
     private
 
       # Perform dispatch
@@ -123,7 +189,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(first_child.to_s)
+        write(name.to_s)
       end
 
     end # Argument
@@ -144,7 +210,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(O_AMP)
+        write(T_AMP)
         visit(name)
       end
 

data/lib/unparser/emitter/assignment.rb

@@ -29,7 +29,7 @@ module Unparser
         def emit_right
           right = right_node
           if right
-            write(WS, O_ASN, WS)
+            write(WS, T_ASN, WS)
             visit(right)
           end
         end
@@ -105,7 +105,7 @@ module Unparser
         # @api private
         #
         def emit_right
-          write(WS, O_ASN, WS)
+          write(WS, T_ASN, WS)
           right = children.last
           case right.type
           when :array

data/lib/unparser/emitter/begin.rb

@@ -113,7 +113,7 @@ module Unparser
       #
       def emit_assignment
         return unless assignment
-        write(WS, O_ASR, WS)
+        write(WS, T_ASR, WS)
         visit(assignment)
       end
 
@@ -135,7 +135,6 @@ module Unparser
       def dispatch
         case children.length
         when 0
-          write(K_NIL)
         when 1
           visit(first_child)
         else

data/lib/unparser/emitter/binary.rb

@@ -7,8 +7,8 @@ module Unparser
       children :left, :right
 
       MAP = {
-        :or => O_OR,
-        :and => O_AND
+        :or => T_OR,
+        :and => T_AND
       }.freeze
 
     private

data/lib/unparser/emitter/block.rb

@@ -20,7 +20,7 @@ module Unparser
         visit(send)
         write(WS, K_DO)
         emit_block_arguments
-        indented { emit_body }
+        emit_body
         k_end
       end
 
@@ -33,21 +33,11 @@ module Unparser
       def emit_block_arguments
         return if arguments.children.empty?
         ws
-        parentheses(O_PIPE, O_PIPE) do
+        parentheses(T_PIPE, T_PIPE) do
           visit(arguments)
         end
       end
 
-      # Emit body
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_body
-        visit(body)
-      end
-
     end # Block
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/cbase.rb

@@ -14,7 +14,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(O_DCL)
+        write(T_DCL)
       end
 
     end # CBase

data/lib/unparser/emitter/class.rb

@@ -31,7 +31,7 @@ module Unparser
       #
       def emit_superclass
         return unless superclass
-        write(WS, O_LT, WS)
+        write(WS, T_LT, WS)
         visit(superclass)
       end
 
@@ -51,7 +51,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(K_CLASS, WS, O_DLT, WS)
+        write(K_CLASS, WS, T_DLT, WS)
         visit(object)
         emit_body
         k_end

data/lib/unparser/emitter/def.rb

@@ -37,16 +37,6 @@ module Unparser
         k_end
       end
 
-      # Emit body
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_body
-        indented { visit(body) }
-      end
-
       # Emit arguments
       #
       # @return [undefined]
@@ -98,7 +88,7 @@ module Unparser
         #
         def emit_name
           visit(subject)
-          write(O_DOT, name.to_s)
+          write(T_DOT, name.to_s)
         end
 
       end # Singleton

data/lib/unparser/emitter/empty.rb

@@ -0,0 +1,22 @@
+module Unparser
+  class Emitter
+
+    # Emitter for artifical empty node
+    class Empty < self
+
+      handle :empty
+
+    private
+
+      # Perform dispatch
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def dispatch
+      end
+
+    end
+  end
+end # Unparser

data/lib/unparser/emitter/not.rb

@@ -16,7 +16,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(O_NEG)
+        write(T_NEG)
         visit(body)
       end
 

data/lib/unparser/emitter/op_assign.rb

@@ -55,7 +55,7 @@ module Unparser
       # @api private
       #
       def emit_operator
-        write(WS, children[1].to_s, O_ASN, WS)
+        write(WS, children[1].to_s, T_ASN, WS)
       end
 
     end # OpAssign

data/lib/unparser/emitter/repetition.rb

@@ -24,7 +24,7 @@ module Unparser
       def dispatch
         write(MAP.fetch(node.type), WS)
         visit(condition)
-        indented { visit(body) }
+        emit_body
         k_end
       end
 

data/lib/unparser/emitter/send.rb

@@ -146,7 +146,7 @@ module Unparser
       def emit_receiver
         return unless first_child
         emit_unambiguous_receiver
-        write(O_DOT)
+        write(T_DOT)
       end
 
       # Test for unary operator implemented as method

data/lib/unparser/emitter/send/binary.rb

@@ -26,10 +26,10 @@ module Unparser
         #
         def emit_receiver
           emit_unambiguous_receiver
-          write(O_DOT) if parentheses?
+          write(T_DOT) if parentheses?
         end
 
-        # Emit operator 
+        # Emit operator
         #
         # @return [undefined]
         #

data/lib/unparser/emitter/send/index.rb

@@ -70,7 +70,7 @@ module Unparser
               delimited([index])
             end
             return if assignment.empty? # mlhs
-            write(WS, O_ASN, WS)
+            write(WS, T_ASN, WS)
             delimited(assignment)
           end
 

data/lib/unparser/emitter/splat.rb

@@ -16,7 +16,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(O_SPLAT)
+        write(T_SPLAT)
         visit(subject) if subject
       end
     end

data/lib/unparser/emitter/variable.rb

@@ -52,7 +52,7 @@ module Unparser
         return unless parent
         visit(parent)
         if parent.type != :cbase
-          write(O_DCL)
+          write(T_DCL)
         end
       end
     end

data/spec/integration/unparser/spike_spec.rb

@@ -6,7 +6,8 @@ describe Unparser, 'spike' do
   PARSERS = IceNine.deep_freeze(
     '1.8' => Parser::Ruby18,
     '1.9' => Parser::Ruby19,
-    '2.0' => Parser::Ruby20
+    '2.0' => Parser::Ruby20,
+    '2.1' => Parser::Ruby21
   )
 
   RUBIES = PARSERS.keys.freeze
@@ -44,7 +45,7 @@ describe Unparser, 'spike' do
   def self.assert_generates(ast, expected, versions = RUBIES)
     with_versions(versions) do |version, parser|
       it "should generate #{ast.inspect} as #{expected} under #{version}" do
-        unless ast.kind_of?(Parser::AST::Node)
+        if ast.kind_of?(String)
           ast = parser.parse(ast)
         end
         generated = Unparser.unparse(ast)
@@ -238,17 +239,50 @@ describe Unparser, 'spike' do
     assert_source 'a.foo'
     assert_source 'A.foo'
     assert_source 'foo[1]'
+    assert_source 'foo[*baz]'
     assert_source 'foo(1)'
     assert_source 'foo(bar)'
     assert_source 'foo(&block)'
     assert_source 'foo(*arguments)'
-    assert_source "foo do\n  nil\nend"
-    assert_source "foo(1) do\n  nil\nend"
-    assert_source "foo do |a, b|\n  nil\nend"
-    assert_source "foo do |a, *b|\n  nil\nend"
-    assert_source "foo do |a, *|\n  nil\nend"
-    assert_source "foo do\n  bar\nend"
-    assert_source 'foo.bar(*args)'
+    assert_source 'foo(*arguments)'
+    assert_source <<-RUBY
+      foo do
+      end
+    RUBY
+
+    assert_source <<-RUBY
+      foo(1) do
+        nil
+      end
+    RUBY
+
+    assert_source <<-RUBY
+      foo do |a, b|
+        nil
+      end
+    RUBY
+
+    assert_source <<-RUBY
+      foo do |a, *b|
+        nil
+      end
+    RUBY
+
+    assert_source <<-RUBY
+      foo do |a, *|
+        nil
+      end
+    RUBY
+
+    assert_source <<-RUBY
+      foo do
+        bar
+      end
+    RUBY
+
+    assert_source <<-RUBY
+      foo.bar(*args)
+    RUBY
 
     assert_source <<-RUBY
       foo.bar do |(a, b), c|
@@ -285,7 +319,7 @@ describe Unparser, 'spike' do
   end
 
   context 'begin; end' do
-    assert_generates s(:begin), 'nil'
+    assert_generates s(:begin), ''
 
     assert_source <<-RUBY
       foo
@@ -511,6 +545,11 @@ describe Unparser, 'spike' do
   context 'def' do
     context 'on instance' do
 
+      assert_source <<-RUBY
+        def foo
+        end
+      RUBY
+
       assert_source <<-RUBY
         def foo
           bar
@@ -547,6 +586,16 @@ describe Unparser, 'spike' do
         end
       RUBY
 
+      assert_source <<-RUBY, %w(2.1)
+        def foo(bar: 1)
+        end
+      RUBY
+
+      assert_source <<-RUBY, %w(2.0)
+        def foo(**bar)
+        end
+      RUBY
+
       assert_source <<-RUBY
         def foo(*)
           bar
@@ -601,16 +650,15 @@ describe Unparser, 'spike' do
           baz
         end
       RUBY
+    end
+
+    context 'on singleton' do
 
       assert_source <<-RUBY
         def self.foo
-          bar
-          baz
         end
       RUBY
-    end
 
-    context 'on singleton' do
 
       assert_source <<-RUBY
         def self.foo
@@ -618,6 +666,13 @@ describe Unparser, 'spike' do
         end
       RUBY
 
+      assert_source <<-RUBY
+        def self.foo
+          bar
+          baz
+        end
+      RUBY
+
       assert_source <<-RUBY
         def Foo.bar
           bar
@@ -745,6 +800,11 @@ describe Unparser, 'spike' do
   end
 
   context 'lambda' do
+    assert_source <<-RUBY
+      lambda do
+      end
+    RUBY
+
     assert_source <<-RUBY
       lambda do |a, b|
         a
@@ -897,6 +957,11 @@ describe Unparser, 'spike' do
   end
 
   context 'while' do
+    assert_source <<-RUBY
+      while false
+      end
+    RUBY
+
     assert_source <<-RUBY
       while false
         3
@@ -905,6 +970,11 @@ describe Unparser, 'spike' do
   end
 
   context 'until' do
+    assert_source <<-RUBY
+      until false
+      end
+    RUBY
+
     assert_source <<-RUBY
       until false
         3

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'unparser'
 require 'devtools/spec_helper'
 
+require 'parser/ruby21'
+
 module SpecHelper
   def s(type, *children)
     Parser::AST::Node.new(type, children)

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = 'unparser'
-  s.version  = '0.0.2'
+  s.version  = '0.0.3'
 
   s.authors  = ['Markus Schirp']
   s.email    = 'mbj@schir-dso.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -120,6 +120,7 @@ files:
 - lib/unparser/emitter/class.rb
 - lib/unparser/emitter/def.rb
 - lib/unparser/emitter/defined.rb
+- lib/unparser/emitter/empty.rb
 - lib/unparser/emitter/for.rb
 - lib/unparser/emitter/hookexe.rb
 - lib/unparser/emitter/if.rb