plek 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f009f7c15f4e0b0fa5a5b5f3866e327101ff3ed1a7cc4527e5d3346398bcf3
-  data.tar.gz: 8ed2fcfc3453d92b3a049f0941bf6026d0f6294f33b51bab9e0d69bfa6608af7
+  metadata.gz: dce9ccd2cdfbd98e5f5d400b89afc268e7ac85eede91425d6999a45d8c8241e7
+  data.tar.gz: fb644ee1e4abefa8d133083e6dae182c4d6292cd9079a39e890a7d81a7d7846e
 SHA512:
-  metadata.gz: a7f2980ae077e50f4f277ad26ece95057c9f486f8f1883e24cb80f47f60b02fc35cd58ab7812642a7348a90d648b2223572609702220e281180e0f5e3b4a8610
-  data.tar.gz: 48664f58cd9f619b78dea7db04afe260153ac596ce79977d5e07911ef23a68f0e308f9e71ff135ee4636c7ebc6eb9f85880bdf88ec94515a874bac2f2c32a57a
+  metadata.gz: 152b9b257a2d0ccc8dc1a0854e0e63ee75464173561d4b6eb781caafbb9a89abcd56ff9bb0cd31bb24f297a23a45d07f6bbd45ceb7911ff34ca88b8539391211
+  data.tar.gz: df7e4c1d134ede43491e7bb1e8ff0f1568bf3e9b39a64a2487fae48f800fdda709ca43f092bbaa1eca451a6e3324a7d5c33d73b6e23ea9947032d2efb6e85dd5

data/lib/plek.rb

@@ -1,5 +1,5 @@
-require 'plek/version'
-require 'uri'
+require "plek/version"
+require "uri"
 
 # Plek resolves service names to a corresponding base URL.
 #
@@ -17,10 +17,10 @@ class Plek
   class NoConfigurationError < StandardError; end
 
   # The fallback parent domain to use in development mode.
-  DEV_DOMAIN = 'dev.gov.uk'
+  DEV_DOMAIN = "dev.gov.uk".freeze
 
   # Domains to return http URLs for.
-  HTTP_DOMAINS = [ DEV_DOMAIN ]
+  HTTP_DOMAINS = [DEV_DOMAIN].freeze
 
   attr_accessor :parent_domain, :external_domain
 
@@ -63,19 +63,19 @@ class Plek
   # @return [String] The base URL for the service.
   def find(service, options = {})
     name = name_for(service)
-    if service_uri = defined_service_uri_for(name)
+    if (service_uri = defined_service_uri_for(name))
       return service_uri
     end
 
     host = "#{name}.#{options[:external] ? external_domain : parent_domain}"
 
-    if host_prefix = ENV['PLEK_HOSTNAME_PREFIX']
+    if (host_prefix = ENV["PLEK_HOSTNAME_PREFIX"])
       host = "#{host_prefix}#{host}"
     end
 
     if options[:scheme_relative]
       "//#{host}".freeze
-    elsif options[:force_http] or HTTP_DOMAINS.include?(parent_domain)
+    elsif options[:force_http] || HTTP_DOMAINS.include?(parent_domain)
       "http://#{host}".freeze
     else
       "https://#{host}".freeze
@@ -107,13 +107,6 @@ class Plek
     env_var_or_dev_fallback("GOVUK_ASSET_ROOT") { find("static") }
   end
 
-  # Find the asset host used to serve assets to the public
-  #
-  # @return [String] The public-facing asset base URL
-  def public_asset_host
-    env_var_or_dev_fallback("GOVUK_ASSET_HOST") { find("static") }
-  end
-
   # Find the base URL for the public website frontend.
   #
   # @return [String] The website base URL.
@@ -140,7 +133,7 @@ class Plek
     name = service.to_s.dup
     name.downcase!
     name.strip!
-    name.gsub!(/[^a-z\.-]+/, '')
+    name.gsub!(/[^a-z\.-]+/, "")
     name
   end
 
@@ -164,10 +157,10 @@ class Plek
     end
   end
 
-  private
+private
 
   def env_var_or_dev_fallback(var_name, fallback_str = nil)
-    if var = ENV[var_name]
+    if (var = ENV[var_name])
       var
     elsif ENV["RAILS_ENV"] == "production" || ENV["RACK_ENV"] == "production"
       raise(NoConfigurationError, "Expected #{var_name} to be set. Perhaps you should run your task through govuk_setenv <appname>?")
@@ -179,12 +172,13 @@ class Plek
   end
 
   def defined_service_uri_for(service)
-    service_name = service.upcase.gsub(/-/,'_')
+    service_name = service.upcase.gsub(/-/, "_")
     var_name = "PLEK_SERVICE_#{service_name}_URI"
 
-    if (uri = ENV[var_name] and ! uri.empty?)
+    if (uri = ENV[var_name]) && !uri.empty?
       return uri
     end
-    return nil
+
+    nil
   end
 end

data/lib/plek/version.rb

@@ -1,3 +1,3 @@
 class Plek
-  VERSION = '3.0.0'
+  VERSION = "4.0.0".freeze
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: plek
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: climate_control
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: climate_control
+  name: rake
+  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: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Locations for services