arborist-webservice 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d364d3021e618267b924682c39b011d365aa486c56a37c13842a23d71e4b4c6
-  data.tar.gz: b6028b714764befd0d89372432d6936037eaa0b5bd54d10f735c537903fbeb38
+  metadata.gz: 9074057038e73d8e0ece407edd5dadd634c65e068a9c88b1f96559cf5638ac3f
+  data.tar.gz: 404d121137779059274aced0add2b36dbac8d3c868530a2564a0e7b13a3355be
 SHA512:
-  metadata.gz: f7b5ff725bd2e08a5737e5c2d0ceb8dfdff21aec1d30633cf08fa0c310ca82c01f1524c3bdb2ce472843ca002536311cbf1eca65d1e087bd2487ecfb156741ee
-  data.tar.gz: 1c023a87365bc5551a3ccb3f054e5c15a671f8bff6df0e66e88b8f83232d08524d0f4f07a94a791c19a033b67d8ff71eef437ecf730a4dbebefc08773472fcf4
+  metadata.gz: 77063a8daa6787169e5249187e79d05fa4abc10c84504ce2a47d5c2669247ebdb14314d4c1681392e2d5606f60fd88781e2d4fec9cf61a77fd56a95d21dc0756
+  data.tar.gz: c624e285ac468e8627b0fa5040ebc510cbdc5c510961bd1fe37962d1028ab15c976ede1a5a2dcb9a922ff4c874375535571fd54c8b669be3b04d3c53cb3d8ef5

data/ChangeLog

@@ -1,8 +1,55 @@
+2018-09-03  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/arborist/monitor/webservice.rb,
+	spec/arborist/monitor/webservice_spec.rb:
+	Always request 'expected_status' from the node when monitoring.
+	[ba3b0f990a97] [github/master, tip]
+
+	* lib/arborist/node/webservice.rb,
+	spec/arborist/node/webservice_spec.rb:
+	Allow method symbols or strings.
+	[2c0f5b6ec7ed]
+
+	* lib/arborist/monitor/webservice.rb:
+	Pass the entire node into #make_response_results, so child classes
+	that override this method have all the node information at their
+	disposal.
+	[0bbbc289d9af]
+
+	* spec/arborist/node/webservice_spec.rb:
+	Test shorthand node URI syntax with a port, too
+	[5eb19864f76f]
+
+2018-09-03  Mahlon E. Smith  <mahlon@laika.com>
+
+	* spec/arborist/monitor/webservice_spec.rb:
+	Fix tests.
+	[339e7709deca]
+
+2018-08-30  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/arborist/monitor/webservice.rb:
+	... and do the same for timeout messages, including the current
+	value.
+	[c27a86bfa110]
+
+	* lib/arborist/monitor/webservice.rb:
+	Reuse the 'nicer' error message for the node state message.
+	[2e655e5843de]
+
 2018-08-30  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.0.1 for changeset ed8ca51f19e8
+	[be250f639097]
+
+	* .hgsigs:
+	Added signature for changeset 65c19b823a1b
+	[ed8ca51f19e8] [v0.0.1]
+
 	* History.md, arborist-webservice.gemspec:
 	Update history and the gemspec
-	[65c19b823a1b] [tip]
+	[65c19b823a1b]
 
 	* README.md, lib/arborist/monitor/webservice.rb,
 	lib/arborist/node/webservice.rb,
@@ -18,7 +65,7 @@
 	* lib/arborist/monitor/webservice.rb,
 	spec/arborist/monitor/webservice_spec.rb:
 	Rename 'HTML' monitor callback to 'HTTP'
-	[c970fb9b5ccf] [github/master]
+	[c970fb9b5ccf]
 
 2018-08-15  Michael Granger  <ged@FaerieMUD.org>
 

data/History.md

@@ -1,3 +1,18 @@
+## v0.1.0 [2018-09-03] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Always request 'expected_status' from the node when monitoring.
+- Allow HTTP method to be either a symbol or a string.
+
+Enhancements:
+
+- Make error messages nicer.
+- Support shorthand URI syntax to automatically use the containing
+  host's first IP.
+- Improve the ability to override behavior of the HTTP monitor
+
+
 ## v0.0.1 [2018-08-30] Michael Granger <ged@FaerieMUD.org>
 
 Initial release.

data/lib/arborist/monitor/webservice.rb

@@ -61,7 +61,7 @@ module Arborist::Monitor::Webservice
 		}
 
 		# The array of node properites used by this monitor
