plek 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a4e57ba04bdaed9c12a5cfda39e40b8a7b9e49a
-  data.tar.gz: 7fb41bdf33d4f3ce101f339cdbd1daea95318438
+  metadata.gz: db58b6a4a924d4c06eed2f4aa05251a733b71ccf
+  data.tar.gz: 4a59305d33e96a082ecce8e9908aadacc8bc21f6
 SHA512:
-  metadata.gz: cb81b99d7eae93c1acc01a321a56296d1c88595deef7ab9863e7f20b0486cddf8a4f3095001d5713d4f34d61ac41ca388d18ac9dd2d3a2b028e707d812294fa6
-  data.tar.gz: 0529dd33cc435710a61861834c0202b25ec72e4dc0a47e97188856d3317f3905af833470a3e5bbc7420fa2dee79def7070e3e981381b7339b89aa5f049fe5b18
+  metadata.gz: db7341e606a4629f61f87ccf1cb2087f2b70a10bf3513cd301e6e867313eab3dc52ca3bfc6a2e69a900352f66f707634f8ebc33866e70d50ecba071f5d5f81d3
+  data.tar.gz: afc6924a5f847f6268f16561caa194fbe491509d3f899b38bc36d022dd5f6c62e6a0c1f1920432b2d8f483d04646ef4a9dbbb02cd217471a5bcf0299233c3ea0

data/lib/plek.rb

@@ -22,7 +22,7 @@ class Plek
   # Domains to return http URLs for.
   HTTP_DOMAINS = [ DEV_DOMAIN ]
 
-  attr_accessor :parent_domain
+  attr_accessor :parent_domain, :external_domain
 
   # Construct a new Plek instance.
   #
@@ -31,8 +31,10 @@ class Plek
   #
   #   In development mode, this falls back to {DEV_DOMAIN} if the environment
   #   variable is unset.
-  def initialize(domain_to_use = nil)
+  def initialize(domain_to_use = nil, external_domain = nil)
     self.parent_domain = domain_to_use || env_var_or_dev_fallback("GOVUK_APP_DOMAIN", DEV_DOMAIN)
+    self.external_domain = external_domain ||
+                           env_var_or_dev_fallback("GOVUK_APP_DOMAIN_EXTERNAL", DEV_DOMAIN)
   end
 
   # Find the base URL for a service/application. This constructs the URL from
@@ -61,7 +63,7 @@ class Plek
       return service_uri
     end
 
-    host = "#{name}.#{parent_domain}"
+    host = "#{name}.#{options[:external] ? external_domain : parent_domain}"
 
     if host_prefix = ENV['PLEK_HOSTNAME_PREFIX']
       host = "#{host_prefix}#{host}"
@@ -76,6 +78,15 @@ class Plek
     end
   end
 
+  # Find the external URL for a service/application.
+  #
+  # @param service [String] the name of the service to lookup.  This should be
+  #   the hostname of the service.
+  # @param options [Hash] see the documentation for find.
+  def external_url_for(service, options = {})
+    find(service, options.merge(external: true))
+  end
+
   # Find the base URL for a service/application, and parse as a URI object.
   # This wraps #find and returns the parsed result.
   #

data/lib/plek/version.rb

@@ -1,3 +1,3 @@
 class Plek
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plek
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Craig R Webster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake