unparser 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fbc42b2270dfea79002ff8d2bf543618237f65e
-  data.tar.gz: 992ce6239c5de55bf3cb5f3b182a2e6d8368ae06
+  metadata.gz: 51f39ff818f38c725475d8e6970391c4f7a771a1
+  data.tar.gz: 6838c26d95b6bf42ecf19e9b1874c39223d00d6a
 SHA512:
-  metadata.gz: 90e80a39138d2cf49d9be5e303f9255be55ff8200ddb1dcb5181951ddce109816749e8cd72388a5a935b966ab6d67a23175eb714fa5038dde99cb846a547a6f4
-  data.tar.gz: f51ab9def69f2641e819f1c57741d808f61f25cfc2738257ea846daff6a1a4562683e9972d8fde4f58b023fdc0e1edf1a03fe996157c89bc9efe5a2aa940f75f
+  metadata.gz: e71bf25de61e37a461f9f09d3b1600070d84c7458d9717c11ce768d5eafd3881a5ea1eca3e8926d0704dbc06862d4d1bfb718f335fb2e9a23d9362a3797a0bea
+  data.tar.gz: 2df198d4fd9b6807af07b7a45f5a781f1b969a4b716fb6ef407f7c3cdca0613b9b66fbf84eddfba9b73b59e81e4b076f86a08f4df823b9e80a46aa3a6b4b799f

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.1.3
   - rbx-2
 matrix:
   include:

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.1.15 2014-09-24
+
+* Handle syntax edge case for MRI 2.1.3 parser.
+
 # v0.1.14 2014-06-15
 
 * Fix emitter to correctly unparse foo[] = 1

data/Gemfile.devtools

@@ -2,8 +2,8 @@
 
 group :development do
   gem 'rake',       '~> 10.3.2'
-  gem 'rspec',      '~> 2.99.0'
-  gem 'rspec-core', '~> 2.99.0'
+  gem 'rspec',      '~> 3.1.0'
+  gem 'rspec-its',  '~> 1.0.1'
   gem 'yard',       '~> 0.8.7.4'
 
   platform :rbx do
@@ -38,13 +38,13 @@ group :metrics do
   gem 'flay',      '~> 2.5.0'
   gem 'flog',      '~> 4.2.1'
   gem 'reek',      '~> 1.3.7'
-  gem 'rubocop',   '~> 0.23.0'
+  gem 'rubocop',   '~> 0.26.1'
   gem 'simplecov', '~> 0.7.1'
   gem 'yardstick', '~> 0.9.9'
 
   platforms :mri do
-    gem 'mutant',       '~> 0.5.19'
-    gem 'mutant-rspec', '~> 0.5.19'
+    gem 'mutant',       '~> 0.6.3'
+    gem 'mutant-rspec', '~> 0.6.3'
   end
 
   platforms :ruby_19, :ruby_20 do

data/README.md

