Skip to content

Commit 4a2e269

Browse files
author
Ricard Forniol
committed
Use more ruby naming convention duplicate_token_error?
1 parent dc6175c commit 4a2e269

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lib/mongoid/token/collisions.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def resolve_token_collisions
77
yield
88
rescue Mongo::Error::OperationFailure => e
99
resolver = self.class.resolvers.select do |r|
10-
is_duplicate_token_error?(e, self, r.field_name)
10+
duplicate_token_error?(e, self, r.field_name)
1111
end.first
1212
raise e unless resolver
1313
retries ||= resolver.retry_count
@@ -25,7 +25,7 @@ def raise_collision_retries_exceeded_error(field_name, retry_count)
2525
raise Mongoid::Token::CollisionRetriesExceeded.new(self, retry_count)
2626
end
2727

28-
def is_duplicate_token_error?(err, document, field_name)
28+
def duplicate_token_error?(err, document, field_name)
2929
err.message =~ /(11000|11001)/ &&
3030
err.message =~ /dup key/ &&
3131
err.message =~ /"#{document.send(field_name)}"/ &&

spec/mongoid/token/collisions_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
allow(resolver).to receive(:field_name).and_return(:token)
1111
allow(resolver).to receive(:create_new_token_for){|doc|}
1212
document.class.send(:include, Mongoid::Token::Collisions)
13-
allow(document).to receive(:is_duplicate_token_error?).and_return(true)
13+
allow(document).to receive(:duplicate_token_error?).and_return(true)
1414
allow(document.class).to receive(:resolvers).and_return([resolver])
1515
end
1616

@@ -58,7 +58,7 @@
5858

5959
context "and a different index is violated" do
6060
it "should bubble the operation failure" do
61-
allow(document).to(receive(:is_duplicate_token_error?)
61+
allow(document).to(receive(:duplicate_token_error?)
6262
.and_return(false))
6363
allow(resolver).to receive(:retry_count).and_return(3)
6464
e = Mongo::Error::OperationFailure.new("nope")
@@ -98,7 +98,7 @@
9898
end
9999
end
100100

101-
describe "#is_duplicate_token_error?" do
101+
describe "#duplicate_token_error?" do
102102
before(:each) do
103103
document.class.send(:include, Mongoid::Token::Collisions)
104104
end
@@ -113,7 +113,7 @@
113113
'{ : "tokenvalue123" } (11000) (on localhost'\
114114
':27017, legacy retry, attempt 1) (on localh'\
115115
'ost:27017, legacy retry, attempt 1)'))
116-
expect(document.is_duplicate_token_error?(err, document, :token)).to(
116+
expect(document.duplicate_token_error?(err, document, :token)).to(
117117
be(true)
118118
)
119119
end

0 commit comments

Comments
 (0)