parser 1.4.2 → 2.0.0.beta1

data/test/test_source_comment.rb

@@ -0,0 +1,34 @@
+require 'helper'
+
+class TestSourceComment < MiniTest::Unit::TestCase
+  def setup
+    @buf = Parser::Source::Buffer.new('(string)')
+    @buf.source = "# foo\n=begin foo\nbar\n=end baz\n"
+  end
+
+  def range(s, e)
+    Parser::Source::Range.new(@buf, s, e)
+  end
+
+  def test_initialize
+    comment = Parser::Source::Comment.new(range(0, 5))
+    assert comment.frozen?
+  end
+
+  def test_text
+    comment = Parser::Source::Comment.new(range(0, 5))
+    assert_equal '# foo', comment.text
+  end
+
+  def test_inline
+    comment = Parser::Source::Comment.new(range(0, 5))
+    assert_equal :inline, comment.type
+    assert comment.inline?
+  end
+
+  def test_document
+    comment = Parser::Source::Comment.new(range(6, 25))
+    assert_equal :document, comment.type
+    assert comment.document?
+  end
+end

data/test/test_source_comment_associator.rb

@@ -0,0 +1,48 @@
+require 'helper'
+require 'parser/ruby18'
+
+class TestSourceCommentAssociator < MiniTest::Unit::TestCase
+  def test_associate
+    parser = Parser::Ruby18.new
+
+    buffer = Parser::Source::Buffer.new('(comments)')
+    buffer.source = <<-END
+# Class comment
+# another class comment
+class Foo
+  # attr_accessor comment
+  attr_accessor :foo
+
+  # method comment
+  def bar
+    # expr comment
+    1 + # intermediate comment
+      2
+    # stray comment
+  end
+end
+    END
+
+    ast, comments = parser.parse_with_comments(buffer)
+    associations  = Parser::Source::Comment.associate(ast, comments)
+
+    klass_node         = ast
+    attr_accessor_node = ast.children[2].children[0]
+    method_node        = ast.children[2].children[1]
+    expr_node          = method_node.children[2]
+    intermediate_node  = expr_node.children[2]
+
+    assert_equal 5, associations.size
+    assert_equal ['# Class comment', '# another class comment'],
+                 associations[klass_node].map(&:text)
+    assert_equal ['# attr_accessor comment'],
+                 associations[attr_accessor_node].map(&:text)
+    assert_equal ['# method comment'],
+                 associations[method_node].map(&:text)
+    assert_equal ['# expr comment'],
+                 associations[expr_node].map(&:text)
+    assert_equal ['# intermediate comment'],
+                 associations[intermediate_node].map(&:text)
+  end
+
+end

data/test/test_source_range.rb

@@ -2,25 +2,25 @@ require 'helper'
 
 class TestSourceRange < MiniTest::Unit::TestCase
   def setup
-    @sfile = Parser::Source::Buffer.new('(string)')
-    @sfile.source = "foobar\nbaz"
+    @buf = Parser::Source::Buffer.new('(string)')
+    @buf.source = "foobar\nbaz"
   end
 
   def test_initialize
-    sr = Parser::Source::Range.new(@sfile, 1, 2)
+    sr = Parser::Source::Range.new(@buf, 1, 2)
     assert_equal 1, sr.begin_pos
     assert_equal 2, sr.end_pos
     assert sr.frozen?
   end
 
   def test_size
-    sr = Parser::Source::Range.new(@sfile, 1, 3)
+    sr = Parser::Source::Range.new(@buf, 1, 3)
     assert_equal 2, sr.size
   end
 
   def test_join
-    sr1 = Parser::Source::Range.new(@sfile, 1, 2)
-    sr2 = Parser::Source::Range.new(@sfile, 5, 8)
+    sr1 = Parser::Source::Range.new(@buf, 1, 2)
+    sr2 = Parser::Source::Range.new(@buf, 5, 8)
     sr = sr1.join(sr2)
 
     assert_equal 1, sr.begin_pos
@@ -28,24 +28,24 @@ class TestSourceRange < MiniTest::Unit::TestCase
   end
 
   def test_line
-    sr = Parser::Source::Range.new(@sfile, 7, 8)
+    sr = Parser::Source::Range.new(@buf, 7, 8)
     assert_equal 2, sr.line
   end
 
   def test_source_line
-    sr = Parser::Source::Range.new(@sfile, 7, 8)
+    sr = Parser::Source::Range.new(@buf, 7, 8)
     assert_equal "baz", sr.source_line
   end
 
   def test_columns
-    sr = Parser::Source::Range.new(@sfile, 7, 8)
+    sr = Parser::Source::Range.new(@buf, 7, 8)
     assert_equal 0, sr.begin.column
     assert_equal 1, sr.end.column
     assert_equal 0...1, sr.column_range
   end
 
   def test_begin_end
-    sr = Parser::Source::Range.new(@sfile, 1, 5)
+    sr = Parser::Source::Range.new(@buf, 1, 5)
 
     sr_beg = sr.begin
     assert_equal 1, sr_beg.begin_pos
@@ -56,16 +56,22 @@ class TestSourceRange < MiniTest::Unit::TestCase
     assert_equal 5, sr_end.end_pos
   end
 
-  def test_to_source
-    sr = Parser::Source::Range.new(@sfile, 0, 3)
-    assert_equal "foo", sr.to_source
+  def test_source
+    sr = Parser::Source::Range.new(@buf, 0, 3)
+    assert_equal "foo", sr.source
 
-    sr_multi = Parser::Source::Range.new(@sfile, 0, 10)
-    assert_equal "foobar\nbaz", sr_multi.to_source
+    sr_multi = Parser::Source::Range.new(@buf, 0, 10)
+    assert_equal "foobar\nbaz", sr_multi.source
+  end
+
+  def test_is?
+    sr = Parser::Source::Range.new(@buf, 0, 3)
+    assert sr.is?('foo')
+    refute sr.is?('bar')
   end
 
   def test_to_s
-    sr = Parser::Source::Range.new(@sfile, 8, 9)
+    sr = Parser::Source::Range.new(@buf, 8, 9)
     assert_equal "(string):2:2", sr.to_s
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -188,9 +188,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .jrubyrc
+- .rubocop.yml
 - .travis.yml
 - .yardopts
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -226,6 +228,8 @@ files:
 - lib/parser/runner/ruby_parse.rb
 - lib/parser/runner/ruby_rewrite.rb
 - lib/parser/source/buffer.rb
+- lib/parser/source/comment.rb
+- lib/parser/source/comment/associator.rb
 - lib/parser/source/map.rb
 - lib/parser/source/map/block.rb
 - lib/parser/source/map/collection.rb
@@ -258,6 +262,8 @@ files:
 - test/test_parse_helper.rb
 - test/test_parser.rb
 - test/test_source_buffer.rb
+- test/test_source_comment.rb
+- test/test_source_comment_associator.rb
 - test/test_source_range.rb
 - test/test_source_rewriter.rb
 - test/test_source_rewriter_action.rb
@@ -282,9 +288,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.0
@@ -304,6 +310,8 @@ test_files:
 - test/test_parse_helper.rb
 - test/test_parser.rb
 - test/test_source_buffer.rb
+- test/test_source_comment.rb
+- test/test_source_comment_associator.rb
 - test/test_source_range.rb
 - test/test_source_rewriter.rb
 - test/test_source_rewriter_action.rb

data/.jrubyrc

@@ -1 +0,0 @@
--Xcext.enabled=true