Allow using specific consitency on all methods

.rubocop.yml

@@ -2,6 +2,12 @@
 AllCops:
   DisplayCopNames: true
 
+Metrics/AbcSize:
+  Max: 17
+
+Metrics/CyclomaticComplexity:
+  Max: 7
+
 Metrics/LineLength:
   # This will disable the rule completely, regardless what other options you put
   Enabled: true
@@ -11,3 +17,6 @@ Metrics/LineLength:
 # Allow classes longer than 100 lines of code
 ClassLength:
   Max: 250
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false

lib/diplomat.rb

@@ -23,8 +23,8 @@ def require_libs(*libs)
 
   raise 'Diplomat only supports ruby >= 2.0.0' unless RUBY_VERSION.to_f >= 2.0
 
-  self.root_path = File.expand_path '..', __FILE__
-  self.lib_path = File.expand_path '../diplomat', __FILE__
+  self.root_path = File.expand_path __dir__
+  self.lib_path = File.expand_path 'diplomat', __dir__
 
   require_libs 'configuration', 'rest_client', 'api_options', 'kv', 'datacenter',
                'service', 'members', 'node', 'nodes', 'check', 'health', 'session', 'lock',

lib/diplomat/acl.rb

@@ -15,7 +15,7 @@ def info(id, options = nil, not_found = :reject, found = :return)
       @options = options
       url = ["/v1/acl/info/#{id}"]
       url << check_acl_token
-      url << use_consistency(options)
+      url << use_consistency(options) if use_consistency(options, nil)
 
       raw = @conn_no_err.get concat_url url
       if raw.status == 200 && raw.body.chomp != 'null'

lib/diplomat/api_options.rb

@@ -9,10 +9,6 @@ def use_cas(options)
       options ? use_named_parameter('cas', options[:cas]) : []
     end
 
-    def use_consistency(options)
-      options && options[:consistency] ? [options[:consistency].to_s] : []
-    end
-
     # Mapping for valid key/value store transaction verbs and required parameters
     #
     # @return [Hash] valid key/store transaction verbs and required parameters

lib/diplomat/datacenter.rb

@@ -6,8 +6,9 @@ class Datacenter < Diplomat::RestClient
     # Get an array of all avaliable datacenters accessible by the local consul agent
     # @param meta [Hash] output structure containing header information about the request (index)
     # @return [OpenStruct] all datacenters avaliable to this consul agent
-    def get(meta = nil)
+    def get(meta = nil, options = nil)
       url = ['/v1/catalog/datacenters']
+      url << use_consistency(options) if use_consistency(options, nil)
 
       ret = @conn.get concat_url url
 

lib/diplomat/health.rb

@@ -11,6 +11,7 @@ class Health < Diplomat::RestClient
     def node(n, options = nil)
       url = ["/v1/health/node/#{n}"]
       url << use_named_parameter('dc', options[:dc]) if options && options[:dc]
+      url << use_consistency(options) if use_consistency(options, nil)
 
       # If the request fails, it's probably due to a bad path
       # so return a PathNotFound error.
@@ -27,6 +28,7 @@ def node(n, options = nil)
     def checks(s, options = nil)
       url = ["/v1/health/checks/#{s}"]
       url << use_named_parameter('dc', options[:dc]) if options && options[:dc]
+      url << use_consistency(options) if use_consistency(options, nil)
 
       # If the request fails, it's probably due to a bad path
       # so return a PathNotFound error.
@@ -49,6 +51,7 @@ def service(s, options = nil)
       url << 'passing' if options && options[:passing]
       url << use_named_parameter('tag', options[:tag]) if options && options[:tag]
       url << use_named_parameter('near', options[:near]) if options && options[:near]
+      url << use_consistency(options) if use_consistency(options, nil)
 
       # If the request fails, it's probably due to a bad path
       # so return a PathNotFound error.
@@ -68,6 +71,7 @@ def state(s, options = nil)
       url = ["/v1/health/state/#{s}"]
       url << use_named_parameter('dc', options[:dc]) if options && options[:dc]
       url << use_named_parameter('near', options[:near]) if options && options[:near]
+      url << use_consistency(options) if use_consistency(options, nil)
 
       # If the request fails, it's probably due to a bad path
       # so return a PathNotFound error.

lib/diplomat/kv.rb

@@ -256,7 +256,7 @@ def decode_transaction(transaction) # rubocop:disable Metrics/MethodLength
           next unless resp['KV']['Value']
           begin
             resp['KV']['Value'] = Base64.decode64(resp['KV']['Value'])
-          rescue # rubocop:disable RescueWithoutErrorClass
+          rescue StandardError
             nil
           end
         end

lib/diplomat/lock.rb

