step-track 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc50b128bbf34ac66883d612e505726bbb4e9f64
-  data.tar.gz: f2575a7a94f5dbd39f985a0019bd7c94117fd271
+  metadata.gz: 4a0bf2ec6b3a6e6f8598448e7e1ddbfd6fda1c12
+  data.tar.gz: 83adeac1520de8022874b87ce25f007759a9ab06
 SHA512:
-  metadata.gz: cd7889d54b30b00638136ce29bb311e8608f46efe311ead7908ab5900ec772cc1734923ac94d5bf00c26e19e6d60ed3358620d3c92c3506ad1a542e0c5936cdf
-  data.tar.gz: 090e8bbd1cdee43a78498c6b844026ef543c0ee65c71e6b983e78d48d28c191efb8d2e9f9e9684adab30bcd04337c6a3419445649f807f29ed3951447f3a90fd
+  metadata.gz: 1dcb19876dbc655a30629b8e406a129928721132597b906ed95a92accf6e17b7221f0e904c201555fb3b258bb002f21a00d8c24d0302f9bb55dd1bdf9d5ccb56
+  data.tar.gz: 975b29eec0db2f6fab3b318026e0ec27dd040605c21edc9cbd8e0f203846b13761c73deb7d2ec1366fd2838587f14b69414cf8ab9588d100ab7d89d0100b607a

data/lib/step_track.rb

@@ -40,7 +40,13 @@ module StepTrack
     last_step[:final_step_name] = last_step.delete(:step_name)
     result.merge!(last_step)
     steps.each_with_index do |step, i|
-      name = step.delete(:step_name)
+      name = name_dupe = step.delete(:step_name)
+      j = 0
+      while result.key?("step_#{name_dupe}_i".to_sym)
+        j += 1
+        name_dupe = "#{name}_#{j}"
+      end
+      name = name_dupe
       [:split, :duration].each { |k| step[k] = (step[k] * 1000).to_i }
       result.merge!(step.merge(i: i + 1).
         map { |k, v| ["step_#{name}_#{k}".to_sym, v] }.to_h)

data/lib/step_track/version.rb

@@ -1,3 +1,3 @@
 module StepTrack
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/test/step_track_test.rb

@@ -46,9 +46,9 @@ describe "StepTrack" do
       data = Thread.current[StepTrack.send(:ref, "test")]
       step = data[:steps].first
       assert_equal 1, data[:steps].size
-      assert_equal "step", step[:name]
+      assert_equal "step", step[:step_name]
       assert_equal "bar", step[:moo]
-      expected_keys = [:name, :split, :duration, :time, :caller]
+      expected_keys = [:split, :duration, :time, :caller]
       assert_equal expected_keys, expected_keys & step.keys
     end
 
@@ -100,19 +100,30 @@ describe "StepTrack" do
 
     it "merges the last step into result" do
       result = StepTrack.done("test")
-      assert_equal "last", result[:name]
-      expected_keys = [:name, :split, :duration, :caller]
+      assert_equal "last", result[:final_step_name]
+      expected_keys = [:split, :duration, :caller]
       assert_equal expected_keys, expected_keys & result.keys
     end
 
     it "enumerates every step into result" do
       result = StepTrack.done("test")
-      expected_key_parts = [:name, :split, :duration, :caller]
+      expected_key_parts = [:split, :duration, :caller]
 
       ["step", "last"].each_with_index do |n, i|
         expected_keys = expected_key_parts.map { |k| "step_#{n}_#{k}".to_sym }
         assert_equal expected_keys, expected_keys & result.keys
       end
     end
+
+    it "enumerate duplicated step names with index in the result" do
+      StepTrack.push("test", "last", gnu: "blu")
+      result = StepTrack.done("test")
+      expected_key_parts = [:split, :duration, :caller]
+
+      ["step", "last", "last_1"].each_with_index do |n, i|
+        expected_keys = expected_key_parts.map { |k| "step_#{n}_#{k}".to_sym }
+        assert_equal expected_keys, expected_keys & result.keys
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: step-track
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Matthias Geier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest