Handle defining access scope for existing methods

Fixes #78

Author: mislav

lib/ripper-tags/parser.rb

@@ -71,7 +71,7 @@ def on_command(name, *args)
          "has_one", "has_many",
          "belongs_to", "has_and_belongs_to_many",
          "scope", "named_scope",
-         "public_class_method", "private_class_method",
+         "public_class_method", "private_class_method", "protected_class_method",
          "public", "protected", "private",
          /^[mc]?attr_(accessor|reader|writer)$/
       on_method_add_arg([:fcall, name], args[0])
@@ -171,18 +171,22 @@ def on_method_add_arg(call, args)
         [:alias, args[1][0], args[2][0], line] if args[1] && args[2]
       when "define_method"
         [:def, args[1][0], line]
-      when "public_class_method", "private_class_method", "private", "public", "protected"
+      when "public_class_method", "private_class_method", "protected_class_method", "private", "public", "protected"
         access = name.sub("_class_method", "")
+        klass = name == access ? nil : 'self'
+        procedure = :def_with_access
 
-        if args[1][1] == 'self'
-          klass = 'self'
+        if args[1][0].is_a?(String)
+          procedure = :redefine_access
+          method_name = args[1][0]
+        elsif args[1][1] == 'self'
           method_name = args[1][2]
         else
           klass = nil
           method_name = args[1][1]
         end
 
-        [:def_with_access, klass, method_name, access, line]
+        [procedure, klass, method_name, access, line]
       when "scope", "named_scope"
         [:rails_def, :scope, args[1][0], line]
       when /^[mc]?attr_(accessor|reader|writer)$/
@@ -457,6 +461,14 @@ def on_def_with_access(klass, name, access, line)
         :access => access
     end
 
+    def on_redefine_access(klass, name, access, line)
+      ns = (@namespace.empty? ? 'Object' : @namespace.join('::'))
+      singleton = @is_singleton || klass == 'self'
+      full_name = "#{ns}#{singleton ? '.' : '#'}#{name}"
+      tag = @tags.select { |t| t[:full_name] == full_name }.last
+      tag[:access] = access if tag
+    end
+
     def on_rails_def(kind, name, line)
       ns = (@namespace.empty?? 'Object' : @namespace.join('::'))
 

test/test_ripper_tags.rb

@@ -204,6 +204,37 @@ def self.def() end
     end
   end
 
+  def test_extract_one_line_definition_access_by_symbol
+    %w(private public protected).each do |visibility|
+      tags = extract(<<-EOC)
+        class Test
+          def foo() end
+          #{visibility} :foo
+        end
+      EOC
+
+      assert_equal 2, tags.size
+      tag = tags.find { |t| t[:name] == "foo" }
+      assert_equal visibility, tag[:access]
+      assert_equal 2, tag[:line]
+    end
+
+    %w(private_class_method public_class_method protected_class_method).each do |visibility|
+      tags = extract(<<-EOC)
+        class Test
+          def self.bar() end
+          #{visibility} :bar
+        end
+      EOC
+
+      assert_equal 2, tags.size
+      tag = tags.find { |t| t[:name] == "bar" }
+      scope = visibility.sub("_class_method", "")
+      assert_equal scope, tag[:access]
+      assert_equal 2, tag[:line]
+    end
+  end
+
   def test_extract_module_eval
     tags = extract(<<-EOC)
       M.module_eval do