unparser 0.2.4 → 0.2.5

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'yaml'
 require 'pathname'
 require 'unparser'

data/spec/unit/unparser/buffer/append_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Buffer, '#append' do

data/spec/unit/unparser/buffer/append_without_prefix_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Buffer, '#append_without_prefix' do

data/spec/unit/unparser/buffer/capture_content_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Buffer, '#capture_content' do

data/spec/unit/unparser/buffer/content_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Buffer, '#content' do

data/spec/unit/unparser/buffer/fresh_line_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Buffer, '#fresh_line?' do

data/spec/unit/unparser/buffer/indent_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Buffer, '#indent' do

data/spec/unit/unparser/buffer/nl_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Buffer, '#nl' do

data/spec/unit/unparser/buffer/unindent_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Buffer, '#unindent' do

data/spec/unit/unparser/comments/consume_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Comments, '#consume' do

data/spec/unit/unparser/comments/take_all_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Comments, '#take_all' do

data/spec/unit/unparser/comments/take_before_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Comments, '#take_before' do

data/spec/unit/unparser/comments/take_eol_comments_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Unparser::Comments, '#take_eol_comments' do

data/spec/unit/unparser/emitter/class_methods/handle_spec.rb

@@ -1,8 +1,6 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
-describe Unparser::Emitter, '.handle' do
+describe Unparser::Emitter, '.handle', mutant_expression: 'Unparser::Emitter*' do
   subject { class_under_test.class_eval { handle :foo } }
 
   let(:class_under_test) do

data/spec/unit/unparser_spec.rb

@@ -1,15 +1,12 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
-describe Unparser do
+describe Unparser, mutant_expression: 'Unparser::Emitter*' do
   describe '.unparse' do
 
     PARSERS = IceNine.deep_freeze(
-      '1.9' => Parser::Ruby19,
-      '2.0' => Parser::Ruby20,
       '2.1' => Parser::Ruby21,
-      '2.2' => Parser::Ruby22
+      '2.2' => Parser::Ruby22,
+      '2.3' => Parser::Ruby23
     )
 
     RUBIES = PARSERS.keys.freeze
@@ -30,7 +27,7 @@ describe Unparser do
       ast, comments = parser.parse_with_comments(input)
       generated = Unparser.unparse(ast, comments)
       expect(generated).to eql(input)
-      generated_ast, _ = parser.parse_with_comments(generated)
+      generated_ast, _comments = parser.parse_with_comments(generated)
       expect(ast == generated_ast).to be(true)
     end
 
@@ -84,16 +81,16 @@ describe Unparser do
     end
 
     context 'kwargs' do
-      assert_source <<-RUBY, %w(2.1)
+      assert_source <<-RUBY
         def foo(bar:, baz:)
         end
       RUBY
 
-      assert_source <<-RUBY, %w(2.1)
+      assert_source <<-RUBY
         foo(**bar)
       RUBY
 
-      assert_source <<-RUBY, %w(2.1)
+      assert_source <<-RUBY
         def foo(bar:, baz: "value")
         end
       RUBY
@@ -112,46 +109,40 @@ describe Unparser do
         assert_generates '-10e10000000000', '-Float::INFINITY'
       end
 
-      # Rubies < 2.0 do not have these literals, parser can parse them
-      # but there are subtible differencies. Excluding them under those rubies.
-      if RUBY_VERSION >= '2.0'
-        context 'rational' do
-          assert_terminated '1r', %w(2.1)
-          assert_generates '1.0r', '1r', %w(2.1)
-          assert_generates '-0r', '0r', %w(2.1)
+      context 'rational' do
+        assert_terminated '1r'
+        assert_generates '1.0r', '1r'
+        assert_generates '-0r', '0r'
 
-          assert_terminated '1.5r', %w(2.1)
-          assert_terminated '1.3r', %w(2.1)
-        end
+        assert_terminated '1.5r'
+        assert_terminated '1.3r'
+      end
 
-        context 'complex' do
-          %w(
-            5i
-            -5i
-            0.6i
-            -0.6i
-            1000000000000000000000000000000i
-            1ri
-          ).each do |expression|
-            assert_terminated(expression, %w(2.1))
-          end
+      context 'complex' do
+        %w(
+          5i
+          -5i
+          0.6i
+          -0.6i
+          1000000000000000000000000000000i
+          1ri
+        ).each do |expression|
+          assert_terminated(expression)
         end
       end
 
       context 'string' do
-        assert_generates '?c', '"c"'
-        assert_generates '"foo" "bar"', '"foobar"'
-        assert_generates '%Q(foo"#{@bar})', '"foo\\"#{@bar}"'
+        assert_generates '?c',                 '"c"'
+        assert_generates '"foo" "bar"',        '"#{"foo"}#{"bar"}"'
+        assert_generates '"foo" "bar #{baz}"', '"#{"foo"}#{"#{"bar "}#{baz}"}"'
+        assert_generates '%Q(foo"#{@bar})',    '"#{"foo\\""}#{@bar}"'
+        assert_generates '"foo#{1}bar"',       '"#{"foo"}#{1}#{"bar"}"'
+        assert_generates '"\\\\#{}"',          '"#{"\\\\"}#{}"'
+        assert_generates '"#{}\#{}"',          '"#{}#{"\#{}"}"'
+        assert_generates '"\#{}#{}"',          '"#{"\#{}"}#{}"'
         assert_terminated '"\""'
-        assert_terminated '"foo#{1}bar"'
-        assert_terminated '"\"#{@a}"'
-        assert_terminated '"\\\\#{}"'
         assert_terminated '"foo bar"'
         assert_terminated '"foo\nbar"'
-        assert_terminated '"foo bar #{}"'
-        assert_terminated '"foo\nbar #{}"'
-        assert_terminated '"#{}\#{}"'
-        assert_terminated '"\#{}#{}"'
         # Within indentation
         assert_generates <<-'RUBY', <<-'RUBY'
           if foo
@@ -161,21 +152,17 @@ describe Unparser do
           end
         RUBY
           if foo
-            "\n  #{foo}\n  "
+            "#{"\n"}#{"  "}#{foo}#{"\n"}#{"  "}"
           end
         RUBY
-
-        assert_terminated '"foo#{@bar}"'
-        assert_terminated '"fo\no#{bar}b\naz"'
       end
 
       context 'execute string' do
-        assert_terminated '`foo`'
-        assert_terminated '`foo#{@bar}`'
-        assert_generates '%x(\))', '`)`'
-        # FIXME: Research into this one!
-        # assert_generates  '%x(`)', '`\``'
-        assert_terminated '`"`'
+        assert_generates '`foo`',        '`#{"foo"}`'
+        assert_generates '`foo#{@bar}`', '`#{"foo"}#{@bar}`'
+        assert_generates '%x(\))',       '`#{")"}`'
+        assert_generates '%x(`)',        '`#{"`"}`'
+        assert_generates '`"`',          '`#{"\\""}`'
       end
 
       context 'symbol' do
@@ -189,12 +176,10 @@ describe Unparser do
 
       context 'regexp' do
         assert_terminated '/foo/'
