mmmm 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1243a0d9d8c1ee44508e533fd277d74187d91d61
-  data.tar.gz: 53a9d2c38916e6bbac2d01725c79bc67f1b790d7
+  metadata.gz: a9f1cf1b165a5b5c70a800ee3d5fc641552b3ab4
+  data.tar.gz: 39e1d73d93248f5bf5cb41fbc7d00d81990eec6a
 SHA512:
-  metadata.gz: 6e481f68f7c35f6ada225962c184dc3dfdc7097d810fb460b6caef0c23bf742dddcd7730588d5b24b47aa225e5a56b8bde826f6088804ac82b387514dba69896
-  data.tar.gz: 7d1c1da02a39e89c2667fb2aceefb6817462fde6c573bfd0a79ba846a40514eb5e135387437c15d8c8ef3d582b24931fe2d905ab8cbed7fd353806de9f918c18
+  metadata.gz: b33542499bb7e20bc5f4cd1d40a04c475f0a03561dd55f02b382fb2075a5c5e32f16497e9e27516668b479bbe3fdebd70b111885c20158a31459a8ac07c48fc1
+  data.tar.gz: e9970ad0598a27573b78fed9cb464134ec8a091fcbcd1be0638c4194734f96101e60ea18929305d917d640f1caf8d4818a0f983a171e0cdbb24a52ec11910dc5

data/lib/mmmm/helper.rb

@@ -11,8 +11,7 @@ module Mmmm
     def helper name
       if Mmmm::Top.respond_to? name or
         Mmmm::Top.private_methods.include? name
-	raise NameError,"#{name} is already defined. Please use Mmmm.helper(:another_name)"
-        return
+        raise NameError, "#{name} is already defined. Please use Mmmm.helper(:another_name)"
       end
       define_helper_method name
     end

data/lib/mmmm/object_method.rb

@@ -7,8 +7,8 @@ module Mmmm
 
     def inspect
       @locs_in_all_ancs.
-	map{|file, line| [file.cyan, line].join(' ')}.
-	join("\n")
+        map{ |file, line| [file.cyan, line].join(' ') }.
+        join("\n")
     end
 
     private
@@ -24,7 +24,7 @@ module Mmmm
             loc = instance_method_location method_name, class_or_module
             locs << loc unless loc.nil?
            end.
-	   uniq
+           uniq
     end
 
     def instance_method_location method_name, mod

data/lib/mmmm/object_methods.rb

@@ -3,49 +3,60 @@ module Mmmm
 
     class FileLineMethod
       attr_reader :file, :line, :method
-      def initialize src_loc, m
+      def initialize src_loc, m, inherited
         @file = src_loc[0]
         @line = src_loc[1]
         @method = m
+        @inherited = inherited
+      end
+
+      def inherited?
+        @inherited
       end
     end
 
     def initialize obj
-      file = nil
-      flm_arr = file_line_method_arr(obj)
-      @group_by_file = group_by_file(flm_arr)
+      @obj = obj
     end
 
     def inspect
-      @group_by_file.
-	map {|file, flms| "#{file.cyan}\n#{lm_in_string(flms)}" }.
-	join("\n")
+      group_by_inherited_and_file.
+        map { |inh_file, flms| "#{inh_file[1].cyan} #{inh_file[0]}\n#{lm_in_string(flms)}" }.
+        join("\n")
     end
 
     private
 
-    def file_line_method_arr obj
-      obj.methods.reduce([]) do |rs, m|
-        file_line = obj.method(m).source_location
-        if file_line
-          rs << FileLineMethod.new(file_line, m)
-        end
-        rs
+    def file_line_method_arr
+      @obj.methods.each_with_object([]) do |m, rs|
+        file_line = @obj.method(m).source_location
+        rs << FileLineMethod.new(file_line, m, inherited?(m)) if file_line
       end
     end
 
-    def group_by_file flm_arr
-      grouped = flm_arr.
-	group_by{|flm| flm.file}.
-	sort_by{|file, flm| file}
+    def inherited? method
+      not open_class_defined_methods.include? method
+    end
+
+    def open_class_defined_methods
+      @ocdm ||= [:singleton_class, :class].
+        map{ |klass| @obj.send(klass).instance_methods(false) }.
+        flatten.
+        uniq
+    end
+
+    def group_by_inherited_and_file
+      grouped = file_line_method_arr.
+        group_by{ |flm| [flm.inherited?.to_s, flm.file] }.
+        sort_by{ |inh_f, _| inh_f }
 
       Hash[grouped]
     end
 
     def lm_in_string flms
       flms.
-	map {|flm| "#{format('%5d', flm.line)} #{flm.method}" }.
-	join("\n")
+        map {|flm| "#{format('%5d', flm.line)} #{flm.method}" }.
+        join("\n")
     end
   end
 end

data/lib/mmmm/version.rb

@@ -1,3 +1,3 @@
 module Mmmm
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmmm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: find (all) method source location