ruby2ruby 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4071b8713e84a587983a485ea48163835eafc4aa
-  data.tar.gz: 4acc95c551e76369e017e4ee4edc13533e229d32
+  metadata.gz: eb8caf02a8d2b2af6ef49ddd52a55f62e4dc683a
+  data.tar.gz: bbdd946629c332a35d65d9919bad429510e64218
 SHA512:
-  metadata.gz: 12cd7ca6f607eb86dee92655813e34c145b821df17b3057baea781c8b84882669686b02f1dd24a037eb7b674b0bde981c5930ba1d9f1b3ac0ff288ac25e130f7
-  data.tar.gz: 4225c4aac264d6093d1e17a668daa4f54d608ee82bfb0b7c30f24fd9b13299e6e84a148d8b33da107f86f232ee44cd7c8b748015ee1d1f77d241a358e6ddf7e0
+  metadata.gz: 2ac5b2af3ec0b14d74abbb17f4247b2c590bb8072b2adfae590a16a59cd5b78ef746585ff6561f56d28250407fcbdf6d565aa96934f6536280c936a5c639ceef
+  data.tar.gz: 5b77706f664f28b47927fa6a81615719cc0ca8deedfcd090d541a80c53989292f6311794d41bbec7f1b9c328f5da167dac98567f9cc382650fbc1b5f07b623e3

data/History.txt

@@ -1,3 +1,11 @@
+=== 2.3.0 / 2016-02-18
+
+* 3 minor enhancements:
+
+  * Added support for safe navigation/lonely operator. (presidentbeef)
+  * Expanded tests for 2.3 support
+  * Support safe attrasgn. (presidentbeef).
+
 === 2.2.0 / 2015-05-27
 
 * 1 minor enhancement:

data/lib/ruby2ruby.rb

@@ -31,7 +31,7 @@ end
 # Generate ruby code from a sexp.
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = "2.2.0" # :nodoc:
+  VERSION = "2.3.0" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
@@ -218,7 +218,7 @@ class Ruby2Ruby < SexpProcessor
     end
   end
 
-  def process_call(exp) # :nodoc:
+  def process_call(exp, safe_call = false) # :nodoc:
     receiver_node_type = exp.first.nil? ? nil : exp.first.first
     receiver = process exp.shift
     receiver = "(#{receiver})" if ASSIGN_NODES.include? receiver_node_type
@@ -254,7 +254,11 @@ class Ruby2Ruby < SexpProcessor
 
     case name
     when *BINARY then
-      "(#{receiver} #{name} #{args.join(', ')})"
+      if safe_call
+        "#{receiver}&.#{name}(#{args.join(', ')})"
+      else
+        "(#{receiver} #{name} #{args.join(', ')})"
+      end
     when :[] then
       receiver ||= "self"
       "#{receiver}[#{args.join(', ')}]"
@@ -271,7 +275,8 @@ class Ruby2Ruby < SexpProcessor
     else
       args     = nil                    if args.empty?
       args     = "(#{args.join(', ')})" if args
-      receiver = "#{receiver}."         if receiver
+      receiver = "#{receiver}."         if receiver and not safe_call
+      receiver = "#{receiver}&."        if receiver and safe_call
 
       "#{receiver}#{name}#{args}"
     end
@@ -279,6 +284,10 @@ class Ruby2Ruby < SexpProcessor
     @calls.pop
   end
 
+  def process_safe_call(exp) # :nodoc:
+    process_call(exp, :safe)
+  end
+
   def process_case(exp) # :nodoc:
     result = []
     expr = process exp.shift
@@ -827,6 +836,24 @@ class Ruby2Ruby < SexpProcessor
     end
   end
 
+  def process_safe_attrasgn(exp) # :nodoc:
+    receiver = process exp.shift
+    name = exp.shift
+    rhs  = exp.pop
+    args = exp.pop # should be nil
+    exp.clear
+
+    raise "dunno what to do: #{args.inspect}" if args
+
+    name = name.to_s.sub(/=$/, '')
+
+    if rhs && rhs != s(:arglist) then
+      "#{receiver}&.#{name} = #{process(rhs)}"
+    else
+      raise "dunno what to do: #{rhs.inspect}"
+    end
+  end
+
   def process_sclass(exp) # :nodoc:
     "class << #{process(exp.shift)}\n#{indent(process_block(exp))}\nend"
   end

data/test/test_ruby2ruby.rb

@@ -19,7 +19,7 @@ class R2RTestCase < ParseTreeTestCase
   def self.generate_test klass, node, data, input_name, output_name
     output_name = data.has_key?('Ruby2Ruby') ? 'Ruby2Ruby' : 'Ruby'
 
-    return if node.to_s =~ /(str_question|not|bang).*_(19|20|21|22)$/
+    return if node.to_s =~ /(str_question|not|bang).*_(19|20|21|22|23)$/
 
     klass.class_eval <<-EOM
       def test_#{node}
@@ -379,6 +379,39 @@ class TestRuby2Ruby < R2RTestCase
     util_compare inn, out
   end
 
+  def test_safe_attrasgn
+    inn = s(:safe_attrasgn,
+            s(:call, nil, :x),
+            :y=,
+            s(:lit, 1))
+
+    out = "x&.y = 1"
+
+    util_compare inn, out
+  end
+
+  def test_safe_call
+    inn = s(:safe_call,
+            s(:safe_call,
+              s(:call, nil, :x),
+              :y),
+              :z,
+              s(:lit, 1))
+
+    out ="x&.y&.z(1)"
+    util_compare inn, out
+  end
+
+  def test_safe_call_binary
+    inn = s(:safe_call,
+            s(:call, nil, :x),
+            :>,
+            s(:lit, 1))
+
+    out = "x&.>(1)"
+    util_compare inn, out
+  end
+
   def test_splat_call
     inn = s(:call, nil, :x,
             s(:splat,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2ruby
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE0MDkxNzIzMDcwN1oXDTE1MDkxNzIzMDcwN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAFoDJRokCQdxFfOrmsKX41KOFlU/zjrbDVM9hgB/Ur999M6OXGSi8FitXNtMwY
-  FVjsiAPeU7HaWVVcZkj6IhINelTkXsxgGz/qCzjHy3iUMuZWw36cS0fiWJ5rvH+e
-  hD7uXxJSFuyf1riDGI1aeWbQ74WMwvNstOxLUMiV5a1fzBhlxPqb537ubDjq/M/h
-  zPUFPVYeL5KjDHLCqI2FwIk2sEMOQgjpXHzl+3NlD2LUgUhHDMevmgVua0e2GT1B
-  xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
-  VpzF30vNaJK6ZT7xlIsIlwmH
+  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
+  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
+  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
+  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
+  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
+  NLq5jm1fq6Y9Uolu3RJbmycf
   -----END CERTIFICATE-----
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2016-02-19 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.7'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: |-
   ruby2ruby provides a means of generating pure ruby code easily from
   RubyParser compatible Sexps. This makes making dynamic language
@@ -116,7 +116,6 @@ extra_rdoc_files:
 - README.txt
 files:
 - .autotest
-- .gemtest
 - History.txt
 - Manifest.txt
 - README.txt