Skip to content

Commit dc9c511

Browse files
DemetrisChrDemetrisChr
authored
RCBC-399: Add default options objects as class constants (#69)
1 parent 6a6e646 commit dc9c511

File tree

5 files changed

+108
-27
lines changed

5 files changed

+108
-27
lines changed

‎lib/couchbase/bucket.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def default_collection
8080
# ))
8181
#
8282
# @return [ViewResult]
83-
def view_query(design_document_name, view_name, options = Options::View.new)
83+
def view_query(design_document_name, view_name, options = Options::View::DEFAULT)
8484
resp = @backend.document_view(@name, design_document_name, view_name, options.namespace, options.to_backend)
8585
ViewResult.new do |res|
8686
res.meta_data = ViewMetaData.new do |meta|
@@ -112,7 +112,7 @@ def view_indexes
112112
# @param [Options::Ping] options
113113
#
114114
# @return [PingResult]
115-
def ping(options = Options::Ping.new)
115+
def ping(options = Options::Ping::DEFAULT)
116116
resp = @backend.ping(@name, options.to_backend)
117117
PingResult.new do |res|
118118
res.version = resp[:version]

‎lib/couchbase/cluster.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def bucket(name)
9898
# Options::Query(consistent_with: MutationState.new(res.mutation_token)))
9999
#
100100
# @return [QueryResult]
101-
def query(statement, options = Options::Query.new)
101+
def query(statement, options = Options::Query::DEFAULT)
102102
resp = @backend.document_query(statement, options.to_backend)
103103

104104
QueryResult.new do |res|
@@ -136,7 +136,7 @@ def query(statement, options = Options::Query.new)
136136
# Options::Analytics(named_parameters: {user_id: 2}))
137137
#
138138
# @return [AnalyticsResult]
139-
def analytics_query(statement, options = Options::Analytics.new)
139+
def analytics_query(statement, options = Options::Analytics::DEFAULT)
140140
resp = @backend.document_analytics(statement, options.to_backend)
141141

142142
AnalyticsResult.new do |res|
@@ -180,7 +180,7 @@ def analytics_query(statement, options = Options::Analytics.new)
180180
# ))
181181
#
182182
# @return [SearchResult]
183-
def search_query(index_name, query, options = Options::Search.new)
183+
def search_query(index_name, query, options = Options::Search::DEFAULT)
184184
resp = @backend.document_search(index_name, JSON.generate(query), options.to_backend)
185185

186186
SearchResult.new do |res|
@@ -306,7 +306,7 @@ def disconnect
306306
# @param [Options::Diagnostics] options
307307
#
308308
# @return [DiagnosticsResult]
309-
def diagnostics(options = Options::Diagnostics.new)
309+
def diagnostics(options = Options::Diagnostics::DEFAULT)
310310
resp = @backend.diagnostics(options.report_id)
311311
DiagnosticsResult.new do |res|
312312
res.version = resp[:version]
@@ -332,7 +332,7 @@ def diagnostics(options = Options::Diagnostics.new)
332332
# @param [Options::Ping] options
333333
#
334334
# @return [PingResult]
335-
def ping(options = Options::Ping.new)
335+
def ping(options = Options::Ping::DEFAULT)
336336
resp = @backend.ping(nil, options.to_backend)
337337
PingResult.new do |res|
338338
res.version = resp[:version]

‎lib/couchbase/collection.rb‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def binary
6969
# # "name"=>"Douglas Reynholm"}
7070
#
7171
# @return [GetResult]
72-
def get(id, options = Options::Get.new)
72+
def get(id, options = Options::Get::DEFAULT)
7373
resp = if options.need_projected_get?
7474
@backend.document_get_projected(bucket_name, @scope_name, @name, id, options.to_backend)
7575
else
@@ -98,7 +98,7 @@ def get(id, options = Options::Get.new)
9898
# res[1].content #=> content of "bar"
9999
#
100100
# @return [Array<GetResult>]
101-
def get_multi(ids, options = Options::GetMulti.new)
101+
def get_multi(ids, options = Options::GetMulti::DEFAULT)
102102
resp = @backend.document_get_multi(ids.map { |id| [bucket_name, @scope_name, @name, id] }, options.to_backend)
103103
resp.map do |entry|
104104
GetResult.new do |res|
@@ -128,7 +128,7 @@ def get_multi(ids, options = Options::GetMulti.new)
128128
# collection.replace("user", user_data, Options::Upsert(cas: res.cas))
129129
#
130130
# @return [GetResult]
131-
def get_and_lock(id, lock_time, options = Options::GetAndLock.new)
131+
def get_and_lock(id, lock_time, options = Options::GetAndLock::DEFAULT)
132132
resp = @backend.document_get_and_lock(bucket_name, @scope_name, @name, id,
133133
lock_time.respond_to?(:in_seconds) ? lock_time.public_send(:in_seconds) : lock_time,
134134
options.to_backend)
@@ -150,7 +150,7 @@ def get_and_lock(id, lock_time, options = Options::GetAndLock.new)
150150
# collection.get_and_touch("customer123", 10)
151151
#
152152
# @return [GetResult]
153-
def get_and_touch(id, expiry, options = Options::GetAndTouch.new)
153+
def get_and_touch(id, expiry, options = Options::GetAndTouch::DEFAULT)
154154
resp = @backend.document_get_and_touch(bucket_name, @scope_name, @name, id,
155155
Utils::Time.extract_expiry_time(expiry),
156156
options.to_backend)
@@ -168,7 +168,7 @@ def get_and_touch(id, expiry, options = Options::GetAndTouch.new)
168168
# @param [Options::GetAllReplicas] options request customization
169169
#
170170
# @return [Array<GetReplicaResult>]
171-
def get_all_replicas(id, options = Options::GetAllReplicas.new)
171+
def get_all_replicas(id, options = Options::GetAllReplicas::DEFAULT)
172172
resp = @backend.document_get_all_replicas(@bucket_name, @scope_name, @name, id, options.to_backend)
173173
resp.map do |entry|
174174
GetReplicaResult.new do |res|
@@ -198,7 +198,7 @@ def get_all_replicas(id, options = Options::GetAllReplicas.new)
198198
#
199199
#
200200
# @return [GetReplicaResult]
201-
def get_any_replica(id, options = Options::GetAnyReplica.new)
201+
def get_any_replica(id, options = Options::GetAnyReplica::DEFAULT)
202202
resp = @backend.document_get_any_replica(@bucket_name, @scope_name, @name, id, options.to_backend)
203203
GetReplicaResult.new do |res|
204204
res.transcoder = options.transcoder
@@ -219,7 +219,7 @@ def get_any_replica(id, options = Options::GetAnyReplica.new)
219219
# res.exists? #=> true
220220
#
221221
# @return [ExistsResult]
222-
def exists(id, options = Options::Exists.new)
222+
def exists(id, options = Options::Exists::DEFAULT)
223223
resp = @backend.document_exists(bucket_name, @scope_name, @name, id, options.to_backend)
224224
ExistsResult.new do |res|
225225
res.deleted = resp[:deleted]
@@ -252,7 +252,7 @@ def exists(id, options = Options::Exists.new)
252252
# end
253253
#
254254
# @return [MutationResult]
255-
def remove(id, options = Options::Remove.new)
255+
def remove(id, options = Options::Remove::DEFAULT)
256256
resp = @backend.document_remove(bucket_name, @scope_name, @name, id, options.to_backend)
257257
MutationResult.new do |res|
258258
res.cas = resp[:cas]
@@ -278,7 +278,7 @@ def remove(id, options = Options::Remove.new)
278278
# end
279279
#
280280
# @return [Array<MutationResult>]
281-
def remove_multi(ids, options = Options::RemoveMulti.new)
281+
def remove_multi(ids, options = Options::RemoveMulti::DEFAULT)
282282
resp = @backend.document_remove_multi(bucket_name, @scope_name, @name, ids.map do |id|
283283
case id
284284
when String
@@ -318,7 +318,7 @@ def remove_multi(ids, options = Options::RemoveMulti.new)
318318
# end
319319
#
320320
# @return [MutationResult]
321-
def insert(id, content, options = Options::Insert.new)
321+
def insert(id, content, options = Options::Insert::DEFAULT)
322322
blob, flags = options.transcoder ? options.transcoder.encode(content) : [content, 0]
323323
resp = @backend.document_insert(bucket_name, @scope_name, @name, id, blob, flags, options.to_backend)
324324
MutationResult.new do |res|
@@ -338,7 +338,7 @@ def insert(id, content, options = Options::Insert.new)
338338
# res.cas #=> 242287264414742
339339
#
340340
# @return [MutationResult]
341-
def upsert(id, content, options = Options::Upsert.new)
341+
def upsert(id, content, options = Options::Upsert::DEFAULT)
342342
blob, flags = options.transcoder ? options.transcoder.encode(content) : [content, 0]
343343
resp = @backend.document_upsert(bucket_name, @scope_name, @name, id, blob, flags, options.to_backend)
344344
MutationResult.new do |res|
@@ -365,7 +365,7 @@ def upsert(id, content, options = Options::Upsert.new)
365365
# res[1].cas #=> 7751418925851
366366
#
367367
# @return [Array<MutationResult>]
368-
def upsert_multi(id_content, options = Options::UpsertMulti.new)
368+
def upsert_multi(id_content, options = Options::UpsertMulti::DEFAULT)
369369
resp = @backend.document_upsert_multi(bucket_name, @scope_name, @name, id_content.map do |(id, content)|
370370
blob, flags = options.transcoder ? options.transcoder.encode(content) : [content, 0]
371371
[id, blob, flags]
@@ -392,7 +392,7 @@ def upsert_multi(id_content, options = Options::UpsertMulti.new)
392392
# res.cas #=> 242287264414742
393393
#
394394
# @return [MutationResult]
395-
def replace(id, content, options = Options::Replace.new)
395+
def replace(id, content, options = Options::Replace::DEFAULT)
396396
blob, flags = options.transcoder ? options.transcoder.encode(content) : [content, 0]
397397
resp = @backend.document_replace(bucket_name, @scope_name, @name, id, blob, flags, options.to_backend)
398398
MutationResult.new do |res|
@@ -411,7 +411,7 @@ def replace(id, content, options = Options::Replace.new)
411411
# res = collection.touch("customer123", 30)
412412
#
413413
# @return [MutationResult]
414-
def touch(id, expiry, options = Options::Touch.new)
414+
def touch(id, expiry, options = Options::Touch::DEFAULT)
415415
resp = @backend.document_touch(bucket_name, @scope_name, @name, id,
416416
Utils::Time.extract_expiry_time(expiry),
417417
options.to_backend)
@@ -433,7 +433,7 @@ def touch(id, expiry, options = Options::Touch.new)
433433
# @return [void]
434434
#
435435
# @raise [Error::DocumentNotFound]
436-
def unlock(id, cas, options = Options::Unlock.new)
436+
def unlock(id, cas, options = Options::Unlock::DEFAULT)
437437
@backend.document_unlock(bucket_name, @scope_name, @name, id, cas, options.to_backend)
438438
end
439439

@@ -455,7 +455,7 @@ def unlock(id, cas, options = Options::Unlock.new)
455455
# LookupInSpec.exists("purchases.pending[-1]"),
456456
# ]
457457
# @return [LookupInResult]
458-
def lookup_in(id, specs, options = Options::LookupIn.new)
458+
def lookup_in(id, specs, options = Options::LookupIn::DEFAULT)
459459
resp = @backend.document_lookup_in(
460460
bucket_name, @scope_name, @name, id,
461461
specs.map do |s|
@@ -501,7 +501,7 @@ def lookup_in(id, specs, options = Options::LookupIn.new)
501501
# ])
502502
#
503503
# @return [MutateInResult]
504-
def mutate_in(id, specs, options = Options::MutateIn.new)
504+
def mutate_in(id, specs, options = Options::MutateIn::DEFAULT)
505505
resp = @backend.document_mutate_in(
506506
bucket_name, @scope_name, @name, id,
507507
specs.map do |s|

0 commit comments

Comments
 (0)