rack_console 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52ea8e7199b864ee9eb5771258dcdba1b64181e5
-  data.tar.gz: 42b0d1681e6d1fd6e679d8ed97f161f4e4b057f9
+  metadata.gz: 7120aad9356f5f31cf013d2adb6e3c0df0707358
+  data.tar.gz: 86fdf0c4a1d680d5c1dcad8c35716fb71e0778a2
 SHA512:
-  metadata.gz: 887920281e5e9507852fc055805ee8185ae52f3fee4a2ad918312ea39cee800236e6f4f04a3ea3f5763c6b911d44a9921093b8a984994d60cf0d2531c3406a38
-  data.tar.gz: f5160c4bbfdba16cecea4bd74ff0d097cc8e22f653f29553fc20c503c0d8ac66862f5f51d398ef9df2b782de5334aa8a3a680c2cbd8f0425c06bbc7316dde659
+  metadata.gz: 47c26a65af32882b275722bd22f7ad8a2b84d009b110b3505f19eaa4192624910a32262e2d86b64b778f31c1d029f6737a44e7469c6aeb1efa96482e19037063
+  data.tar.gz: 3a9795aa14d8a82c105778929a2a458c450893b027dcc626ee60a2f011f21f0c290fde5116e07229c55d6f0f7e51e40c36b367b9b6e79ed42c586c7129e24e73

data/example/ex01/config.ru

@@ -1,10 +1,8 @@
 $:.unshift "../../lib"
 $:.unshift "."
 require 'rack_console/app'
-require 'pry'
 require 'app'
 use Rack::Reloader
-use Rack::Static, :urls => ["/css", "/img"], :root => "public"
 run Rack::URLMap.new(
   "/console" => RackConsole::App.new(
     awesome_print: true,

data/lib/rack_console/ansi2html.rb

@@ -1,8 +1,12 @@
+require 'rack/utils'
+
 module RackConsole
   class Ansi2Html
-    def initialize
-      @tag_b = { }
-      @tag_e = { }
+    @@tag_b = { }
+    @@tag_e = { }
+
+    def self.convert str, out = nil
+      new.convert(str, out)
     end
 
     def convert str, out = nil
@@ -27,7 +31,7 @@ module RackConsole
             cls = CLASS_FOR_CODE[code]
             tag(:span, cls) unless cls.nil?
           end
-        when /\A.*/
+        when /\A.+/
           text($&)
         end
         @str = $'
@@ -38,9 +42,9 @@ module RackConsole
     def tag name, cls
       if cls
         tag_b =
-          @tag_b[[name, cls]] ||= %Q{<#{name} class="#{cls}">}.freeze
+          @@tag_b[[name, cls]] ||= %Q{<#{name} class="#{cls}">}.freeze
         tag_e =
-          @tag_e[name] ||= %Q{</#{name}>}.freeze
+          @@tag_e[name] ||= %Q{</#{name}>}.freeze
         @tags << [ tag_b, tag_e ]
         @out << tag_b
       else
@@ -55,13 +59,14 @@ module RackConsole
     end
 
     def text str
+      return if str.empty?
       lines = str.split("\n", 99999)
       last = lines.pop
       lines.each do | line |
-        @out << h(line)
+        @out << h(line) unless line.empty?
         @out << BR
       end
-      @out << h(last)
+      @out << h(last) unless last.empty?
     end
 
     def h(text)

data/lib/rack_console/app_helpers.rb

@@ -139,6 +139,16 @@ module RackConsole
       @result_class = @result.class.name
     end
 
+    def server_info
+      thr = Thread.current
+      (config[:server_info] || { }).merge(
+        host: Socket.gethostname,
+        pid: Process.pid,
+        ppid: Process.ppid,
+        thread: thr[:name] || thr.object_id,
+      )
+    end
+
     def format_object obj, inline = false
       case obj
       when Module

data/lib/rack_console/template/css/rack_console.css

@@ -29,6 +29,34 @@
   color: #fff;
 }
 
+.rack_console .server_info {
+  font-size: 80%;
+  float: right;
+  color: #888;
+}
+
+.rack_console .server_info .key {
+  font-style: italic;
+}
+
+.rack_console .server_info .value {
+}
+
+/* Hover to show */
+.rack_console a.hover_show {
+  text-decoration: none;
+}
+
+.rack_console a.hover_show:hover span {
+  color: #000;
+  display: initial;
+  font-style: bold;
+}
+
+.rack_console span.display_on_hover {
+  display: none;
+}
+
 .rack_console .result {
   margin: 0px;
 }

data/lib/rack_console/template/haml/console.haml

@@ -1,4 +1,5 @@
 .rack_console
+  =haml :'console/server_info', locals: locals
   .eval
     - evaluate_expr!
     %form{action: url_root("/"), method: "post"}

data/lib/rack_console/template/haml/console/file.haml

@@ -1,4 +1,5 @@
 .rack_console
+  =haml :'console/server_info', locals: locals
   .result
     .file
       %dl

data/lib/rack_console/template/haml/console/method.haml

@@ -1,4 +1,5 @@
 .rack_console
+  =haml :'console/server_info', locals: locals
   - evaluate_method!
   .result
     .method

data/lib/rack_console/template/haml/console/methods.haml

@@ -1,4 +1,5 @@
 .rack_console
+  =haml :'console/server_info', locals: locals
   .result
     =haml :'console/methods_table', locals: locals.merge(methods: @methods)
   =haml :'console/error', locals: locals

data/lib/rack_console/template/haml/console/methods_table.haml

@@ -1,4 +1,5 @@
 .methods
+  =haml :'console/server_info', locals: locals
   - if methods = locals[:methods]
     %table
       - @methods.each do | meth |

data/lib/rack_console/template/haml/console/module.haml

@@ -1,4 +1,5 @@
 .rack_console
+  =haml :'console/server_info', locals: locals
   - evaluate_module!
   .result
     .module

data/lib/rack_console/template/haml/console/server_info.haml

@@ -0,0 +1,8 @@
+%span.server_info
+  - k_last = nil; server_info.each do | k, v |
+    = k_last ? " | " : ""
+    - k_last = k
+    %a.hover_show
+      %span.value= h v
+      %span.key
+        %span.display_on_hover= h " : #{k}"

data/lib/rack_console/template/haml/layout.haml

@@ -2,8 +2,8 @@
 %html
   %head
     %title rack_console
-    %link(rel="stylesheet" href="#{url_root}/css/rack_console.css")
-    %link(rel="stylesheet" href="#{url_root}/css/ansi.css")
+    %link(rel="stylesheet" href="#{url_root "/css/rack_console.css"})
+    %link(rel="stylesheet" href="#{url_root "/css/ansi.css"})
   %body
     .wrapper
       .header

data/lib/rack_console/version.rb

@@ -1,3 +1,3 @@
 module RackConsole
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack_console
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kurt Stephens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -165,8 +165,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - example/ex01/app.rb
 - example/ex01/config.ru
 - example/ex01/template/haml/index.haml
@@ -185,6 +183,7 @@ files:
 - lib/rack_console/template/haml/console/methods.haml
 - lib/rack_console/template/haml/console/methods_table.haml
 - lib/rack_console/template/haml/console/module.haml
+- lib/rack_console/template/haml/console/server_info.haml
 - lib/rack_console/template/haml/layout.haml
 - lib/rack_console/version.rb
 - rack_console.gemspec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "rack_console"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here