process_metrics 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbf3017d3862823d521621348082d8dd46df0fde
-  data.tar.gz: 2870f25914e46b7977f52cdf50540e1eb1b50ac1
+  metadata.gz: 1d66fea7efd65b1d14fc80ef7c19375f0f491d65
+  data.tar.gz: a9794b5b4f6e89bb26c0f4f7e1d37aa688a0219d
 SHA512:
-  metadata.gz: b53d0da4d45c960362f752aa57ebb3cb860e1d1469d275c4649c931eee8b942e0308be2051d8952fd8315e06702fbc626e34fa2b1ea8a4711bdd3506498bae6f
-  data.tar.gz: 5eb11c12cffbde2ca6e455250c75fd479600fe51cca361ff536ad7a48c3e15cd6fcaeb21ac53db1aa7219a115f5ff9c439aad5478db11f2a79d586d510736012
+  metadata.gz: b0b559b1b6a77358920d8c04975e556908061300c986ee0ecde04a4c198791ad9fb1399a776a27a768042ffe6156e179360d11b3388bf3889c8dc33090e6537c
+  data.tar.gz: 84121883e14637930bb658ab0ebc79392676d57923e752c380460d531a89d79249a1b8357427302f374401ec24e3107f7bb7a5afb7154d542d0d1d8b2e94778a

data/README.md

@@ -1,4 +1,4 @@
-[![Code Climate](https://codeclimate.com/github/lucasuyezu/metric.png)](https://codeclimate.com/github/lucasuyezu/metric)
+[![Code Climate](https://codeclimate.com/github/locaweb/process_metrics.png)](https://codeclimate.com/github/locaweb/process_metrics)
 
 Process Metrics
 ===============
@@ -130,6 +130,7 @@ Configuration
 One time, in a migration
 ------------------------
 ```ruby
+ProcessMetrics::Persistence::ActiveRecord.table_name = 'onon' # optional
 ProcessMetrics::Persistence::ActiveRecord.setup!
 ```
 
@@ -137,6 +138,6 @@ Then, in an initializer
 -----------------------
 
 ```ruby
-ProcessMetrics.logger = Rails.logger
+ProcessMetrics.config.logger = Rails.logger
 ProcessMetrics.persistence = Metric::Persistence::ActiveRecord # Default is Logger
 ```

data/lib/process_metrics/timer.rb

@@ -3,40 +3,24 @@ module ProcessMetrics
     @@replacing = false
 
     def measure(*methods_names)
+      methods_names.flatten!
       options = extract_options(methods_names)
 
       methods_names.each do |method_name|
-        measure_method_name = :"measure_#{method_name}"
-        raw_method_name     = :"raw_#{method_name}"
-        self.send(:define_method, measure_method_name) do |*args, &block|
-          parent_uuid  = parent_uuid(options)
-          process_name = "#{self.class.name}##{method_name}"
-          parent       = ProcessMetrics::Base.new(process_name)
-          parent.uuid  = parent_uuid
-
-          ProcessMetrics.measure(process_name, parent) do |metric|
-            ProcessMetrics.config.logger.debug "About to send #{raw_method_name} with args #{args.inspect} and block #{block.inspect} to #{self}"
-            metric.data = {args: args, block: block}
-
-            send(raw_method_name, *args, &block)
-          end
-        end
+        define_wrapper_method(method_name, options)
+        wrap_method(method_name) if method_exists?(method_name)
       end
     end
 
     def method_added(method_name)
-      return if @@replacing || method_name =~ /^measure_/ || method_name =~ /^raw_/
+      return if method_name =~ /^measure_/ || method_name =~ /^raw_/
       ProcessMetrics.config.logger.debug "Adding method #{method_name} in #{self}"
 
       measure_method_name = :"measure_#{method_name}"
-      raw_method_name     = :"raw_#{method_name}"
 
       if self.instance_methods.include? measure_method_name
-        ProcessMetrics.config.logger.debug "#{self}##{measure_method_name} exists. Replacing..."
-        @@replacing = true
-        alias_method raw_method_name, method_name
-        alias_method method_name, measure_method_name
-        @@replacing = false
+        ProcessMetrics.config.logger.debug "#{self}##{measure_method_name} exists. Wrapping..."
+        wrap_method(method_name)
       else
         ProcessMetrics.config.logger.debug "#{self}##{measure_method_name} does not exist. Exiting..."
       end
@@ -46,6 +30,42 @@ module ProcessMetrics
     def extract_options(array)
       array.last && array.last.is_a?(Hash) ? array.pop : nil
     end
+
+    def define_wrapper_method(method_name, options)
+      measure_method_name = :"measure_#{method_name}"
+      raw_method_name     = :"raw_#{method_name}"
+
+      self.send(:define_method, measure_method_name) do |*args, &block|
+        parent_uuid  = parent_uuid(options)
+        process_name = "#{self.class.name}##{method_name}"
+        parent       = ProcessMetrics::Base.new(process_name)
+        parent.uuid  = parent_uuid
+
+        ProcessMetrics.measure(process_name, parent) do |metric|
+          ProcessMetrics.config.logger.debug "About to send #{raw_method_name} with args #{args.inspect} and block #{block.inspect} to #{self}"
+          metric.data = {args: args, block: block}
+
+          send(raw_method_name, *args, &block)
+        end
+      end
+    end
+
+    def method_exists?(method_name)
+      self.instance_methods.include? method_name
+    end
+
+    def wrap_method(method_name)
+      return if @@replacing
+
+      measure_method_name = :"measure_#{method_name}"
+      raw_method_name     = :"raw_#{method_name}"
+
+      @@replacing = true
+      alias_method raw_method_name, method_name
+      alias_method method_name, measure_method_name
+      @@replacing = false
+      nil
+    end
   end
 
   module Timer
@@ -58,7 +78,7 @@ module ProcessMetrics
 
       if options[:parent_uuid].respond_to?(:call)
         # It's a proc. parent_uuid is the return value
-        options[:parent_uuid].call
+        options[:parent_uuid].call(self)
       elsif options[:parent_uuid].is_a?(Symbol)
         # It's a symbol. Call method on object and parent_uuid is its result.
         send(options[:parent_uuid])

data/lib/process_metrics/version.rb

@@ -1,3 +1,3 @@
 module ProcessMetrics
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Lucas Uyezu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie