ripper-plus 1.0.0 → 1.0.1

data/README.md

@@ -49,7 +49,7 @@ Need to be properly resolved. Did you know that, unlike the `label = label` exam
 
 Anyway, ripper-plus turns all method-call `:var_ref` nodes into `zcall` nodes; the node structure is otherwise unchanged.
 
-The truth is, everybody who is using Ripper right now *should* be doing *all* of this. Anything short, and you have bugs. [Laser](https://github.com/michaeledgar/laser/) has bugs as a result. It's a pain in the ass to get it all right. So hopefully, in Ruby 1.9.x, this will be the default. For now, you *should* use ripper-plus.
+The truth is, everybody who is using Ripper right now *should* be doing *all* of this. Anything short, and you have bugs. [Laser](https://github.com/michaeledgar/laser/) has bugs as a result. It's a pain in the ass to get it all right. `ripper-plus` probably has bugs - I'm not gonna lie. So hopefully, in Ruby 1.9.x, this will be the default. For now, you *should* use ripper-plus.
 
 ## Contributing to ripper-plus
  

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/ripper-plus/transformer.rb

@@ -98,6 +98,13 @@ module RipperPlus
           transform_params(param_node, scope_stack)
           transform_tree(body, scope_stack)
         end
+      when :rescue
+        list, name, body = tree[1..3]
+        transform_tree(list, scope_stack)
+        if name
+          add_variables_from_lhs(name, scope_stack)
+        end
+        transform_tree(body, scope_stack)
       when :method_add_block
         call, block = tree[1..2]
         # first transform the call

data/ripper-plus.gemspec

@@ -0,0 +1,75 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ripper-plus}
+  s.version = "1.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Michael Edgar"]
+  s.date = %q{2011-04-27}
+  s.description = %q{Ripper is the Ruby parser library packaged
+with Ruby 1.9. While quite complete, it has some quirks that can
+make use frustrating. This gem intends to correct them.}
+  s.email = %q{michael.j.edgar@dartmouth.edu}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/ripper-plus.rb",
+    "lib/ripper-plus/ripper-plus.rb",
+    "lib/ripper-plus/scope_stack.rb",
+    "lib/ripper-plus/transformer.rb",
+    "ripper-plus.gemspec",
+    "spec/ripper-plus_spec.rb",
+    "spec/scope_stack_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/transformer_spec.rb"
+  ]
+  s.homepage = %q{http://github.com/michaeledgar/ripper-plus}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.7.2}
+  s.summary = %q{Parses Ruby code into an improved Ripper AST format}
+  s.test_files = [
+    "spec/ripper-plus_spec.rb",
+    "spec/scope_stack_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/transformer_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/spec/transformer_spec.rb

@@ -464,4 +464,102 @@ describe RipperPlus::Transformer do
          [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]
     input_tree.should transform_to output_tree
   end
+  
+  it 'observes the creation of local variables by rescue clauses' do
+    input_tree =
+      [:program,
+       [[:def,
+         [:@ident, "foo", [1, 4]],
+         [:paren, [:params, [[:@ident, "x", [1, 8]]], nil, nil, nil, nil]],
+         [:bodystmt,
+          [[:void_stmt],
+           [:assign,
+            [:var_field, [:@ident, "y", [1, 12]]],
+            [:binary,
+             [:@int, "1", [1, 16]],
+             :/,
+             [:var_ref, [:@ident, "x", [1, 20]]]]]],
+          [:rescue,
+           [[:var_ref, [:@const, "Exception", [1, 30]]]],
+           [:var_field, [:@ident, "err", [1, 43]]],
+           [[:command,
+             [:@ident, "p", [1, 48]],
+             [:args_add_block, [[:var_ref, [:@ident, "err", [1, 50]]]], false]]],
+           nil],
+          [:else,
+           [[:void_stmt],
+            [:command,
+             [:@ident, "p", [1, 61]],
+             [:args_add_block, [[:var_ref, [:@ident, "err", [1, 63]]]], false]]]],
+          [:ensure,
+           [[:void_stmt],
+            [:command,
+             [:@ident, "p", [1, 76]],
+             [:args_add_block, [[:var_ref, [:@ident, "err", [1, 78]]]], false]]]]]]]]
+    input_tree.should transform_to input_tree
+  end
+  
+  it 'handles rescue clauses normally otherwise' do
+    input_tree =
+      [:program,
+       [[:def,
+         [:@ident, "foo", [1, 4]],
+         [:paren, [:params, [[:@ident, "x", [1, 8]]], nil, nil, nil, nil]],
+         [:bodystmt,
+          [[:void_stmt],
+           [:assign,
+            [:var_field, [:@ident, "y", [1, 12]]],
+            [:binary,
+             [:@int, "1", [1, 16]],
+             :/,
+             [:var_ref, [:@ident, "x", [1, 20]]]]]],
+          [:rescue,
+           [[:var_ref, [:@const, "Exception", [1, 30]]]],
+           nil,
+           [[:command,
+             [:@ident, "p", [1, 48]],
+             [:args_add_block, [[:var_ref, [:@ident, "err", [1, 50]]]], false]]],
+           nil],
+          [:else,
+           [[:void_stmt],
+            [:command,
+             [:@ident, "p", [1, 61]],
+             [:args_add_block, [[:var_ref, [:@ident, "err", [1, 63]]]], false]]]],
+          [:ensure,
+           [[:void_stmt],
+            [:command,
+             [:@ident, "p", [1, 76]],
+             [:args_add_block, [[:var_ref, [:@ident, "err", [1, 78]]]], false]]]]]]]]
+    output_tree =
+      [:program,
+       [[:def,
+         [:@ident, "foo", [1, 4]],
+         [:paren, [:params, [[:@ident, "x", [1, 8]]], nil, nil, nil, nil]],
+         [:bodystmt,
+          [[:void_stmt],
+           [:assign,
+            [:var_field, [:@ident, "y", [1, 12]]],
+            [:binary,
+             [:@int, "1", [1, 16]],
+             :/,
+             [:var_ref, [:@ident, "x", [1, 20]]]]]],
+          [:rescue,
+           [[:var_ref, [:@const, "Exception", [1, 30]]]],
+           nil,
+           [[:command,
+             [:@ident, "p", [1, 48]],
+             [:args_add_block, [[:zcall, [:@ident, "err", [1, 50]]]], false]]],
+           nil],
+          [:else,
+           [[:void_stmt],
+            [:command,
+             [:@ident, "p", [1, 61]],
+             [:args_add_block, [[:zcall, [:@ident, "err", [1, 63]]]], false]]]],
+          [:ensure,
+           [[:void_stmt],
+            [:command,
+             [:@ident, "p", [1, 76]],
+             [:args_add_block, [[:zcall, [:@ident, "err", [1, 78]]]], false]]]]]]]]
+    input_tree.should transform_to output_tree
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: ripper-plus
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Michael Edgar
@@ -91,6 +91,7 @@ files:
 - lib/ripper-plus/ripper-plus.rb
 - lib/ripper-plus/scope_stack.rb
 - lib/ripper-plus/transformer.rb
+- ripper-plus.gemspec
 - spec/ripper-plus_spec.rb
 - spec/scope_stack_spec.rb
 - spec/spec_helper.rb
@@ -108,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 505813799173151565
+      hash: -2160406408905027692
       segments: 
       - 0
       version: "0"