stackprof-webnav 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1552e5fc93e065620a447d3a7c32e23da16590ee857cfd2e13a5856fcc0972ad
-  data.tar.gz: 7514d5a49e0544494ee8fcf924ba6d3f9f2bccfb7cee2021c1b588b8cc6b4af5
+  metadata.gz: 1b4dd46c0ac72aaee58af286f92444820d29a4e06152981a41c6667c4183aa19
+  data.tar.gz: 74b43d464b781f3f42ef815e21beaab77c7eb9e46b47f2b3233a69519b9aee1e
 SHA512:
-  metadata.gz: 9573405eb7fd02e23b6bf72d9f1065b6a6b6c584cf83c17e07388fa4722c79bfc9fa1e4c5bc8e48d0850ae8d33fd69456f67b6a82c9a5178f9dbb3b4a52b5a6e
-  data.tar.gz: 74c6a96b5e19164f8b2ee61803f59f1af867a4b5ccf3155156000e939e9607517468cecedd62671468bd9a81ab2ef9fe2159f11d5b532a2c1b245bbc98f8b889
+  metadata.gz: b4dbb9e1bd18dbedfcee77cced956d2a205094ffb6721c100a8f5bf592fc1a008d91647bcd113eb1ed7d8d89c38e908407c32932b58f764f93ce5503de0104f1
+  data.tar.gz: 21e1289ab6b4170da780cdaefb1d4c8cdf0a63b79f887ed9e5f2330f6f1f733e8fb9bc39ed0820c60ce2518fe6c371ba70a2004f60de8ad0ee8a81b88627f1c8

data/.github/workflows/ruby.yml

@@ -19,7 +19,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7']
+        ruby-version:
+          - '2.7'
+          - '3.0'
 
     steps:
     - uses: actions/checkout@v2

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    stackprof-webnav (1.0.2)
+    stackprof-webnav (1.0.3)
       better_errors (~> 1.1.0)
       haml (~> 5.1.2)
       ruby-graphviz (~> 1.2.4)
-      sinatra (~> 2.0.7)
-      sinatra-contrib (~> 2.0.5)
+      sinatra (~> 2.1.0)
+      sinatra-contrib (~> 2.1.0)
       stackprof (>= 0.2.13)
+      webrick (~> 1.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.21.0)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -29,8 +29,8 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.0.8)
-    rack-protection (2.0.8.1)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -51,22 +51,22 @@ GEM
     rspec-support (3.9.0)
     ruby-graphviz (1.2.5)
       rexml
-    ruby2_keywords (0.0.4)
-    sinatra (2.0.8.1)
+    ruby2_keywords (0.0.5)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.8.1)
-      backports (>= 2.8.2)
+    sinatra-contrib (2.1.0)
       multi_json
       mustermann (~> 1.0)
-      rack-protection (= 2.0.8.1)
-      sinatra (= 2.0.8.1)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
       tilt (~> 2.0)
     stackprof (0.2.17)
     temple (0.8.2)
     tilt (2.0.10)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby

data/lib/stackprof-webnav/public/css/application.css

@@ -6,6 +6,12 @@ pre code {
   color: black;
 }
 
+input.filter {
+  max-width: 68%;
+  margin: 0 0 0 1rem;
+  display: inline;
+}
+
 #graph > a {
   position: absolute;
 }

data/lib/stackprof-webnav/public/lib/string_score.js

@@ -0,0 +1,78 @@
+/*
+ * string_score.js: Quicksilver-like string scoring algorithm.
+ *
+ * Copyright (C) 2009-2011 Joshaven Potter <yourtech@gmail.com>
+ * Copyright (C) 2010-2011 Yesudeep Mangalapilly <yesudeep@gmail.com>
+ * MIT license: http://www.opensource.org/licenses/mit-license.php
+ *
+ * This is a javascript port of the above mentionned, with a tiny change:
+ * it avoids string monkey patch.
+ */
+;(function(global) {
+	global.stringScore = (string, abbreviation) => {
+		// Perfect match if the spring equals the abbreviation
+		if (string == abbreviation) return 1.0
+
+		// Initializing variables.
+		let string_length = string.length
+		let abbreviation_length = abbreviation.length
+		let total_character_score = 0
+
+		// Awarded only if the string and the abbreviation have a common prefix.
+		let should_award_common_prefix_bonus = 0
+
+		// # Sum character scores
+
+		// Add up scores for each character in the abbreviation.
+		for (let i = 0, c = abbreviation[i]; i < abbreviation_length; c = abbreviation[++i]) {
+			// Find the index of current character (case-insensitive) in remaining part of string.
+        	let index_c_lowercase = string.indexOf(c.toLowerCase())
+        	let index_c_uppercase = string.indexOf(c.toUpperCase())
+        	let min_index = Math.min(index_c_lowercase, index_c_uppercase)
+        	let index_in_string = min_index > -1 ? min_index : Math.max(index_c_lowercase, index_c_uppercase)
+
+			// # Identical Strings
+			// Bail out if current character is not found (case-insensitive) in remaining part of string.
+			if (index_in_string == -1) return 0
+
+			// Set base score for current character.
+			let character_score = 0.1
+
+
+			// # Case-match bonus
+			// If the current abbreviation character has the same case
+			// as that of the character in the string, we add a bonus.
+			if (string[index_in_string] == c) character_score += 0.1
+
+			// # Consecutive character match and common prefix bonuses
+			// Increase the score when each consecutive character of
+			// the abbreviation matches the first character of the
+			// remaining string.
+			if (index_in_string == 0) {
+				character_score += 0.8
+				// String and abbreviation have common prefix, so award bonus.
+				if (i == 0) should_award_common_prefix_bonus = 1
+			}
+
+			// # Acronym bonus
+			// Typing the first character of an acronym is as
+			// though you preceded it with two perfect character
+			// matches.
+			if (string.charAt(index_in_string - 1) == ' ') // TODO: better accro
+				character_score += 0.8 // * Math.min(index_in_string, 5) # Cap bonus at 0.4 * 5
+
+			// Left trim the matched part of the string
+			// (forces sequential matching).
+			string = string.substring(index_in_string + 1, string_length)
+
+			// Add to total character score.
+			total_character_score += character_score
+		}
+
+		let abbreviation_score = total_character_score / abbreviation_length
+
+		let final_score = ((abbreviation_score * (abbreviation_length / string_length)) + abbreviation_score) / 2
+		if (should_award_common_prefix_bonus && final_score + 0.1 < 1) final_score += 0.1
+		return final_score
+	}
+})(window)

data/lib/stackprof-webnav/public/overview.js

@@ -0,0 +1,29 @@
+;(function() {
+	const table = document.getElementsByTagName('table')[0]
+	const input = document.getElementsByClassName('filter')[0]
+	const rows = {}
+	const filterKeys = Array.from(document.querySelectorAll('tr[data-filter-key]')).map(el => {
+		key = el.dataset.filterKey
+		rows[key] = el
+		return key
+	})
+	const scores = {}
+	const computeScores = () => {
+		const searchString = input.value
+		filterKeys.forEach(filterKey => scores[filterKey] = stringScore(filterKey, searchString))
+	}
+
+	const redrawTable = (sorted) => {
+		const newBody = document.createElement('tbody')
+		sorted.forEach(key => newBody.appendChild(rows[key]))
+		table.removeChild(table.getElementsByTagName('tbody')[0])
+		table.appendChild(newBody)
+	}
+
+	input.addEventListener('input', () => {
+		computeScores()
+		redrawTable(
+			filterKeys.filter(k => scores[k] !== 0).sort((a, b) => scores[b] - scores[a])
+		)
+	})
+})()

data/lib/stackprof-webnav/server.rb

@@ -3,7 +3,6 @@ require 'haml'
 require 'stackprof'
 require_relative 'presenter'
 require_relative 'dump'
-require 'pry'
 require 'sinatra/reloader' if development?
 require 'ruby-graphviz'
 

data/lib/stackprof-webnav/version.rb

@@ -1,5 +1,5 @@
 module StackProf
   module Webnav
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/lib/stackprof-webnav/views/overview.haml

@@ -25,11 +25,14 @@
     %th %
     %th Samples
     %th %
-    %th Method
+    %th
+      Method
+      %input.filter{:placeholder => "filter methods", :type => "text"}/
 
   %tbody
     - @frames.each do |frame|
-      %tr
+      - # Filter keys are preprocessed to better match acronyms.
+      %tr{"data-filter-key" => frame[:method].gsub(/[A-Z]/, " \\0").gsub(/[\W_]+/, " ").strip}
         %td= frame[:total]
         %td= frame[:total_pct]
         %td= frame[:samples]
@@ -37,3 +40,6 @@
         %td
           %a{:href => url_for("/method", name: frame[:method])}
             &= frame[:method]
+
+%script{src: "lib/string_score.js"}
+%script{src: "overview.js"}

data/stackprof-webnav.gemspec

@@ -21,12 +21,13 @@ Gem::Specification.new do |spec|
   spec.bindir = 'bin'
   spec.executables << 'stackprof-webnav'
 
-  spec.add_dependency "sinatra", "~> 2.0.7"
+  spec.add_dependency "sinatra", "~> 2.1.0"
   spec.add_dependency "haml", "~> 5.1.2"
   spec.add_dependency "stackprof", ">= 0.2.13"
   spec.add_dependency "better_errors", "~> 1.1.0"
   spec.add_dependency "ruby-graphviz", "~> 1.2.4"
-  spec.add_dependency "sinatra-contrib", "~> 2.0.5"
+  spec.add_dependency "sinatra-contrib", "~> 2.1.0"
+  spec.add_dependency "webrick", "~> 1.7.0"
   spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", "~> 10.1"
   spec.add_development_dependency "rspec", "~> 3.9.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackprof-webnav
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +174,6 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -176,6 +189,8 @@ files:
 - lib/stackprof-webnav/public/css/foundation.min.css
 - lib/stackprof-webnav/public/css/normalize.css
 - lib/stackprof-webnav/public/flamegraph.js
+- lib/stackprof-webnav/public/lib/string_score.js
+- lib/stackprof-webnav/public/overview.js
 - lib/stackprof-webnav/server.rb
 - lib/stackprof-webnav/version.rb
 - lib/stackprof-webnav/views/error.haml

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-script: bundle exec rspec
-before_install:
-  - "sudo apt-get install graphviz"