ruby2ruby 2.0.3 → 2.0.4

data.tar.gz.sig

@@ -1,4 +1 @@
-BU'�i~P�=��A�a���i�>�Ml�f$���*c83ѝ,���B
-١�k��U�ẋl�J�<���t
-Iwh�Jqᵦ���A
-���ά}ê�.N�#��x[5V$�z�6��ta��[<�4N�bl��!���;�mw0�Tz]�sb��U�gkkClqj&�8���j�bƂ��D%n�4�z���������"-�_7aJ�y�G�0�G��7����=�B�!�ɂɑ�=N�/�w�
+}�*5ܡ߂�:�|�u#a=�M��'��"\Zؾ"�d!��,g�s=~:.�Wc6pP’�%~w��z�������6����������RD+�+A�j$�Y~�8L
�9��K
1>������Ša��R��1g��8c����eY�蘷놓�"ȳ�;u�R�85�ͫn\�P��7��6��̦�����2636�M�aC���xQ�,�^��dt���;5ʬI8J�7.ꂰ�؟$��Jߥ�%��DFE��K��9y�	��

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.0.4 / 2013-03-28
+
+* 1 bug fix:
+
+  * Fixed attr_* generators in cases where the body isn't idiomatic. (robertfeldt)
+
 === 2.0.3 / 2013-02-07
 
 * 2 minor enhancements:

data/lib/ruby2ruby.rb

@@ -24,7 +24,7 @@ class Regexp
 end
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = '2.0.3'
+  VERSION = "2.0.4"
   LINE_LENGTH = 78
 
   BINARY = [:<=>, :==, :<, :>, :<=, :>=, :-, :+, :*, :/, :%, :<<, :>>, :**]
@@ -315,15 +315,34 @@ class Ruby2Ruby < SexpProcessor
     type1 = exp[1].first
     type2 = exp[2].first rescue nil
 
-    if type1 == :args and [:ivar, :attrset].include? type2 then
-      name = exp.shift
+    if type1 == :args and [:ivar, :iasgn, :attrset].include? type2 then
+      name = exp.first # don't shift in case we pass through
       case type2
       when :ivar then
-        exp.clear
-        return "attr_reader #{name.inspect}"
+        ivar_name = exp.ivar.last
+
+        meth_name = ivar_name.to_s[1..-1].to_sym
+        expected = s(meth_name, s(:args), s(:ivar, ivar_name))
+
+        if exp == expected then
+          exp.clear
+          return "attr_reader #{name.inspect}"
+        end
       when :attrset then
+        # TODO: deprecate? this is a PT relic
         exp.clear
         return "attr_writer :#{name.to_s[0..-2]}"
+      when :iasgn then
+        ivar_name = exp.iasgn[1]
+        meth_name = "#{ivar_name.to_s[1..-1]}=".to_sym
+        arg_name = exp.args.last
+        expected = s(meth_name, s(:args, arg_name),
+                     s(:iasgn, ivar_name, s(:lvar, arg_name)))
+
+        if exp == expected then
+          exp.clear
+          return "attr_writer :#{name.to_s[0..-2]}"
+        end
       else
         raise "Unknown defn type: #{exp.inspect}"
       end

data/test/test_ruby2ruby.rb

@@ -80,6 +80,42 @@ class TestRuby2Ruby < R2RTestCase
     util_compare inn, out
   end
 
+  def test_attr_reader_diff
+    inn = s(:defn, :same, s(:args), s(:ivar, :@diff))
+    out = "def same\n  @diff\nend"
+    util_compare inn, out
+  end
+
+  def test_attr_reader_same
+    inn = s(:defn, :same, s(:args), s(:ivar, :@same))
+    out = "attr_reader :same"
+    util_compare inn, out
+  end
+
+  def test_attr_reader_same_name_diff_body
+    inn = s(:defn, :same, s(:args), s(:not, s(:ivar, :@same)))
+    out = "def same\n  (not @same)\nend"
+    util_compare inn, out
+  end
+
+  def test_attr_writer_diff
+    inn = s(:defn, :same=, s(:args, :o), s(:iasgn, :@diff, s(:lvar, :o)))
+    out = "def same=(o)\n  @diff = o\nend"
+    util_compare inn, out
+  end
+
+  def test_attr_writer_same_name_diff_body
+    inn = s(:defn, :same=, s(:args, :o), s(:iasgn, :@same, s(:lit, 42)))
+    out = "def same=(o)\n  @same = 42\nend"
+    util_compare inn, out
+  end
+
+  def test_attr_writer_same
+    inn = s(:defn, :same=, s(:args, :o), s(:iasgn, :@same , s(:lvar, :o)))
+    out = "attr_writer :same"
+    util_compare inn, out
+  end
+
   def test_dregx_slash
     inn = util_thingy(:dregx)
     out = '/a"b#{(1 + 1)}c"d\/e/'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby2ruby
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-02-07 00:00:00 Z
+date: 2013-03-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -76,11 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 21
         segments: 
         - 4
-        - 5
-        version: "4.5"
+        - 7
+        version: "4.7"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 

metadata.gz.sig

@@ -1,2 +1,3 @@
-�ҟAd�����I����L��L9���Q�*��o�qu��Β�p�S���f%�SGCt�L�:�
-�Zu�t
�+yh5e�PQ���R�����&)��4'���;Rѵ�KL��{���$�W���k�A�0�x���C?Wܔ�EK��鴳��8��<k��|��}~4Ƌ�R����ܽo$��A`d$
&�ǡ�����W�e�עz<N"�
+V��>\5�{�j[�������{
+�Ԑ8�Ed�[�4p�`�BhZ������=Ĵ-J��9���]۹�������E
NE#ō�S��%�L�C��RsOB��Ll��t��^����id�#j��~�[OD���S~e��b�F.RGI��;f��
+�:|��)��ܝ��'�[��8G��a��F���������2���)�l�L�[Q�y���X�ӠDN�0��Wj"�ڄd3�LЭ