-		NODE_PROPERTIES = %i[ uri http_method body body_mimetype config ].freeze
+		NODE_PROPERTIES = %i[ uri expected_status http_method body body_mimetype config ].freeze
 
 
 		### Return an array of attributes to fetch from nodes for this monitor.
@@ -112,7 +112,7 @@ module Arborist::Monitor::Webservice
 				request.on_complete do |response|
 					self.log.debug "Handling response for %s" % [ identifier ]
 					results[ identifier ] =
-						self.make_response_results( response, node['expected_status'] )
+						self.make_response_results( response, node )
 				end
 				hydra.queue( request )
 			end
@@ -184,21 +184,21 @@ module Arborist::Monitor::Webservice
 
 
 		### Return a Hash of results appropriate for the specified +response+.
-		def make_response_results( response, expected_status=200 )
-			if response.code == expected_status
+		def make_response_results( response, node )
+			if response.code == node[ 'expected_status' ]
 				return { webservice: self.success_results(response) }
 			elsif response.timed_out?
-				self.log.error "Request timed out."
-				return { error: 'Request timed out.' }
+				errmsg = "Request timed out after %0.1f seconds." % [ self.timeout ]
+				self.log.error( errmsg )
+				return { error: errmsg }
 			elsif response.code == 0
 				self.log.error( response.return_message )
 				return { error: response.return_message }
 			else
-				self.log.error "Got an unexpected %03d %s response; expected %03d." %
-					[ response.code, response.status_message, expected_status ]
-				return {
-					error: "%03d %s" % [ response.code, response.status_message ]
-				}
+				errmsg = "Got an unexpected %03d %s response; expected %03d." %
+					[ response.code, response.status_message, node['expected_status'] ]
+				self.log.error( errmsg )
+				return { error: errmsg }
 			end
 		end
 

data/lib/arborist/node/webservice.rb

@@ -106,7 +106,7 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 			when 'uri'
 				URI( self.uri ) == URI( val )
 			when 'http_method'
-				self.http_method == val
+				self.http_method.to_s == val
 			when 'http_version'
 				self.http_version == val
 			when 'expected_status'

data/lib/arborist/webservice.rb

@@ -14,10 +14,10 @@ module Arborist::Webservice
 
 
 	# Package version
-	VERSION = '0.0.1'
+	VERSION = '0.1.0'
 
 	# Version control revision
-	REVISION = %q$Revision: 59e390021ccd $
+	REVISION = %q$Revision: b5c6af551f6c $
 
 
 	### Return the name of the library with the version, and optionally the build ID if

data/spec/arborist/monitor/webservice_spec.rb

@@ -36,7 +36,7 @@ describe Arborist::Monitor::Webservice do
 		let( :nodes ) {[ webservice_node1, webservice_node2, webservice_node3 ]}
 		let( :nodes_hash ) do
 			nodes.each_with_object({}) do |node, accum|
-				accum[ node.identifier ] = node.fetch_values
+				accum[ node.identifier ] = node.fetch_values( described_class.node_properties.map( &:to_s ) )
 			end
 		end
 
@@ -75,7 +75,7 @@ describe Arborist::Monitor::Webservice do
 
 			result = monitor.run( nodes_hash )
 
-			expect( result[webservice_node3.identifier] ).to include( error: '500 Server Error' )
+			expect( result[webservice_node3.identifier] ).to include( error: /Got an unexpected 500 Server Error/ )
 		end
 
 
@@ -103,7 +103,7 @@ describe Arborist::Monitor::Webservice do
 
 			result = monitor.run( nodes_hash )
 
-			expect( result[webservice_node2.identifier] ).to include( error: 'Request timed out.' )
+			expect( result[webservice_node2.identifier] ).to include( error: /Request timed out after/ )
 		end
 
 

data/spec/arborist/node/webservice_spec.rb

@@ -20,7 +20,7 @@ describe Arborist::Node::Webservice do
 	let( :node ) { host_node.webservice('api', 'https://example.com/api/v1') }
 	let( :getonly_node ) do
 		host_node.webservice( 'repo-api', 'https://repo.example.com/' ) do
-			http_method 'GET'
+			http_method :GET
 		end
 	end
 	let( :http10_node ) do
@@ -70,5 +70,11 @@ describe Arborist::Node::Webservice do
 	end
 
 
+	it "allows shorthand URI syntax with a port for implicit host" do
+		node = host_node.webservice( 'djinn', 'http://:8080/' )
+		expect( node.uri ).to eq( 'http://192.168.66.12:8080/' )
+	end
+
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arborist-webservice
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
   OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arborist