@@ -5,7 +5,6 @@ unparser
 [![Dependency Status](https://gemnasium.com/mbj/unparser.png)](https://gemnasium.com/mbj/unparser)
 [![Code Climate](https://codeclimate.com/github/mbj/unparser.png)](https://codeclimate.com/github/mbj/unparser)
 [![Gem Version](https://img.shields.io/gem/v/unparser.svg)](https://rubygems.org/gems/unparser)
-[![Gittip](https://img.shields.io/gittip/mbj.svg)](https://gittip.com/mbj)
 
 Generate equivalent source for ASTs from whitequarks [parser](https://github.com/whitequark/parser).
 

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 701
+total_score: 698

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 21.3
+threshold: 22.1

data/lib/unparser/ast.rb

@@ -21,11 +21,7 @@ module Unparser
     #
     # @param [Parser::AST::Node] node
     #
-    # @return [true]
-    #   if local variable scope must NOT be reset
-    #
-    # @return [false]
-    #   otherwise
+    # @return [Boolean]
     #
     # @api private
     #
@@ -37,11 +33,7 @@ module Unparser
     #
     # @param [Parser::AST::Node] node
     #
-    # @return [true]
-    #   if local variable scope must NOT be reset
-    #
-    # @return [false]
-    #   otherwise
+    # @return [Boolean]
     #
     # @api private
     #
@@ -132,7 +124,7 @@ module Unparser
       # @api private
       #
       def type(type)
-        select { |node| node.type == type }
+        select { |node| node.type.equal?(type) }
       end
 
       # Return frozne set of objects

data/lib/unparser/ast/local_variable_scope.rb

@@ -28,11 +28,7 @@ module Unparser
       #
       # @param [Parser::AST::Node] node
       #
-      # @return [true]
-      #   if local variable was firstly introduced in body
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #
@@ -48,11 +44,7 @@ module Unparser
       # @param [Parser::AST::Node] node
       # @param [Symbol] name
       #
-      # @return [true]
-      #   if local variable is defined
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #
@@ -89,11 +81,7 @@ module Unparser
       # @param [Parser::AST::Node] node
       #   if block given
       #
-      # @return [true]
-      #   if found an matched
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #

data/lib/unparser/buffer.rb

@@ -27,7 +27,7 @@ module Unparser
     # @api private
     #
     def append(string)
-      if @content[-1] == NL
+      if @content[-1].eql?(NL)
         prefix
       end
       write(string)
@@ -82,16 +82,12 @@ module Unparser
 
     # Test for a fresh line
     #
-    # @return [true]
-    #   if the buffer content ends with a fresh line
-    #
-    # @return [false]
-    #   otherwise
+    # @return [Boolean]
     #
     # @api private
     #
     def fresh_line?
-      @content.empty? || @content[-1] == NL
+      @content.empty? || @content[-1].eql?(NL)
     end
 
     # Return content of buffer

data/lib/unparser/cli.rb

@@ -128,7 +128,7 @@ module Unparser
       if @start_with
         reject = true
         @sources.reject do |source|
-          if reject && source == @start_with
+          if reject && source.eql?(@start_with)
             reject = false
           end
 

data/lib/unparser/cli/source.rb

@@ -36,15 +36,12 @@ module Unparser
 
       # Test if source could be unparsed successfully
       #
-      # @return [true]
-      #   if source could be unparsed successfully
-      #
-      # @return [false]
+      # @return [Boolean]
       #
       # @api private
       #
       def success?
-        generated.success? && original_ast && generated_ast && original_ast == generated_ast
+        generated.success? && original_ast && generated_ast && original_ast.eql?(generated_ast)
       end
 
       # Return error report

data/lib/unparser/emitter.rb

@@ -337,7 +337,7 @@ module Unparser
     def emit_comments(comments)
       max = comments.size - 1
       comments.each_with_index do |comment, index|
-        if comment.type == :document
+        if comment.type.equal?(:document)
           buffer.append_without_prefix(comment.text.chomp)
         else
           write(comment.text)

data/lib/unparser/emitter/argument.rb

@@ -30,7 +30,7 @@ module Unparser
 
       handle :args
 
-      SHADOWARGS = ->(node) { node.type == :shadowarg }.freeze
+      SHADOWARGS = ->(node) { node.type.equal?(:shadowarg) }.freeze
 
     private
 
@@ -55,7 +55,7 @@ module Unparser
       #
       def normal_arguments
         children.reject(&SHADOWARGS).map do |child|
-          if child.type == :mlhs
+          if child.type.equal?(:mlhs)
             Parser::AST::Node.new(:arg_expr, [child])
           else
             child

data/lib/unparser/emitter/assignment.rb

@@ -132,7 +132,7 @@ module Unparser
 
       private
 
-        NO_COMMA = [:splat, :restarg, :mlhs]
+        NO_COMMA = [:splat, :restarg, :mlhs].to_set.freeze
 
         # Perform dispatch
         #
@@ -141,11 +141,11 @@ module Unparser
         # @api private
         #
         def dispatch
-          conditional_parentheses(parent_type == :mlhs) do
+          conditional_parentheses(parent_type.equal?(:mlhs)) do
             delimited(children)
           end
 
-          write(',') if children.one? && !NO_COMMA.include?(children.first.type) && parent_type != :arg_expr
+          write(',') if children.one? && !NO_COMMA.include?(children.first.type) && !parent_type.equal?(:arg_expr)
         end
 
       end # MLHS

data/lib/unparser/emitter/begin.rb

@@ -27,6 +27,16 @@ module Unparser
 
         NON_EMPTY_PARENS = [:root, :dstr, :dyn_str_body].to_set.freeze
 
+        # Test if begin is terminated
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def terminated?
+          children.empty? && !NON_EMPTY_PARENS.include?(parent_type)
+        end
+
       private
 
         # Perform dispatch
@@ -36,10 +46,10 @@ module Unparser
         # @api private
         #
         def dispatch
-          if children.empty? && !NON_EMPTY_PARENS.include?(parent_type)
+          if terminated?
             write('()')
           else
-            conditional_parentheses(parent_type == :optarg) do
+            conditional_parentheses(parent_type.equal?(:optarg)) do
               emit_inner
             end
           end

data/lib/unparser/emitter/def.rb

@@ -97,11 +97,7 @@ module Unparser
 
         # Test if subject needs parentheses
         #
-        # @return [true]
-        #   if subject needs parentheses
-        #
-        # @return [false]
-        #   otherwise
+        # @return [Boolean]
         #
         # @api private
         #

data/lib/unparser/emitter/flow_modifier.rb

@@ -22,7 +22,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        conditional_parentheses((parent_type == :or || parent_type == :and) && children.any?) do
+        conditional_parentheses((parent_type.equal?(:or) || parent_type.equal?(:and)) && children.any?) do
           write(MAP.fetch(node.type))
           emit_arguments if children.any?
         end

data/lib/unparser/emitter/if.rb

@@ -27,11 +27,7 @@ module Unparser
 
       # Test for postcondition
       #
-      # @return [true]
-      #   if node must be emitted in postcondition style
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #
@@ -69,13 +65,9 @@ module Unparser
         k_end
       end
 
-      # Test for unless
-      #
-      # @return [true]
-      #   if to emit as unless
+      # Test if AST can be emitted as unless
       #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #

data/lib/unparser/emitter/literal/dynamic.rb

@@ -26,16 +26,12 @@ module Unparser
 
         # Test for interpolation
         #
-        # @return [true]
-        #   if dynamic component was interpolated
-        #
-        # @return [false]
-        #   otherwise
+        # @return [Boolean]
         #
         # @api private
         #
         def interpolation?
-          children.any? { |child| child.type != :str }
+          children.any? { |child| !child.type.equal?(:str) }
         end
 
         # Return dynamic body

data/lib/unparser/emitter/literal/dynamic_body.rb

@@ -62,7 +62,7 @@ module Unparser
         end
 
         pairs = Parser::Lexer::ESCAPES.invert.map do |key, value|
-          [key, "\\#{value}"] unless key == WS
+          [key, "\\#{value}"] unless key.eql?(WS)
         end.compact
 
         pairs << ['#{', '\#{']

data/lib/unparser/emitter/literal/hash.rb

@@ -7,6 +7,23 @@ module Unparser
       # Abstract namespace class for hash pair emitters
       class HashPair < self
 
+        children :key, :value
+
+      private
+
+        # Emit value
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_value
+          value_type = value.type
+          conditional_parentheses(value_type.equal?(:if)) do
+            visit_terminated(value)
+          end
+        end
+
         # Pair emitter that emits hash-rocket separated key values
         class Rocket < self
           HASHROCKET = ' => '.freeze
@@ -22,7 +39,9 @@ module Unparser
           # @api private
           #
           def dispatch
-            delimited(children, HASHROCKET)
+            visit(key)
+            write(HASHROCKET)
+            emit_value
           end
 
         end # Rocket
@@ -33,8 +52,6 @@ module Unparser
 
           handle :pair_colon
 
-          children :key, :value
-
         private
 
           # Perform dispatch
@@ -45,7 +62,7 @@ module Unparser
           #
           def dispatch
             write(key.children.first.to_s, COLON)
-            visit_terminated(value)
+            emit_value
           end
 
         end # Colon
@@ -80,11 +97,11 @@ module Unparser
         #
         def effective_body
           children.map do |pair|
-            if pair.type == :kwsplat
+            if pair.type.equal?(:kwsplat)
               pair
             else
               key, _value = *pair
-              if key.type == :sym && key.children.first.to_s =~ BAREWORD
+              if key.type.equal?(:sym) && key.children.first.to_s =~ BAREWORD
                 n(:pair_colon, pair.children)
               else
                 n(:pair_rocket, pair.children)

data/lib/unparser/emitter/repetition.rb

@@ -58,13 +58,9 @@ module Unparser
         end
       end
 
-      # Test for postcontrol
+      # Test if node must be emitted in postcontrol form
       #
-      # @return [true]
-      #   if repetition must be emitted as post control
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #

data/lib/unparser/emitter/rescue.rb

@@ -37,16 +37,12 @@ module Unparser
 
       # Test if rescue node ist standalone
       #
-      # @return [true]
-      #   if rescue node is standalone
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #
       def standalone?
-        if parent_type == :ensure
+        if parent_type.equal?(:ensure)
           !parent.node.children.first.equal?(node)
         else
           !EMBEDDED_TYPES.include?(parent_type)

data/lib/unparser/emitter/send.rb

@@ -105,7 +105,7 @@ module Unparser
       # @api private
       #
       def binary_operator?
-        BINARY_OPERATORS.include?(selector) && arguments.one? && arguments.first.type != :splat
+        BINARY_OPERATORS.include?(selector) && arguments.one? && !arguments.first.type.equal?(:splat)
       end
 
       # Emit selector
@@ -141,15 +141,12 @@ module Unparser
       # @api private
       #
       def assignment?
-        string_selector[-1] == ASSIGN_SUFFIX
+        string_selector[-1].eql?(ASSIGN_SUFFIX)
       end
 
       # Test for attribute assignment
       #
-      # @return [true]
-      #   if node represetns and attribute assignment
-      #
-      # @return [false]
+      # @return [Boolean]
       #
       # @api private
       #
@@ -159,11 +156,7 @@ module Unparser
 
       # Test for empty arguments
       #
-      # @return [true]
-      #   if arguments are empty
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #
@@ -198,11 +191,7 @@ module Unparser
 
       # Test for local variable clash
       #
-      # @return [true]
-      #   if selector clashes with a local variable
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #

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

@@ -32,7 +32,7 @@ module Unparser
         def effective_arguments
           last = children.length - 1
           children.each_with_index.map do |argument, index|
-            if last == index && argument.type == :hash && argument.children.any?
+            if last.equal?(index) && argument.type.equal?(:hash) && argument.children.any?
               argument.updated(:hash_body)
             else
               argument

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

@@ -22,7 +22,7 @@ module Unparser
         def dispatch
           name = selector
           write(MAP.fetch(name, name).to_s)
-          if receiver.type == :int && selector == :'+@' && receiver.children.first > 0
+          if receiver.type.equal?(:int) && selector.equal?(:'+@') && receiver.children.first > 0
             write('+')
           end
 

data/lib/unparser/emitter/variable.rb

@@ -53,7 +53,7 @@ module Unparser
       def emit_scope
         return unless scope
         visit(scope)
-        write(T_DCL) if scope.type != :cbase
+        write(T_DCL) unless scope.type.equal?(:cbase)
       end
     end
 

data/lib/unparser/preprocessor.rb

@@ -130,7 +130,7 @@ module Unparser
       #
       def collapsed_children
         chunked_children.each_with_object([]) do |(type, nodes), aggregate|
-          if type == :str
+          if type.equal?(:str)
             aggregate << s(:str, nodes.map { |node| node.children.first }.join)
           else
             aggregate.concat(nodes)
@@ -163,7 +163,7 @@ module Unparser
       # @api private
       #
       def result
-        if children.all? { |child| child.type == :str }
+        if children.all? { |child| child.type.equal?(:str) }
           node.updated(:str, [children.map { |child| child.children.first }.join])
         else
           node

data/spec/unit/unparser_spec.rb

@@ -215,6 +215,9 @@ describe Unparser do
         assert_source '{ 1 => 2 }'
         assert_source '{ 1 => 2, 3 => 4 }'
 
+        # special case for 2.1.3
+        assert_source "{ foo: (if true\nend) }"
+
         context 'with symbol keys' do
           assert_source '{ a: (1 rescue(foo)), b: 2 }'
           assert_source '{ a: 1, b: 2 }'

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name     = 'unparser'
-  gem.version  = '0.1.14'
+  gem.version  = '0.1.15'
 
   gem.authors  = ['Markus Schirp']
   gem.email    = 'mbj@schir-dso.com'
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency('parser',        '~> 2.1')
+  gem.add_dependency('parser',        '~> 2.2.0.pre.4')
   gem.add_dependency('procto',        '~> 0.0.2')
   gem.add_dependency('concord',       '~> 0.1.5')
   gem.add_dependency('adamantium',    '~> 0.2.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.2.0.pre.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.2.0.pre.4
 - !ruby/object:Gem::Dependency
   name: procto
   requirement: !ruby/object:Gem::Requirement
@@ -248,4 +248,3 @@ test_files:
 - spec/unit/unparser/comments/take_eol_comments_spec.rb
 - spec/unit/unparser/emitter/class_methods/handle_spec.rb
 - spec/unit/unparser_spec.rb
-has_rdoc: