ripper_ruby_parser 0.0.8 → 1.0.0

data/test/unit/sexp_processor_test.rb

@@ -55,6 +55,7 @@ describe RipperRubyParser::SexpProcessor do
       end
     end
 
+    if false
     describe "for an :args_add_block sexp" do
       it "transforms a one-argument sexp to an :arglist" do
         sexp = s(:args_add_block, s(s(:foo)), false)
@@ -68,10 +69,11 @@ describe RipperRubyParser::SexpProcessor do
         result.must_equal s(:arglist, s(:foo_p), s(:bar_p))
       end
     end
+    end
 
     describe "for a :command sexp" do
       it "transforms a sexp to a :call" do
-        sexp = s(:command, s(:@ident, "foo", s(1, 0)), s(:foo))
+        sexp = s(:command, s(:@ident, "foo", s(1, 0)), s(:arglist, s(:foo)))
         result = processor.process sexp
         result.must_equal s(:call, nil, :foo, s(:foo_p))
       end
@@ -89,62 +91,59 @@ describe RipperRubyParser::SexpProcessor do
       it "transforms the sexp to a :call sexp" do
         sexp = s(:vcall, s(:@ident, "bar", s(1, 4)))
         result = processor.process sexp
-        result.must_equal s(:call, nil, :bar, s(:arglist))
+        result.must_equal s(:call, nil, :bar)
       end
     end
 
     describe "for a :module sexp" do
-      it "does not create a nested :block sexp for an empty definition" do
+      it "does not create body eleents for an empty definition" do
         sexp = s(:module,
                  s(:const_ref, s(:@const, "Foo", s(1, 13))),
                  s(:bodystmt, s(s(:void_stmt)), nil, nil, nil))
         result = processor.process sexp
-        result.must_equal s(:module, :Foo, s(:scope))
+        result.must_equal s(:module, :Foo)
       end
 
-      it "does not create a nested :block sexp for a definition with one statement" do
+      it "creates a single body element for a definition with one statement" do
         sexp = s(:module,
                  s(:const_ref, s(:@const, "Foo", s(1, 13))),
                  s(:bodystmt, s(s(:foo)), nil, nil, nil))
         result = processor.process sexp
-        result.must_equal s(:module, :Foo, s(:scope, s(:foo_p)))
+        result.must_equal s(:module, :Foo, s(:foo_p))
       end
 
-      it "creates a nested :block sexp for a definition with more than one statement" do
+      it "creates multiple body elements for a definition with more than one statement" do
         sexp = s(:module,
                  s(:const_ref, s(:@const, "Foo", s(1, 13))),
                  s(:bodystmt, s(s(:foo), s(:bar)), nil, nil, nil))
         result = processor.process sexp
-        result.must_equal s(:module, :Foo,
-                            s(:scope, s(:block, s(:foo_p), s(:bar_p))))
+        result.must_equal s(:module, :Foo, s(:foo_p), s(:bar_p))
       end
     end
 
     describe "for a :class sexp" do
-      it "does not create a nested :block sexp for an empty definition" do
+      it "does not create body eleents for an empty definition" do
         sexp = s(:class,
                  s(:const_ref, s(:@const, "Foo", s(1, 13))), nil,
                  s(:bodystmt, s(s(:void_stmt)), nil, nil, nil))
         result = processor.process sexp
-        result.must_equal s(:class, :Foo, nil, s(:scope))
+        result.must_equal s(:class, :Foo, nil)
       end
 
-      it "does not create a nested :block sexp for a definition with one statement" do
+      it "creates a single body element for a definition with one statement" do
         sexp = s(:class,
                  s(:const_ref, s(:@const, "Foo", s(1, 13))), nil,
                  s(:bodystmt, s(s(:foo)), nil, nil, nil))
         result = processor.process sexp
-        result.must_equal s(:class, :Foo, nil, s(:scope, s(:foo_p)))
+        result.must_equal s(:class, :Foo, nil, s(:foo_p))
       end
 
-      it "creates a nested :block sexp for a definition with more than one statement" do
+      it "creates multiple body elements for a definition with more than one statement" do
         sexp = s(:class,
                  s(:const_ref, s(:@const, "Foo", s(1, 13))), nil,
                  s(:bodystmt, s(s(:foo), s(:bar)), nil, nil, nil))
         result = processor.process sexp
-        result.must_equal s(:class,
-                            :Foo, nil,
-                            s(:scope, s(:block, s(:foo_p), s(:bar_p))))
+        result.must_equal s(:class, :Foo, nil, s(:foo_p), s(:bar_p))
       end
 
       it "passes on the given ancestor" do
@@ -153,7 +152,7 @@ describe RipperRubyParser::SexpProcessor do
                  s(:var_ref, s(:@const, "Bar", s(1, 12))),
                  s(:bodystmt, s(s(:void_stmt)), nil, nil, nil))
         result = processor.process sexp
-        result.must_equal s(:class, :Foo, s(:const, :Bar), s(:scope))
+        result.must_equal s(:class, :Foo, s(:const, :Bar))
       end
     end
 
@@ -161,13 +160,13 @@ describe RipperRubyParser::SexpProcessor do
       it "creates a :scope sexp with nested :block" do
         sexp = s(:bodystmt, s(s(:foo), s(:bar)), nil, nil, nil)
         result = processor.process sexp
-        result.must_equal s(:scope, s(:block, s(:foo_p), s(:bar_p)))
+        result.must_equal s(s(:block, s(:foo_p), s(:bar_p)))
       end
 
       it "removes nested :void_stmt sexps" do
         sexp = s(:bodystmt, s(s(:void_stmt), s(:foo)), nil, nil, nil)
         result = processor.process sexp
-        result.must_equal s(:scope, s(:block, s(:foo_p)))
+        result.must_equal s(s(:foo_p))
       end
     end
 
@@ -178,8 +177,7 @@ describe RipperRubyParser::SexpProcessor do
                  s(:params, nil, nil, nil, nil, nil),
                  s(:bodystmt, s(s(:void_stmt)), nil, nil, nil))
         result = processor.process sexp
-        result.must_equal s(:defn,
-                            :foo, s(:args), s(:scope, s(:block, s(:nil))))
+        result.must_equal s(:defn, :foo, s(:args), s(:nil))
 
       end
     end
@@ -205,10 +203,10 @@ describe RipperRubyParser::SexpProcessor do
     end
 
     describe "for a :binary sexp" do
-      it "creates a :call sexp with an :arglist" do
+      it "creates a :call sexp" do
         sexp = s(:binary, s(:bar), :==, s(:foo))
         result = processor.process sexp
-        result.must_equal s(:call, s(:bar_p), :==, s(:arglist, s(:foo_p)))
+        result.must_equal s(:call, s(:bar_p), :==, s(:foo_p))
       end
     end
 
@@ -219,12 +217,12 @@ describe RipperRubyParser::SexpProcessor do
                  s(:brace_block, nil, s(s(:bar))))
         result = processor.process sexp
         result.must_equal s(:iter,
-                            s(:call, s(:foo_p), :baz, s(:arglist)), nil,
+                            s(:call, s(:foo_p), :baz), s(:args),
                             s(:bar_p))
       end
 
       describe "with a block parameter" do
-        it "creates an :iter sexp with a :lasgn sexp for the block parameter" do
+        it "creates an :iter sexp with an :args sexp for the block parameter" do
           sexp = s(:method_add_block,
                    s(:call, s(:foo), :".", s(:@ident, "baz", s(1, 2))),
                    s(:brace_block,
@@ -234,8 +232,8 @@ describe RipperRubyParser::SexpProcessor do
                      s(s(:bar))))
           result = processor.process sexp
           result.must_equal s(:iter,
-                              s(:call, s(:foo_p), :baz, s(:arglist)),
-                              s(:lasgn, :i),
+                              s(:call, s(:foo_p), :baz),
+                              s(:args, :i),
                               s(:bar_p))
         end
       end

metadata

@@ -1,105 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ripper_ruby_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.4.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: |2
+      RipperRubyParser is a parser for Ruby based on Ripper that aims to be a
+      drop-in replacement for RubyParser.
 email:
 - matijs@matijs.net
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
 - lib/ripper_ruby_parser.rb
+- lib/ripper_ruby_parser/commenting_ripper_parser.rb
 - lib/ripper_ruby_parser/sexp_processor.rb
 - lib/ripper_ruby_parser/syntax_error.rb
 - lib/ripper_ruby_parser/sexp_ext.rb
@@ -117,7 +109,6 @@ files:
 - lib/ripper_ruby_parser/sexp_handlers/conditionals.rb
 - lib/ripper_ruby_parser/sexp_handlers/method_calls.rb
 - lib/ripper_ruby_parser/version.rb
-- lib/ripper_ruby_parser/commenting_sexp_builder.rb
 - lib/ripper_ruby_parser/parser.rb
 - test/test_helper.rb
 - test/unit/sexp_processor_test.rb
@@ -128,7 +119,7 @@ files:
 - test/unit/parser_method_calls_test.rb
 - test/unit/parser_literals_test.rb
 - test/unit/version_test.rb
-- test/unit/commenting_sexp_builder_test.rb
+- test/unit/commenting_ripper_parser_test.rb
 - test/unit/parser_conditionals_test.rb
 - test/unit/parser_test.rb
 - test/pt_testcase/pt_test.rb
@@ -139,33 +130,33 @@ files:
 - test/end_to_end/comparison_test.rb
 - test/end_to_end/test_comparison_test.rb
 - test/end_to_end/comments_test.rb
