rack_console 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7120aad9356f5f31cf013d2adb6e3c0df0707358
-  data.tar.gz: 86fdf0c4a1d680d5c1dcad8c35716fb71e0778a2
+  metadata.gz: 8635759efe0c98de153499de75f6cd6637cbf804
+  data.tar.gz: 7c003b7f68057c920ae1d966949fd8885463655e
 SHA512:
-  metadata.gz: 47c26a65af32882b275722bd22f7ad8a2b84d009b110b3505f19eaa4192624910a32262e2d86b64b778f31c1d029f6737a44e7469c6aeb1efa96482e19037063
-  data.tar.gz: 3a9795aa14d8a82c105778929a2a458c450893b027dcc626ee60a2f011f21f0c290fde5116e07229c55d6f0f7e51e40c36b367b9b6e79ed42c586c7129e24e73
+  metadata.gz: 7a254fd07d115832dbae6d9c0b64ce0fe609a3325730f747e39d64207933cd96b9904dd0680ae2d25136fcbffe444187b09a5ec87e6c2b5fa5a10e1a1ca3b449
+  data.tar.gz: 43d74977d408bf5f519ee99e3e1c89b50374398d2fa5c6e2043b3868807f7ea857184cf0122dd931d461324b53577e3f873bf134736967885d18a1d9ca0af8a9

data/lib/rack_console/app_helpers.rb

@@ -3,9 +3,12 @@ require 'active_support/core_ext/object/blank'
 require 'pp'
 require 'stringio'
 require 'rack_console/ansi2html'
+require 'rack_console/expr_helpers'
 
 module RackConsole
   module AppHelpers
+    include ExprHelpers
+
     def has_console_access?
       true
     end
@@ -49,6 +52,7 @@ module RackConsole
     end
 
     def evaluate_expr!
+      return if @result_evaled
       result_capture! do
         @stdin  = StringIO.new('')
         @stdout = StringIO.new('')
@@ -57,15 +61,11 @@ module RackConsole
         @expr = (params[:expr] || '').strip
         unless @expr.blank?
           @result_evaled = true
-          Timeout.timeout(30) do
-            _stdin, _stdout, _stderr = $stdin, $stdout, $stderr
-            $stdin, $stdout, $stderr = @stdin, @stdout, @stderr
-            begin
+          Timeout.timeout(config[:eval_timeout] || 120) do
+            capture_stdio! do
               expr_str = "begin; #{@expr} \n; end"
               @result = eval(expr_str)
               @result_ok = true
-            ensure
-              $stdin, $stdout, $stderr = _stdin, _stdout, _stderr
             end
           end
         end
@@ -74,22 +74,17 @@ module RackConsole
 
     def evaluate_module!
       evaluate_expr!
+      @show_stdio = @show_result = false
       if @result_ok && @result.is_a?(Module)
         result_capture! do
           @module = @result
-          @ancestors = @module.ancestors.drop(1)
-          if @is_class = @module.is_a?(Class)
-            @superclass = @module.superclass
-            @subclasses = @module.subclasses.sort_by{|c| c.name || ''}
-          end
-          @constants = @module.constants(false).sort.map{|n| [ n, const_get_safe(@module, n) ]}
-          @methods = methods_for_module(@module)
         end
       end
     end
 
     def evaluate_method!
       evaluate_expr!
+      @show_stdio = @show_result = false
       if @result_ok && @result.is_a?(Module)
         result_capture! do
           @module = @result
@@ -103,10 +98,23 @@ module RackConsole
           @method_source_location = @method.source_location
           @method_source = @method_source_location && SourceFile.new(@method_source_location).load!.narrow_to_block!
           @result = @method
+          @is_method = true
+          expr_for_object! @method, @module, @method_kind
         end
       end
     end
 
+    def capture_stdio!
+      @captured_stdio = true
+      _stdin, _stdout, _stderr = $stdin, $stdout, $stderr
+      $stdin, $stdout, $stderr = @stdin, @stdout, @stderr
+      begin
+        yield
+      ensure
+        $stdin, $stdout, $stderr = _stdin, _stdout, _stderr
+      end
+    end
+    
     def evaluate_methods!
       @methods = nil
       result_capture! do
@@ -137,6 +145,16 @@ module RackConsole
     ensure
       @result_extended = @result.singleton_class.included_modules rescue nil
       @result_class = @result.class.name
+      if @is_module = Module === @result
+        @module = @result
+        @ancestors = @module.ancestors.drop(1)
+        if @is_class = @module.is_a?(Class)
+          @superclass = @module.superclass
+          @subclasses = @module.subclasses.sort_by{|c| c.name || ''}
+        end
+        @constants = @module.constants(false).sort.map{|n| [ n, const_get_safe(@module, n) ]}
+        @methods = methods_for_module(@module)
+      end
     end
 
     def server_info

