localtower 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a94e3d3bd8df7939b70dff9b955d4c00eab463
-  data.tar.gz: 6d211998789567a6efb5bc3a2c620497ba559876
+  metadata.gz: dcfd04482b7b0798e66c863f019e56a6b5af16d2
+  data.tar.gz: c8729e1ed2b16a5a09851e3e5ee828d59137cfc7
 SHA512:
-  metadata.gz: 8cef1c348104c018a47ce550760d49d527def661b9e8d6de4fd402e58ff2761041965b90244e8c621b8c30359a008ccbcbbabe4efe15ec5ad7ea3f1bb82abe16
-  data.tar.gz: 8ca6c334cd7b0e5fb8b2da3b5c122b039b82a2199e5c78bd1ca5e7ef6df05a5d8fb36ac067b5c3a68a14241e67b574608034e2bd41d4262020111a4cd8ee91cd
+  metadata.gz: 2b5f5ad3608a85599a661ae92cb2da043039f7b45a49e2943aafea4b2ae6426bd2edc9dfc037e9dcd8fdd8ef4edb16ca9d0c0a094610a3b2d78624c73a6d3545
+  data.tar.gz: d71724de93ea68cd9e5f5a4ffd32f8995664dd7d34897ab8a9131eed797a9d0c976e2e402194ccbac0c8887ae6e6fcc6d278924cc6ba1818185cf7b179ac8a6d

data/README.md

