where_is 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081429ac13b2f3e5ff923da95306900535c0ec39
-  data.tar.gz: 08b00b6d0696e13ffcf09be13fd68ace84aa350d
+  metadata.gz: b4c855bcddc4646e2e9d75948b465b5c411a9400
+  data.tar.gz: e9fdf1137a464bf2b0dabf9e49aae76efcb067e7
 SHA512:
-  metadata.gz: 422ceefba0193373a6016311b0e504ca081d084c87d4e8ceb7e4e790615d725eb75da1de33c97e96fa3601df12fe954fa0241ec0a769c3b9dbbc1588580fd88d
-  data.tar.gz: e962135912c48d7f22b2bafc9215012e8bf56089b30254edfe3e656e8ebc1ccd8794ee349d3321a32167b2c5ca57cc766dde908d810462cd6d7c92c2517c4fb9
+  metadata.gz: 4d3cff0fd27d01e9d0050a8807f940f534e8f4068a9fd6afdc15495aa00819aa102f01426f4d8366a0a02e4f607a463709a78dc20d5a449ef1d85e0fc6e43cb9
+  data.tar.gz: 3c78c4e6b42232cb3e3c6d4b00da77417b652009c6460e115aef7a9aeb302e83a2bb516e7c765398fe326dd4e245bde9b14cc6e30bc81abc11157c08043ba731

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/daveallie/where_is.svg?branch=master)](https://travis-ci.org/daveallie/where_is)
+
 # Where Is
 
 Gem based on https://gist.github.com/wtaysom/1236979.

data/lib/where_is/version.rb

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

data/lib/where_is.rb

@@ -3,15 +3,7 @@ require 'where_is/version'
 module Where
   class << self
     def is(klass, method = nil)
-      if method
-        begin
-          Where.is_instance_method(klass, method)
-        rescue NameError
-          Where.is_method(klass, method)
-        end
-      else
-        Where.is_class_primarily(klass)
-      end
+      are(klass, method)[0]
     end
 
     def are(klass, method = nil)
@@ -31,54 +23,61 @@ module Where
     end
 
     def is_method(klass, method_name)
-      source_location(klass.method(method_name))
+      are_methods(klass, method_name)[0]
     end
 
     def is_instance_method(klass, method_name)
-      source_location(klass.instance_method(method_name))
+      are_instance_methods(klass, method_name)[0]
     end
 
     def are_methods(klass, method_name)
-      methods = are_via_extractor(:method, klass, method_name)
+      ensured_class = ensure_class(klass)
+      methods = are_via_extractor(:method, ensured_class, method_name)
       source_locations = group_and_combine_source_locations(methods)
 
       if source_locations.empty?
-        raise NameError, "#{klass} has no methods called #{method_name}"
+        raise NameError, "#{ensured_class} has no methods called #{method_name}"
       end
 
       source_locations
     end
 
     def are_instance_methods(klass, method_name)
-      methods = are_via_extractor(:instance_method, klass, method_name)
+      ensured_class = ensure_class(klass)
+      methods = are_via_extractor(:instance_method, ensured_class, method_name)
       source_locations = group_and_combine_source_locations(methods)
 
       if source_locations.empty?
-        raise NameError, "#{klass} has no methods called #{method_name}"
+        raise NameError, "#{ensured_class} has no methods called #{method_name}"
       end
 
       source_locations
     end
 
+    def is_class_primarily(klass)
+      is_class(klass)[0]
+    end
+
     def is_class(klass)
-      methods = defined_methods(klass)
+      ensured_class = ensure_class(klass)
+      methods = defined_methods(ensured_class)
       source_locations = group_and_combine_source_locations(methods)
 
       if source_locations.empty?
-        raise NameError, "#{klass} has no methods" if methods.empty?
-        raise NameError, "#{klass} only has built-in methods " \
+        raise NameError, "#{ensured_class} has no methods" if methods.empty?
+        raise NameError, "#{ensured_class} only has built-in methods " \
                              "(#{methods.size} in total)"
       end
 
       source_locations
     end
 
-    def is_class_primarily(klass)
-      is_class(klass)[0]
-    end
-
     private
 
+    def ensure_class(klass)
+      [Class, Module].include?(klass.class) ? klass : klass.class
+    end
+
     def source_location(method)
       source_location = method.source_location
       source_location = [method.to_s[/: (.*)>/, 1]] if source_location.nil?
@@ -105,7 +104,6 @@ module Where
     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))
@@ -124,7 +122,7 @@ module Where
     end
 
     def build_location_hash(file, line)
-      { file: file, line: line, path: "#{file}:#{line}" }
+      { file: file, line: line, path: [file, line].compact.join(':') }
     end
   end
 end

data/where_is.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/daveallie/where_is'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
+  spec.files         = Dir['lib/**/*'] + %w[CODE_OF_CONDUCT.md LICENSE.txt
+                                            README.md Gemfile where_is.gemspec]
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rubocop', '~> 0.53.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '~> 0.56.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_is
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dave Allie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.56.0
 description: A little Ruby gem for finding the source location where class and methods
   are defined.
 email:
@@ -60,15 +74,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - lib/where_is.rb
 - lib/where_is/version.rb
 - where_is.gemspec

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.gem

data/.rubocop.yml

@@ -1,8 +0,0 @@
-AllCops:
-  DisplayCopNames: true
-
-Naming/PredicateName:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false

data/Rakefile

@@ -1,6 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rubocop/rake_task'
-
-task default: :rubocop
-
-RuboCop::RakeTask.new(:rubocop)

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'where_is'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here