umts-microservices-engine 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c7059c5b4276cd799095a1159f55508e38f6dbc
-  data.tar.gz: a62ec3df503d7974fa5c46667110aa45c9a3a3cf
+  metadata.gz: b7166a43b8566873abe89546e2c9bb0e3620bc53
+  data.tar.gz: ade4b9cf5322aa048a946c1e1aeedc35b2512822
 SHA512:
-  metadata.gz: 80491981f5041d68c49e949d54fa75671bdf0631b599c113ba6d0419f557bb0b9f8947b8c88307290af8c3379fa08733fac3666d014a73edb33e4cad9a105971
-  data.tar.gz: 8abfcf265e995c7d6fc00662c876959ff0a922926e7ee35635b0443c05177dfa976de608e06e5e7fea4663a232c79bcbfe3354f4613dbc6b1245eb2899500e00
+  metadata.gz: b83b037d3af5652428d19374ed0dab344b71b9dc13336bb18b09c32d48785f9c8c5041ba345ea66c6723c713dc851d1057a366c323de265209206927e535f054
+  data.tar.gz: 49c28abb01b77d05f0806d7bc7934ebf6b387bfa4373fb2219beedb02eee6fcf47cc203a56b86319d8afba83e3d186eb4030a51d225a05717408f6cd3a48b844

data/lib/generators/install/templates/microservices_engine.rb

@@ -2,28 +2,27 @@
 require 'net/http'
 config_file = 'config/mse_router_info.yml'
 
+REPORT_MISSING_CONFIG_KEY = -> (key) {
+  raise ArgumentError, "Missing key #{key} in config/initializers/mse_router_info.yml."
+}
+
 unless File.file?(config_file)
-  raise IOError, '[MSE] > No router configuration YAML file found'
+  raise IOError, 'No router configuration YAML file found'
 end
 
 config_data = YAML.load_file(config_file)
 
-if [config_data['name'], config_data['uri'], config_data['security_token']].any?(&:blank?)
-  raise '[MSE] > Please fill out config/mse_router_info.yml'
-end
-
-# Make sure the URI ends with a / character
-router_uri = config_data['router_uri']
-
-uri = config_data['uri']
-uri += '/' if uri[-1] != '/'
+service_name = config_data.fetch :name, &REPORT_MISSING_CONFIG_KEY
+service_url = config_data.fetch :uri, &REPORT_MISSING_CONFIG_KEY
+router_url = config_data.fetch :router_uri, &REPORT_MISSING_CONFIG_KEY
+security_token = config_data.fetch :security_token, &REPORT_MISSING_CONFIG_KEY
 
 res = Net::HTTP.post_form(
-  URI(router_uri),
-  'name': config_data['name'],
-  'url': uri,
-  'models': config_data['accessible_models'],
-  'security_token': config_data['security_token']
+  URI.parse(router_url),
+  name: service_name,
+  url: service_url,
+  models: config_data['accessible_models'],
+  security_token: security_token
 )
 
-raise '[MSE] > The router API response was invalid' if res.code != '200'
+raise 'The router API response was invalid' if res.code != '200'

data/lib/microservices_engine/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module MicroservicesEngine
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umts-microservices-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - UMass Transportation Services