data/lib/rack_console/expr_helpers.rb

@@ -0,0 +1,43 @@
+require 'time'
+require 'date'
+
+module RackConsole
+  module ExprHelpers
+    def expr_for_object! obj, mod = nil, kind = nil
+      @result = result_capture! do
+        @expr = expr_for_object obj, mod, kind
+        obj
+      end
+      @result_evaled = true
+      @result_ok = true
+    end
+    
+    def expr_for_object obj, mod = nil, kind = nil
+      case obj
+      when nil, true, false
+        obj.to_s
+      when Float, Integer
+        obj.inspect
+      when Time
+        "Time.parse(#{obj.iso8601(6).inspect})"
+      when Date
+        "Date.parse(#{obj.to_s.inspect})"
+      when Module
+        expr_for_object obj
+      when Method, UnboundMethod
+        expr_for_method(mod, obj.name, kind) if mod && kind
+      else
+        nil
+      end
+    end
+
+    def expr_for_method mod, name, kind
+      "#{mod}.#{kind}(#{name.to_sym.inspect})"
+    end
+
+    def expr_for_Module obj
+      obj && obj.name
+    end
+  end
+end
+

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

@@ -0,0 +1,8 @@
+.eval
+  - evaluate_expr!
+  %form{action: url_root("/"), method: "post"}
+    %div
+      %textarea.expr{name: 'expr'}=h @expr
+    %div
+      %input{ type: 'submit', value: 'Evaluate' }
+  = haml :'console/result'

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

@@ -1,29 +1,6 @@
 .rack_console
   =haml :'console/server_info', locals: locals
   - evaluate_method!
-  .result
-    .method
-      %dl
-      - if @result_evaled && @result_ok
-        %dt Class:
-        %dd= format_module(@method.class)
-        %dt Name:
-        %dd= format_methods(@method.name)
-        %dt Owner:
-        %dd= format_module(@module)
-        %dt Parameters:
-        %dd= h @method.parameters.inspect
-        %dt Arity:
-        %dd= h @method.arity
-        %dt Source Location:
-        %dd= format_source_location(@method_source_location, @method, nil, @module)
-        - if @method_source
-          %dt Source:
-          %dd
-            %table.source_listing
-              - @method_source.lines.each do | line |
-                %tr
-                  %td{class: line[:class] * ' '}= h("%4d %s" % [ line[:line], line[:str] ]).gsub(' ', '&nbsp')
-
+  =haml :'console/eval', locals: locals
   =haml :'console/error', locals: locals
             

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

@@ -1,5 +1,4 @@
 .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,61 +1,6 @@
 .rack_console
   =haml :'console/server_info', locals: locals
   - evaluate_module!
-  .result
-    .module
-      %dl
-        - if @result_evaled && @result_ok
-          %dt Class:
-          %dd= format_module(@result.class)
-          %dt Result:
-          %dd= format_module(@result)
-          - if @is_class
-            %dt Superclass:
-            %dd= format_module(@superclass)
-          %dt Ancestors:
-          %dd
-            - if (@ancestors || [ ]).empty?
-              %span.none NONE
-            - else
-              %table.ancestors
-                - @ancestors.each do | mod |
-                  %tr
-                    %td= format_module(mod)
-          - if @subclasses
-            %dt Subclasses:
-            %dd
-              - if @subclasses.empty?
-                %span.none NONE
-              - else
-                %table.subclasses
-                  - @subclasses.each do | mod |
-                    %tr
-                      %td= format_module(mod)
-          %dt Extended By:
-          %dd
-            - if (@result_extended || [ ]).empty?
-              %span.none NONE
-            - else
-              %table.extended_by
-                - @result_extended.each do | mod |
-                  %tr
-                    %td= format_module(mod)
-          %dt Constants:
-          %dd
-            - if (@constants || [ ]).empty?
-              %span.none NONE
-            - else
-              %table.constants
-                - @constants.each do | name, value |
-                  %tr.constant
-                    %td
-                      %tt=h name
-                    %td= format_module(value.class)
-                    %td= format_object(value, :inline)
-          %dt
-            Methods:
-          %dd
-            = haml :'console/methods_table', locals: locals.merge(methods: @methods)
-
+  =haml :'console/eval', locals: locals
   =haml :'console/error', locals: locals
 

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

@@ -0,0 +1,28 @@
+%dt Class:
+%dd
+  .class= format_module(@result.class)
+- if @show_result != false
+  %dt Result:
+  %dd
+    .result
+      ~ format_object(@result)
+%dt Extended By:
+%dd
+  .extended_by
+    - extensions = (@result_extended || [ ])
+    - if extensions.empty?
+      %span.none NONE
+    - else
+      %table
+        - extensions.each do | mod |
+          %tr
+            %td= format_module(mod)
+- if @captured_stdio && @show_stdio != false
+  %dt $stdout:
+  %dd
+    .io.stdout
+      ~ format_as_terminal(@stdout && @stdout.string)
+  %dt $stderr:
+  %dd
+    .io.stderr
+      ~ format_as_terminal(@stderr && @stderr.string)

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

@@ -0,0 +1,17 @@
+%dt Name:
+%dd= format_methods(@method.name)
+%dt Owner:
+%dd= format_module(@module)
+%dt Parameters:
+%dd= h @method.parameters.inspect
+%dt Arity:
+%dd= h @method.arity
+%dt Source Location:
+%dd= format_source_location(@method_source_location, @method, nil, @module)
+- if @method_source
+  %dt Source:
+  %dd
+    %table.source_listing
+      - @method_source.lines.each do | line |
+        %tr
+          %td{class: line[:class] * ' '}= h("%4d %s" % [ line[:line], line[:str] ]).gsub(' ', '&nbsp')

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

@@ -0,0 +1,47 @@
+- if @is_class
+  %dt Superclass:
+  %dd= format_module(@superclass)
+%dt Ancestors:
+%dd
+  - if (@ancestors || [ ]).empty?
+    %span.none NONE
+  - else
+    %table.ancestors
+      - @ancestors.each do | mod |
+        %tr
+          %td= format_module(mod)
+- if @subclasses
+  %dt Subclasses:
+  %dd
+    - if @subclasses.empty?
+      %span.none NONE
+    - else
+      %table.subclasses
+        - @subclasses.each do | mod |
+          %tr
+            %td= format_module(mod)
+%dt Extended By:
+%dd
+  - if (@result_extended || [ ]).empty?
+    %span.none NONE
+  - else
+    %table.extended_by
+      - @result_extended.each do | mod |
+        %tr
+          %td= format_module(mod)
+%dt Constants:
+%dd
+  - if (@constants || [ ]).empty?
+    %span.none NONE
+  - else
+    %table.constants
+      - @constants.each do | name, value |
+        %tr.constant
+          %td
+            %tt=h name
+          %td= format_module(value.class)
+          %td= format_object(value, :inline)
+%dt
+  Methods:
+%dd
+  = haml :'console/methods_table', locals: locals.merge(methods: @methods)

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

@@ -0,0 +1,9 @@
+.result
+  %dl
+    - if @result_evaled && @result_ok
+      = haml :'console/result/basic', locals: locals
+      - if @is_module
+        = haml :'console/result/module', locals: locals
+      - if @is_method
+        = haml :'console/result/method', locals: locals
+

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

@@ -1,41 +1,5 @@
 .rack_console
   =haml :'console/server_info', locals: locals
-  .eval
-    - evaluate_expr!
-    %form{action: url_root("/"), method: "post"}
-      %div
-        %textarea.expr{name: 'expr'}=h @expr
-      %div
-        %input{ type: 'submit', value: 'Evaluate' }
-    .result
-      - if @result_evaled && @result_ok
-        %dl
-          %dt Class:
-          %dd
-            .class= format_module(@result.class)
-          %dt Result:
-          %dd
-            .result
-              ~ format_object(@result)
-          %dt Extended By:
-          %dd
-            .extended_by
-              - extensions = (@result_extended || [ ])
-              - if extensions.empty?
-                %span.none NONE
-              - else
-                %table
-                  - extensions.each do | mod |
-                    %tr
-                      %td= format_module(mod)
-          %dt $stdout:
-          %dd
-            .io.stdout
-              ~ format_as_terminal(@stdout && @stdout.string)
-          %dt $stderr:
-          %dd
-            .io.stderr
-              ~ format_as_terminal(@stderr && @stderr.string)
-
+  =haml :'console/eval', locals: locals
   =haml :'console/error', locals: locals
 

data/lib/rack_console/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack_console
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Kurt Stephens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -173,16 +173,22 @@ files:
 - lib/rack_console/ansi2html.rb
 - lib/rack_console/app.rb
 - lib/rack_console/app_helpers.rb
+- lib/rack_console/expr_helpers.rb
 - lib/rack_console/source_file.rb
 - lib/rack_console/template/css/ansi.css
 - lib/rack_console/template/css/rack_console.css
 - lib/rack_console/template/haml/console.haml
 - lib/rack_console/template/haml/console/error.haml
+- lib/rack_console/template/haml/console/eval.haml
 - lib/rack_console/template/haml/console/file.haml
 - lib/rack_console/template/haml/console/method.haml
 - 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/result.haml
+- lib/rack_console/template/haml/console/result/basic.haml
+- lib/rack_console/template/haml/console/result/method.haml
+- lib/rack_console/template/haml/console/result/module.haml
 - lib/rack_console/template/haml/console/server_info.haml
 - lib/rack_console/template/haml/layout.haml
 - lib/rack_console/version.rb
@@ -207,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A Rack App that provides a basic interactive Ruby console and introspection.