ruby_parser 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f40dfeee0e474212f0bfb56c32bfa6ac2c15345
-  data.tar.gz: 3b138c15fc4ccea9cdaeb78a29d735b4ce044075
+  metadata.gz: 1f350ff7bf3488d00b47a3600fd72700fdd74f9f
+  data.tar.gz: 33372b3af380e0a55e49b67d7679175a9e853cf1
 SHA512:
-  metadata.gz: eab6b5f51918c84302a104d5f9f6957c4848478a2a52c63a013e50dde8e447d88f384721c699a5fdb2e104fa260c3cfc8ab4af135fccc0a320a09ebc2e876917
-  data.tar.gz: 9dd361bb654390734c54292fe533291c583a202ffde25b417e133abc03cc96b143a0df5669aa4158c4b0938a3aa782d727452778648681eb6b3a2e2495b8358a
+  metadata.gz: ccba7c96b1ee7a9ea715ff77337cbdaca1b33f3ccf6f0125e54d8e0d3b689ffb0e9bf3e04c2e2f9952f887b111a1cc999d8f1eeb07ed0e18b07e04bcda61787c
+  data.tar.gz: a744bab946600077d2d6b770cf9bcec6c9f9ad197f8224d2575caf73c4ca0c365d96672cb885ad90019a594678db11487827b2ecc12c00cc55100da859fce85b

data.tar.gz.sig

@@ -1,3 +1 @@
-��"�� ����%{e��磵F�
Ne
-G��t��X?��T����^�jd�Ӳ���l��5�7K�Y�y"#����:�ْ����@N�
-4�Z�^]�-N��������
+r)
NG)�W؊��"���������w���*k��nIâk&�?8������N�����{�h��.�*�v��j=D��	�WLטw&X��
�A""C�*�j�~Y����]C5%�I~Y�ã�R�2Y�z?,A�j�d%��/�s�j6w�'����riS�	�-���B��x��M�{E�|��M�Q�h���J}b�]պ|��5Nh�N��LQ����PZ�h�=uݤR*w��܏;����e9�(Y��ɧ

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 3.10.1 / 2017-07-21
+
+* 2 bug fixes:
+
+  * Fixed identification of parser version whether Ruby##Parser or Parser::V##.
+  * Fixed squiggly heredoc lexing when using 24 parser.
+
 === 3.10.0 / 2017-07-17
 
 * 4 minor enhancements:

data/lib/ruby_lexer.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+$DEBUG = true if ENV["DEBUG"]
+
 class RubyLexer
 
   # :stopdoc:
@@ -216,7 +218,7 @@ class RubyLexer
 
     string_content = string_buffer.join.delete("\r")
 
-    string_content = heredoc_dedent(string_content) if content_indent && ruby23?
+    string_content = heredoc_dedent(string_content) if content_indent && ruby23plus?
 
     return :tSTRING_CONTENT, string_content
   end
@@ -265,7 +267,7 @@ class RubyLexer
     self.string_buffer = []
 
     heredoc_indent_mods = '-'
-    heredoc_indent_mods += '\~' if ruby23?
+    heredoc_indent_mods += '\~' if ruby23plus?
 
     case
     when scan(/([#{heredoc_indent_mods}]?)([\'\"\`])(.*?)\2/) then
@@ -1175,8 +1177,8 @@ class RubyLexer
     parser.class.version >= 22
   end
 
-  def ruby23?
-    Ruby23Parser === parser
+  def ruby23plus?
+    parser.class.version >= 23
   end
 
   def process_string # TODO: rewrite / remove

data/lib/ruby_parser.rb

@@ -17,7 +17,7 @@ class RubyParser
     end
 
     def self.version
-      Parser > self and self.name[/V(\d+)$/, 1].to_i
+      Parser > self and self.name[/(?:V|Ruby)(\d+)/, 1].to_i
     end
   end
 

data/lib/ruby_parser_extras.rb

@@ -7,7 +7,7 @@ require "rp_extensions"
 require "rp_stringscanner"
 
 module RubyParserStuff
-  VERSION = "3.10.0"
+  VERSION = "3.10.1"
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments

data/test/test_ruby_parser.rb

@@ -3412,6 +3412,13 @@ module TestRubyParserShared23Plus
     assert_parse rb, pt
   end
 
+  def test_heredoc_squiggly
+    rb = "a = <<~\"EOF\"\n  blah blah\n  EOF\n\n"
+    pt = s(:lasgn, :a, s(:str, "blah blah\n"))
+
+    assert_parse rb, pt
+  end
+
   def test_slashy_newlines_within_string
     rb = %(puts "hello\\
  my\\
@@ -3440,6 +3447,8 @@ class TestRubyParser < Minitest::Test
   def test_cls_version
     assert_equal 18, RubyParser::V18.version
     assert_equal 23, RubyParser::V23.version
+    assert_equal 24, RubyParser::V24.version
+    assert_equal 24, Ruby24Parser.version
     refute RubyParser::Parser.version
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
   fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor