diplomat 2.0.5 → 2.1.0

data/lib/diplomat/session.rb

@@ -6,18 +6,14 @@ module Diplomat
     # Create a new session
     # @param value [Object] hash or json representation of the session arguments
     # @param options [Hash] session options
-    # @param options [String] :dc datacenter to create session for
     # @return [String] The sesssion id
-    def create(value = nil, options = nil)
+    def create(value = nil, options = {})
       # TODO: only certain keys are recognised in a session create request,
       # should raise an error on others.
-      raw = @conn.put do |req|
-        url = ['/v1/session/create']
-        url += use_named_parameter('dc', options[:dc]) if options && options[:dc]
-
-        req.url concat_url url
-        req.body = (value.is_a?(String) ? value : JSON.generate(value)) unless value.nil?
-      end
+      custom_params = []
+      custom_params << use_named_parameter('dc', options[:dc]) if options[:dc]
+      data = value.is_a?(String) ? value : JSON.generate(value) unless value.nil?
+      raw = send_put_request(@conn, ['/v1/session/create'], options, data, custom_params)
       body = JSON.parse(raw.body)
       body['ID']
     end
@@ -25,74 +21,54 @@ module Diplomat
     # Destroy a session
     # @param id [String] session id
     # @param options [Hash] session options
-    # @param options [String] :dc datacenter to destroy session for
     # @return [String] Success or failure of the session destruction
-    def destroy(id, options = nil)
-      raw = @conn.put do |req|
-        url = ["/v1/session/destroy/#{id}"]
-        url += use_named_parameter('dc', options[:dc]) if options && options[:dc]
-
-        req.url concat_url url
-      end
+    def destroy(id, options = {})
+      custom_params = []
+      custom_params << use_named_parameter('dc', options[:dc]) if options[:dc]
+      raw = send_put_request(@conn, ["/v1/session/destroy/#{id}"], options, nil, custom_params)
       raw.body
     end
 
     # List sessions
     # @param options [Hash] session options
-    # @param options [String] :dc datacenter to list sessions
     # @return [OpenStruct]
-    def list(options = nil)
-      raw = @conn.get do |req|
-        url = ['/v1/session/list']
-        url += use_named_parameter('dc', options[:dc]) if options && options[:dc]
-
-        req.url concat_url url
-      end
+    def list(options = {})
+      custom_params = []
+      custom_params << use_named_parameter('dc', options[:dc]) if options[:dc]
+      raw = send_get_request(@conn, ['/v1/session/list'], options, custom_params)
       JSON.parse(raw.body).map { |session| OpenStruct.new session }
     end
 
     # Renew session
     # @param id [String] session id
     # @param options [Hash] session options
-    # @param options [String] :dc datacenter to renew session for
     # @return [OpenStruct]
-    def renew(id, options = nil)
-      raw = @conn.put do |req|
-        url = ["/v1/session/renew/#{id}"]
-        url += use_named_parameter('dc', options[:dc]) if options && options[:dc]
-
-        req.url concat_url url
-      end
+    def renew(id, options = {})
+      custom_params = []
+      custom_params << use_named_parameter('dc', options[:dc]) if options[:dc]
+      raw = send_put_request(@conn, ["/v1/session/renew/#{id}"], options, nil, custom_params)
       JSON.parse(raw.body).map { |session| OpenStruct.new session }
     end
 
     # Session information
     # @param id [String] session id
     # @param options [Hash] session options
-    # @param options [String] :dc datacenter to renew session for
     # @return [OpenStruct]
-    def info(id, options = nil)
-      raw = @conn.get do |req|
-        url = ["/v1/session/info/#{id}"]
-        url += use_named_parameter('dc', options[:dc]) if options && options[:dc]
-
-        req.url concat_url url
-      end
+    def info(id, options = {})
+      custom_params = []
+      custom_params << use_named_parameter('dc', options[:dc]) if options[:dc]
+      raw = send_get_request(@conn, ["/v1/session/info/#{id}"], options, custom_params)
       JSON.parse(raw.body).map { |session| OpenStruct.new session }
     end
 
     # Session information for a given node
     # @param name [String] node name
     # @param options [Hash] session options
-    # @param options [String] :dc datacenter to renew session for
     # @return [OpenStruct]
-    def node(name, options = nil)
-      raw = @conn.get do |req|
-        url = ["/v1/session/node/#{name}"]
-        url += use_named_parameter('dc', options[:dc]) if options && options[:dc]
-
-        req.url concat_url url
-      end
+    def node(name, options = {})
+      custom_params = []
+      custom_params << use_named_parameter('dc', options[:dc]) if options[:dc]
+      raw = send_get_request(@conn, ["/v1/session/node/#{name}"], options, custom_params)
       JSON.parse(raw.body).map { |session| OpenStruct.new session }
     end
   end

data/lib/diplomat/status.rb

@@ -4,18 +4,18 @@ module Diplomat
     @access_methods = %i[leader peers]
 
     # Get the raft leader for the datacenter in which the local consul agent is running
+    # @param options [Hash] options parameter hash
     # @return [OpenStruct] the address of the leader
-    def leader
-      url = ['/v1/status/leader']
-      ret = @conn.get concat_url url
+    def leader(options = {})
+      ret = send_get_request(@conn, ['/v1/status/leader'], options)
       JSON.parse(ret.body)
     end
 
     # Get an array of Raft peers for the datacenter in which the agent is running
+    # @param options [Hash] options parameter hash
     # @return [OpenStruct] an array of peers
-    def peers
-      url = ['/v1/status/peers']
-      ret = @conn.get concat_url url
+    def peers(options = {})
+      ret = send_get_request(@conn, ['/v1/status/peers'], options)
       JSON.parse(ret.body)
     end
   end

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = '2.0.5'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - John Hamelink
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,6 +157,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.49'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -224,8 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Diplomat is a simple wrapper for Consul