@@ -11,7 +11,6 @@ class Lock < Diplomat::RestClient
     # @param value [String] the value for the key
     # @param options [Hash] :dc string for dc specific query
     # @return [Boolean] If the lock was acquired
-    # rubocop:disable AbcSize
     def acquire(key, session, value = nil, options = nil)
       raw = @conn.put do |req|
         url = ["/v1/kv/#{key}"]
@@ -24,7 +23,6 @@ def acquire(key, session, value = nil, options = nil)
       end
       raw.body.chomp == 'true'
     end
-    # rubocop:enable AbcSize
 
     # wait to aquire a lock
     # @param key [String] the key

lib/diplomat/node.rb

@@ -13,6 +13,7 @@ def get(key, options = nil)
       url = ["/v1/catalog/node/#{key}"]
       url += check_acl_token
       url << use_named_parameter('dc', options[:dc]) if options && options[:dc]
+      url << use_consistency(options) if use_consistency(options, nil)
 
       # If the request fails, it's probably due to a bad path
       # so return a PathNotFound error.

lib/diplomat/nodes.rb

@@ -7,14 +7,16 @@ class Nodes < Diplomat::RestClient
     # Get all nodes
     # @deprecated Please use Diplomat::Node instead.
     # @return [OpenStruct] all data associated with the nodes in catalog
-    def get
+    def get(options = nil)
       ret = @conn.get '/v1/catalog/nodes'
+      url << use_consistency(options) if use_consistency(options, nil)
       JSON.parse(ret.body)
     end
 
     def get_all(options = nil)
       url = ['/v1/catalog/nodes']
       url << use_named_parameter('dc', options[:dc]) if options && options[:dc]
+      url << use_consistency(options) if use_consistency(options, nil)
 
       ret = @conn.get concat_url url
       JSON.parse(ret.body).map { |service| OpenStruct.new service }

lib/diplomat/query.rb

@@ -13,6 +13,7 @@ def get(key, options = nil)
       url = ["/v1/query/#{key}"]
       url += check_acl_token
       url << use_named_parameter('dc', options[:dc]) if options && options[:dc]
+      url << use_consistency(options) if use_consistency(options, nil)
 
       ret = @conn.get concat_url url
       JSON.parse(ret.body).map { |query| OpenStruct.new query }
@@ -27,7 +28,7 @@ def get_all(options = nil)
       url = ['/v1/query']
       url += check_acl_token
       url << use_named_parameter('dc', options[:dc]) if options && options[:dc]
-
+      url << use_consistency(options) if use_consistency(options, nil)
       ret = @conn.get concat_url url
       JSON.parse(ret.body).map { |query| OpenStruct.new query }
     rescue Faraday::ClientError

lib/diplomat/rest_client.rb

@@ -17,6 +17,19 @@ def use_named_parameter(name, value)
       value ? ["#{name}=#{value}"] : []
     end
 
+    def use_consistency(options, default_value = [])
+      return default_value unless options
+      case options[:consistency]
+      when 'consistent'
+        return use_named_parameter('consistent', 'consistent')
+      when 'stale'
+        return use_named_parameter('stale', 'stale')
+      when 'leader'
+        return use_named_parameter('leader', 'leader')
+      end
+      default_value
+    end
+
     # Assemble a url from an array of parts.
     # @param parts [Array] the url chunks to be assembled
     # @return [String] the resultant url string
@@ -143,7 +156,7 @@ def decode_values
       @raw.each_with_object([]) do |acc, el|
         begin
           acc['Value'] = Base64.decode64(acc['Value'])
-        rescue # rubocop:disable RescueWithoutErrorClass
+        rescue StandardError
           nil
         end
         el << acc

lib/diplomat/service.rb

@@ -23,6 +23,7 @@ def get(key, scope = :first, options = nil, meta = nil)
       url << use_named_parameter('index', options[:index]) if options && options[:index]
       url << use_named_parameter('dc', options[:dc]) if options && options[:dc]
       url << use_named_parameter('tag', options[:tag]) if options && options[:tag]
+      url << use_consistency(options) if use_consistency(options, nil)
 
       # If the request fails, it's probably due to a bad path
       # so return a PathNotFound error.
@@ -53,6 +54,7 @@ def get_all(options = nil)
       url = ['/v1/catalog/services']
       url += check_acl_token
       url << use_named_parameter('dc', options[:dc]) if options && options[:dc]
+      url << use_consistency(options) if use_consistency(options, nil)
       begin
         ret = @conn.get concat_url url
       rescue Faraday::ClientError
@@ -113,6 +115,5 @@ def maintenance(service_id, options = { enable: true })
       end
       maintenance.status == 200
     end
-    # rubocop:enable AbcSize
   end
 end