rack_console 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6118a7bb2ae127448272b43fa93fded43d4dee30
-  data.tar.gz: 0d2bfcf921120bfb7897e4f609fc384df1b126fa
+  metadata.gz: 4a4ba0df0574adddc3056759da9cd1f0977e45bd
+  data.tar.gz: 3ec32e29c2b3ff8145767f5e3ea4b26b7bfe433d
 SHA512:
-  metadata.gz: da69edcfc2924e8606afa7c761c93b9d1d0a1b08738d8d3b1f35a57c7a279bc843f8995b4a288ef7305191b0465abf82a47ebf8b655aafe20aa3f1d400cae5de
-  data.tar.gz: afd218cc0f1f15b503a4d026025a9c880c18043358385564bb6a8d9600960f3a440cd78dc03975503f431e39f766890128467e6e0901d095a1b36e86b1b94f95
+  metadata.gz: 9aa66a2d07385e9ae6431a428eb88acc8c17a4b2050102ce034c0027dd9abb9a0c6877d2a9314d54628985f45be6d18d7f4978db2f4815446a79e09ca4ce81fa
+  data.tar.gz: 15516fe338a8c8b83ff56fa8a0cdb82d1a3bd8a24ba35b3b6d5ffaf98dd0d8af4dabaa03d304a9fa49af60ea536e47d68d755d31e85aa0485ed891aef9f35d03

data/lib/rack_console/app.rb

@@ -1,3 +1,4 @@
+require 'rack_console'
 require 'rack_console/source_file'
 require 'rack_console/app_helpers'
 require 'sinatra'
@@ -9,37 +10,51 @@ module RackConsole
     set :views, :default
 
     get '/?' do
-      console!
+      with_access do
+        console!
+      end
     end
 
     post '/?' do
-      console!
+      with_access do
+        console!
+      end
     end
 
     get "/module/:expr" do
-      evaluate_module!
-      haml :'console/module', locals: locals, layout: layout
+      with_access do
+        evaluate_module!
+        haml :'console/module', locals: locals, layout: layout
+      end
     end
 
     get "/method/:expr/:kind/:name" do
-      evaluate_method!
-      haml :'console/method', locals: locals, layout: layout
+      with_access do
+        evaluate_method!
+        haml :'console/method', locals: locals, layout: layout
+      end
     end
 
     get "/methods/:owner/:kind/:name" do
-      evaluate_methods!
-      haml :'console/methods', locals: locals, layout: layout
+      with_access do
+        evaluate_methods!
+        haml :'console/methods', locals: locals, layout: layout
+      end
     end
 
     get "/file/*" do
-      prepare_file!
-      haml :'console/file', locals: locals, layout: layout
+      with_access do
+        prepare_file!
+        haml :'console/file', locals: locals, layout: layout
+      end
     end
 
     get "/methods/file/*" do
-      prepare_file!
-      @methods = methods_within_file(@source_file.file) if @source_file
-      haml :'console/methods', locals: locals, layout: layout
+      with_access do
+        prepare_file!
+        @methods = methods_within_file(@source_file.file) if @source_file
+        haml :'console/methods', locals: locals, layout: layout
+      end
     end
 
     get "/css/:path" do | path |

data/lib/rack_console/app_helpers.rb

@@ -4,13 +4,21 @@ require 'pp'
 require 'stringio'
 require 'rack_console/ansi2html'
 require 'rack_console/expr_helpers'
+require 'rack_console/mock_method'
 
 module RackConsole
   module AppHelpers
     include ExprHelpers
 
     def has_console_access?
-      true
+      case a = config[:authorized?]
+      when true, false
+        a
+      when Proc
+        a.call
+      else
+        true
+      end
     end
 
     def has_file_access? file
@@ -43,14 +51,18 @@ module RackConsole
 
     ###############################
 
-    def console!
+    def with_access
       if has_console_access?
-        haml :console, locals: locals, layout: layout
+        yield
       else
-        raise "not authorized"
+        raise Error, "not authorized"
       end
     end
 
+    def console!
+      haml :console, locals: locals, layout: layout
+    end
+
     def evaluate_expr!
       return if @result_evaled
       result_capture! do
@@ -78,6 +90,7 @@ module RackConsole
       if @result_ok && @result.is_a?(Module)
         result_capture! do
           @module = @result
+          expr_for_object! @module
         end
       end
     end
@@ -95,10 +108,7 @@ module RackConsole
             @method = @module.send(:method, @method_name)
             @method_kind = :method
           end
-          @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
@@ -145,16 +155,21 @@ module RackConsole
     ensure
       @result_extended = @result.singleton_class.included_modules rescue nil
       @result_class = @result.class.name
-      if @is_module = Module === @result
+      if @is_module = (::Module === @result)
         @module = @result
         @ancestors = @module.ancestors.drop(1)
-        if @is_class = @module.is_a?(Class)
+        if @is_class = (::Class === @module)
           @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
+      if @is_method = (::Method === @result || ::UnboundMethod === @result || MockMethod === @result)
+        @method = @result
+        @method_source_location = @method.source_location
+        @method_source = @method_source_location && SourceFile.new(@method_source_location).load!.narrow_to_block!
+      end
     end
 
     def server_info
