where_is 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6c7084127b003a146f929e32f5c7682be7adc42
-  data.tar.gz: e0e7c87c2bdaf475baa3d3b0d4d35e2d5a8efa80
+  metadata.gz: 081429ac13b2f3e5ff923da95306900535c0ec39
+  data.tar.gz: 08b00b6d0696e13ffcf09be13fd68ace84aa350d
 SHA512:
-  metadata.gz: f07a78076b84383157fdbd7246f5900bad72c9c8768d7676743a4cf180c72194765e8653bec37651b17d720c18b4f49806382a62a32ae94b436355796878fc6f
-  data.tar.gz: 848a7dce9d1b383b8192fa31369748402527cb3dcc0c5aef169bb6515904b051e567066eed5e5503db17087b8c77a47cb70fe36c28a7709d21c421e07325138e
+  metadata.gz: 422ceefba0193373a6016311b0e504ca081d084c87d4e8ceb7e4e790615d725eb75da1de33c97e96fa3601df12fe954fa0241ec0a769c3b9dbbc1588580fd88d
+  data.tar.gz: e962135912c48d7f22b2bafc9215012e8bf56089b30254edfe3e656e8ebc1ccd8794ee349d3321a32167b2c5ca57cc766dde908d810462cd6d7c92c2517c4fb9

data/README.md

@@ -24,25 +24,28 @@ Or install it yourself as:
 # Where.is takes a class and an optional method
 
 Where.is(Where, :is)
-# => ["/Users/david/.rvm/gems/ruby-2.3.1/gems/where_is-0.2.0/lib/where_is.rb", 5]
+# => {:file=>"/Users/david/repos/daveallie/where_is/lib/where_is.rb", :line=>5, :path=>"/Users/david/repos/daveallie/where_is/lib/where_is.rb:5"}
 
 Where.is(IRB)
-# => ["/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/inspector.rb", 24]
+# => {:file=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/inspector.rb", :line=>24, :path=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/inspector.rb:24"}
+
+Where.is(String, :empty?) # This method is defined in C
+# => {:file=>"String#empty?", :line=>nil, :path=>"String#empty?:"}
 
 
 # Where.are takes a class and an optional method and will return all definitions
 # of the method/class
 Where.are(Where, :is)
-# => [["/Users/david/.rvm/gems/ruby-2.3.1/gems/where_is-0.2.0/lib/where_is.rb", 5]]
+# => [{:file=>"/Users/david/repos/daveallie/where_is/lib/where_is.rb", :line=>5, :path=>"/Users/david/repos/daveallie/where_is/lib/where_is.rb:5"}]
 
 Where.are(IRB)
 # => [
-#  ["/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/inspector.rb", 24],
-#  ["/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/workspace.rb", 112],
-#  ["(eval)", 2],
-#  ["/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb.rb", 350],
-#  ["/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/init.rb", 16]
-#]
+#   {:file=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/inspector.rb", :line=>24, :path=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/inspector.rb:24"},
+#   {:file=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/workspace.rb", :line=>112, :path=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/workspace.rb:112"},
+#   {:file=>"(eval)", :line=>2, :path=>"(eval):2"},
+#   {:file=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb.rb", :line=>350, :path=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb.rb:350"},
+#   {:file=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/init.rb", :line=>16, :path=>"/Users/david/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/irb/init.rb:16"}
+# ]
 
 
 Where.is(String, :unknown_method)

data/lib/where_is/version.rb

@@ -1,3 +1,3 @@
 module Where
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/lib/where_is.rb

@@ -81,31 +81,31 @@ module Where
 
     def source_location(method)
       source_location = method.source_location
-      return method.to_s[/: (.*)>/, 1] if source_location.nil?
+      source_location = [method.to_s[/: (.*)>/, 1]] if source_location.nil?
 
       # source_location is a 2 element array
       # [filename, line_number]
       # some terminals (eg. iterm) will jump to the file if you cmd+click it
       # but they can jump to the specific line if you concat file & line number
       filename, line = source_location
-      { file: filename, line: line, path: "#{filename}:#{line}" }
+      build_location_hash(filename, line)
     end
 
     def group_and_combine_source_locations(source_locations)
-      file_groups = source_locations.group_by { |src_loc| src_loc[0] }.to_a
+      file_groups = source_locations.group_by { |src_loc| src_loc[:file] }.to_a
 
       file_groups.map! do |file, src_locs|
-        lines = src_locs.map { |sl| sl[1] }
+        lines = src_locs.map { |sl| sl[:line] }
         count = lines.size
         line = lines.min
-        { file: file, count: count, line: line }
+        { count: count, data: build_location_hash(file, line) }
       end
 
-      file_groups.sort_by! { |fc| fc[:count] }
-      file_groups.map { |fc| [fc[:file], fc[:line]] }
+      file_groups.sort_by { |fc| fc[:count] }.map { |fc| fc[:data] }
     end
 
     def are_via_extractor(extractor, klass, method_name)
+      klass = klass.class unless [Class, Module].include?(klass.class)
       klass.ancestors.map do |ancestor|
         begin
           source_location(ancestor.send(extractor, method_name))
@@ -116,11 +116,15 @@ module Where
     end
 
     def defined_methods(klass)
-      methods = klass.methods(false)
-                     .map { |m| klass.method(m) }
+      methods = klass.methods(false).map { |m| klass.method(m) }
       methods += klass.instance_methods(false)
                       .map { |m| klass.instance_method(m) }
-      methods.map(&:source_location).compact
+      source_locations = methods.map(&:source_location).compact
+      source_locations.map { |(file, line)| build_location_hash(file, line) }
+    end
+
+    def build_location_hash(file, line)
+      { file: file, line: line, path: "#{file}:#{line}" }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: where_is
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dave Allie