Skip to content

Commit 23d36b9

Browse files
committed
fix rubocop
1 parent dfdd8f1 commit 23d36b9

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

lib/dalli/protocol/meta.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ def quiet_get_request(key)
4242
def gat(key, ttl, options = nil)
4343
ttl = TtlSanitizer.sanitize(ttl)
4444
encoded_key, base64 = KeyRegularizer.encode(key)
45-
req = RequestFormatter.meta_get(key: encoded_key, ttl: ttl, base64: base64, meta_flags: meta_flag_options(options))
45+
req = RequestFormatter.meta_get(key: encoded_key, ttl: ttl, base64: base64,
46+
meta_flags: meta_flag_options(options))
4647
write(req)
4748
if meta_flag_options(options)
4849
response_processor.meta_get_with_value_and_meta_flags(cache_nils: cache_nils?(options))

lib/dalli/protocol/meta/response_processor.rb

+10-6
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ def meta_get_with_value_and_meta_flags(cache_nils: false)
4949
tokens = error_on_unexpected!([VA, EN, HD])
5050
return [(cache_nils ? ::Dalli::NOT_FOUND : nil), {}] if tokens.first == EN
5151

52-
meta_flags = {
53-
c: cas_from_tokens(tokens),
54-
h: hit_from_tokens(tokens),
55-
l: last_accessed_from_tokens(tokens),
56-
t: ttl_remaining_from_tokens(tokens),
57-
}
52+
meta_flags = meta_flags_from_tokens(tokens)
5853
return [(cache_nils ? ::Dalli::NOT_FOUND : nil), meta_flags] unless tokens.first == VA
5954

6055
value, bitflag = @value_marshaller.retrieve(read_data(tokens[1].to_i), bitflags_from_tokens(tokens))
@@ -189,6 +184,15 @@ def error_on_unexpected!(expected_codes)
189184
tokens
190185
end
191186

187+
def meta_flags_from_tokens(tokens)
188+
{
189+
c: cas_from_tokens(tokens),
190+
h: hit_from_tokens(tokens),
191+
l: last_accessed_from_tokens(tokens),
192+
t: ttl_remaining_from_tokens(tokens)
193+
}
194+
end
195+
192196
def bitflags_from_tokens(tokens)
193197
value_from_tokens(tokens, 'f')&.to_i
194198
end

test/integration/test_operations.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@
4343
skip 'not supported' if p == :binary
4444
dc.flush
4545

46-
val1 = "meta"
46+
val1 = 'meta'
4747
dc.set('meta_key', val1)
48-
response = dc.get('meta_key', meta_flags: [:l, :h, :t])
48+
dc.get('meta_key', meta_flags: %i[l h t])
4949
# ensure hit true and last accessed 0
50-
response = dc.get('meta_key', meta_flags: [:l, :h, :t])
50+
response = dc.get('meta_key', meta_flags: %i[l h t])
5151
val2 = response.first
5252
meta_flags = response.last
5353

5454
assert_equal val1, val2
55-
assert_equal meta_flags, {c: 0, l: 0, h: true, t: -1, bitflag: nil}
55+
assert_equal({ c: 0, l: 0, h: true, t: -1, bitflag: nil }, meta_flags)
5656

5757
assert op_addset_succeeds(dc.set('a', nil))
5858
assert_nil dc.get('a')

0 commit comments

Comments
 (0)