@@ -298,19 +313,6 @@ module RackConsole
     end
     DUMMY_SOURCE_LOCATION = [ "".freeze, 0 ].freeze
 
-    class MockMethod
-      attr_accessor :meth, :name, :kind, :owner
-      def initialize *args
-        @meth, @name, @kind, @owner = args
-      end
-      def instance_method?
-        @kind == :i
-      end
-      def source_location
-        @meth.source_location
-      end
-    end
-
     def file_line_to_href name, lineno = nil
       link = name.sub(%r{^/}, '-')
       link = link.split('/').map{|s| e s}.join('/')
@@ -379,7 +381,15 @@ module RackConsole
       href = url_root("/method/#{owner.name}/#{e kind.to_s}/#{e m.name}")
     end
 
-    def format_methods name
+    def format_methods obj
+      case obj
+      when nil
+        return nil
+      when ::Method, ::UnboundMethod, MockMethod
+        name = obj.name or return nil
+      else
+        name = obj.to_s
+      end
       href = url_root("/methods/*/*/#{e name}")
       "<a href='#{href}' title='Other methods named #{h name.inspect}' class='method_name'>#{method_name_tag(h(name))}</a>"
     end
@@ -411,13 +421,14 @@ module RackConsole
       %Q{<span class="backtrace">#{html}</span>}
     end
 
-    def wrap_lines str, width = 80
+    def wrap_lines str, width = nil
       str.to_s.split("\n").map do | line |
         wrap_line line, width
       end * "\n"
     end
 
-    def wrap_line str, width = 80
+    def wrap_line str, width = nil
+      width ||= config[:wrap_width] || 80
       str = str.to_s
       out = ''
       pos = 0

data/lib/rack_console/expr_helpers.rb

@@ -1,5 +1,6 @@
 require 'time'
 require 'date'
+require 'rack_console/mock_method'
 
 module RackConsole
   module ExprHelpers
@@ -14,17 +15,15 @@ module RackConsole
     
     def expr_for_object obj, mod = nil, kind = nil
       case obj
-      when nil, true, false
-        obj.to_s
-      when Float, Integer
+      when nil, true, false, ::Numeric, ::String
         obj.inspect
-      when Time
+      when ::Time
         "Time.parse(#{obj.iso8601(6).inspect})"
-      when Date
+      when ::Date
         "Date.parse(#{obj.to_s.inspect})"
-      when Module
-        expr_for_object obj
-      when Method, UnboundMethod
+      when ::Module
+        expr_for_module obj
+      when ::Method, ::UnboundMethod, MockMethod
         expr_for_method(mod, obj.name, kind) if mod && kind
       else
         nil
@@ -32,11 +31,11 @@ module RackConsole
     end
 
     def expr_for_method mod, name, kind
-      "#{mod}.#{kind}(#{name.to_sym.inspect})"
+      mod.name && "#{expr_for_module(mod)}.#{kind}(#{name.to_sym.inspect})"
     end
 
-    def expr_for_Module obj
-      obj && obj.name
+    def expr_for_module obj
+      obj && obj.name && "::#{obj.name}"
     end
   end
 end

data/lib/rack_console/mock_method.rb

@@ -0,0 +1,16 @@
+module RackConsole
+  class MockMethod
+    attr_accessor :meth, :name, :kind, :owner
+    def initialize *args
+      @meth, @name, @kind, @owner = args
+      @owner ||= @meth.owner
+    end
+    def instance_method?
+      @kind == :i
+    end
+    def source_location
+      @meth.source_location
+    end
+  end
+end
+

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

@@ -6,6 +6,6 @@
           %td.class=format_module(meth.owner)
           %td.kind
             %a{href: method_href(meth, meth.kind, meth.owner), title: "Method detail"}=meth.instance_method? ? "#" : "."
-          %td.name=format_methods(meth.name)
+          %td.name=format_methods(meth)
           %td.source_location=format_source_location(meth.source_location, meth, meth.kind)
     .status{style: "text-align: center"}=h "#{methods.size} methods"

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

@@ -1,5 +1,5 @@
 %dt Name:
-%dd= format_methods(@method.name)
+%dd= format_methods(@method)
 %dt Owner:
 %dd= format_module(@module)
 %dt Parameters:

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.3.1"
+  VERSION = "0.3.2"
 end

data/lib/rack_console.rb

@@ -1,5 +1,5 @@
 require "rack_console/version"
 
 module RackConsole
-  # Your code goes here...
+  class Error < ::StandardError; end
 end

data/rack_console.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sinatra", "~> 1.4"
   spec.add_dependency "haml", "~> 4.0"
-  spec.add_dependency "activesupport", "~> 4.2"
+  spec.add_dependency "activesupport", ">= 3.0"
   spec.add_dependency "awesome_print", "~> 1.6"
 
   spec.add_development_dependency "bundler", "~> 1.10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_console
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kurt Stephens
@@ -42,16 +42,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - lib/rack_console/app.rb
 - lib/rack_console/app_helpers.rb
 - lib/rack_console/expr_helpers.rb
+- lib/rack_console/mock_method.rb
 - lib/rack_console/source_file.rb
 - lib/rack_console/template/css/ansi.css
 - lib/rack_console/template/css/rack_console.css
@@ -213,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Rack App that provides a basic interactive Ruby console and introspection.