-- README.rdoc
+- README.md
 - Rakefile
 homepage: http://www.github.com/mvz/ripper_ruby_parser
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
-- README.rdoc
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Parse with Ripper, produce sexps that are compatible with RubyParser.
 test_files:
 - test/end_to_end/comments_test.rb
@@ -177,7 +168,7 @@ test_files:
 - test/end_to_end/test_comparison_test.rb
 - test/pt_testcase/pt_test.rb
 - test/test_helper.rb
-- test/unit/commenting_sexp_builder_test.rb
+- test/unit/commenting_ripper_parser_test.rb
 - test/unit/parser_assignment_test.rb
 - test/unit/parser_blocks_test.rb
 - test/unit/parser_conditionals_test.rb
@@ -188,4 +179,3 @@ test_files:
 - test/unit/parser_test.rb
 - test/unit/sexp_processor_test.rb
 - test/unit/version_test.rb
-has_rdoc: 

data/test/unit/commenting_sexp_builder_test.rb

@@ -1,113 +0,0 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
-
-describe RipperRubyParser::CommentingSexpBuilder do
-  def parse_with_builder str
-    builder = RipperRubyParser::CommentingSexpBuilder.new str
-    builder.parse
-  end
-
-  describe "handling comments" do
-    it "produces a comment node surrounding a commented def" do
-      result = parse_with_builder "# Foo\ndef foo; end"
-      result.must_equal [:program,
-                         [[:comment,
-                           "# Foo\n",
-                           [:def,
-                            [:@ident, "foo", [2, 4]],
-                            [:params, nil, nil, nil, nil, nil],
-                            [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
-    end
-
-    it "produces a blank comment node surrounding a def that has no comment" do
-      result = parse_with_builder "def foo; end"
-      result.must_equal [:program,
-                         [[:comment,
-                           "",
-                           [:def,
-                           [:@ident, "foo", [1, 4]],
-                           [:params, nil, nil, nil, nil, nil],
-                           [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
-    end
-
-    it "produces a comment node surrounding a commented class" do
-      result = parse_with_builder "# Foo\nclass Foo; end"
-      result.must_equal [:program,
-                         [[:comment,
-                           "# Foo\n",
-                           [:class,
-                            [:const_ref, [:@const, "Foo", [2, 6]]],
-                            nil,
-                            [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
-    end
-
-    it "produce a blank comment node surrounding a class that has no comment" do
-      result = parse_with_builder "class Foo; end"
-      result.must_equal [:program,
-                         [[:comment,
-                           "",
-                           [:class,
-                           [:const_ref, [:@const, "Foo", [1, 6]]],
-                           nil,
-                           [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
-    end
-
-    it "produces a comment node surrounding a commented module" do
-      result = parse_with_builder "# Foo\nmodule Foo; end"
-      result.must_equal [:program,
-                         [[:comment,
-                           "# Foo\n",
-                           [:module,
-                            [:const_ref, [:@const, "Foo", [2, 7]]],
-                            [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
-    end
-
-    it "produces a blank comment node surrounding a module that has no comment" do
-      result = parse_with_builder "module Foo; end"
-      result.must_equal [:program,
-                         [[:comment,
-                           "",
-                           [:module,
-                           [:const_ref, [:@const, "Foo", [1, 7]]],
-                           [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
-    end
-
-    it "is not confused by a symbol containing a keyword" do
-      result = parse_with_builder ":class; def foo; end"
-      result.must_equal [:program,
-                         [[:symbol_literal, [:symbol, [:@kw, "class", [1, 1]]]],
-                          [:comment,
-                           "",
-                           [:def,
-                            [:@ident, "foo", [1, 12]],
-                            [:params, nil, nil, nil, nil, nil],
-                            [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
-    end
-
-    it "is not confused by a dynamic symbol" do
-      result = parse_with_builder ":'foo'; def bar; end"
-      result.must_equal [:program,
-                         [[:dyna_symbol, [[:@tstring_content, "foo", [1, 2]]]],
-                          [:comment,
-                           "",
-                           [:def,
-                            [:@ident, "bar", [1, 12]],
-                            [:params, nil, nil, nil, nil, nil],
-                            [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
-    end
-
-    it "is not confused by a dynamic symbol containing a class definition" do
-      result = parse_with_builder ":\"foo\#{class Bar;end}\""
-      result.must_equal [:program,
-                         [[:dyna_symbol,
-                           [[:@tstring_content, "foo", [1, 2]],
-                            [:string_embexpr,
-                             [[:comment,
-                               "",
-                               [:class,
-                                [:const_ref, [:@const, "Bar", [1, 13]]],
-                                nil,
-                                [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]]]]]
-    end
-  end
-end
-