ruby2ruby 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c87f0ca74e11a422495c56f40bac470ab3379f
-  data.tar.gz: 29e705948c7770c3722eab456247992042752495
+  metadata.gz: d5a340729045b8139f699cb585b8fcc302b8282f
+  data.tar.gz: cbfd1a1d811f65485c8175d33854ca21c80dad94
 SHA512:
-  metadata.gz: 5e9540e531c0456eb52033bba31c56f5d9a5a1e317839e566e1385620205494a8f18499d40e762b65976c5feca0f3f08949d7092cfb6d06d2cc929f8015638e6
-  data.tar.gz: ddb3bd03f2ed3495ec701530f791aca28099cbb07773355477cf1d8b5fa638e33b7c26dde8cf9d2fbde59ef1595e6c608d35c2d58f6b6861760908528fe805d0
+  metadata.gz: 2af547a9f8c9534c09e3b60f7c03e38d2342b9f63643a518bb30ee0126d4b691313f36e7a61ede70d4d385216493cdf840aa99ad032e792a87502fe669b94648
+  data.tar.gz: 04c75aab59b408c62a1a34eea38639cba985ca9d8286ca355def1e01cdb4b1ca07377dbfb4d4def1695e1198ef3e927a2cf2f90cdd47f568bf66b4a90800771e

data/History.txt

@@ -1,3 +1,13 @@
+=== 2.1.4 / 2015-04-13
+
+* 1 minor enhancement:
+
+  * Wrap fewer hash values in parentheses. (jaredbeck)
+
+* 1 bug fix:
+
+  * Fixed handling of kwsplat args.
+
 === 2.1.3 / 2014-09-26
 
 * 1 bug fix:

data/lib/ruby2ruby.rb

@@ -31,7 +31,7 @@ end
 # Generate ruby code from a sexp.
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = "2.1.3" # :nodoc:
+  VERSION = "2.1.4" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
@@ -60,6 +60,24 @@ class Ruby2Ruby < SexpProcessor
                   :rescue,
                  ]
 
+  ##
+  # Some sexp types are OK without parens when appearing as hash values.
+  # This list can include `:call`s because they're always printed with parens
+  # around their arguments. For example:
+  #
+  #     { :foo => (bar("baz")) } # The outer parens are unnecessary
+  #     { :foo => bar("baz") }   # This is the normal code style
+
+  HASH_VAL_NO_PAREN = [
+    :call,
+    :false,
+    :lit,
+    :lvar,
+    :nil,
+    :str,
+    :true
+  ]
+
   def initialize # :nodoc:
     super
     @indent = "  "
@@ -481,13 +499,21 @@ class Ruby2Ruby < SexpProcessor
     result = []
 
     until exp.empty?
-      lhs = process(exp.shift)
-      rhs = exp.shift
-      t = rhs.first
-      rhs = process rhs
-      rhs = "(#{rhs})" unless [:lit, :str].include? t # TODO: verify better!
+      s = exp.shift
+      t = s.sexp_type
+      lhs = process s
+
+      case t
+      when :kwsplat then
+        result << lhs
+      else
+        rhs = exp.shift
+        t = rhs.first
+        rhs = process rhs
+        rhs = "(#{rhs})" unless HASH_VAL_NO_PAREN.include? t
 
-      result << "#{lhs} => #{rhs}"
+        result << "#{lhs} => #{rhs}"
+      end
     end
 
     return result.empty? ? "{}" : "{ #{result.join(', ')} }"

data/test/test_ruby2ruby.rb

@@ -80,6 +80,49 @@ class TestRuby2Ruby < R2RTestCase
     assert_equal exp, eval(out)
   end
 
+  def test_hash_parens_str
+    inn = s(:hash, s(:lit, :k), s(:str, "banana"))
+    out = '{ :k => "banana" }'
+    util_compare inn, out
+  end
+
+  def test_hash_parens_lit
+    inn = s(:hash, s(:lit, :k), s(:lit, 0.07))
+    out = "{ :k => 0.07 }"
+    util_compare inn, out
+  end
+
+  def test_hash_parens_bool
+    inn = s(:hash, s(:lit, :k), s(:true))
+    out = "{ :k => true }"
+    util_compare inn, out
+  end
+
+  def test_hash_parens_nil
+    inn = s(:hash, s(:lit, :k), s(:nil))
+    out = "{ :k => nil }"
+    util_compare inn, out
+  end
+
+  def test_hash_parens_lvar
+    inn = s(:hash, s(:lit, :k), s(:lvar, :x))
+    out = "{ :k => x }"
+    util_compare inn, out
+  end
+
+  def test_hash_parens_call
+    inn = s(:hash, s(:lit, :k), s(:call, nil, :foo, s(:lit, :bar)))
+    out = "{ :k => foo(:bar) }"
+    util_compare inn, out
+  end
+
+  def test_hash_parens_iter
+    iter = s(:iter, s(:call, nil, :foo), s(:args), s(:str, "bar"))
+    inn = s(:hash, s(:lit, :k), iter)
+    out = '{ :k => (foo { "bar" }) }'
+    util_compare inn, out
+  end
+
   def test_and_alias
     inn = s(:and, s(:true), s(:alias, s(:lit, :a), s(:lit, :b)))
     out = "true and (alias :a :b)"
@@ -168,8 +211,25 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_call_kwsplat
-    inn = s(:call, nil, :test_splat, s(:kwsplat, s(:call, nil, :testing)))
+    inn = s(:call, nil, :test_splat, s(:hash, s(:kwsplat, s(:call, nil, :testing))))
     out = "test_splat(**testing)"
+
+    util_compare inn, out
+  end
+
+  def test_call_arg_assoc_kwsplat
+    inn = s(:call, nil, :f,
+           s(:lit, 1),
+           s(:hash, s(:lit, :kw), s(:lit, 2), s(:kwsplat, s(:lit, 3))))
+    out = "f(1, :kw => 2, **3)"
+
+    util_compare inn, out
+  end
+
+  def test_call_kwsplat_x
+    inn = s(:call, nil, :a, s(:hash, s(:kwsplat, s(:lit, 1))))
+    out = "a(**1)"
+
     util_compare inn, out
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2ruby
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
   VpzF30vNaJK6ZT7xlIsIlwmH
   -----END CERTIFICATE-----
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -146,10 +146,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ruby2ruby provides a means of generating pure ruby code easily from RubyParser
   compatible Sexps
-test_files:
-- test/test_ruby2ruby.rb
+test_files: []