ruby2ruby 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb8caf02a8d2b2af6ef49ddd52a55f62e4dc683a
-  data.tar.gz: bbdd946629c332a35d65d9919bad429510e64218
+  metadata.gz: 7370313e3e5edb8daa2cbbf2fb09d692076c1b1d
+  data.tar.gz: 449fd3f4262f9edd0e112b5c4d5be7c2fe2804d5
 SHA512:
-  metadata.gz: 2ac5b2af3ec0b14d74abbb17f4247b2c590bb8072b2adfae590a16a59cd5b78ef746585ff6561f56d28250407fcbdf6d565aa96934f6536280c936a5c639ceef
-  data.tar.gz: 5b77706f664f28b47927fa6a81615719cc0ca8deedfcd090d541a80c53989292f6311794d41bbec7f1b9c328f5da167dac98567f9cc382650fbc1b5f07b623e3
+  metadata.gz: a9894255594551689f3b4a0a6a1043fce8506d64ee10e89d5a77d0ea045b0ed373bcac2ea56ec06b7b23cbe80696bf78c1ad27053ddb566222fc3e8b6fb58c46
+  data.tar.gz: 850e6856e5a10e73f013e44ecc1a0e9873149c393f1652e7afdabc84780d4d1495f841e3cf0eb5973c722c582f04411c978c20ffc3c5d2dcc6330529934d351e

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-�y��.ٻRC
-M����$"½?�;�S{���+����gj,b��ɕ�0
%�ݓp�>
-~-�Kw�g��
+%�?	�ܞ#C�4�����R��%\7S�i�a����Y
+o�%�,�*��-!�C�R#�Ϋn�]:,�Q�W�IW�����Ŵ�j(����_�ν |Zֿxfd'�^���I���Uq��9�F3��qY3�/9��6�xjZ��Ljt�Y/wJ��pL
+���g�+"GR䋎Z��E7���1��
	�M�e�c1�D����*QW����'�m>��A��~E��6Y$8f�6 t�

data/History.txt

@@ -1,3 +1,13 @@
+=== 2.3.1 / 2016-10-09
+
+* 1 minor enhancement:
+
+  * Support more op_asgn nodes. (presidentbeef)
+
+* 1 bug fix:
+
+  * Fix for non-binary 'binary' calls (eg arity > 1). (presidentbeef)
+
 === 2.3.0 / 2016-02-18
 
 * 3 minor enhancements:

data/lib/ruby2ruby.rb

@@ -31,7 +31,7 @@ end
 # Generate ruby code from a sexp.
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = "2.3.0" # :nodoc:
+  VERSION = "2.3.1" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
@@ -256,6 +256,8 @@ class Ruby2Ruby < SexpProcessor
     when *BINARY then
       if safe_call
         "#{receiver}&.#{name}(#{args.join(', ')})"
+      elsif args.length > 1
+        "#{receiver}.#{name}(#{args.join(', ')})"
       else
         "(#{receiver} #{name} #{args.join(', ')})"
       end
@@ -734,6 +736,16 @@ class Ruby2Ruby < SexpProcessor
     "$#{exp.shift}"
   end
 
+  def process_op_asgn(exp) # :nodoc:
+    # [[:lvar, :x], [:call, nil, :z, [:lit, 1]], :y, :"||"]
+    lhs = process(exp.shift)
+    rhs = process(exp.shift)
+    index = exp.shift
+    op = exp.shift
+
+    "#{lhs}.#{index} #{op}= #{rhs}"
+  end
+
   def process_op_asgn1(exp) # :nodoc:
     # [[:lvar, :b], [:arglist, [:lit, 1]], :"||", [:lit, 10]]
     lhs = process(exp.shift)
@@ -854,6 +866,27 @@ class Ruby2Ruby < SexpProcessor
     end
   end
 
+  def process_safe_op_asgn(exp) # :nodoc:
+    # [[:lvar, :x], [:call, nil, :z, [:lit, 1]], :y, :"||"]
+    lhs = process(exp.shift)
+    rhs = process(exp.shift)
+    index = exp.shift
+    op = exp.shift
+
+    "#{lhs}&.#{index} #{op}= #{rhs}"
+  end
+
+  def process_safe_op_asgn2(exp) # :nodoc:
+    # [[:lvar, :c], :var=, :"||", [:lit, 20]]
+    lhs = process(exp.shift)
+    index = exp.shift.to_s[0..-2]
+    msg = exp.shift
+
+    rhs = process(exp.shift)
+
+    "#{lhs}&.#{index} #{msg}= #{rhs}"
+  end
+
   def process_sclass(exp) # :nodoc:
     "class << #{process(exp.shift)}\n#{indent(process_block(exp))}\nend"
   end

data/test/test_ruby2ruby.rb

@@ -412,6 +412,28 @@ class TestRuby2Ruby < R2RTestCase
     util_compare inn, out
   end
 
+  def test_safe_op_asgn
+    inn = s(:safe_op_asgn,
+            s(:call, nil, :x),
+            s(:call, nil, :z, s(:lit, 1)),
+            :y,
+            :+)
+
+    out = "x&.y += z(1)"
+    util_compare inn, out
+  end
+
+  def test_safe_op_asgn2
+    inn = s(:safe_op_asgn2,
+            s(:call, nil, :x),
+            :y=,
+            :"||",
+            s(:lit, 1))
+
+    out = "x&.y ||= 1"
+    util_compare inn, out
+  end
+
   def test_splat_call
     inn = s(:call, nil, :x,
             s(:splat,
@@ -515,6 +537,14 @@ class TestRuby2Ruby < R2RTestCase
     end
   end
 
+  def test_binary_operators_with_multiple_arguments
+    Ruby2Ruby::BINARY.each do |op|
+      inn = s(:call, s(:lvar, :x), op, s(:lit, 2), s(:lit, 3))
+      out = "x.#{op}(2, 3)"
+      util_compare inn, out
+    end
+  end
+
   def test_call_empty_hash
     inn = s(:call, nil, :foo, s(:hash))
     out = "foo({})"
@@ -591,6 +621,17 @@ class TestRuby2Ruby < R2RTestCase
     util_compare inn, out
   end
 
+  def test_op_asgn
+    inn = s(:op_asgn,
+            s(:call, nil, :x),
+            s(:call, nil, :z, s(:lit, 1)),
+            :y,
+            :+)
+
+    out = "x.y += z(1)"
+    util_compare inn, out
+  end
+
   def test_rescue_block
     inn = s(:rescue,
             s(:call, nil, :alpha),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2ruby
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
+  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,16 +20,17 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
-  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
-  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
-  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
-  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
-  NLq5jm1fq6Y9Uolu3RJbmycf
+  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
+  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
+  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
+  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
+  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
+  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
+  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
+  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -59,20 +60,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +80,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
 description: |-
   ruby2ruby provides a means of generating pure ruby code easily from
   RubyParser compatible Sexps. This makes making dynamic language