-        assert_terminated %q(/[\x80-\xff]+/), %w(1.9)
         assert_terminated %q(/[^-+',.\/:@[:alnum:]\[\]]+/)
         assert_terminated '/foo#{@bar}/'
         assert_terminated '/foo#{@bar}/imx'
-        assert_terminated '/#{"\x00"}/', %w(1.9)
-        assert_terminated '/#{"\u0000"}/', %w(2.0 2.1)
+        assert_terminated '/#{"\u0000"}/'
         assert_terminated "/\n/"
         assert_terminated '/\n/'
         assert_terminated "/\n/x"
@@ -212,11 +197,8 @@ describe Unparser do
       end
 
       context 'dynamic symbol' do
-        assert_terminated ':"foo#{bar}baz"'
-        assert_terminated ':"fo\no#{bar}b\naz"'
-        assert_terminated ':"#{bar}foo"'
-        assert_terminated ':"#{"foo"}"'
-        assert_terminated ':"foo#{bar}"'
+        assert_generates ':"foo#{bar}baz"', ':"#{"foo"}#{bar}#{"baz"}"'
+        assert_source ':"#{"foo"}"'
       end
 
       context 'irange' do
@@ -424,6 +406,11 @@ describe Unparser do
       end
     end
 
+    context 'conditional send (csend)' do
+      assert_terminated 'a&.b',    %w(2.3)
+      assert_terminated 'a&.b(c)', %w(2.3)
+    end
+
     context 'send' do
       assert_terminated 'foo'
       assert_terminated 'self.foo'
@@ -1088,22 +1075,11 @@ describe Unparser do
           end
         RUBY
 
-        assert_source <<-'RUBY', %w(1.9 2.0)
-          def foo(bar, baz = true, foo)
-            bar
-          end
-        RUBY
-
-        assert_source <<-'RUBY', %w(2.1)
+        assert_source <<-'RUBY'
           def foo(bar: 1)
           end
         RUBY
 
-        assert_source <<-'RUBY', %w(2.0)
-          def foo(**bar)
-          end
-        RUBY
-
         assert_source <<-'RUBY'
           def foo(*)
             bar

data/unparser.gemspec

@@ -1,29 +1,32 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |gem|
-  gem.name     = 'unparser'
-  gem.version  = '0.2.4'
+  gem.name        = 'unparser'
+  gem.version     = '0.2.5'
+
+  gem.authors     = ['Markus Schirp']
+  gem.email       = 'mbj@schirp-dso.com'
+  gem.summary     = 'Generate equivalent source for parser gem AST nodes'
 
-  gem.authors  = ['Markus Schirp']
-  gem.email    = 'mbj@schir-dso.com'
-  gem.summary  = 'Generate equivalent source for parser gem AST nodes'
   gem.description = gem.summary
-  gem.homepage = 'http://github.com/mbj/unparser'
-  gem.license  = 'MIT'
+  gem.homepage    = 'http://github.com/mbj/unparser'
+  gem.license     = 'MIT'
 
   gem.files            = `git ls-files`.split("\n")
   gem.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
-  gem.require_paths    = %w(lib)
-  gem.extra_rdoc_files = %w(README.md)
-  gem.executables      = [ 'unparser' ]
+  gem.require_paths    = %w[lib]
+  gem.extra_rdoc_files = %w[README.md]
+  gem.executables      = %w[unparser]
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.1'
 
-  gem.add_dependency('parser',        '~> 2.2.2')
-  gem.add_dependency('procto',        '~> 0.0.2')
-  gem.add_dependency('concord',       '~> 0.1.5')
+  gem.add_dependency('abstract_type', '~> 0.0.7')
   gem.add_dependency('adamantium',    '~> 0.2.0')
   gem.add_dependency('equalizer',     '~> 0.0.9')
-  gem.add_dependency('abstract_type', '~> 0.0.7')
   gem.add_dependency('diff-lcs',      '~> 1.2.5')
+  gem.add_dependency('concord',       '~> 0.1.5')
+  gem.add_dependency('parser',        '~> 2.3.0')
+  gem.add_dependency('procto',        '~> 0.0.2')
+
+  gem.add_development_dependency('anima',    '~> 0.3.0')
+  gem.add_development_dependency('devtools', '~> 0.1.3')
+  gem.add_development_dependency('morpher',  '~> 0.2.6')
 end

metadata

@@ -1,43 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parser
+  name: abstract_type
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
-  name: procto
+  name: adamantium
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: equalizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: concord
   requirement: !ruby/object:Gem::Requirement
@@ -53,63 +81,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
-  name: adamantium
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: equalizer
+  name: procto
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: abstract_type
+  name: anima
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
-  type: :runtime
+        version: 0.3.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: diff-lcs
+  name: devtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
-  type: :runtime
+        version: 0.1.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: morpher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.6
 description: Generate equivalent source for parser gem AST nodes
-email: mbj@schir-dso.com
+email: mbj@schirp-dso.com
 executables:
 - unparser
 extensions: []
@@ -119,14 +161,11 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Changelog.md
 - Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
-- TODO
 - bin/unparser
 - circle.yml
 - config/devtools.yml
@@ -189,6 +228,7 @@ files:
 - lib/unparser/emitter/send/arguments.rb
 - lib/unparser/emitter/send/attribute_assignment.rb
 - lib/unparser/emitter/send/binary.rb
+- lib/unparser/emitter/send/conditional.rb
 - lib/unparser/emitter/send/index.rb
 - lib/unparser/emitter/send/regular.rb
 - lib/unparser/emitter/send/unary.rb
@@ -230,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -238,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
@@ -260,3 +300,4 @@ 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: