log-analyzer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 866eefaeda010bc822f01b13b9e4d15bf2b7cfbe
-  data.tar.gz: 5407e578aee2608481dadb66d5e9b4b351d97b4e
+  metadata.gz: cd574288f31cafa46f022f902045c6d82f100822
+  data.tar.gz: 675f2bcbbd6f6443e4ac27ccb8ed2a397c9b1cc4
 SHA512:
-  metadata.gz: 784514f2e132c8558990f4076d197cfe76a16183e91b7f769a67a264a7746f2139a1fc262a3bc218c8325579ffa1bba6601654116a4f1a9d1160951dc3699ac9
-  data.tar.gz: f97b7d88c249fd621ce9b50f6191c946d8afbd9138d64373fee8c280935f34dca5055b5f3c45673217a0e742dac4656f574908fa9286416f37d082cd252cad08
+  metadata.gz: f8981741bedf7ac47c1861b8648d2e647e09cd24219439c3d7913922f5d0bc2c0152c771e6b9e041e2573b0aebd0081a7376e7649ea2273e2c6739bdd1274e94
+  data.tar.gz: 28e60e495707d4f39eb33c1e726cefda2dcd0e725a0daad2c529f6251d3e6509a1b134d2a3791c1f87f45aa3cd85256e11739cf53abb504927332b8e6cffcd4b

data/lib/log-analyzer/1

@@ -0,0 +1,12 @@
+module Log::Analyzer
+  class Config
+    attr_accessor :log_regexp, :route_regexp, :log_separator
+
+    def initialize
+      @route_regexp = /(GET|POST|DELETE|PATCH|PUT)\s*([^\s]*)\s*([^\s]*)\s*(\{.*\})?\s*(\[.*\])/i
+      #@route_regexp = /(GET|POST|DELETE|PATCH|PUT)\s+([^\s]*)\s/i
+      @log_regexp = /Started (?<request_method>GET|POST|DELETE|PATCH|PUT) "(?<path_info>[^"]+)".*in (?<response_time>[0-9]+)ms/im
+      @log_separator = "\n\n\n"
+    end
+  end
+end

data/lib/log-analyzer/analyze.rb

@@ -1,7 +1,7 @@
 module Log::Analyzer
   class Analyze
     def initialize(files, routes_text)
-      @files =files.is_a?(Array) ? files : [files]
+      @files = Dir.glob(files).select { |f| File.file?(f) }
       @routes = Routes.new(routes_text)
       create_endpoints
     end
@@ -23,14 +23,12 @@ module Log::Analyzer
       @files.each do |file|
         log = Log.new(file)
         log.each_line do |req|
-          matche = router.serve(req)
-          next unless matche.any?
+          route = router.serve(req)
+          next if route.nil?
 
-          req.env.delete_if { |key, val| ["REQUEST_METHOD", "PATH_INFO"].include?(key) }
-          _, _, route =  matche.first
+          req.env.delete_if { |key, val| ["REQUEST_METHOD", "PATH_INFO", "SCRIPT_NAME", "action_dispatch.request.path_parameters"].include?(key) }
           endpoint = Endpoint.find_by(method: route.path.request_method, uri_pattern: route.path.uri_pattern)
           endpoint.count += 1
-
           req.env.each do |key, val|
             endpoint[key.downcase] << val.to_i
           end

data/lib/log-analyzer/config.rb

@@ -3,7 +3,7 @@ module Log::Analyzer
     attr_accessor :log_regexp, :route_regexp, :log_separator
 
     def initialize
-      @route_regexp = /(GET|POST|DELETE|PATCH|PUT)\s+([^\s]*)\s/i
+      @route_regexp = /(GET|POST|DELETE|PATCH|PUT)\s*([^\s]*)\s*[^\s]*\s*(\{.*\})?\s*(\[.*\])?/i
       @log_regexp = /Started (?<request_method>GET|POST|DELETE|PATCH|PUT) "(?<path_info>[^"]+)".*in (?<response_time>[0-9]+)ms/im
       @log_separator = "\n\n\n"
     end

data/lib/log-analyzer/pattern.rb

@@ -2,8 +2,14 @@ module Log::Analyzer
   class Pattern < ActionDispatch::Journey::Path::Pattern
     attr_accessor :request_method, :uri_pattern
 
-    def self.from_string(request_method, uri_pattern)
-      new(ActionDispatch::Journey::Router::Strexp.build(uri_pattern, {}, ["/.?"], true), request_method, uri_pattern)
+    def self.from_string(request_method, uri_pattern, requirements)
+      requirements = if requirements.nil? || requirements.empty?
+                       {}
+                     else
+                       eval(requirements)
+                     end
+      requirements ||= {}
+      new(ActionDispatch::Journey::Router::Strexp.build(uri_pattern, requirements, ["/.?"], true), request_method, uri_pattern)
     end
 
     def initialize(strexp, request_method, uri_pattern)

data/lib/log-analyzer/rails/inspector.rb

@@ -0,0 +1,64 @@
+module Log::Analyzer::Rails
+  class RoutesInspector < ::ActionDispatch::Routing::RoutesInspector
+    private
+    def collect_routes(routes)
+      routes.collect do |route|
+        ::ActionDispatch::Routing::RouteWrapper.new(route)
+      end.reject do |route|
+        route.internal?
+      end.collect do |route|
+        collect_engine_routes(route)
+        constraints = collect_constraints(route)
+
+        { name:   route.name,
+          verb:   route.verb,
+          path:   route.path,
+          reqs:   route.reqs,
+          regexp: route.json_regexp,
+          constraints: constraints }
+      end
+    end
+
+    def collect_constraints(route)
+      return [] unless route.app.respond_to?(:constraints)
+
+      route.app.constraints.collect do |constraint|
+        case
+        when constraint.respond_to?(:matches?)
+          constraint.class
+        when constraint.respond_to?(:call)
+          constraint.source.match(/constraints: (.*)/) do |md|
+            md[1]
+          end
+        else
+          nil
+        end
+      end
+    end
+  end
+
+  class ConsoleFormatter < ::ActionDispatch::Routing::ConsoleFormatter
+    private
+    def draw_section(routes)
+      header_lengths = ['Prefix', 'Verb', 'URI Pattern', 'Controller#Action'].map(&:length)
+      name_width, verb_width, path_width, reqs_width = widths(routes).zip(header_lengths).map(&:max)
+
+      routes.map do |r|
+        "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs].ljust(reqs_width)} #{r[:constraints]}"
+      end
+    end
+
+    def draw_header(routes)
+      name_width, verb_width, path_width, reqs_width = widths(routes)
+
+      "#{"Prefix".rjust(name_width)} #{"Verb".ljust(verb_width)} #{"URI Pattern".ljust(path_width)} #{"Controller#Action".ljust(reqs_width)} Constraints"
+    end
+
+    def widths(routes)
+      [routes.map { |r| r[:name].length }.max || 0,
+       routes.map { |r| r[:verb].length }.max || 0,
+       routes.map { |r| r[:path].length }.max || 0,
+       routes.map { |r| r[:reqs].length }.max || 0]
+    end
+  end
+end

data/lib/log-analyzer/rails/tasks.rake

@@ -1,11 +1,12 @@
 namespace :log_analyzer do
   desc 'Analyze the endpoint from the log'
   task analyze: :environment do
+    require 'log-analyzer/rails/inspector'
     require 'log-analyzer/cli'
 
     all_routes = Rails.application.routes.routes
-    inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
-    routing_text = inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, ENV['CONTROLLER'])
+    inspector = Log::Analyzer::Rails::RoutesInspector.new(all_routes)
+    routing_text = inspector.format(Log::Analyzer::Rails::ConsoleFormatter.new, ENV['CONTROLLER'])
     analyze = Log::Analyzer::Analyze.new(Rails.root.join("log/#{Rails.env}.log"), routing_text)
     Log::Analyzer::CLI::Report.new(analyze.sort).run
   end

data/lib/log-analyzer/router.rb

@@ -1,7 +1,29 @@
 module Log::Analyzer
   class Router < ActionDispatch::Journey::Router
     def serve(req)
-      find_routes(req)
+      find_routes(req).each do |match, parameters, route|
+        set_params  = req.path_parameters
+        path_info   = req.path_info
+        script_name = req.script_name
+
+        unless route.path.anchored
+          req.script_name = (script_name.to_s + match.to_s).chomp('/')
+          req.path_info = match.post_match
+          req.path_info = "/" + req.path_info unless req.path_info.start_with? "/"
+        end
+
+        req.path_parameters = set_params.merge parameters
+        unless route.app.matches?(req)
+          req.script_name     = script_name
+          req.path_info       = path_info
+          req.path_parameters = set_params
+          next
+        end
+
+        return route
+      end
+
+      nil
     end
   end
 end

data/lib/log-analyzer/routes.rb

@@ -5,9 +5,18 @@ module Log::Analyzer
   class Routes < ActionDispatch::Journey::Routes
     def initialize(routes_text)
       super()
-      routes_text.scan(regexp) do |request_method, request_path|
-        path_pattern = Pattern.from_string(request_method, request_path)
-        add_route(nil, path_pattern, {request_method: /^#{request_method}$/}, {}, {})
+      routes_text.scan(regexp) do |request_method, request_path, requirements, constraints|
+        constraints = if constraints.nil? || constraints.empty?
+                        []
+                      else
+                        eval(constraints)
+                      end.map do |constraint|
+                        constraint.is_a?(String) ? eval(constraint) : constraint
+                      end
+        app = ActionDispatch::Routing::Mapper::Constraints.new(nil, constraints, true)
+
+        path_pattern = Pattern.from_string(request_method, request_path, requirements)
+        add_route(app, path_pattern, {request_method: /^#{request_method}$/}, {}, {})
       end
     end
 

data/lib/log-analyzer/version.rb

@@ -1,5 +1,5 @@
 module Log
   module Analyzer
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log-analyzer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - shiro16
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -142,6 +142,7 @@ files:
 - bin/setup
 - exe/log-analyzer
 - lib/log-analyzer.rb
+- lib/log-analyzer/1
 - lib/log-analyzer/analyze.rb
 - lib/log-analyzer/cli.rb
 - lib/log-analyzer/command/log-analyzer.rb
@@ -149,6 +150,7 @@ files:
 - lib/log-analyzer/endpoint.rb
 - lib/log-analyzer/log.rb
 - lib/log-analyzer/pattern.rb
+- lib/log-analyzer/rails/inspector.rb
 - lib/log-analyzer/rails/railtie.rb
 - lib/log-analyzer/rails/tasks.rake
 - lib/log-analyzer/router.rb
@@ -175,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Analyze the performance of each endpoint from the routing file