cornucopia 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef45d4d18ad938d5938b24b72aef051e32bac2ba
-  data.tar.gz: 790fdc748ce0c81864570425f5a3fc780fd1c5b5
+  metadata.gz: 935a830f6ee463eeed47e9205eb2c4e6beed72ec
+  data.tar.gz: 3b06aa0ab914fe774a42160e963b8acbc9c26740
 SHA512:
-  metadata.gz: c2a910e0e709f6a6369896afca72449b310233ed70d509000a439691b708e8862a7ead7d441d8c64baf320dd1fad062916c3634d3bdccd60893a1e2c3ae564be
-  data.tar.gz: a73bb3a1dc30aead997a617341ed25e799cf3185659b9a49648c3720289493e5804e933fa90a69a44ea9708f03261fb126c327ee84e8436f212a7e7dc3316390
+  metadata.gz: 8cce1b9e5d66f6ae8145ca30ee35c1c4d6b34c10bf74eb24c8b9fed087cf8272147a58def17e757ca7c61a3a1805557ad96d3f2e4739ebb8ebaad3f035c5ee7d
+  data.tar.gz: f0d35c59e261ded4d4f4efa8d518f2c0635e00ef3d11ae85588c3f9b4933ad6b888715350a94a80448376d0887c0429313a82f114934a5d6f56cea068e49c5ca

data/lib/cornucopia/util/report_builder.rb

@@ -48,8 +48,8 @@ module Cornucopia
         def format_code_refs(value)
           safe_text = Cornucopia::Util::ReportBuilder.escape_string(value)
 
-          safe_text = safe_text.gsub(/(#{Cornucopia::Util::ReportBuilder.root_folder}|\.\/|(?=(?:^features|^spec)\/))([^\:\r\n &]*(?:\:[^\:\r\n\>& ]*)?)/,
-                                     "\\1 <span class=\"cornucopia-app-file\">\\2\\3</span> ").html_safe
+          safe_text = safe_text.gsub(/(#{Cornucopia::Util::ReportBuilder.root_folder}|\.\/|(?=(?:^features|^spec)\/))([^\:\r\n &]*(?: *\: *[0-9]+)?)/,
+                                     "\\1 <span class=\"cornucopia-app-file\">\\2</span> ").html_safe
 
           safe_text
         end

data/lib/cornucopia/version.rb

@@ -1,3 +1,3 @@
 module Cornucopia
-  VERSION = "0.1.24"
+  VERSION = "0.1.25"
 end

data/spec/lib/util/report_builder_spec.rb

@@ -122,6 +122,54 @@ describe Cornucopia::Util::ReportBuilder do
 
       expect(Cornucopia::Util::ReportBuilder.format_code_refs(sample_string)).to be_html_safe
     end
+
+    it "formats the refs in a string" do
+      sample_string = "This is a sample string ./features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb:445 > :in `block (2 levels) in <top (required)>'"
+      result_string = "This is a sample string ./ <span class=\"cornucopia-app-file\">features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb:445</span>  &gt; :in `block (2 levels) in &lt;top (required)&gt;&#39;"
+
+      expect(Cornucopia::Util::ReportBuilder.format_code_refs(sample_string)).to be == result_string
+    end
+
+    it "formats the refs in a string but not the : after unless it has a number" do
+      sample_string = "This is a sample string ./features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb :in `block (2 levels) in <top (required)>'"
+      result_string = "This is a sample string ./ <span class=\"cornucopia-app-file\">features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb</span>  :in `block (2 levels) in &lt;top (required)&gt;&#39;"
+
+      expect(Cornucopia::Util::ReportBuilder.format_code_refs(sample_string)).to be == result_string
+    end
+
+    it "formats the refs in a string starting with features" do
+      sample_string = "features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb : 445 > :in `block (2 levels) in <top (required)>'"
+      result_string = " <span class=\"cornucopia-app-file\">features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb : 445</span>  &gt; :in `block (2 levels) in &lt;top (required)&gt;&#39;"
+
+      expect(Cornucopia::Util::ReportBuilder.format_code_refs(sample_string)).to be == result_string
+    end
+
+    it "formats the refs in a string starting with spec" do
+      sample_string = "spec/admin2/step_definitions/daily_email_deal_scheduling_steps.rb : 445 > :in `block (2 levels) in <top (required)>'"
+      result_string = " <span class=\"cornucopia-app-file\">spec/admin2/step_definitions/daily_email_deal_scheduling_steps.rb : 445</span>  &gt; :in `block (2 levels) in &lt;top (required)&gt;&#39;"
+
+      expect(Cornucopia::Util::ReportBuilder.format_code_refs(sample_string)).to be == result_string
+    end
+
+    it "formats the refs root refs in a string" do
+      sample_string = "This is a sample string c:/bizarro/features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb:445 > :in `block (2 levels) in <top (required)>'"
+      result_string = "This is a sample string c:/bizarro/ <span class=\"cornucopia-app-file\">features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb:445</span>  &gt; :in `block (2 levels) in &lt;top (required)&gt;&#39;"
+
+      allow(Cornucopia::Util::ReportBuilder).to receive(:root_folder).and_return("c:/bizarro/")
+
+      expect(Cornucopia::Util::ReportBuilder.format_code_refs(sample_string)).to be == result_string
+    end
+
+    it "formats multiple refs root refs in a string" do
+      sample_string = "This is a sample string c:/bizarro/features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb:445 > :in `block (2 levels) in <top (required)>'
+This is a sample string c:/bizarro/features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb:445 > :in `block (2 levels) in <top (required)>'"
+      result_string = "This is a sample string c:/bizarro/ <span class=\"cornucopia-app-file\">features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb:445</span>  &gt; :in `block (2 levels) in &lt;top (required)&gt;&#39;
+This is a sample string c:/bizarro/ <span class=\"cornucopia-app-file\">features/admin2/step_definitions/daily_email_deal_scheduling_steps.rb:445</span>  &gt; :in `block (2 levels) in &lt;top (required)&gt;&#39;"
+
+      allow(Cornucopia::Util::ReportBuilder).to receive(:root_folder).and_return("c:/bizarro/")
+
+      expect(Cornucopia::Util::ReportBuilder.format_code_refs(sample_string)).to be == result_string
+    end
   end
 
   describe "#root_folder" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cornucopia
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - RealNobody