@@ -101,3 +101,8 @@ Tests are currently very slow because this is testing rails commands so it boots
 Thanks for reporting issues, I'll do my best.
 
 [![Analytics](https://ga-beacon.appspot.com/UA-93841935-1/github-readme?pixel)](https://github.com/damln/localtower)
+
+
+## Deploy
+
+    gem build localtower.gemspec

data/app/views/localtower/pages/logs.html.erb

@@ -1,9 +1,18 @@
 <style type="text/css">
+  .string { color: green; }
+  .number { color: darkorange; }
+  .boolean { color: blue; }
+  .null { color: magenta; }
+  .key { color: red; }
+
+  .code {
+    font: 12px Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
+  }
+
   .value {
+    padding: 10px;
     border: 1px solid #cacaca;
     line-height: 1.2em;
-    font: 12px Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
-    padding: 10px;
     overflow:auto;
     -moz-background-clip: padding;
     -webkit-background-clip: padding-box;
@@ -16,6 +25,9 @@
   }
 
 </style>
+
+
+
 <% content_for :title do %>Logs<% end %>
 
 <div class="row">
@@ -26,26 +38,27 @@
       </div>
 
       <div class="content">
-        <table class="table table-hover table-striped">
+        <table class="table">
           <thead>
             <th>Variable</th>
             <th>Value</th>
+            <th>Value Type</th>
           </thead>
 
           <tbody data-selector="tbody">
-            <% @logs.each do |item| %>
-
-            <%
-            variable = item[:variable]
-            value = item[:value]
-            %>
+            <% @logs["variables"].each do |item| %>
 
               <tr data-selector="tr">
+                <td class="code">
+                  <%= item["name"] %>
+                </td>
+
                 <td>
-                  <%= variable %>
+                  <pre class="value json code"><%= Localtower::Plugins::Capture.printable(item["value"]) %></pre>
                 </td>
+
                 <td>
-                <pre class="value"><%= value %></pre>
+                  <pre class="code"><%= item["klass"] %></pre>
                 </td>
               </tr>
             <% end %>

data/lib/localtower/plugins/capture.rb

@@ -18,6 +18,29 @@ module Localtower
         "@_response_body",
       ]
 
+      class << self
+        def printable(content)
+          if content.respond_to?(:to_json)
+            # content.to_json
+            JSON.pretty_generate(content)
+          else
+            content.to_s
+          end
+        end
+
+        def type_of(value)
+          if value.instance_of?(Float); return Float.to_s; end;
+          if value.instance_of?(Integer); return Integer.to_s; end;
+          if value.instance_of?(String); return String.to_s; end;
+          if value.instance_of?(Array); return Array.to_s; end;
+          if value.instance_of?(Hash); return Hash.to_s; end;
+          if value.instance_of?(ApplicationController); return ApplicationController.to_s; end;
+          if value.instance_of?(NilClass); return NilClass.to_s; end;
+
+          nil
+        end
+      end
+
       def initialize(context = nil, context_binding = nil)
         @context = context
         @context_binding = context_binding
@@ -25,27 +48,15 @@ module Localtower
 
       def logs
         content = File.open(LOG_FILE).read
-        return [] unless content.present?
+        return {"variables" => []} unless content.present?
 
         data = JSON.parse(content)
-
-        data.map do |key, value|
-          if value.respond_to?(:to_json)
-            value = JSON.pretty_generate(value)
-          end
-
-          {
-            variable: key,
-            value: value,
-          }
-        end
       end
 
       def my_logger
         @@my_logger ||= Logger.new(LOG_FILE)
         @@my_logger.formatter = proc do |severity, datetime, progname, msg|
           "#{msg}\n"
-          # "[#{datetime}] | #{msg}\n"
         end
 
         @@my_logger
@@ -54,37 +65,74 @@ module Localtower
       def values
         hash = {}
 
+        a = @context.send(:caller)[1] # xx/xx/app/controllers/clients/events_controller.rb:57:in `new'
+        a = a.split(Rails.root.to_s).last # events_controller.rb:57:in `new'
+        a = a.split("\:")
+
+        file = a[0].strip
+        line_number = a[1].strip
+        method = a[2].strip.gsub("in \`", "").gsub("\'", "")
+
+        hash["class"] = self.klass_name
+        hash["method"] = "#{file}##{method}:#{line_number}"
+
+        variables = []
+
         @context_binding.local_variables.each do |var|
           next if EXCLUDE_INSTANCE_VARIABLES.include?(var.to_s)
-          hash[var] = @context_binding.local_variable_get(var)
 
-          if hash[var].is_a?(ActiveRecord::AssociationRelation)
-            hash["count_#{var}"] = hash[var].count
+          value = @context_binding.local_variable_get(var)
+          klass = self.class.type_of(value)
+
+          variables << {
+            name: var,
+            value: value,
+            klass: klass
+          }
+
+          if value.is_a?(ActiveRecord::AssociationRelation) and value.respond_to?(:count)
+            variables << {
+              name: "#{var}_count",
+              value: value.count,
+              klass: nil
+            }
           end
         end
 
         @context.instance_variables.each do |var|
           next if EXCLUDE_INSTANCE_VARIABLES.include?(var.to_s)
 
-          Rails.logger.debug("-------------var")
-          Rails.logger.debug(var)
+          value = @context.instance_variable_get(var.to_sym)
+          klass = self.class.type_of(value)
 
-          hash[var] = @context.instance_variable_get(var)
+          variables << {
+            name: var,
+            value: value,
+            klass: klass
+          }
 
-          if hash[var].is_a?(ActiveRecord::AssociationRelation)
-            hash["count_#{var}"] = hash[var].count
+          if value.is_a?(ActiveRecord::AssociationRelation) and value.respond_to?(:count)
+            variables << {
+              name: "#{var}_count",
+              value: value.count,
+              klass: nil
+            }
           end
         end
 
+        hash["variables"] = variables
+
         hash
       end
 
       def klass_name
-        if @context.class == "Class"
+        value = if @context.class == "Class"
           @context
         else
           @context.class
         end
+
+        value.to_s
       end
 
       # def context_caller

data/lib/localtower/version.rb

@@ -1,3 +1,3 @@
 module Localtower
-  VERSION = '0.1.9'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/public/js/app.js

@@ -2,10 +2,16 @@ window.MainApp = {};
 
 MainApp = {
   init: function() {
-
   },
 
   ready: function() {
+
+    $(".json").each(function() {
+      var $el = $(this);
+      var done = MainApp.syntaxHighlight($el.text());
+      $el.html(done);
+    });
+
     MainApp.whenActionOnElement("click", "duplicate", function(e) {
       e.preventDefault();
       MainApp.duplicateLine();
@@ -41,7 +47,28 @@ MainApp = {
     });
   },
 
-  // INSTANCE
+  // INSTANCE --------------------------------------------------
+
+  syntaxHighlight: function(json) {
+    json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function(match) {
+      var cls = 'number';
+      if (/^"/.test(match)) {
+        if (/:$/.test(match)) {
+          cls = 'key';
+        } else {
+          cls = 'string';
+        }
+      } else if (/true|false/.test(match)) {
+        cls = 'boolean';
+      } else if (/null/.test(match)) {
+        cls = 'null';
+      }
+      return '<span class="' + cls + '">' + match + '</span>';
+    });
+  },
+
+
 
   // This is a little bit dirty but it works well for the moment:
   // We dynamically show/hide fields
@@ -95,9 +122,10 @@ MainApp = {
 
           nullable_input,
           nullable_label,
-        ], function(i, el) {
-        el.hide();
-      });
+        ],
+        function(i, el) {
+          el.hide();
+        });
 
       var mapping = {
         add_column: [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localtower
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Damian Le Nouaille