From e3ae86b6181fcb35321d72367b4ec344cf19e98f Mon Sep 17 00:00:00 2001 From: Henrik Holm Date: Mon, 27 May 2019 14:04:08 +0200 Subject: [PATCH 1/2] Allow regex to match on / when loading the result file --- lib/cloudscrape_client/executions/result/file.rb | 2 +- spec/cloudscrape_client/executions/result/file_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cloudscrape_client/executions/result/file.rb b/lib/cloudscrape_client/executions/result/file.rb index 99e5d53..f88ba29 100644 --- a/lib/cloudscrape_client/executions/result/file.rb +++ b/lib/cloudscrape_client/executions/result/file.rb @@ -17,7 +17,7 @@ class File ; # first split (?'providerId'\d+) # Dexi provider id ; # second split - (?'id'[a-z0-9-]*) # file id + (?'id'[a-z0-9-\/]*) # file id \Z # end of line }x EXPECTED_FORMAT = "FILE:;;" diff --git a/spec/cloudscrape_client/executions/result/file_spec.rb b/spec/cloudscrape_client/executions/result/file_spec.rb index af01204..2c644d1 100644 --- a/spec/cloudscrape_client/executions/result/file_spec.rb +++ b/spec/cloudscrape_client/executions/result/file_spec.rb @@ -5,13 +5,13 @@ RSpec.describe CloudscrapeClient::Executions::Result::File do let(:instance) { described_class.new(value) } - let(:value) { "FILE:image/png;26071;11fed7f0-a508-4dc8-956a-481535c6f88a" } + let(:value) { "FILE:image/png;26071;testaccount/11fed7f0-a508-4dc8-956a-481535c6f88a" } describe "#id" do subject(:id) { instance.id } it "returns id parsed from value" do - expect(id).to eq("11fed7f0-a508-4dc8-956a-481535c6f88a") + expect(id).to eq("testaccount/11fed7f0-a508-4dc8-956a-481535c6f88a") end context "when id is not found" do @@ -77,7 +77,7 @@ subject(:file_name) { instance.file_name } it "returns expected file name" do - expect(file_name).to eq("11fed7f0-a508-4dc8-956a-481535c6f88a-26071.png") + expect(file_name).to eq("testaccount/11fed7f0-a508-4dc8-956a-481535c6f88a-26071.png") end end From 2b8499e710fd3db4e7a015e22ea065d9981a169d Mon Sep 17 00:00:00 2001 From: Henrik Holm Date: Tue, 28 May 2019 13:50:10 +0200 Subject: [PATCH 2/2] Get rid of warning: character class has '-' without escape --- lib/cloudscrape_client/executions/result/file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cloudscrape_client/executions/result/file.rb b/lib/cloudscrape_client/executions/result/file.rb index f88ba29..f2946ae 100644 --- a/lib/cloudscrape_client/executions/result/file.rb +++ b/lib/cloudscrape_client/executions/result/file.rb @@ -17,7 +17,7 @@ class File ; # first split (?'providerId'\d+) # Dexi provider id ; # second split - (?'id'[a-z0-9-\/]*) # file id + (?'id'[a-z0-9\-\/]*) # file id \Z # end of line }x EXPECTED_FORMAT = "FILE:;;"