Skip to content

Commit 19e6ae5

Browse files
imagekitioimagekitio
authored
Merge pull request #53 from bishosilwal/fix/remove-url-sdk-version
Remove id-sdk-version parameter from url
2 parents 297cca2 + 9ee1ed5 commit 19e6ae5

File tree

6 files changed

+35
-36
lines changed

6 files changed

+35
-36
lines changed

‎.github/workflows/gempush.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v2
1313
- name: Set up Ruby 2.6
14-
uses: actions/setup-ruby@v1
14+
uses: ruby/setup-ruby@v1.126.0
1515
with:
16-
version: 2.6.x
16+
version: 2.6.5
1717

1818
- name: Run Test Cases
1919
run: |

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v2
1212
- name: Set up Ruby 2.6
13-
uses: actions/setup-ruby@v1
13+
uses: ruby/setup-ruby@v1.126.0
1414
with:
15-
ruby-version: 2.6.x
15+
ruby-version: 2.6.5
1616
- name: Build and test with Rake
1717
run: |
1818
gem install bundler

‎lib/imagekitio/sdk/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module ImageKitIo
22
module Sdk
3-
VERSION = '2.2.2'
3+
VERSION = '2.2.3'
44
end
55
end

‎lib/imagekitio/url.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ def build_url(options)
8585
result_url_hash[:scheme] ||= "https"
8686

8787
query_param_arr = []
88-
query_param_arr.push("ik-sdk-version=ruby-"+ImageKitIo::Sdk::VERSION)
8988
query_params.each do |key, value|
9089
if value.to_s == ""
9190
query_param_arr.push(key.to_s)

‎test/imagekit/client_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@
393393
}
394394
url = SUT.url(options)
395395

396-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
396+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg")
397397
end
398398

399399
it "get_authentication_params_test_with_hard_coded_params" do

‎test/imagekit/url_test.rb‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
url = url_obj.generate_url(options)
2424

25-
expect(url).to eq("https://imagekit.io/your-imgekit-id/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
25+
expect(url).to eq("https://imagekit.io/your-imgekit-id/default-image.jpg")
2626
end
2727

2828
it "test_generate_url_with_path" do
@@ -33,7 +33,7 @@
3333
}
3434
url = url_obj.generate_url(options)
3535

36-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
36+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg")
3737
end
3838

3939
it "test_generate_url_with_path_with_special_characters" do
@@ -44,7 +44,7 @@
4444
}
4545
url = url_obj.generate_url(options)
4646

47-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
47+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png")
4848
end
4949

5050
it "test_generate_url_without_slash" do
@@ -54,7 +54,7 @@
5454
}
5555
url = url_obj.generate_url(options)
5656

57-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
57+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg")
5858
end
5959

6060
it "test_generate_url_with_path_without_slash_with_special_characters" do
@@ -65,7 +65,7 @@
6565
}
6666
url = url_obj.generate_url(options)
6767

68-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
68+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png")
6969
end
7070

7171
it "test_generate_url_with_override_url_endpoint_without_slash" do
@@ -75,7 +75,7 @@
7575
}
7676
url = url_obj.generate_url(options)
7777

78-
expect(url).to eq("https://ik.imagekit.io/your_override_imagekit_id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
78+
expect(url).to eq("https://ik.imagekit.io/your_override_imagekit_id/tr:h-300,w-400/default-image.jpg")
7979
end
8080

8181
it "test_generate_url_with_override_url_endpoint_without_slash_with_special_characters" do
@@ -85,7 +85,7 @@
8585
}
8686
url = url_obj.generate_url(options)
8787

88-
expect(url).to eq("https://ik.imagekit.io/your_override_imagekit_id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
88+
expect(url).to eq("https://ik.imagekit.io/your_override_imagekit_id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png")
8989
end
9090

9191
it "test_generate_url_with_override_url_endpoint_with_slash" do
@@ -96,7 +96,7 @@
9696
}
9797
url = url_obj.generate_url(options)
9898

99-
expect(url).to eq("https://ik.imagekit.io/your_override_imagekit_id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
99+
expect(url).to eq("https://ik.imagekit.io/your_override_imagekit_id/tr:h-300,w-400/default-image.jpg")
100100
end
101101

102102
it "test_generate_url_with_override_url_endpoint_with_slash_with_special_characters" do
@@ -106,7 +106,7 @@
106106
}
107107
url = url_obj.generate_url(options)
108108

109-
expect(url).to eq("https://ik.imagekit.io/your_override_imagekit_id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
109+
expect(url).to eq("https://ik.imagekit.io/your_override_imagekit_id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png")
110110
end
111111

112112
it "test_generate_url_with_override_url_endpoint_with_special_characters" do
@@ -116,7 +116,7 @@
116116
}
117117
url = url_obj.generate_url(options)
118118

119-
expect(url).to eq("https://www.Fjällräven.com/your_override_imagekit_id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
119+
expect(url).to eq("https://www.Fjällräven.com/your_override_imagekit_id/tr:h-300,w-400/γειασας/Fjällräven_KnSJwp87u6q.png")
120120
end
121121

122122
it "test_generate_url_with_new_transformation_parameters" do
@@ -126,7 +126,7 @@
126126
transformation: [{ height: 300, width: 400 }, { new_params: 100 }],
127127
}
128128
url = url_obj.generate_url(options)
129-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400:new_params-100/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
129+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400:new_params-100/default-image.jpg")
130130
end
131131

132132
it "test_generate_url_should_have_ik_sdk_version" do
@@ -136,7 +136,7 @@
136136
transformation: [{ height: 300, width: 400 },]
137137
}
138138
url = url_obj.generate_url(options)
139-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
139+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg")
140140
end
141141

142142
it "test_generate_url_should_have_transformation_parameters" do
@@ -200,7 +200,7 @@
200200
},]
201201
}
202202
url = url_obj.generate_url(options)
203-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400,ar-4-3,q-40,c-force,cm-extract,fo-left,f-jpeg,r-50,bg-A94D34,b-5-A94D34,rt-90,bl-10,n-some_name,ox-35,oy-35,ofo-bottom,oh-20,ow-20,oi-folder@@file.jpg,oit-false,oiar-4:3,oibg-0F0F0F,oib-10_0F0F0F,oidpr-2,oiq-50,oic-force,ot-two words,ots-20,otf-Open Sans,otc-00FFFF,oa-5,ott-b,obg-00AAFF55,ote-b3ZlcmxheSBtYWRlIGVhc3k%3D,otw-50,otbg-00AAFF55,otp-40,otia-left,or-10,pr-true,lo-true,t-5,md-true,cp-true,di-folder@@file.jpg,dpr-3,e-sharpen-10,e-usm-2-2-0.8-0.024,e-contrast-true,e-grayscale-true,orig-true,w-200,h-200/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
203+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400,ar-4-3,q-40,c-force,cm-extract,fo-left,f-jpeg,r-50,bg-A94D34,b-5-A94D34,rt-90,bl-10,n-some_name,ox-35,oy-35,ofo-bottom,oh-20,ow-20,oi-folder@@file.jpg,oit-false,oiar-4:3,oibg-0F0F0F,oib-10_0F0F0F,oidpr-2,oiq-50,oic-force,ot-two words,ots-20,otf-Open Sans,otc-00FFFF,oa-5,ott-b,obg-00AAFF55,ote-b3ZlcmxheSBtYWRlIGVhc3k%3D,otw-50,otbg-00AAFF55,otp-40,otia-left,or-10,pr-true,lo-true,t-5,md-true,cp-true,di-folder@@file.jpg,dpr-3,e-sharpen-10,e-usm-2-2-0.8-0.024,e-contrast-true,e-grayscale-true,orig-true,w-200,h-200/default-image.jpg")
204204
end
205205

206206
it "test_generate_url_with_chained_transformation" do
@@ -210,7 +210,7 @@
210210
transformation: [{ height: 300, width: 400 }, { rotation: 90 }],
211211
}
212212
url = url_obj.generate_url(options)
213-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400:rt-90/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
213+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400:rt-90/default-image.jpg")
214214
end
215215

216216
it "test_generate_url_transformation_parameters_setted_to_query" do
@@ -222,7 +222,7 @@
222222
}
223223
url = url_obj.generate_url(options)
224224

225-
expect(url).to eq("https://imagekit.io/your-imgekit-id/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&tr=h-300,w-400")
225+
expect(url).to eq("https://imagekit.io/your-imgekit-id/default-image.jpg?tr=h-300,w-400")
226226
end
227227

228228
it "test_generate_url_with_special_characters_transformation_parameters_setted_to_query" do
@@ -234,7 +234,7 @@
234234
}
235235
url = url_obj.generate_url(options)
236236

237-
expect(url).to eq("https://imagekit.io/your-imgekit-id/γειασας/Fjällräven_KnSJwp87u6q.png?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&tr=h-300,w-400")
237+
expect(url).to eq("https://imagekit.io/your-imgekit-id/γειασας/Fjällräven_KnSJwp87u6q.png?tr=h-300,w-400")
238238
end
239239

240240
it "test_generate_url_with_query_parameters" do
@@ -245,7 +245,7 @@
245245
}
246246
url = url_obj.generate_url(options)
247247

248-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&v=123&blank_parameter")
248+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg?v=123&blank_parameter")
249249
end
250250

251251
it "test_generate_url_with_query_parameters_with_special_characters" do
@@ -256,7 +256,7 @@
256256
}
257257
url = url_obj.generate_url(options)
258258

259-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&γειασας=γειασας")
259+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/default-image.jpg?γειασας=γειασας")
260260
end
261261

262262
it 'test_generate_url_with_absolute_path' do
@@ -266,7 +266,7 @@
266266
}
267267
url = url_obj.generate_url(options)
268268

269-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/https%3A%2F%2Fexample.com%2Fexternal-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&γειασας=γειασας")
269+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/https%3A%2F%2Fexample.com%2Fexternal-image.jpg?γειασας=γειασας")
270270
end
271271

272272
it "test_generate_url_with_src_checking_query_param_added" do
@@ -277,7 +277,7 @@
277277
}
278278

279279
url = url_obj.generate_url(options)
280-
expect(url).to eq("https://ik.imagekit.io/ldt7znpgpjs/test_YhNhoRxWt.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&another=abc&xyz=888&v=123&tr=h-300,w-400")
280+
expect(url).to eq("https://ik.imagekit.io/ldt7znpgpjs/test_YhNhoRxWt.jpg?another=abc&xyz=888&v=123&tr=h-300,w-400")
281281
end
282282

283283
it "test_generate_url_with_path_checking_query_param_added" do
@@ -288,7 +288,7 @@
288288
}
289289

290290
url = url_obj.generate_url(options)
291-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/test_YhNhoRxWt.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&another=abc&xyz=888&v=123")
291+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/test_YhNhoRxWt.jpg?another=abc&xyz=888&v=123")
292292
end
293293

294294
it "test_generate_url_with_src" do
@@ -306,7 +306,7 @@
306306

307307
url = url_obj.generate_url(options)
308308

309-
expect(url).to eq("https://ik.imagekit.io/ldt7znpgpjs/test_YhNhoRxWt.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&tr=h-300,w-400,f-jpg,pr-true,e-sharpen,e-contrast-1:rt-90")
309+
expect(url).to eq("https://ik.imagekit.io/ldt7znpgpjs/test_YhNhoRxWt.jpg?tr=h-300,w-400,f-jpg,pr-true,e-sharpen,e-contrast-1:rt-90")
310310

