arborist-webservice 0.0.1.pre20180815100446 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1006dfaf9b120fa2720a2637603c4f75397cbe36d62f2039c35d4a1f8c39b56
-  data.tar.gz: 46b34fd363f89a60bcfa7cdafceeec8d2a68c00e9e0b79d2c5126b9fc4b47137
+  metadata.gz: 3d364d3021e618267b924682c39b011d365aa486c56a37c13842a23d71e4b4c6
+  data.tar.gz: b6028b714764befd0d89372432d6936037eaa0b5bd54d10f735c537903fbeb38
 SHA512:
-  metadata.gz: 3d5b067c522b37beb004f549c98fba58ba7e64806a79baa05be708344ef9cc6801d982ec083bedfacbed75f6e30eb5fa4ef09ebf0b744f88272d032f1ea2dc9a
-  data.tar.gz: 49457c9714ce9c128be66eb3e04a9f7bc280ebbf4c0359e2d3719e73415eb21ce62189eb07ff68e095f876f5b8b2dadf996b46dedf230d3084baa0aa4bf5d299
+  metadata.gz: f7b5ff725bd2e08a5737e5c2d0ceb8dfdff21aec1d30633cf08fa0c310ca82c01f1524c3bdb2ce472843ca002536311cbf1eca65d1e087bd2487ecfb156741ee
+  data.tar.gz: 1c023a87365bc5551a3ccb3f054e5c15a671f8bff6df0e66e88b8f83232d08524d0f4f07a94a791c19a033b67d8ff71eef437ecf730a4dbebefc08773472fcf4

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+�@9�]�TElMoˡ�|�g
����c��R�����P����ڙ���u�k�j�U~���w�Ӿݘ��-��
�����!��B��u+����~mVG?�Fѯ�Q��ud�@� :0�R��L.����'�z���mrAs�(�]�`���r0�o'M���ލ��\��Ð�Zp@9C�ͷ�3�bW8����_��~�ަ���#%����/:��|��Z�������vs<���4��)A�P���WOE��@j$�[xs�2W
+��	/0$����JY\�-2

data/ChangeLog

@@ -1,12 +1,55 @@
+2018-08-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.md, arborist-webservice.gemspec:
+	Update history and the gemspec
+	[65c19b823a1b] [tip]
+
+	* README.md, lib/arborist/monitor/webservice.rb,
+	lib/arborist/node/webservice.rb,
+	lib/arborist/webservice/constants.rb,
+	spec/arborist/monitor/webservice_spec.rb,
+	spec/arborist/node/webservice_spec.rb, spec/spec_helper.rb:
+	Finish up tests, flesh out settings and config for less-common
+	cases.
+	[53ff11b5ccf6]
+
+2018-08-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/arborist/monitor/webservice.rb,
+	spec/arborist/monitor/webservice_spec.rb:
+	Rename 'HTML' monitor callback to 'HTTP'
+	[c970fb9b5ccf] [github/master]
+
 2018-08-15  Michael Granger  <ged@FaerieMUD.org>
 
+	* README.md, Rakefile, arborist-webservice.gemspec:
+	Fix some documentation issues.
+	[1e226b9d9561]
+
+	* .hgignore:
+	Ignore built gems
+	[a580ef4ff61b]
+
+	* Rakefile, arborist-webservice.gemspec:
+	Update dependencies.
+	[c08c1e0bbb70]
+
+	* .gems, .hgignore, ChangeLog, Manifest.txt, Rakefile, arborist-
+	webservice.gemspec, lib/arborist/monitor/webservice.rb,
+	lib/arborist/webservice.rb, lib/arborist/webservice/connection.rb,
+	lib/arborist/webservice/constants.rb,
+	spec/arborist/monitor/webservice_spec.rb,
+	spec/arborist/node/webservice_spec.rb:
+	Switch to Typhoeus for batched parallel requests
+	[59e390021ccd]
+
 	* .gems, Rakefile, lib/arborist/monitor/webservice.rb,
 	lib/arborist/node/webservice.rb, lib/arborist/webservice.rb,
 	lib/arborist/webservice/connection.rb,
 	lib/arborist/webservice/constants.rb,
 	lib/arborist/webservice/monkeypatches.rb:
 	Checkpoint commit before switching to Typhoeus
-	[d2e9ed791434] [tip]
+	[d2e9ed791434]
 
 2018-08-01  Mahlon E. Smith  <mahlon@martini.nu>
 
@@ -18,7 +61,7 @@
 
 	* README.md:
 	Fix incorrect URLs in the README
-	[7bdc40158b25] [github/master]
+	[7bdc40158b25]
 
 	* .gems, .pryrc, .ruby-gemset, .ruby-version, .rvm.gems, .rvmrc,
 	ChangeLog, History.md, LICENSE.txt, Manifest.txt, README.md,

data/History.md

@@ -1,4 +1,4 @@
-## v0.0.1 [YYYY-MM-DD] Michael Granger <ged@FaerieMUD.org>
+## v0.0.1 [2018-08-30] Michael Granger <ged@FaerieMUD.org>
 
 Initial release.
 

data/README.md

@@ -30,7 +30,7 @@ The simplest example is an unauthenticated REST service running on port 80:
     end
 
 This adds a `webservice` child node to the containing host with an identifier of
-`frontend-17-api-example-com-webservice`.
+`example-webserver-api-vi`.
 
 The simplest monitor setup to monitor that service might look something like:
 
@@ -38,9 +38,9 @@ The simplest monitor setup to monitor that service might look something like:
     #encoding: utf-8
     
     require 'arborist/monitor/webservice'
-    Arborist::Monitor::Webservice::REST.default
+    Arborist::Monitor::Webservice::HTTP.default
 
-This would check that an OPTIONS HTTP request to `http://api.example.com/v1/heartbeat` responds with a 2xx status code.
+This would check that an HEAD HTTP request to `http://api.example.com/v1/heartbeat` responds with a 2xx status code.
 
 
 ## Prerequisites
@@ -69,7 +69,7 @@ and generate the API documentation.
 
 ## License
 
-Copyright (c) 2016, Michael Granger
+Copyright (c) 2016-2018, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -29,13 +29,13 @@ hoespec = Hoe.spec 'arborist-webservice' do |spec|
 
 	spec.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	spec.dependency 'arborist', '~> 0'
-	spec.dependency 'loggability', '~> 0.11'
+	spec.dependency 'arborist', '~> 0.2'
+	spec.dependency 'loggability', '~> 0.14'
 	spec.dependency 'typhoeus', '~> 1.3'
 
-	spec.dependency 'hoe-deveiate',            '~> 0.3', :developer
+	spec.dependency 'hoe-deveiate',            '~> 0.10', :developer
 	spec.dependency 'simplecov',               '~> 0.7', :developer
-	spec.dependency 'rdoc-generator-fivefish', '~> 0.1', :developer
+	spec.dependency 'rdoc-generator-fivefish', '~> 0.4', :developer
 
 	spec.hg_sign_tags = true if spec.respond_to?( :hg_sign_tags= )
 	spec.check_history_on_release = true if spec.respond_to?( :check_history_on_release= )
@@ -69,11 +69,11 @@ if File.directory?( '.hg' )
 
 	Rake::Task[ 'docs' ].clear
 	RDoc::Task.new( 'docs' ) do |rdoc|
-	    rdoc.main = "README.rdoc"
+	    rdoc.main = "README.md"
 		rdoc.markup = 'markdown'
-	    rdoc.rdoc_files.include( "*.rdoc", "ChangeLog", "lib/**/*.rb" )
+	    rdoc.rdoc_files.include( "*.rdoc", "*.md", "ChangeLog", "lib/**/*.rb" )
 	    rdoc.generator = :fivefish
-		rdoc.title = 'Webservice Node Type for Arborist'
+		rdoc.title = 'Webservice Node Type and Monitor for Arborist'
 	    rdoc.rdoc_dir = 'doc'
 	end
 end

data/lib/arborist/monitor/webservice.rb

@@ -34,12 +34,20 @@ module Arborist::Monitor::Webservice
 			Integer( val )
 		end
 
+		##
+		# Whether or not to enable SSL peer certificate verification by default. The
+		# value is either `1` to enable it by default, or `0` to disable it by default.
+		# The config of each invidual webservice node can override this.
+		setting :ssl_verifypeer, default: 1 do |val|
+			Integer( val ).nonzero? ? 1 : 0
+		end
+
 	end
 
 
 
