method_meter 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b21e5d9564b1e2716490f84775bf00d5381d89259ffd4d5f5ebf5df90390e29
-  data.tar.gz: be86e7ffbc8f9fba9c0b50200625b9c62c66b2ff8196d279e5072796149c50b8
+  metadata.gz: 3a5ff992ee06f786d08c62136e9c793d3c0810ce19b70feefadf298004d83d58
+  data.tar.gz: 36882deddbc956bcfc5baa29326f03a713c27de09cd00f833d88da6acf722ae4
 SHA512:
-  metadata.gz: a3120f5ecf09523ac2a02a34a35bb80fc43fb2fa4b34d094606bb4c371542f57294a769bc0f743c62827ec6baf9059807267a54a57bda5d22baed79a606ede75
-  data.tar.gz: b41f1de2cdad17844289822ac761d4e2f057fd776f34432d166e8e6eea31492e1b26c7c9e0220e3024187833fbc01e3094facab2581d0f43dc2d658b6aadf535
+  metadata.gz: bb17a7e2982862a37acdadaf2adc7f981b06be55b57188a6e1ecb31cdcb1301ba9ad70f01fb21e06ca764931c4a3305bf7a01e88ba5897c9750b7dad2ffe2ccf
+  data.tar.gz: 41c3ed52140bbe3260f12152385261ac6360f8de87479674277277c146e81ea3589162b1cc35cddf1c442fd946fa05496ec670a09282f217f82076b0ab430686

data/lib/method_meter.rb

@@ -1,11 +1,10 @@
 require 'method_meter/version'
 
 require 'active_support'
-require 'active_support/core_ext/string'
 require 'defined_methods'
 
 module MethodMeter
-  mattr_accessor :events, :subscribers, :data, :exceptions
+  mattr_accessor :metered_methods, :subscribers, :data, :exceptions
 
   class << self
     def observe(object, excepted_methods=[])
@@ -14,7 +13,7 @@ module MethodMeter
       DefinedMethods.in(object).each do |group|
         group[:object].module_eval do
           group[:methods].each do |method|
-            MethodMeter.define_instrumented_method(group[:object], method, group[:private], group[:protected], group[:singleton])
+            MethodMeter.define_metering_method(group[:object], method, group[:private], group[:protected], group[:singleton])
           end
         end
       end
@@ -23,10 +22,10 @@ module MethodMeter
     def measure!(key)
       data[key] = {}
 
-      events.each do |event|
-        subscribers << ActiveSupport::Notifications.subscribe(event) do |_, started_at, finished_at, _, _|
-          data[key][event] = [] unless data[key].has_key?(event)
-          data[key][event] << (finished_at - started_at)
+      metered_methods.each do |metered_method|
+        subscribers << ActiveSupport::Notifications.subscribe(metered_method) do |_, started_at, finished_at, _, _|
+          data[key][metered_method] = [] unless data[key].has_key?(metered_method)
+          data[key][metered_method] << (finished_at - started_at)
         end
       end
 
@@ -38,26 +37,28 @@ module MethodMeter
     end
 
     def measurement
-      @measurement ||= begin
-        data.collect do |key, measurement_records|
-          _measurement = measurement_records.collect do |method_name, records|
-            total_calls   = records.size
-            total_runtime = records.reduce(:+) * 1000
-            average       = total_runtime / total_calls
-
-            {
-              method: method_name,
-              min: records.min * 1000,
-              max: records.max * 1000,
-              average: average,
-              total_runtime: total_runtime,
-              total_calls: total_calls,
-            }
-          end
-
-          { key => _measurement }
+      measurement = {}
+
+      data.each do |key, measurement_records|
+        _measurement = measurement_records.collect do |method_name, records|
+          total_calls   = records.size
+          total_runtime = records.reduce(:+) * 1000
+          average       = total_runtime / total_calls
+
+          {
+            method: method_name,
+            min: records.min * 1000,
+            max: records.max * 1000,
+            average: average,
+            total_runtime: total_runtime,
+            total_calls: total_calls,
+          }
         end
+
+        measurement[key] = _measurement
       end
+
+      measurement
     end
 
     def profiling_method_names(method)
@@ -66,21 +67,24 @@ module MethodMeter
       [method_with_profiling, method_without_profiling]
     end
 
-    def instrument_method?(method, event_name)
-      !exceptions.include?(method) && !events.include?(event_name) && (event_name =~ /_profiling/).nil?
+    def meter_method?(method_name)
+      object_name, method = method_name.split('#')
+      object_name, method = method_name.split('.') if method.nil?
+      !exceptions.include?(method.to_sym) && !metered_methods.include?(method_name) && (method_name =~ /_profiling/).nil?
     end
 
-    def define_instrumented_method(object, method, is_private, is_protected, is_singleton)
+    def define_metering_method(object, method, is_private, is_protected, is_singleton)
       object.module_eval do
         method_with_profiling, method_without_profiling = MethodMeter.profiling_method_names(method)
-        event_name = DefinedMethods.fqmn(object.to_s, method, is_singleton)
+        object_name = is_singleton ? object.to_s.split(':').last.gsub('>', '') : object.to_s
+        method_name = DefinedMethods.fqmn(object_name, method, is_singleton)
 
-        return unless MethodMeter.instrument_method?(method, event_name)
+        return unless MethodMeter.meter_method?(method_name)
 
-        MethodMeter.events << event_name
+        MethodMeter.metered_methods << method_name
 
         define_method(method_with_profiling) do |*args, &block|
-          ActiveSupport::Notifications.instrument(event_name, args) do
+          ActiveSupport::Notifications.instrument(method_name, args) do
             send(method_without_profiling, *args, &block)
           end
         end
@@ -96,11 +100,11 @@ module MethodMeter
     private
 
     def init(excepted_methods)
-      self.events =       [] if events.nil?
-      self.exceptions =   [] if exceptions.nil?
-      self.exceptions |=  excepted_methods
-      self.subscribers  = []
-      self.data         = {} if data.blank?
+      self.metered_methods = [] if metered_methods.nil?
+      self.exceptions      = [] if exceptions.nil?
+      self.exceptions     |= excepted_methods
+      self.subscribers     = []
+      self.data            = {} if data.blank?
     end
   end
 end

data/lib/method_meter/version.rb

@@ -1,3 +1,3 @@
 module MethodMeter
-  VERSION = '0.4.0'
+  VERSION = '0.4.3'
 end

data/method_meter.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: method_meter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Wilfrido T. Nuqui Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MethodMeter is a library module that instruments methods defined in a
   given object.
 email: