ddmetrics 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b88f4608168f197c67e407f072a257e5fd6b76839c72a3dc0f63b326bc363534
-  data.tar.gz: 043c06c1a3414422f5f8a442dbec24e634a086f09265a60dc9bb1dd22ef12b7f
+  metadata.gz: cc9eff515c2d5ddd9cf35e2185643a05291e3590636ae9dcee272ca4982aa9d4
+  data.tar.gz: a60d517b811fa2b421789138956d7580755a41c63fc844955dd7190d62489ea0
 SHA512:
-  metadata.gz: c36890a111a870ec0286c02e8d5320ddd5b9ec5d7b3fa7d6809065d7c655a806698a8787e9a07f69468c727c8222775e44ac2935ac357c9fdec896387fe7b69b
-  data.tar.gz: cf4122e405770d4fc787628660366bc634bbd0d29d41e9002b8564cf56dbccf7a74936a602119e01fb5505d41aff01df9cc3008f8fc72d06685c37f8b19f69d0
+  metadata.gz: 0cf2f5dd6f2a5f2e7dba26737f644d3c96589d8e4249adc83a4124d4859cab419b6513a593004a1c6e2650093742dcd1481bd1c1d73d048ceea20aa0316cc1d6
+  data.tar.gz: bdd81032dc806a0ae195dd52d0def6dad76b2a7c308b24aebfb02608155db1f06dc77cf0996c0f7f56d3a155d1419ca82adac930b37258f60d7a241119a3553a

data/.rubocop.yml

@@ -7,7 +7,10 @@ AllCops:
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
 Layout/IndentArray:

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Denis Defreyne
+Copyright (c) 2017–2018 Denis Defreyne
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,5 +1,11 @@
 # DDMetrics news
 