-	# Arborist HTML web service monitor logic
-	class HTML
+	# Arborist HTTP web service monitor logic
+	class HTTP
 		extend Loggability
 		include Arborist::Webservice::Constants
 
@@ -53,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 ].freeze
+		NODE_PROPERTIES = %i[ uri http_method body body_mimetype config ].freeze
 
 
 		### Return an array of attributes to fetch from nodes for this monitor.
@@ -68,7 +76,7 @@ module Arborist::Monitor::Webservice
 		end
 
 
-		### Create a new HTML webservice monitor with the specified +options+. Valid options are:
+		### Create a new HTTP webservice monitor with the specified +options+. Valid options are:
 		###
 		### +:timeout+
 		###   Set the number of seconds to wait for a connection for each node.
@@ -103,7 +111,8 @@ module Arborist::Monitor::Webservice
 				request = self.request_for_node( node )
 				request.on_complete do |response|
 					self.log.debug "Handling response for %s" % [ identifier ]
-					results[ identifier ] = self.make_response_results( response )
+					results[ identifier ] =
+						self.make_response_results( response, node['expected_status'] )
 				end
 				hydra.queue( request )
 			end
@@ -116,9 +125,11 @@ module Arborist::Monitor::Webservice
 
 		### Return a request object built to test the specified webservice +node+.
 		def request_for_node( node_data )
+			http_version = convert_http_version( node_data['http_version'] || DEFAULT_HTTP_VERSION )
+
 			options = {
 				method: node_data['http_method'] || DEFAULT_HTTP_METHOD,
-				http_version: node_data['http_version'] || DEFAULT_HTTP_VERSION,
+				http_version: http_version,
 				headers: self.make_headers_hash( node_data ),
 				body: node_data['body'],
 				timeout: self.timeout,
@@ -129,6 +140,7 @@ module Arborist::Monitor::Webservice
 				options.merge!( ssl_opts )
 			end
 
+			self.log.debug "Node options for %p are: %p" % [ node_data['uri'], options ]
 			return Typhoeus::Request.new( node_data['uri'], options )
 		end
 
@@ -137,10 +149,15 @@ module Arborist::Monitor::Webservice
 		def make_ssl_options( uri, node_data )
 			return nil unless uri.start_with?( 'https:' )
 
-			ssl_attributes = SSL_ATTRIBUTES.each_with_object({}) do |(key, ssl_key), opts|
-				opts[ ssl_key ] = node_data[ key.to_s ] if node_data.key?( key.to_s )
+			self.log.debug "Extracting valid SSL options from the node's config: %p" %
+				[ node_data['config'] ]
+			ssl_attributes = SSL_ATTRIBUTES.each_with_object({}) do |(key, desc), opts|
+				opts[ key ] = node_data[ 'config' ][ key.to_s ] if
+					node_data['config']&.key?( key.to_s )
 			end
 
+			ssl_attributes[ :ssl_verifypeer ] ||= Arborist::Monitor::Webservice.ssl_verifypeer
+
 			return ssl_attributes
 		end
 
@@ -167,17 +184,18 @@ module Arborist::Monitor::Webservice
 
 
 		### Return a Hash of results appropriate for the specified +response+.
-		def make_response_results( response )
-			if response.success?
+		def make_response_results( response, expected_status=200 )
+			if response.code == expected_status
 				return { webservice: self.success_results(response) }
 			elsif response.timed_out?
 				self.log.error "Request timed out."
 				return { error: 'Request timed out.' }
 			elsif response.code == 0
-				self.log.error "Non-HTTP response: %s." % [ response.return_code ]
-				return { error: response.return_code }
+				self.log.error( response.return_message )
+				return { error: response.return_message }
 			else
-				self.log.error "Got a %03d %s response." % [ response.code, response.status_message ]
+				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 ]
 				}
@@ -189,6 +207,7 @@ module Arborist::Monitor::Webservice
 		### responses.
 		def success_results( response )
 			return {
+				http_version: response.http_version,
 				status: response.code,
 				status_message: response.status_message,
 				headers: response.headers_hash,
@@ -203,11 +222,31 @@ module Arborist::Monitor::Webservice
 			}
 		end
 
-	end # class HTML
+
+		#######
+		private
+		#######
+
+		### Convert a version string like `1.1` into the Symbol Typhoeus/Ethon expect
+		### (e.g., `:httpv1_1`)
+		def convert_http_version( version_string )
+			return case version_string
+				when '1.0'
+					:httpv1_0
+				when '1.1'
+					:httpv1_1
+				when '2.0'
+					:httpv2_0
+				else
+					version_string.to_sym
+				end
+		end
+
+	end # class HTTP
 
 
 	# Arborist REST webservice monitor logic
-	class REST < Arborist::Monitor::Webservice::HTML
+	class REST < Arborist::Monitor::Webservice::HTTP
 	end # class REST
 
 end # class Arborist::Monitor::Webservice

data/lib/arborist/node/webservice.rb

@@ -25,14 +25,11 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 
 	### Create a new Webservice node.
 	def initialize( identifier, host, uri, attributes={}, &block )
-		@uri = uri
-		uri_obj = URI( uri )
-
-		attributes[:app_protocol] ||= uri_obj.scheme
-		attributes[:port] ||= uri_obj.port
+		attributes[:uri] = URI( uri )
 		attributes[:protocol] = 'tcp'
 		attributes[:app_protocol] = 'http'
 		attributes[:http_method] ||= DEFAULT_HTTP_METHOD
+		attributes[:http_version] ||= DEFAULT_HTTP_VERSION
 		attributes[:http_headers] ||= {}
 		attributes[:expected_status] ||= DEFAULT_EXPECTED_STATUS
 		attributes[:body] ||= ''
@@ -47,14 +44,14 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 	public
 	######
 
-	##
-	# The URI of an endpoint that can be used to monitor the webservice
-	dsl_accessor :uri
-
 	##
 	# The http_method used by the service
 	dsl_accessor :http_method
 
+	##
+	# The http version used by the service
+	dsl_accessor :http_version
+
 	##
 	# The expected_status used by the service
 	dsl_accessor :expected_status
@@ -73,6 +70,20 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 	end
 
 
+	### Get/set the URI of the service.
+	def uri( new_uri=nil )
+		if new_uri
+			@uri = URI( new_uri )
+			@uri.host ||= self.addresses.first.to_s
+
+			self.app_protocol( @uri.scheme )
+			self.port( @uri.port )
+		end
+
+		return @uri.to_s
+	end
+
+
 	### Set node +attributes+ from a Hash.
 	def modify( attributes )
 		attributes = stringify_keys( attributes )
@@ -81,6 +92,7 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 
 		self.uri( attributes['uri'] )
 		self.http_method( attributes['http_method'] )
+		self.http_version( attributes['http_version'] )
 		self.expected_status( attributes['expected_status'] )
 		self.body( attributes['body'] )
 		self.body_mimetype( attributes['body_mimetype'] )
@@ -95,6 +107,8 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 				URI( self.uri ) == URI( val )
 			when 'http_method'
 				self.http_method == val
+			when 'http_version'
+				self.http_version == val
 			when 'expected_status'
 				self.expected_status == val
 			when 'body'
@@ -122,10 +136,11 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 
 	### Return service-node-specific information for #inspect.
 	def node_description