311311
end
312312

@@ -325,7 +325,7 @@
325325

326326
url = url_obj.generate_url(options)
327327

328-
expect(url).to eq("https://www.Fjällräve.com/γειασας/Fjällräven_KnSJwp87u6q.png?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&tr=h-300,w-400,f-jpg,pr-true,e-sharpen,e-contrast-1:rt-90")
328+
expect(url).to eq("https://www.Fjällräve.com/γειασας/Fjällräven_KnSJwp87u6q.png?tr=h-300,w-400,f-jpg,pr-true,e-sharpen,e-contrast-1:rt-90")
329329

330330
end
331331

@@ -343,7 +343,7 @@
343343

344344
url = url_obj.generate_url(options)
345345

346-
expect(url).to eq("https://ik.imagekit.io/ldt7znpgpjs/test_YhNhoRxWt.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&tr=h-300,w-400,f-jpg,pr-true,e-sharpen,e-contrast-1:rt-90")
346+
expect(url).to eq("https://ik.imagekit.io/ldt7znpgpjs/test_YhNhoRxWt.jpg?tr=h-300,w-400,f-jpg,pr-true,e-sharpen,e-contrast-1:rt-90")
347347
end
348348

349349
it "test_generate_url_with_path_and_signed" do
@@ -355,7 +355,7 @@
355355

356356
url = url_obj.generate_url(options)
357357

358-
expect(url).to include("https://ik.imagekit.io/your_imagekit_id/endpoint/tr:h-300,w-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&ik-s=")
358+
expect(url).to include("https://ik.imagekit.io/your_imagekit_id/endpoint/tr:h-300,w-400/default-image.jpg?ik-s=")
359359
end
360360

361361
it "test_generate_url_with_path_and_signed_with_special_characters" do
@@ -367,7 +367,7 @@
367367

368368
url = url_obj.generate_url(options)
369369

370-
expect(url).to include("https://ik.imagekit.io/your_imagekit_id/endpoint/tr:h-300,w-400/Fjällräven_KnSJwp87u6q.png?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&ik-s=")
370+
expect(url).to include("https://ik.imagekit.io/your_imagekit_id/endpoint/tr:h-300,w-400/Fjällräven_KnSJwp87u6q.png?ik-s=")
371371
end
372372

373373
it 'test_generate_url_with_absolute_path_and_signed' do
@@ -380,7 +380,7 @@
380380
}
381381
url = url_obj.generate_url(options)
382382

383-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/https%3A%2F%2Fexample.com%2Fexternal-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&γειασας=γειασας&ik-s=98426324e72a6d88d4670b374633cab701f4f92a&ik-t=100")
383+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,w-400/https%3A%2F%2Fexample.com%2Fexternal-image.jpg?γειασας=γειασας&ik-s=44c1295edb1dbc1d59216fba8994b4d3a36c61e2&ik-t=100")
384384
end
385385

386386
it "test_url_with_invalid_args_returns_as_it_is" do
@@ -391,7 +391,7 @@
391391
}
392392
url = url_obj.generate_url(options)
393393

394-
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,fake_field-400/default-image.jpg?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}")
394+
expect(url).to eq("https://imagekit.io/your-imgekit-id/tr:h-300,fake_field-400/default-image.jpg")
395395
end
396396

397397
it "test_url_without_path_and_src_should_return_empty" do
@@ -425,7 +425,7 @@
425425
signed: true, }
426426
url = url_obj.generate_url(options)
427427

428-
expect(url).to include("https://test-domain.com/test-endpoint/tr:w-100/test-signed-url.png?ik-sdk-version=ruby-#{ImageKitIo::Sdk::VERSION}&ik-s=")
428+
expect(url).to include("https://test-domain.com/test-endpoint/tr:w-100/test-signed-url.png?ik-s=")
429429
end
430430

431431
it "test_url_with_signed_with_seconds" do

0 commit comments

Comments
 (0)