model_observer 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b200ec400039b569da0a1d685d37f0d72fb563e1
-  data.tar.gz: 3040c514b35539fe11a212b57da89116ca6f1597
+  metadata.gz: 4cefc88cdbb1e00c4b1550cb9f45edcc6b0fd078
+  data.tar.gz: a0798211619936ad40912908f92ba157423c0695
 SHA512:
-  metadata.gz: e255c6498d986abd55298e9750396b5918f02de3518fa602a001c5167786d332145f495d771e2cb348195ea0af49eab8ffbb256971a522a1015819cfb1541cbb
-  data.tar.gz: 919a712014c8a795bb7f45336e01e8fd59f5f70909d8be09f39cc2b5e90d8cad3f679e87a5841a3168e749d48e2159fa3897785950d742f1d5b9c4d93e082c14
+  metadata.gz: 96c0cf861d126fb6be493c7ee17cc4dc9090775187cb7d49c01bbd34ff77a310b8a81b6038b3af8453b78075ad66685c4a6c4994b6df25d53f6fa99d3e69a6f0
+  data.tar.gz: 3182a0ed8c4cb77aadddeaafb5a971eb2e22f6a39123c6439ea083446de315dee9f5ae44e967e06af73880d63e53a01b8f4888ad63e8add7c3dc54d06312f3da

data/README.md

@@ -16,18 +16,29 @@ and bundle
 
     bundle
 
-## Log
+## Query Log
 
-The ModelObserver log will look like:
+The time include instantiate models will be logged after each sql log like this:
+
+    Author Load (0.5ms)  SELECT `authors`.* FROM `authors` WHERE `authors`.`id` = 1 LIMIT 1
+    Author Instantiate (1.5ms)  SELECT `authors`.* FROM `authors` WHERE `authors`.`id` = 1 LIMIT 1
+
+1.5ms == 0.5ms(DB query) + 1.0ms(model instantiation)
+
+## Summary Log
+
+The summary of each request will be added to the end like this:
 
     ===== Model Observer Start =====
-    Author: 1 sum(10ms) avg(10ms)
-    Book: 36 sum(13ms) avg(0ms)
-      id(20): 2
-      id(50): 9
-      id(61): 4
-      id(68): 2
-      id(111): 2
-      id(123): 3
-      id(124): 3
-    ===== Model Observer End =====
+    Author: 1 sum(10.6ms) avg(10.6ms)
+    Book: 27 sum(25.7ms) avg(1.0ms)
+      id(319): 3
+      id(377): 3
+      id(487): 3
+      id(489): 3
+      id(493): 3
+      id(496): 3
+      id(499): 3
+      id(507): 3
+      id(536): 3
+    ===== Model Observer End =======

data/lib/model_observer/active_record3.rb

@@ -2,6 +2,7 @@ module ModelObserver
   module ActiveRecord
     def self.enable
       require 'active_record'
+
       ::ActiveRecord::Inheritance::ClassMethods.class_eval do
         alias_method :origin_instantiate, :instantiate
 
@@ -12,6 +13,17 @@ module ModelObserver
           instance
         end
       end
+
+      ::ActiveRecord::Querying.class_eval do
+        alias_method :origin_find_by_sql, :find_by_sql
+
+        def find_by_sql(sql, binds = [])
+          ::ActiveSupport::Notifications.instrumenter.instrument(
+            "instantiate.model_observer",
+            :sql   => connection.to_sql(sanitize_sql(sql), binds),
+            :name  => "#{name} Instantiate") { origin_find_by_sql(sql, binds) }
+        end
+      end
     end
   end
 end

data/lib/model_observer/active_record4.rb

@@ -2,6 +2,7 @@ module ModelObserver
   module ActiveRecord
     def self.enable
       require 'active_record'
+
       ::ActiveRecord::Persistence::ClassMethods.class_eval do
         alias_method :origin_instantiate, :instantiate
 
@@ -12,6 +13,17 @@ module ModelObserver
           instance
         end
       end
+
+      ::ActiveRecord::Querying.class_eval do
+        alias_method :origin_find_by_sql, :find_by_sql
+
+        def find_by_sql(sql, binds = [])
+          ::ActiveSupport::Notifications.instrumenter.instrument(
+            "instantiate.model_observer",
+            :sql   => connection.to_sql(sanitize_sql(sql), binds),
+            :name  => "#{name} Instantiate") { origin_find_by_sql(sql, binds) }
+        end
+      end
     end
   end
 end

data/lib/model_observer/log_subscriber.rb

@@ -0,0 +1,19 @@
+require 'active_record/log_subscriber'
+
+module ModelObserver
+  class LogSubscriber < ::ActiveRecord::LogSubscriber
+    def instantiate(event)
+      return unless logger.debug?
+
+      payload = event.payload
+      name = '%s (%.1fms)' % [payload[:name], event.duration]
+      sql  = payload[:sql].squeeze(' ')
+
+      name = color(name, YELLOW, true)
+      sql  = color(sql, nil, true)
+      debug "  #{name}  #{sql}"
+    end
+  end
+end
+
+ModelObserver::LogSubscriber.attach_to :model_observer

data/lib/model_observer/querying.rb

@@ -0,0 +1,14 @@
+module ModelObserver
+  module Querying
+    ::ActiveRecord::Querying.class_eval do
+      alias_method :origin_find_by_sql, :find_by_sql
+
+      def find_by_sql(sql, binds = [])
+        ::ActiveSupport::Notifications.instrumenter.instrument(
+          "instantiate.active_record",
+          :sql   => sql,
+          :name  => "#{name} Load") { origin_find_by_sql }
+      end
+    end
+  end
+end

data/lib/model_observer/version.rb

@@ -1,3 +1,3 @@
 module ModelObserver
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/model_observer.rb

@@ -19,6 +19,7 @@ module ModelObserver
     else
       raise "Current version of active_record is not supported."
     end
+    require 'model_observer/log_subscriber'
   end
 
   class << self
@@ -32,7 +33,7 @@ module ModelObserver
     def write_to_rails_log
       Rails.logger.warn "===== Model Observer Start ====="
       Rails.logger.warn Analyser.result
-      Rails.logger.warn "===== Model Observer End ====="
+      Rails.logger.warn "===== Model Observer End ======="
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_observer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Weihu Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -51,7 +51,9 @@ files:
 - lib/model_observer/analyser.rb
 - lib/model_observer/collector.rb
 - lib/model_observer/dependency.rb
+- lib/model_observer/log_subscriber.rb
 - lib/model_observer/metric.rb
+- lib/model_observer/querying.rb
 - lib/model_observer/rack.rb
 - lib/model_observer/railtie.rb
 - lib/model_observer/version.rb