+## 1.0.1 (2018-07-19)
+
+Enhancements:
+
+* Improved formatting of labels in tables (#7)
+
 ## 1.0.0 (2018-01-07)
 
 (identical to 1.0.0rc1)

data/README.md

@@ -89,11 +89,11 @@ puts cache.counter
 ```
 
 ```
-              │ count
-──────────────┼──────
-type=get_miss │     2
-     type=set │     1
- type=get_hit │     3
+    type │ count
+─────────┼──────
+ get_hit │     3
+get_miss │     2
+     set │     1
 ```
 
 ## Scope
@@ -205,10 +205,10 @@ puts summary
 Output:
 
 ```
-            │ count    min    .50    .90    .95    max    tot
-────────────┼────────────────────────────────────────────────
- filter=erb │     2   2.10   3.10   3.90   4.00   4.10   6.20
-filter=haml │     1   5.30   5.30   5.30   5.30   5.30   5.30
+filter │ count    min    .50    .90    .95    max    tot
+───────┼────────────────────────────────────────────────
+   erb │     2   2.10   3.10   3.90   4.00   4.10   6.20
+  haml │     1   5.30   5.30   5.30   5.30   5.30   5.30
 ```
 
 ### Stopwatch

data/lib/ddmetrics/printer.rb

@@ -3,23 +3,21 @@
 module DDMetrics
   class Printer
     def summary_to_s(summary)
-      DDMetrics::Table.new(table_for_summary(summary)).to_s
+      table_for_summary(summary).to_s
     end
 
     def counter_to_s(counter)
-      DDMetrics::Table.new(table_for_counter(counter)).to_s
+      table_for_counter(counter).to_s
     end
 
     private
 
-    def label_to_s(label)
-      label.to_a.sort.map { |pair| pair.join('=') }.join(' ')
-    end
-
     def table_for_summary(summary)
-      headers = ['', 'count', 'min', '.50', '.90', '.95', 'max', 'tot']
+      header_labels = nil
+      headers = ['count', 'min', '.50', '.90', '.95', 'max', 'tot']
 
       rows = summary.labels.map do |label|
+        header_labels ||= label.to_a.sort.map(&:first).map(&:to_s)
         stats = summary.get(label)
 
         count = stats.count
@@ -30,20 +28,22 @@ module DDMetrics
         tot   = stats.sum
         max   = stats.max
 
-        [label_to_s(label), count.to_s] + [min, p50, p90, p95, max, tot].map { |r| format('%4.2f', r) }
+        label.to_a.sort.map(&:last).map(&:to_s) + [count.to_s] + [min, p50, p90, p95, max, tot].map { |r| format('%4.2f', r) }
       end
 
-      [headers] + rows
+      DDMetrics::Table.new([header_labels + headers] + rows, num_headers: header_labels.size)
     end
 
     def table_for_counter(counter)
-      headers = ['', 'count']
+      header_labels = nil
+      headers = ['count']
 
       rows = counter.labels.map do |label|
-        [label_to_s(label), counter.get(label).to_s]
+        header_labels ||= label.to_a.sort.map(&:first).map(&:to_s)
+        label.to_a.sort.map(&:last).map(&:to_s) + [counter.get(label).to_s]
       end
 
-      [headers] + rows
+      DDMetrics::Table.new([header_labels + headers] + rows, num_headers: header_labels.size)
     end
   end
 end

data/lib/ddmetrics/table.rb

@@ -2,8 +2,9 @@
 
 module DDMetrics
   class Table
-    def initialize(rows)
+    def initialize(rows, num_headers: 1)
       @rows = rows
+      @num_headers = num_headers
     end
 
     def to_s
@@ -11,8 +12,13 @@ module DDMetrics
       column_lengths = columns.map { |c| c.map(&:size).max }
 
       [].tap do |lines|
+        # header
         lines << row_to_s(@rows[0], column_lengths)
+
+        # separator
         lines << separator(column_lengths)
+
+        # body
         rows = sort_rows(@rows.drop(1))
         lines.concat(rows.map { |r| row_to_s(r, column_lengths) })
       end.join("\n")
@@ -26,14 +32,14 @@ module DDMetrics
 
     def row_to_s(row, column_lengths)
       values = row.zip(column_lengths).map { |text, length| text.rjust(length) }
-      values[0] + ' │ ' + values[1..-1].join('   ')
+      values.take(@num_headers).join('   ') + ' │ ' + values.drop(@num_headers).join('   ')
     end
 
     def separator(column_lengths)
       (+'').tap do |s|
-        s << '─' * column_lengths[0]
+        s << column_lengths.take(@num_headers).map { |l| '─' * l }.join('───')
         s << '─┼─'
-        s << column_lengths[1..-1].map { |l| '─' * l }.join('───')
+        s << column_lengths.drop(@num_headers).map { |l| '─' * l }.join('───')
       end
     end
   end

data/lib/ddmetrics/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DDMetrics
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/ddmetrics/counter_spec.rb

@@ -97,10 +97,10 @@ describe DDMetrics::Counter do
 
     it 'returns table' do
       expected = <<~TABLE
-                    │ count
-        ────────────┼──────
-         filter=erb │     2
-        filter=haml │     1
+        filter │ count
+        ───────┼──────
+           erb │     2
+          haml │     1
       TABLE
 
       expect(subject.strip).to eq(expected.strip)

data/spec/ddmetrics/summary_spec.rb

@@ -64,21 +64,44 @@ describe DDMetrics::Summary do
   describe '#to_s' do
     subject { summary.to_s }
 
-    before do
-      summary.observe(2.1, filter: :erb)
-      summary.observe(4.1, filter: :erb)
-      summary.observe(5.3, filter: :haml)
+    context 'one label' do
+      before do
+        summary.observe(2.1, filter: :erb)
+        summary.observe(4.1, filter: :erb)
+        summary.observe(5.3, filter: :haml)
+      end
+
+      it 'returns table' do
+        expected = <<~TABLE
+          filter │ count    min    .50    .90    .95    max    tot
+          ───────┼────────────────────────────────────────────────
+             erb │     2   2.10   3.10   3.90   4.00   4.10   6.20
+            haml │     1   5.30   5.30   5.30   5.30   5.30   5.30
+        TABLE
+
+        expect(subject.strip).to eq(expected.strip)
+      end
     end
 
-    it 'returns table' do
-      expected = <<~TABLE
-                    │ count    min    .50    .90    .95    max    tot
-        ────────────┼────────────────────────────────────────────────
-         filter=erb │     2   2.10   3.10   3.90   4.00   4.10   6.20
-        filter=haml │     1   5.30   5.30   5.30   5.30   5.30   5.30
-      TABLE
+    context 'multiple labels' do
+      before do
+        summary.observe(2.1, filter: :erb, stage: :pre)
+        summary.observe(4.1, filter: :erb, stage: :pre)
+        summary.observe(1.2, filter: :erb, stage: :post)
+        summary.observe(5.3, filter: :haml, stage: :post)
+      end
 
-      expect(subject.strip).to eq(expected.strip)
+      it 'returns table' do
+        expected = <<~TABLE
+          filter   stage │ count    min    .50    .90    .95    max    tot
+          ───────────────┼────────────────────────────────────────────────
+             erb     pre │     2   2.10   3.10   3.90   4.00   4.10   6.20
+             erb    post │     1   1.20   1.20   1.20   1.20   1.20   1.20
+            haml    post │     1   5.30   5.30   5.30   5.30   5.30   5.30
+        TABLE
+
+        expect(subject.strip).to eq(expected.strip)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddmetrics
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Non-timeseries measurements for Ruby programs