Add support for parser 2.3

mbj · mbj · commit db433bc45940 · 2016-01-23T23:57:52.000Z
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,8 @@
+# v0.2.6 2016-01-xx
+
+* Add support for ruby 2.3
+* Bump parser dependency to ~>2.3.0
+
 # v0.2.5 2015-05-30
 
 * Drop support for ruby < 2.1
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'mutant', git: 'https://github.com/mbj/mutant.git', branch: 'feature/parser-2-3'
diff --git a/config/devtools.yml b/config/devtools.yml
@@ -1,2 +1,2 @@
 ---
-unit_test_timeout: 1.0
+unit_test_timeout: 2.0
diff --git a/config/flay.yml b/config/flay.yml
@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 663
+total_score: 673
diff --git a/lib/unparser.rb b/lib/unparser.rb
@@ -56,6 +56,7 @@ def self.unparse(node, comment_array = [])
 require 'unparser/emitter/send/binary'
 require 'unparser/emitter/send/index'
 require 'unparser/emitter/send/regular'
+require 'unparser/emitter/send/conditional'
 require 'unparser/emitter/send/arguments'
 require 'unparser/emitter/send/attribute_assignment'
 require 'unparser/emitter/block'
diff --git a/lib/unparser/cli.rb b/lib/unparser/cli.rb
@@ -90,7 +90,7 @@ def exit_status
       effective_sources.each do |source|
         next if @ignore.include?(source)
         process_source(source)
-        break unless @success if @fail_fast
+        break if @fail_fast && !@success
       end
 
       @success ? EXIT_SUCCESS : EXIT_FAILURE
diff --git a/lib/unparser/emitter.rb b/lib/unparser/emitter.rb
@@ -1,6 +1,9 @@
 module Unparser
 
   # Emitter base class
+  #
+  # buggy, argument values are sends to self
+  # rubocop:disable CircularArgumentReference
   class Emitter
     include Adamantium::Flat, AbstractType, Constants, NodeHelpers
     include Concord.new(:node, :parent)
diff --git a/lib/unparser/emitter/send/conditional.rb b/lib/unparser/emitter/send/conditional.rb
@@ -0,0 +1,38 @@
+module Unparser
+  class Emitter
+    class Send
+      # Emitter for "conditional" receiver&.selector(arguments...) case
+      class Conditional < self
+        include Terminated
+
+        handle :csend
+
+      private
+
+        # Perform regular dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          emit_receiver
+          emit_selector
+          emit_arguments
+        end
+
+        # Emit receiver
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_receiver
+          visit(receiver)
+          write(T_AMP, T_DOT)
+        end
+
+      end # Regular
+    end # Send
+  end # Emitter
+end # Unparser
diff --git a/spec/unit/unparser_spec.rb b/spec/unit/unparser_spec.rb
@@ -5,7 +5,8 @@
 
     PARSERS = IceNine.deep_freeze(
       '2.1' => Parser::Ruby21,
-      '2.2' => Parser::Ruby22
+      '2.2' => Parser::Ruby22,
+      '2.3' => Parser::Ruby23
     )
 
     RUBIES = PARSERS.keys.freeze
@@ -405,6 +406,11 @@ def foo
       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'
diff --git a/unparser.gemspec b/unparser.gemspec
@@ -1,10 +1,11 @@
 Gem::Specification.new do |gem|
   gem.name        = 'unparser'
-  gem.version     = '0.2.4'
+  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.description = gem.summary
   gem.homepage    = 'http://github.com/mbj/unparser'
   gem.license     = 'MIT'
@@ -22,10 +23,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency('equalizer',     '~> 0.0.9')
   gem.add_dependency('diff-lcs',      '~> 1.2.5')
   gem.add_dependency('concord',       '~> 0.1.5')
-  gem.add_dependency('parser',        '~> 2.2.2')
+  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.1')
-  gem.add_development_dependency('morpher',  '~> 0.2.5')
+  gem.add_development_dependency('devtools', '~> 0.1.3')
+  gem.add_development_dependency('morpher',  '~> 0.2.6')
 end

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 source 'https://rubygems.org'
 gemspec
++
 +gem 'mutant', git: 'https://github.com/mbj/mutant.git', branch: 'feature/parser-2-3'
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-unit_test_timeout: 1.0`
	`2`	`+unit_test_timeout: 2.0`