rack-webprofiler 0.1.0.pre.beta1 → 0.1.0.pre.beta2

data/lib/rack/web_profiler/router.rb

@@ -56,7 +56,7 @@ module Rack
       def serve_asset(path)
         rf = Rack::File.new(::File.expand_path("../../templates/assets/", __FILE__))
         request = @request.dup
-        request.env[PATH_INFO] = path
+        request.env[PATH_INFO] = "/#{path}"
 
         path_info = Utils.unescape(request.env[PATH_INFO])
         clean_path_info = Utils.clean_path_info(path_info)

data/lib/rack/web_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class WebProfiler
-    VERSION = "0.1.0-beta1".freeze
+    VERSION = "0.1.0-beta2".freeze
   end
 end

data/lib/rack/web_profiler/view.rb

@@ -0,0 +1,236 @@
+require "erb"
+require "rouge"
+
+module Rack
+  class WebProfiler
+    # View
+    class View
+      def initialize(template, layout: nil, context: nil)
+        @template  = template
+        @layout    = layout
+        @context   = context
+      end
+
+      def result(variables = {})
+        unless @template.nil?
+          templates = [read_template(@template)]
+          templates << read_template(@layout) unless @layout.nil?
+
+          content = templates.inject(nil) do |prev, temp|
+            render(temp, variables) { prev }
+          end
+        end
+      end
+
+      def context
+        @context ||= Context.new
+      end
+
+      private
+
+      def read_template(template)
+        unless template.empty?
+          path = ::File.expand_path("../../templates/#{template}", __FILE__)
+          return ::File.read(path) if ::File.exist?(path)
+        end
+        template
+      end
+
+      def options
+        @options ||= {
+          :safe_level => nil,
+          :trim_mode  => '%-',
+          :eoutvar    => '@_erbout',
+        }
+      end
+
+      def render(str, variables = {})
+        opts = options
+
+        format_variables(variables).each do |name, value|
+          context.instance_variable_set("@#{name}", value)
+        end
+
+        context.instance_eval do
+          erb = ::ERB.new(str, *opts.values_at(:safe_level, :trim_mode, :eoutvar))
+          erb.result(binding).sub(/\A\n/, '')
+        end
+        # @todo better error when there is an ERB error.
+      end
+
+      def format_variables(v)
+        case v
+        when Binding
+          h = {}
+          v.eval("instance_variables").each do |k|
+            h[k.to_s.sub(/^@/, '')] = v.eval("instance_variable_get(:#{k})")
+          end
+          h
+        when Hash
+          v
+        else
+          {}
+        end
+      end
+
+      # CommonHelpers.
+      module CommonHelpers
+        def content_for(key, content = nil, &block)
+          block ||= proc { |*| content }
+          content_blocks[key.to_sym] << capture_later(&block)
+        end
+
+        def content_for?(key)
+          content_blocks[key.to_sym].any?
+        end
+
+        def yield_content(key, default = nil)
+          return default if content_blocks[key.to_sym].empty?
+          content_blocks[key.to_sym].map { |b| capture(&b) }.join
+        end
+
+        #
+        def partial(path, variables: nil)
+          return "" if path.nil?
+
+          variables ||= binding if variables.nil?
+
+          capture do
+            WebProfiler::View.new(path, context: self).result(variables)
+          end
+        end
+
+        #
+        def h(obj)
+          case obj
+          when String
+            ::ERB::Util.html_escape(obj)
+          else
+            ::ERB::Util.html_escape(obj.inspect)
+          end
+        end
+
+        #
+        def highlight(code: nil, language: nil)
+          language = language.to_sym if language.is_a? String
+
+          case language
+          when :ruby
+            lexer = Rouge::Lexers::Ruby.new
+          when :json
+            lexer = Rouge::Lexers::Jsonnet.new
+          when :xml
+            lexer = Rouge::Lexers::XML.new
+          else
+            lexer = Rouge::Lexers::PlainText.new
+          end
+
+          code = capture(&Proc.new) if block_given?
+
+          formatter = Rouge::Formatters::HTML.new
+          formatter = Rouge::Formatters::HTMLPygments.new(formatter, css_class='highlight')
+
+          "<div class=\"highlight\">#{formatter.format(lexer.lex(code))}</div>"
+        end
+
+        def capture(&block)
+          @capture = nil
+          @_erbout, _buf_was = '', @_erbout
+          result = yield
+          @_erbout = _buf_was
+          result.strip.empty? && @capture ? @capture : result
+        end
+
+        private
+
+        def capture_later(&block)
+          proc { |*| @capture = capture(&block) }
+        end
+
+        def content_blocks
+          @content_blocks ||= Hash.new {|h,k| h[k] = [] }
+        end
+      end
+
+      # CollectorHelpers.
+      module CollectorHelpers
+
+        #
+        def collector_status(collector, collection)
+          collector_data_storage(collector, collection, :status)
+        end
+
+        #
+        def collector_datas(collector, collection)
+          collector_data_storage(collector, collection, :datas)
+        end
+
+        def collector_tab(collector, collection)
+          return nil unless is_collection_contains_datas_for_collector?(collection, collector)
+
+          c = collector_view_context(collector, collection)
+          c.tab_content
+        end
+
+        def collector_panel(collector, collection)
+          return nil unless is_collection_contains_datas_for_collector?(collection, collector)
+
+          c = collector_view_context(collector, collection)
+          c.panel_content
+        end
+
+        def collector_has_tab?(collector, collection)
+          collector_data_storage(collector, collection, :show_tab)
+        end
+
+        def collector_has_panel?(collector, collection)
+          collector_data_storage(collector, collection, :show_panel)
+        end
+
+        private
+
+        def collector_view_context(collector, collection)
+          collectors_view_context[collector.name] ||= begin
+            v = WebProfiler::Collector::View.new(collector.template)
+            v.result(collector: collector, collection: collection)
+            v.context
+          end
+        end
+
+        def collector_data_storage(collector, collection, key = nil)
+          return nil unless is_collection_contains_datas_for_collector?(collection, collector)
+
+          storage = collection.datas[collector.name.to_sym]
+          storage[key] if !key.nil? && storage.has_key?(key)
+        end
+
+        def is_valid_collector?(collector)
+          !collector.nil? \
+            && collector.kind_of?(WebProfiler::Collector::Definition)
+        end
+
+        def is_valid_collection?(collection)
+          !collection.nil? \
+            && collection.kind_of?(WebProfiler::Model::CollectionRecord)
+        end
+
+        def is_collection_contains_datas_for_collector?(collection, collector)
+          is_valid_collector?(collector) \
+            && is_valid_collection?(collection) \
+            && collection.datas.has_key?(collector.name.to_sym)
+        end
+
+        private
+
+        def collectors_view_context
+          @collectors_view_context ||= {}
+        end
+      end
+
+      class Context
+        include CommonHelpers
+        include CollectorHelpers
+      end
+    end
+  end
+end

data/lib/rack/web_profiler.rb

@@ -12,10 +12,7 @@ module Rack
     autoload :Model,      "rack/web_profiler/model"
     autoload :Request,    "rack/web_profiler/request"
     autoload :Router,     "rack/web_profiler/router"
-
-    module AutoConfigure
-      autoload :Rails, "rack/web_profiler/auto_configure/rails"
-    end
+    autoload :View,       "rack/web_profiler/view"
 
     class << self
       def config
@@ -38,8 +35,9 @@ module Rack
     # @param app [Proc]
     def initialize(app, tmp_dir: nil)
       @app = app
-      # WebProfiler.config(&Proc.new) if block_given?
+
       WebProfiler.config.tmp_dir = tmp_dir unless tmp_dir.nil?
+      WebProfiler.config(&Proc.new) if block_given?
     end
 
     # Call
@@ -48,23 +46,42 @@ module Rack
     #
     # @return [Array]
     def call(env)
-      request = WebProfiler::Request.new(env)
-      request.start_runtime!
+      begin
+        request = WebProfiler::Request.new(env)
+        request.start_runtime!
 
-      response = WebProfiler::Router.response_for(request)
-      return response.finish if response.is_a? Rack::Response
+        response = WebProfiler::Router.response_for(request)
+        return response.finish if response.is_a? Rack::Response
 
-      # begin
-      status, headers, body = @app.call(env)
-      # rescue Exception => e
-      #   raise e
-      # end
+        status, headers, body = @app.call(env)
+      rescue => e
+        process(request, body, status, headers, e)
+        raise
+      end
+
+      process(request, body, status, headers)
+    end
 
+    private
+
+    # Process the request.
+    #
+    # @param request [Rack::WebProfiler::Request]
+    # @param body
+    # @param status [Integer]
+    # @param headers [Hash]
+    # @param exception [Exception, nil]
+    #
+    # @return [Rack::Response]
+    def process(request, body, status, headers, exception = nil)
       request.save_runtime!
 
-      WebProfiler::Engine.process(request, body, status, headers).finish
+      unless exception.nil?
+        request.save_exception(exception)
+        WebProfiler::Engine.process_exception(request).finish
+      else
+        WebProfiler::Engine.process(request, body, status, headers).finish
+      end
     end
   end
 end
-
-require "rack/web_profiler/auto_configure/rails" if defined? Rails

data/rack-webprofiler.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "docile", "~> 1.1"
   spec.add_dependency "sequel", "~> 4"
   spec.add_dependency "sqlite3", "~> 1.3"
+  spec.add_dependency "rouge", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-webprofiler
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.beta1
+  version: 0.1.0.pre.beta2
 platform: ruby
 authors:
 - Nicolas Brousse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +139,7 @@ files:
 - lib/rack/templates/assets/js/rwpt.js
 - lib/rack/templates/assets/js/rwpt.min.js
 - lib/rack/templates/assets/sass/_fonts.scss
+- lib/rack/templates/assets/sass/_highlight.scss
 - lib/rack/templates/assets/sass/_normalize.scss
 - lib/rack/templates/assets/sass/_variables.scss
 - lib/rack/templates/assets/sass/profiler.scss
@@ -136,31 +151,25 @@ files:
 - lib/rack/templates/panel/show.erb
 - lib/rack/templates/profiler.erb
 - lib/rack/web_profiler.rb
-- lib/rack/web_profiler/auto_configure/rails.rb
 - lib/rack/web_profiler/collector.rb
 - lib/rack/web_profiler/collector/debug_collector.rb
 - lib/rack/web_profiler/collector/erb_collector.rb
 - lib/rack/web_profiler/collector/performance_collector.rb
 - lib/rack/web_profiler/collector/rack/rack_collector.rb
 - lib/rack/web_profiler/collector/rack/request_collector.rb
-- lib/rack/web_profiler/collector/rails/active_record_collector.rb
-- lib/rack/web_profiler/collector/rails/logger_collector.rb
-- lib/rack/web_profiler/collector/rails/rails_collector.rb
-- lib/rack/web_profiler/collector/rails/request_collector.rb
 - lib/rack/web_profiler/collector/ruby_collector.rb
-- lib/rack/web_profiler/collector/sinatra/request_collector.rb
-- lib/rack/web_profiler/collector/sinatra/sinatra_collector.rb
 - lib/rack/web_profiler/collector/time_collector.rb
+- lib/rack/web_profiler/collector/view.rb
 - lib/rack/web_profiler/collectors.rb
 - lib/rack/web_profiler/config.rb
 - lib/rack/web_profiler/controller.rb
 - lib/rack/web_profiler/engine.rb
-- lib/rack/web_profiler/erb.rb
 - lib/rack/web_profiler/model.rb
 - lib/rack/web_profiler/model/collection_record.rb
 - lib/rack/web_profiler/request.rb
 - lib/rack/web_profiler/router.rb
 - lib/rack/web_profiler/version.rb
+- lib/rack/web_profiler/view.rb
 - lib/rack/webprofiler.rb
 - rack-webprofiler.gemspec
 homepage: http://github.com/nicolas-brousse/rack-webprofiler

data/lib/rack/web_profiler/auto_configure/rails.rb

@@ -1,12 +0,0 @@
-module Rack
-  # AutoConfigure::Rails
-  class WebProfiler::AutoConfigure::Rails
-    class Engine < ::Rails::Engine # :nodoc:
-      initializer "rack-web_profiler.configure_middleware" do |app|
-        app.middleware.use Rack::WebProfiler do |c|
-          c.tmp_dir = ::File.expand_path(::File.join(Rails.root, "tmp"), __FILE__)
-        end
-      end
-    end
-  end
-end

data/lib/rack/web_profiler/collector/rails/active_record_collector.rb

@@ -1,25 +0,0 @@
-module Rack
-  class WebProfiler::Collector::Rails::ActiveRecordCollector
-    include Rack::WebProfiler::Collector::DSL
-
-    icon nil
-
-    collector_name "rails_activerecord"
-    position       1
-
-    collect do |_request, _response|
-      store :sql_requests, []
-    end
-
-    template __FILE__, type: :DATA
-
-    is_enabled? -> { defined? ActiveRecord }
-  end
-end
-
-# See: https://github.com/noahd1/oink/blob/master/lib/oink/middleware.rb#L46
-
-__END__
-<%# content_for :tab do %>
-
-<%# end %>

data/lib/rack/web_profiler/collector/rails/logger_collector.rb

@@ -1,22 +0,0 @@
-module Rack
-  class WebProfiler::Collector::Rails::LoggerCollector
-    include Rack::WebProfiler::Collector::DSL
-
-    icon nil
-
-    collector_name "rails_logger"
-    position       1
-
-    collect do |_request, _response|
-    end
-
-    template __FILE__, type: :DATA
-
-    is_enabled? -> { defined? Rails }
-  end
-end
-
-__END__
-<%# content_for :tab do %>
-
-<%# end %>

data/lib/rack/web_profiler/collector/rails/rails_collector.rb

@@ -1,25 +0,0 @@
-module Rack
-  class WebProfiler::Collector::Rails::RailsCollector
-    include Rack::WebProfiler::Collector::DSL
-
-    icon nil
-
-    collector_name "rails"
-    position       1
-
-    collect do |_request, _response|
-      store :rails_version, Rails.version
-      store :rails_env,     Rails.env
-      store :rails_doc_url, "http://api.rubyonrails.org/v#{Rails.version}/"
-    end
-
-    template __FILE__, type: :DATA
-
-    is_enabled? -> { defined? Rails }
-  end
-end
-
-__END__
-<%# content_for :tab do %>
-  <%= data[:rails_version] %> | <%= data[:rails_env] %>
-<%# end %>

data/lib/rack/web_profiler/collector/rails/request_collector.rb

@@ -1,50 +0,0 @@
-module Rack
-  class WebProfiler::Collector::Rails::RequestCollector
-    include Rack::WebProfiler::Collector::DSL
-
-    icon nil
-
-    collector_name "rails_request"
-    position       1
-
-    collect do |request, response|
-      route, _matches, request_params = find_route(request)
-
-      store :request_path,    request.path
-      store :request_method,  request.request_method
-      store :request_params,  request_params || {}
-      store :request_cookies, request.cookies
-      store :request_get,     request.GET
-      store :request_post,    request.POST
-      # store :rack_env,        request.env.each { |k, v| v.to_s }
-      # puts request.env.map{ |k, v| k => v.to_s }
-      store :response_status, response.status
-      store :route_name,      route.nil? ? nil : route.name
-
-      if response.successful?
-        status :success
-      elsif response.redirection?
-        status :warning
-      else
-        status :error
-      end
-    end
-
-    template __FILE__, type: :DATA
-
-    is_enabled? -> { defined? Rails }
-
-    class << self
-      def find_route(request)
-        Rails.application.routes.router.recognize(request) do |route, matches, params|
-      return [route, matches, params]
-    end
-      end
-    end
-  end
-end
-
-__END__
-<%# content_for :tab do %>
-  <%= data[:response_status] %> | <%= data[:request_method] %> <%= data[:request_path] %>
-<%# end %>