Skip to content

Commit 9052df1

Browse files
mgomesmgomes
authored
Merge pull request #145 from fwininger/headers
Change return type for request #content_md5 #timestamp #content_type
2 parents 22e91aa + 8196476 commit 9052df1

9 files changed

Lines changed: 26 additions & 47 deletions

File tree

‎lib/api_auth/headers.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ def authorization_header
6767
end
6868

6969
def set_date
70-
@request.set_date if @request.timestamp.empty?
70+
@request.set_date if @request.timestamp.nil?
7171
end
7272

7373
def calculate_md5
74-
@request.populate_content_md5 if @request.content_md5.empty?
74+
@request.populate_content_md5 if @request.content_md5.nil?
7575
end
7676

7777
def md5_mismatch?
78-
if @request.content_md5.empty?
78+
if @request.content_md5.nil?
7979
false
8080
else
8181
@request.md5_mismatch?

‎lib/api_auth/request_drivers/action_controller.rb‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,11 @@ def http_method
4343
end
4444

4545
def content_type
46-
value = find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
47-
value.nil? ? '' : value
46+
find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
4847
end
4948

5049
def content_md5
51-
value = find_header(%w[CONTENT-MD5 CONTENT_MD5 HTTP_CONTENT_MD5])
52-
value.nil? ? '' : value
50+
find_header(%w[CONTENT-MD5 CONTENT_MD5 HTTP_CONTENT_MD5])
5351
end
5452

5553
def original_uri
@@ -66,8 +64,7 @@ def set_date
6664
end
6765

6866
def timestamp
69-
value = find_header(%w[DATE HTTP_DATE])
70-
value.nil? ? '' : value
67+
find_header(%w[DATE HTTP_DATE])
7168
end
7269

7370
def authorization_header

‎lib/api_auth/request_drivers/curb.rb‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ def http_method
3232
end
3333

3434
def content_type
35-
value = find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
36-
value.nil? ? '' : value
35+
find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
3736
end
3837

3938
def content_md5
40-
value = find_header(%w[CONTENT-MD5 CONTENT_MD5])
41-
value.nil? ? '' : value
39+
find_header(%w[CONTENT-MD5 CONTENT_MD5])
4240
end
4341

4442
def original_uri
@@ -55,8 +53,7 @@ def set_date
5553
end
5654

5755
def timestamp
58-
value = find_header(%w[DATE HTTP_DATE])
59-
value.nil? ? '' : value
56+
find_header(%w[DATE HTTP_DATE])
6057
end
6158

6259
def authorization_header

‎lib/api_auth/request_drivers/faraday.rb‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,11 @@ def http_method
4343
end
4444

4545
def content_type
46-
value = find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
47-
value.nil? ? '' : value
46+
find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
4847
end
4948

5049
def content_md5
51-
value = find_header(%w[CONTENT-MD5 CONTENT_MD5 HTTP-CONTENT-MD5 HTTP_CONTENT_MD5])
52-
value.nil? ? '' : value
50+
find_header(%w[CONTENT-MD5 CONTENT_MD5 HTTP-CONTENT-MD5 HTTP_CONTENT_MD5])
5351
end
5452

5553
def original_uri
@@ -69,8 +67,7 @@ def set_date
6967
end
7068

7169
def timestamp
72-
value = find_header(%w[DATE HTTP_DATE])
73-
value.nil? ? '' : value
70+
find_header(%w[DATE HTTP_DATE])
7471
end
7572

7673
def authorization_header

‎lib/api_auth/request_drivers/httpi.rb‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ def http_method
4242
end
4343

4444
def content_type
45-
value = find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
46-
value.nil? ? '' : value
45+
find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
4746
end
4847

4948
def content_md5
50-
value = find_header(%w[CONTENT-MD5 CONTENT_MD5])
51-
value.nil? ? '' : value
49+
find_header(%w[CONTENT-MD5 CONTENT_MD5])
5250
end
5351

5452
def original_uri
@@ -65,8 +63,7 @@ def set_date
6563
end
6664

6765
def timestamp
68-
value = find_header(%w[DATE HTTP_DATE])
69-
value.nil? ? '' : value
66+
find_header(%w[DATE HTTP_DATE])
7067
end
7168

7269
def authorization_header

‎lib/api_auth/request_drivers/net_http.rb‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,11 @@ def http_method
4949
end
5050

5151
def content_type
52-
value = find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
53-
value.nil? ? '' : value
52+
find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
5453
end
5554

5655
def content_md5
57-
value = find_header(%w[CONTENT-MD5 CONTENT_MD5])
58-
value.nil? ? '' : value
56+
find_header(%w[CONTENT-MD5 CONTENT_MD5])
5957
end
6058

6159
def original_uri
@@ -71,8 +69,7 @@ def set_date
7169
end
7270

7371
def timestamp
74-
value = find_header(%w[DATE HTTP_DATE])
75-
value.nil? ? '' : value
72+
find_header(%w[DATE HTTP_DATE])
7673
end
7774

7875
def authorization_header

‎lib/api_auth/request_drivers/rack.rb‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,11 @@ def http_method
4848
end
4949

5050
def content_type
51-
value = find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
52-
value.nil? ? '' : value
51+
find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
5352
end
5453

5554
def content_md5
56-
value = find_header(%w[CONTENT-MD5 CONTENT_MD5 HTTP-CONTENT-MD5 HTTP_CONTENT_MD5])
57-
value.nil? ? '' : value
55+
find_header(%w[CONTENT-MD5 CONTENT_MD5 HTTP-CONTENT-MD5 HTTP_CONTENT_MD5])
5856
end
5957

6058
def original_uri
@@ -71,8 +69,7 @@ def set_date
7169
end
7270

7371
def timestamp
74-
value = find_header(%w[DATE HTTP_DATE])
75-
value.nil? ? '' : value
72+
find_header(%w[DATE HTTP_DATE])
7673
end
7774

7875
def authorization_header

‎lib/api_auth/request_drivers/rest_client.rb‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,11 @@ def http_method
5151
end
5252

5353
def content_type
54-
value = find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
55-
value.nil? ? '' : value
54+
find_header(%w[CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE])
5655
end
5756

5857
def content_md5
59-
value = find_header(%w[CONTENT-MD5 CONTENT_MD5])
60-
value.nil? ? '' : value
58+
find_header(%w[CONTENT-MD5 CONTENT_MD5])
6159
end
6260

6361
def original_uri
@@ -74,8 +72,7 @@ def set_date
7472
end
7573

7674
def timestamp
77-
value = find_header(%w[DATE HTTP_DATE])
78-
value.nil? ? '' : value
75+
find_header(%w[DATE HTTP_DATE])
7976
end
8077

8178
def authorization_header

‎spec/headers_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,14 @@
188188

189189
context 'when request has no md5' do
190190
it "doesn't ask the driver" do
191-
allow(driver).to receive(:content_md5).and_return ''
191+
allow(driver).to receive(:content_md5).and_return nil
192192

193193
expect(driver).not_to receive(:md5_mismatch?).and_call_original
194194
headers.md5_mismatch?
195195
end
196196

197197
it 'returns false' do
198-
allow(driver).to receive(:content_md5).and_return ''
198+
allow(driver).to receive(:content_md5).and_return nil
199199

200200
expect(headers.md5_mismatch?).to be false
201201
end

0 commit comments

Comments
 (0)