ruby2ruby 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c27b4b75cbb39ce6970c2b8dfdeea6ed2adbe560
-  data.tar.gz: 738c1c7d64391ef4eef6a6845045f25bb6509d62
+  metadata.gz: 22aa44300eff21b1cc81f27e2fa1a9523936ecbc
+  data.tar.gz: d910122c91ae8cedd03f1c23892c8ad0811bc243
 SHA512:
-  metadata.gz: 151e03beb0722a93e4df11ccc0bb19b936350e4246cc1a53f382302b6a07642cc24a9e5a8c8f3fb658c859eea1735d9d702be9cd247908c5966c537aa6cebf0b
-  data.tar.gz: 7a804ef6a6386e82ceb3b137a7b4a85fc959e7cc570b4e70adfefc37d72abc16ee5c4b829dc947416e107dcb48282f0fce17a22f10c398a47e36564b35092c00
+  metadata.gz: a56319adfca3c6704b75e5698259b233c1f7a0df7e33033c9e536f55f7053ac4cd92107d57d5c1d30bbb982379261b892ba8f1ab4fa02d439586f99dfc7452b7
+  data.tar.gz: 0fb04e176363497768ad7025b6935a5d8b2945e0f43843fdeec793d0fa29ebfd0f418a9c31c6ff2474af2904e271148b6ff6d5e7ed2d58429ee34ad788ed38de

data.tar.gz.sig

@@ -1,2 +1,2 @@
-��u�Yz���a�WnO��؀��Wš�"o�!��|!�Wb��׌��:�5����ٛ<#UO�ϻړ��r
q{;�cʚ��j�?�ya?^�7��mRu��X�1B����r�
-߄3zm��m� Z��������=���
0[��h|�]�:�rpW��2���Фm�rFSib�E����4}!�O��J�+��������c+<�Y�����J�5�ړG�V��r°Y-/�ߺkT>�
�&5�)q���`�
+�|���ki�:b#_ᷘT~�|�ޤe�{�s�)�Q��@��hm�\�۬i��"�B�Ϊ�����Z�5��n�)B�-�Mo�#�&WCR��������B|q��gY�8����v��qm��:�z*�������c�2��v�UH�
+zC���&�q�B]�F=��\��υ�1J�G���kI�G�

data/History.txt

@@ -1,3 +1,12 @@
+=== 2.1.0 / 2014-04-23
+
+* 4 minor enhancements:
+
+  * Don't indent defn body extra if it has a top-level rescue.
+  * Don't indent defn body until fully processed.
+  * Don't use simple rescue form if resbody is a return (statement keyword). (eyberg)
+  * Remove superfluous begin/end for top-level defn rescue.
+
 === 2.0.8 / 2014-03-24
 
 * 1 bug fix:

data/lib/ruby2ruby.rb

@@ -29,7 +29,7 @@ end
 # Generate ruby code from a sexp.
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = "2.0.8" # :nodoc:
+  VERSION = "2.1.0" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
@@ -370,12 +370,14 @@ class Ruby2Ruby < SexpProcessor
     # REFACTOR: use process_block but get it happier wrt parenthesize
     body = []
     until exp.empty? do
-      body << indent(process(exp.shift))
+      body << process(exp.shift)
     end
 
-    body << indent("# do nothing") if body.empty?
-
+    body << "# do nothing" if body.empty?
     body = body.join("\n")
+    body = body.lines.to_a[1..-2].join("\n") if
+      body =~ /^\Abegin/ && body =~ /^end\z/
+    body = indent(body) unless body =~ /(^|\n)rescue/
 
     return "#{comm}def #{name}#{args}\n#{body}\nend".gsub(/\n\s*\n+/, "\n")
   end
@@ -760,7 +762,9 @@ class Ruby2Ruby < SexpProcessor
     els  = process(exp.pop)   unless exp.last.first  == :resbody
 
     body ||= "# do nothing"
-    simple = exp.size == 1 && !exp.resbody.block && exp.resbody.size <= 3
+    simple = exp.size == 1 && exp.resbody.size <= 3 &&
+      !exp.resbody.block &&
+      !exp.resbody.return
 
     resbodies = []
     until exp.empty? do

data/test/test_ruby2ruby.rb

@@ -229,9 +229,19 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_defn_kwsplat
-    inn = s(:defn, :test, s(:args, :"**testing"))
+    inn = s(:defn, :test, s(:args, :"**testing"), s(:nil))
     out = "def test(**testing)\n  # do nothing\nend"
-    util_compare inn, out
+    assert_parse inn, out
+  end
+
+  def test_defn_rescue_return
+    inn = s(:defn, :blah, s(:args),
+           s(:rescue,
+             s(:lasgn, :a, s(:lit, 1)),
+             s(:resbody, s(:array), s(:return, s(:str, "a")))))
+    out = "def blah\n  a = 1\nrescue\n  return \"a\"\nend"
+
+    assert_parse inn, out
   end
 
   def test_masgn_block_arg
@@ -342,7 +352,7 @@ class TestRuby2Ruby < R2RTestCase
                 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"
+    out = "def foo\n  a = 1\nrescue\n  log\n  raise\nend"
     util_compare inn, out
   end
 
@@ -512,13 +522,14 @@ class TestRuby2Ruby < R2RTestCase
     util_compare Ruby19Parser.new.parse(rb3), rb2
   end
 
-  def util_compare sexp, expected_ruby, expected_eval = nil
+  def assert_parse sexp, expected_ruby, expected_eval = nil
     assert_equal sexp, RubyParser.new.process(expected_ruby), "ruby -> sexp" if
       @check_sexp
 
     assert_equal expected_ruby, @processor.process(sexp), "sexp -> ruby"
     assert_equal expected_eval, eval(expected_ruby) if expected_eval
   end
+  alias util_compare assert_parse
 
   def util_thingy(type)
     s(type,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
 description: |-
   ruby2ruby provides a means of generating pure ruby code easily from
   RubyParser compatible Sexps. This makes making dynamic language
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ruby2ruby
+rubyforge_project: 
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4