caller_log 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 170210b9d7d1c0fe0f6caf0b358cfbccec98e54c
-  data.tar.gz: fd1c8f249534e9d62ff28e55d1ebd1014832ded1
+  metadata.gz: dce8296b1ca697f272b3dae5e064f8899d64cecb
+  data.tar.gz: 44c6a29b8c78d936864511c9e6695a95b0b0f06c
 SHA512:
-  metadata.gz: 81309e4dc08389dc2f29bd8d45d43c1375e96aa739c4694db5adeeb84fb94bd9d7b0dba99b4a98bdd5e229babdad073f863f75c1df244026aba7bf06d460302d
-  data.tar.gz: 5ad9e14f9dcf5a4324372c54ed072a7425081506f7d007fb1574f722abc119f78df32cd45d9143ad7c6fbd3a9ac283efdcb705b12258cd61424c025a212893b3
+  metadata.gz: 9768b0ee6e4019c3670b70811e0053193865439f150c17cc756933969d4e919d66ab05e950f3a3d48f4a574e909ae0470207ccdf5c3690591ab77fe8c08ccace
+  data.tar.gz: 5b1718a7b4075dd31c857b3eb3101d5af8e1231799f877b9d432e8abddb8aeef92f3de94a445a0c384c415af260be66c57539ba62ca4693f3be9df9f852bf734

data/caller_log.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 
-  spec.add_dependency "dcr"
   spec.add_dependency "binding_of_callers"
   spec.add_dependency "nokogiri", "~> 1.7.1"
 end

data/lib/caller_log.rb

@@ -1,29 +1,51 @@
 require 'caller_log/version'
 require 'caller_log/log'
 require 'binding_of_callers'
-require 'dcr'
 
 module CallerLog
   class << self
 
-    def instance *args
+    def log *args
       raise ArgumentError,
         "wrong number of arguments (given #{args.count}, expected more than 1)" if args.count < 2
       log_file = args.pop
-      modules = Array args
+      objects = Array args
 
       log = Log.new log_file
 
-      modules.each do |mod|
-        mod.instance_methods(false).each do |method_id|
-          Dcr.instance mod, method_id do |method, *para, &blk|
-            record =  OpenStruct.new time: Time.now, module: mod, method_id: method_id, callers: binding.of_callers[2..-1]
+      objects.each do |obj|
+
+        callee = calling obj
+
+        obj.instance_methods(false).each do |method_id|
+          o_method = ref_old method_id
+          obj.send :alias_method, o_method, method_id
+          obj.send :define_method, method_id, &-> *para, &blk {
+            record =  OpenStruct.new time: Time.now, callee: "#{callee}##{method_id}", callers: binding.of_callers[1..-1]
             log.puts record
-            method.call *para, &blk
-          end
+            self.send o_method, *para, &blk
+          }
+        end if obj.is_a? Module
+
+        obj.methods(false).each do |method_id|
+          o_method = obj.method method_id
+          obj.singleton_class.send :define_method, method_id, &-> *para, &blk {
+            record =  OpenStruct.new time: Time.now, callee: "#{callee}.#{method_id}", callers: binding.of_callers[1..-1]
+            log.puts record
+            o_method.call *para, &blk
+          }
         end
+
       end
     end
+
+    def calling obj
+      Module === obj ? "#{obj}" : "<#{obj.class}:#{obj.object_id}>"
+    end
+
+    def ref_old method_id
+      "#{method_id}_caller_log"
+    end
   end
 
 end

data/lib/caller_log/log.rb

@@ -57,14 +57,16 @@ EOHTML
         time = record.time.strftime "%F %T"
         call = Nokogiri::HTML::DocumentFragment.parse <<-EOHTML
 <li id='call-#{record.object_id}' class='thread-#{Thread.current.object_id} call'>
-  <span class='time'>#{time}</span><span class='class_and_method'>#{record.module}##{record.method_id}</span>
+  <span class='time'>#{time}</span><span class='class_and_method'>#{record.callee}</span>
 </li>
 EOHTML
         base.at_css('.calls') << call
       end
 
       def new_stack_fragment record
-        callers = record.callers.map do |c|
+        callers = record.callers.reject do |c|
+          c.file =~ /caller_log\/lib\/caller_log\.rb/
+        end.map do |c|
           class_and_method = CGI::escapeHTML "#{c.klass}#{c.call_symbol}#{c.frame_env}"
           "<p><span class='class_and_method'>#{class_and_method}</span><span class='location'>#{c.file}:#{c.line}</span></p>"
         end.join

data/lib/caller_log/template.html

@@ -3,18 +3,27 @@
   <head>
     <meta charset='utf-8'/>
     <style>
+html,body {
+    margin: 0;
+    padding: 0;
+    background-color: #E91E63;
+}
 ul {
     padding-left: 0;
+    background-color: white;
+    margin-bottom: 0;
 }
 
 li {
   list-style: none;
   margin-bottom: .8rem;
+  padding-left: 1rem;
 }
 
 ul.threads li {
     float: left;
     margin-top: -.5rem;
+    color: white;
 }
 
 ul.calls {
@@ -23,17 +32,19 @@ ul.calls {
     top: 1rem;
     bottom: 0;
     width: 18rem;
+    padding: 1rem 0 1rem 0;
     overflow: auto;
 }
 
 ul.stacks {
     position: fixed;
-    left: 20rem;
+    left: 18rem;
     top: 1rem;
     bottom: 0;
     margin-top: 2rem;
+    padding: 1rem 0 1rem 0;
     overflow: auto;
-    width: calc(100% - 20rem);
+    width: calc(100% - 18rem);
 }
 
 p {
@@ -61,6 +72,10 @@ ul.stacks li {
 ul.stacks li.show {
     display: block;
 }
+
+.highlight {
+  color: #03A9F4;
+}
     </style>
   </head>
   <body>
@@ -96,12 +111,19 @@ ul.stacks li.show {
     document.querySelector('.' + call_li.id).classList.add('show');
   }
 
+  function highlight(call_li){
+    var curr_highlight = document.querySelector('.highlight');
+    curr_highlight && curr_highlight.classList.remove('highlight');
+    call_li.classList.add('highlight');
+    return true;
+  }
+
   var body = document.getElementsByTagName('body')[0];
 
   body.addEventListener('click', function(e){
     var target = e.target;
     target.type == 'checkbox' && target.checked && show_call(target.value) || hide_call(target.value);
-    e.target.parentElement.classList.contains('call') && toggle_stack(e.target.parentElement);
+    e.target.parentElement.classList.contains('call') && highlight(e.target.parentElement) && toggle_stack(e.target.parentElement);
   }, false);
 
 })();

data/lib/caller_log/version.rb

@@ -1,3 +1,3 @@
 module CallerLog
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caller_log
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: dcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: binding_of_callers
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Log every call to a object