-		desc = "%s %s %s/1.1" % [
+		desc = "%s %s %s/%s" % [
 			self.http_method,
 			self.uri,
 			self.app_protocol.upcase,
+			self.http_version,
 		]
 
 		if body && !body.empty?

data/lib/arborist/webservice/constants.rb

@@ -0,0 +1,76 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'arborist/webservice' unless defined?( Arborist::Webservice )
+
+
+module Arborist::Webservice::Constants
+
+	# The default HTTP verb to use for monitoring requests
+	DEFAULT_HTTP_METHOD = 'HEAD'.freeze
+
+	# The default HTTP status code to expect from responses
+	DEFAULT_EXPECTED_STATUS = 200
+
+	# The default Content-type to use for requests with a body
+	DEFAULT_BODY_MIMETYPE = 'text/plain'.freeze
+
+	# The version of HTTP to use in the request line
+	DEFAULT_HTTP_VERSION = '2.0'
+
+	# The headers to include with the request
+	DEFAULT_HTTP_HEADERS = {
+		'Connection' => 'close',
+		'Accept' => '*/*',
+		'User-Agent' => "Arborist-WebService/%s" % [ Arborist::Webservice::VERSION ],
+	}.freeze
+
+	# The SSL attributes that are settable
+	SSL_ATTRIBUTES = {
+		sslcert: "Client cert.",
+		sslcerttype: "Client cert type.",
+		sslkey: "Client key.",
+		sslkeytype: "Client key type.",
+		keypasswd: "Client key password.",
+		ssl_enable_alpn: "Enable use of ALPN.",
+		ssl_enable_npn: "Enable use of NPN.",
+		sslengine: "Use identifier with SSL engine.",
+		sslengine_default: "Default SSL engine.",
+		ssl_falsestart: "Enable TLS False Start.",
+		sslversion: "SSL version to use.",
+		ssl_verifyhost: "Verify the host name in the SSL certificate.",
+		ssl_verifypeer: "Verify the SSL certificate.",
+		ssl_verifystatus: "Verify the SSL certificate's status.",
+		cainfo: "CA cert bundle.",
+		issuercert: "Issuer certificate.",
+		capath: "Path to CA cert bundle.",
+		crlfile: "Certificate Revocation List.",
+		certinfo: "Extract certificate info.",
+		pinnedpublickey: "Set pinned SSL public key .",
+		random_file: "Provide source for entropy random data.",
+		egdsocket: "Identify EGD socket for entropy.",
+		ssl_cipher_list: "Ciphers to use.",
+		tls13_ciphers: "TLS 1.3 cipher suites to use.",
+		ssl_sessionid_cache: "Disable SSL session-id cache.",
+		ssl_options: "Control SSL behavior.",
+		krblevel: "Kerberos security level.",
+		gssapi_delegation: "Disable GSS-API delegation.",
+		proxy_sslcert: "Proxy client cert.",
+		proxy_sslcerttype: "Proxy client cert type.",
+		proxy_sslkey: "Proxy client key.",
+		proxy_sslkeytype: "Proxy client key type.",
+		proxy_keypasswd: "Proxy client key password.",
+		proxy_sslversion: "Proxy SSL version to use.",
+		proxy_ssl_verifyhost: "Verify the host name in the proxy SSL certificate.",
+		proxy_ssl_verifypeer: "Verify the proxy SSL certificate.",
+		proxy_cainfo: "Proxy CA cert bundle.",
+		proxy_capath: "Path to proxy CA cert bundle.",
+		proxy_crlfile: "Proxy Certificate Revocation List.",
+		proxy_pinnedpublickey: "Set the proxy's pinned SSL public key.",
+		proxy_ssl_cipher_list: "Proxy ciphers to use.",
+		proxy_tls13_ciphers: "Proxy TLS 1.3 cipher suites to use.",
+		proxy_ssl_options: "Control proxy SSL behavior.",
+	}.freeze
+
+
+end # module Arborist::Webservice::Constants

data/spec/arborist/monitor/webservice_spec.rb

@@ -0,0 +1,169 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../../spec_helper'
+
+require 'typhoeus'
+require 'arborist/webservice'
+
+
+describe Arborist::Monitor::Webservice do
+
+	using Arborist::TimeRefinements
+
+	before( :each ) do
+		Typhoeus::Expectation.clear
+	end
+	after( :each ) do
+		Typhoeus::Expectation.clear
+	end
+
+
+	describe Arborist::Monitor::Webservice::HTTP do
+
+		let( :monitor ) { described_class.new }
+		let( :host_node ) do
+			Arborist::Node.create( :host, 'webserver' ) do
+				description "Test host node with a few web services"
+				address '10.2.18.64'
+				tags :testing
+			end
+		end
+
+		let( :webservice_node1 ) { host_node.webservice('marketing', 'https://www.acme.com/') }
+		let( :webservice_node2 ) { host_node.webservice('store', 'https://store.acme.com/') }
+		let( :webservice_node3 ) { host_node.webservice('support', 'https://int.support.acme.com/') }
+
+		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
+			end
+		end
+
+
+		it "is created with a default timeout" do
+			expect( monitor.timeout ).to be_an( Numeric )
+		end
+
+
+		it "can clone itself with a new timeout" do
+			new_monitor = monitor.with_timeout( 2.minutes )
+			expect( new_monitor ).to_not equal( monitor )
+			expect( new_monitor.timeout ).to eq( 2.minutes )
+		end
+
+
+		it "runs against a collection of nodes and updates the statuses of each one" do
+			Typhoeus.stub( /acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 200, body: "OK" )
+			end
+
+			result = monitor.run( nodes_hash )
+
+			expect( result ).to be_a( Hash )
+			expect( result.keys ).to contain_exactly( *nodes.map(&:identifier) )
+		end
+
+
+		it "sets an error for HTTP error response statuses" do
+			Typhoeus.stub( /support\.acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 500, status_message: 'Server Error' )
+			end
+			Typhoeus.stub( /(www|store)\.acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 200, body: "OK" )
+			end
+
+			result = monitor.run( nodes_hash )
+
+			expect( result[webservice_node3.identifier] ).to include( error: '500 Server Error' )
+		end
+
+
+		it "sets a human-readable error message for lower-layer error response statuses" do
+			Typhoeus.stub( /store\.acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 0, return_code: :couldnt_connect )
+			end
+			Typhoeus.stub( /(www|support)\.acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 200, body: "OK" )
+			end
+
+			result = monitor.run( nodes_hash )
+
+			expect( result[webservice_node2.identifier] ).to include( error: "Couldn't connect to server" )
+		end
+
+
+		it "sets an error for timeouts" do
+			Typhoeus.stub( /store\.acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 0, return_code: :operation_timedout )
+			end
+			Typhoeus.stub( /(www|support)\.acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 200, body: "OK" )
+			end
+
+			result = monitor.run( nodes_hash )
+
+			expect( result[webservice_node2.identifier] ).to include( error: 'Request timed out.' )
+		end
+
+
+		it "doesn't error if HTTP error response status matches the expected status" do
+			Typhoeus.stub( /store\.acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 401, status_message: 'Access denied' )
+			end
+			Typhoeus.stub( /(www|support)\.acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 200, body: "OK" )
+			end
+
+			webservice_node2.expected_status( 401 )
+			result = monitor.run( nodes_hash )
+
+			expect( result[webservice_node2.identifier] ).to_not include( :error )
+		end
+
+
+		it "posts with the provided body if one is set" do
+			Typhoeus.stub( /support\.acme/i ).and_return do |req|
+				expect( req.options[:method] ).to eq( 'POST' )
+				expect( req.options[:body] ).to eq( '[1, 2, 3, 4]' )
+				expect( req.options[:headers] ).to include( 'Content-type' => 'application/json' )
+				Typhoeus::Response.new( code: 201, status_message: 'Object created' )
+			end
+			Typhoeus.stub( /(www|store)\.acme/i ).and_return do |req|
+				Typhoeus::Response.new( code: 200, body: "OK" )
+			end
+
+			webservice_node3.http_method( 'POST' )
+			webservice_node3.body( '[1, 2, 3, 4]' )
+			webservice_node3.body_mimetype( 'application/json' )
+			webservice_node3.expected_status( 201 )
+
+			result = monitor.run( nodes_hash )
+
+			expect( result.keys ).to contain_exactly( *nodes.map(&:identifier) )
+		end
+
+
+		it "uses valid entries from the node's config as SSL configuration" do
+			Typhoeus.stub( /acme/i ).and_return do |req|
+				expect( req.options[:ssl_verifypeer] ).to eq( 0 )
+				Typhoeus::Response.new( code: 200, body: "OK" )
+			end
+
+			nodes.each do |node|
+				node.config( ssl_verifypeer: 0 )
+			end
+
+			result = monitor.run( nodes_hash )
+
+			expect( result ).to be_a( Hash )
+			expect( result.keys ).to contain_exactly( *nodes.map(&:identifier) )
+		end
+
+	end
+
+
+	describe "REST monitor logic"
+
+end
+

data/spec/arborist/node/webservice_spec.rb

@@ -4,21 +4,71 @@
 require_relative '../../spec_helper'
 
 require 'rspec'
+require 'arborist/node/host'
 require 'arborist/node/webservice'
 
 describe Arborist::Node::Webservice do
 
-	it "can match on URI"
-	it "can match on HTTP method"
-	it "can match on request body"
-	it "can match on request body media type"
+	let( :host_node ) do
+		Arborist::Host 'testhost' do
+			address '192.168.66.12'
+			address '10.2.12.68'
+			hostname 'example.com'
+		end
+	end
 
-	it "includes the URI in the operational attributes"
-	it "includes the HTTP method in the operational attributes"
-	it "includes the request body in the operational attributes"
-	it "includes the request body media type in the operational attributes"
+	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'
+		end
+	end
+	let( :http10_node ) do
+		host_node.webservice( 'archive-site', 'http://archive.example.com/' ) do
+			http_version '1.0'
+		end
+	end
+
+
+	it "can match on URI" do
+		expect( node ).to match_criteria( uri: 'https://example.com/api/v1' )
+		expect( node ).to_not match_criteria( uri: 'https://example.com/api/v2' )
+		expect( node ).to_not match_criteria( uri: 'https://bitter.com/api/v1' )
+		expect( node ).to_not match_criteria( uri: 'http://example.com/api/v1' )
+	end
+
+
+	it "can match on HTTP method" do
+		expect( node ).to match_criteria( http_method: 'HEAD' )
+		expect( node ).to_not match_criteria( http_method: 'GET' )
+		expect( getonly_node ).to match_criteria( http_method: 'GET' )
+		expect( getonly_node ).to_not match_criteria( http_method: 'HEAD' )
+	end
+
+
+	it "can match on HTTP version" do
+		expect( node ).to match_criteria( http_version: '2.0' )
+		expect( node ).to_not match_criteria( http_version: '1.0' )
+		expect( http10_node ).to match_criteria( http_version: '1.0' )
+		expect( http10_node ).to_not match_criteria( http_version: '1.1' )
+	end
+
+
+	it "includes the URI in the operational attributes" do
+		expect( node.operational_values ).to include( uri: node.uri )
+	end
+
+
+	it "includes the HTTP method in the operational attributes" do
+		expect( node.operational_values ).to include( http_method: node.http_method )
+	end
+
+
+	it "allows shorthand URI syntax for implicit host" do
+		node = host_node.webservice( 'djinn', 'http:///' )
+		expect( node.uri ).to eq( 'http://192.168.66.12/' )
+	end
 
-	it "provides a DSL declaration to disable SSL verification"
 
 end
 

data/spec/arborist/webservice_spec.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../spec_helper'
+
+require 'arborist/webservice'
+
+
+describe Arborist::Webservice do
+
+	it "has a version constant" do
+		expect( described_class::VERSION ).to match( /^\d+(\.\d+){2}$/ )
+	end
+
+
+	it "can return a version string for itself" do
+		expect( described_class.version_string ).
+			to match( /Arborist::Webservice v\d+\.\d+\.\d+/ )
+	end
+
+
+	it "can return a version string with the build ID" do
+		expect( described_class.version_string(include_build: true) ).
+			to match( /Arborist::Webservice v\d+\.\d+\.\d+.*\(Revision: \w+\)/ )
+	end
+
+end
+

data/spec/spec_helper.rb

@@ -6,6 +6,17 @@ require 'simplecov' if ENV['COVERAGE']
 require 'rspec'
 
 require 'loggability/spechelpers'
+require 'arborist'
+require 'arborist/mixins'
+require 'arborist/webservice'
+
+
+RSpec::Matchers.define( :match_criteria ) do |criteria|
+	match do |node|
+		criteria = Arborist::HashUtilities.stringify_keys( criteria )
+		node.matches?( criteria )
+	end
+end
 
 
 ### Mock with RSpec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arborist-webservice
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre20180815100446
+  version: 0.0.1
 platform: ruby
 authors:
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
   OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arborist
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,10 @@ files:
 - lib/arborist/monitor/webservice.rb
 - lib/arborist/node/webservice.rb
 - lib/arborist/webservice.rb
+- lib/arborist/webservice/constants.rb
+- spec/arborist/monitor/webservice_spec.rb
 - spec/arborist/node/webservice_spec.rb
+- spec/arborist/webservice_spec.rb
 - spec/spec_helper.rb
 homepage: http://deveiate.org/projects/arborist-webservice
 licenses:
@@ -221,9 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6