show_code 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 917027002bceb30270e19f1419fc1cb1e0d58f42
-  data.tar.gz: a6eef9368dc7ee9b58c571386f25fa615d857fa8
+  metadata.gz: 860381c352a3583f9a08a13a459eedfe7484675a
+  data.tar.gz: 12a2a63183c690607678a83c01782591cca92d23
 SHA512:
-  metadata.gz: 3b2d93838f1183ef011ce36cfe6c19d8aac52cf332ef0333b365f2d3202e017a9721875d33dbc032092e5ff0a7804a902f9113ef13b758058ebafe652254136f
-  data.tar.gz: cdfa8bde87f2dce7c2cbf6547054f3188f0787e96d83bc3190794251f46f86301661c1fa303a1babeeb5d064399e01a8c8277db6b2a8f3998eda5215ed502b4f
+  metadata.gz: a32516a8ce21c77cbf98b6d9854f4f3afb44e347b1737325ba382e781358803ec5154cf0290009319e0475f570672f92a1e56a526571258d7f192bdeacc72870
+  data.tar.gz: 0515308a0ea0809e4c329926f6d8654495430affac86a6419ad6ce7000e24167465e9c5ee3e2ea52b01255faaeef578b126ab8b96801730ae6a0efdcf3cf484f

data/lib/show_code/code.rb

@@ -6,15 +6,25 @@ module ShowCode
 
     def initialize(location)
       @file         = location.file
-      @line         = location.line
       file_lines    = File.readlines(@file) if @file
 
+      @line         = real_start_line file_lines, location.line
       related_lines = file_lines[(@line - 1)..-1] || []
+
       codes         = extract_method_code related_lines
       @lines        = codes.count
       @content      = codes.join
     end
 
+    def real_start_line(file_lines, line)
+      return line unless line.zero?
+
+      file_lines.each do |loc|
+        line += 1
+        return line if /^\s*(class|module)\s+[A-Z]/ === loc
+      end
+    end
+
     def extract_method_code(related_lines)
       codes = []
       related_lines.each do |loc|
@@ -49,7 +59,7 @@ module ShowCode
       line_number = line - 1
       output.split("\n").map do |loc|
         line_number += 1
-        "\e[33m#{line_number}\e[0m #{loc}"
+        "\e[33m#{line_number.to_s.ljust(4, ' ')}\e[0m#{loc}"
       end.join("\n")
     end
 

data/lib/show_code/source_location.rb

@@ -1,5 +1,6 @@
 module ShowCode
   class SourceLocationError < StandardError; end
+  class ModuleNotFound < StandardError; end
 
   class SourceLocation
     attr :method, :file, :line
@@ -7,8 +8,8 @@ module ShowCode
     def initialize(target)
       if target.is_a?(String)
         arr    = target.gsub('.new.', '.allocate.').split('.')
-        klass  = arr[0..-2].join('.')
-        method = arr[-1]
+        klass, method = arr[0..-2].join('.'), arr[-1]
+        klass, method = based_on_klass_method(target) if arr.size == 1 # if hope view Class/Module source codes
 
         # refer:
         # Object.instance_method(:method).bind(User).call(:current).source_location
@@ -23,12 +24,30 @@ module ShowCode
       end
 
       if @method.source_location.nil?
-        raise SourceLocationError, 'cannot find the method source location'
+        raise SourceLocationError, 'Could not find the method source location'
       else
-        @file, @line = @method.source_location
+        @file, line = @method.source_location
+        @line ||= line
       end
 
     end
 
+    private
+
+    # find class first singleton method or first instance_method
+    def based_on_klass_method(klass)
+      _class = eval(klass)
+
+      regroup_klass = if !(method = _class.instance_methods(:false)[0]).nil?
+        klass + '.allocate'
+      elsif !(method = _class.methods(:false)[0]).nil?
+        klass
+      else
+        raise ModuleNotFound, "Could not find #{klass}"
+      end
+
+      @line = 0; [regroup_klass, method]
+    end
+
   end
 end

data/lib/show_code/version.rb

@@ -1,3 +1,3 @@
 module ShowCode
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: show_code
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - cenxky