drg 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42a8cc2408820a2a4101af0d3c59c058562e83ed
-  data.tar.gz: c956180e13fae9e3f0b00896a46d4bf60c160869
+  metadata.gz: f1910c0f8c2bc805658481b0fe924c81178d6523
+  data.tar.gz: 59a3de60bfcfa792a81cad5b23ba77cf569c259c
 SHA512:
-  metadata.gz: 35e3b6994c4ab69cdc529a20caa30638fc7e004073ebb6b0d879addba16e3abc3ad1ee13d8bab395dd79c6eddaacd0b32cc006767df6059190794397c1050c37
-  data.tar.gz: 2902a622ed22d2b0131ead991e46ab1f65a677f0fee21a4189b9fa1e8ae06f8783e50545591ed97b1ddbea8300d600ced7bd1b8a150ce21c6cfcfbd8849083cc
+  metadata.gz: e92fdb899f3ad0beba37ed43de71a7da699aaa0eb58496057f7632a1d3c1631479cac601f36a90423e61856e1ff30aa9e468d577ca0ef5699995b3b3cfb2449b
+  data.tar.gz: 46c3e353e3a89151609f7621e92b7cdd07a5ff89897f10d5e75b26cc360c133b4c07222d8c22f40db3ff5d75019ff74da52e79d5b2945d80174dafe843d90966

data/lib/drg/ruby/const.rb

@@ -1,7 +1,8 @@
 require 'ruby_parser'
 
 class DRG::Ruby::Const
-  CONSTANT_DEFS = { class: :class, module: :module, cdecl: :class }
+  CLASS_MOD_DEFS = { class: :class, module: :module }
+  CONSTANT_DEFS = { cdecl: :class }.merge CLASS_MOD_DEFS
 
   attr_reader :sexp
 
@@ -11,13 +12,19 @@ class DRG::Ruby::Const
     @sexp = sexp
   end
 
+  # s(:module, :Admin, s(:class, :Super, nil, s(:class, :UsersController, s(:colon3, :ApplicationController), s(:defn, :name, s(:args)
+  # s(:class, :Report, nil, s(:cdecl, :DEFAULT_TZ, s(:str, "UTC")), s(:defs, s(:self), :enqueue,
   def name(sexp = @sexp, list = [])
     sexp = Array(sexp)
     if sexp[1].is_a?(Sexp) && sexp[1][0] == :colon2
       parts = sexp[1].to_a.flatten
       list.concat parts.drop(parts.size / 2)
     elsif CONSTANT_DEFS.key?(sexp[0])
-      name(sexp.compact[2], list << sexp[1].to_s)
+      list << sexp[1].to_s
+      # recurse unless the second element is nil, which indicates it's the end of the class/module definition
+      if !sexp[2].nil? || (sexp[3].is_a?(Sexp) and CLASS_MOD_DEFS.key?(sexp[3].first))
+        name(sexp.compact[2], list)
+      end
     end
     list.join('::')
   end

data/lib/drg/version.rb

@@ -1,3 +1,3 @@
 module DRG
-  VERSION = '0.15.1'.freeze
+  VERSION = '0.15.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Ryan Buckley