ruby2ruby 2.0.5 → 2.0.6

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.0.6 / 2013-06-20
+
+* 2 bug fixes:
+
+  * Fixed bug with complex rescue but short enough to trigger 1-liner. (Confusion)
+  * Fixed multiple expressions inside sclass
+
 === 2.0.5 / 2013-04-25
 
 * 2 bug fixes:

data/lib/ruby2ruby.rb

@@ -29,7 +29,7 @@ end
 # Generate ruby code from a sexp.
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = "2.0.5" # :nodoc:
+  VERSION = "2.0.6" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
@@ -361,6 +361,7 @@ class Ruby2Ruby < SexpProcessor
 
     exp.shift if exp == s(s(:nil)) # empty it out of a default nil expression
 
+    # REFACTOR: use process_block but get it happier wrt parenthesize
     body = []
     until exp.empty? do
       body << indent(process(exp.shift))
@@ -746,8 +747,7 @@ class Ruby2Ruby < SexpProcessor
     els  = process(exp.pop)   unless exp.last.first  == :resbody
 
     body ||= "# do nothing"
-    simple = exp.size == 1 && !exp.resbody.block
-
+    simple = exp.size == 1 && !exp.resbody.block && exp.resbody.size <= 3
 
     resbodies = []
     until exp.empty? do
@@ -782,7 +782,7 @@ class Ruby2Ruby < SexpProcessor
   end
 
   def process_sclass(exp) # :nodoc:
-    "class << #{process(exp.shift)}\n#{indent(process(exp.shift))}\nend"
+    "class << #{process(exp.shift)}\n#{indent(process_block(exp))}\nend"
   end
 
   def process_self(exp) # :nodoc:
@@ -907,6 +907,7 @@ class Ruby2Ruby < SexpProcessor
     complex = false
     complex ||= exp.size > 3
     complex ||= exp.resbody.block
+    complex ||= exp.resbody.size > 3
     complex ||= exp.find_nodes(:resbody).any? { |n| n[1] != s(:array) }
     complex ||= exp.find_nodes(:resbody).any? { |n| n.last.nil? }
     complex ||= exp.find_nodes(:resbody).any? { |n| n[2] and n[2].node_type == :block }

data/test/test_ruby2ruby.rb

@@ -281,6 +281,31 @@ class TestRuby2Ruby < R2RTestCase
     util_compare inn, out
   end
 
+  def test_resbody_short_with_begin_end_multiple
+    # "begin; blah; rescue; []; end"
+    inn = s(:rescue,
+            s(:call, nil, :blah),
+            s(:resbody, s(:array),
+              s(:call, nil, :log),
+              s(:call, nil, :raise)))
+    out = "begin\n  blah\nrescue\n  log\n  raise\nend"
+    util_compare inn, out
+  end
+
+  def test_resbody_short_with_defn_multiple
+    inn = s(:defn,
+            :foo,
+            s(:args),
+            s(:rescue,
+              s(:lasgn, :a, s(:lit, 1)),
+              s(:resbody,
+                s(:array),
+                s(:call, nil, :log),
+                s(:call, nil, :raise))))
+    out = "def foo\n  begin\n    a = 1\n  rescue\n    log\n    raise\n  end\nend"
+    util_compare inn, out
+  end
+
   def test_regexp_options
     inn = s(:match3,
             s(:dregx,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby2ruby
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-04-25 00:00:00 Z
+date: 2013-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -76,11 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
-        - 4
-        - 7
-        version: "4.7"
+        - 5
+        - 0
+        version: "5.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 

metadata.gz.sig

@@ -1,3 +1,3 @@
-�_�䓿4��
-�8��
-��Uo�0��9����:�WV
+z�%C�nv)d�MH ���	w��3��_��
+d�9����8�}�{HDDۿ�k{n�嬭�QSn��������E,s�
+	�7���	SNv®v�;�vYd�]f �b