plek 0.3.0 → 0.4.0

data/lib/plek.rb

@@ -6,10 +6,6 @@ class Plek
 
   SERVICES = {
     "production.www"                 => "www.gov.uk",
-    "production.authentication"      => "signon.production.alphagov.co.uk",
-    "production.needs"               => "needotron.production.alphagov.co.uk",
-    "production.data"                => "imminence.production.alphagov.co.uk",
-    "production.arbiter"             => "panopticon.production.alphagov.co.uk",
     "production.assets"              => "static.production.alphagov.co.uk",
     "production.cdn"                 => "d17tffe05zdvwj.cloudfront.net",
     "production.publication-preview" => "private-frontend.production.alphagov.co.uk",
@@ -18,10 +14,6 @@ class Plek
     "production.#{DEFAULT_PATTERN}"  => "%s.production.alphagov.co.uk",
 
     "preview.www"                    => "www.preview.alphagov.co.uk",
-    "preview.authentication"         => "signon.preview.alphagov.co.uk",
-    "preview.needs"                  => "needotron.preview.alphagov.co.uk",
-    "preview.data"                   => "imminence.preview.alphagov.co.uk",
-    "preview.arbiter"                => "panopticon.preview.alphagov.co.uk",
     "preview.assets"                 => "static.preview.alphagov.co.uk",
     "preview.cdn"                    => "djb1962t8apu5.cloudfront.net",
     "preview.publication-preview"    => "private-frontend.preview.alphagov.co.uk",
@@ -31,20 +23,12 @@ class Plek
     "preview.#{DEFAULT_PATTERN}"     => "%s.preview.alphagov.co.uk",
 
     "staging.frontend"               => "demo.alphagov.co.uk",
-    "staging.authentication"         => "signon.alpha.gov.uk",
-    "staging.needs"                  => "needotron.alpha.gov.uk",
     "staging.publisher"              => "guides.staging.alphagov.co.uk",
-    "staging.data"                   => "imminence.staging.alphagov.co.uk",
-    "staging.arbiter"                => "panopticon.staging.alphagov.co.uk",
     "staging.assets"                 => "static.staging.alphagov.co.uk",
     "staging.assets"                 => "static.staging.alphagov.co.uk",
     "staging.publication-preview"    => "private-frontend.staging.alphagov.co.uk",
     "staging.#{DEFAULT_PATTERN}"     => "%s.staging.alphagov.co.uk",
 
-    "development.authentication"     => "signon.dev.gov.uk",
-    "development.needs"              => "needotron.dev.gov.uk",
-    "development.data"               => "imminence.dev.gov.uk",
-    "development.arbiter"            => "panopticon.dev.gov.uk",
     "development.assets"             => "static.dev.gov.uk",
     "development.cdn"                => "static.dev.gov.uk",
     "development.whitehall"          => "whitehall.dev.gov.uk",
@@ -52,10 +36,6 @@ class Plek
     "development.publication-preview"=> "www.dev.gov.uk",
     "development.#{DEFAULT_PATTERN}" => "%s.dev.gov.uk",
 
-    "test.authentication"            => "signon.test.gov.uk",
-    "test.needs"                     => "needotron.test.gov.uk",
-    "test.data"                      => "imminence.test.gov.uk",
-    "test.arbiter"                   => "panopticon.test.gov.uk",
     "test.publication-preview"       => "www.test.gov.uk",
     "test.cdn"                       => "static.test.gov.uk",
     "test.whitehall"                 => "whitehall.test.alphagov.co.uk",
@@ -63,45 +43,6 @@ class Plek
     "test.#{DEFAULT_PATTERN}"        => "%s.test.gov.uk",
   }.freeze
 
-  SERVICE_TOKENS = %w(
-    frontend
-    authentication
-    needs
-    publisher
-    data
-    arbiter
-    search
-  ).sort.freeze
-
-  PURPOSE_FOR_SERVICE = {
-    "need-o-tron"    => "needs",
-    "signon"         => "authentication",
-    "imminence"      => "data",
-    "panopticon"     => "arbiter"
-  }.freeze
-
-  SERVICE_NAMES = %w(
-    panopticon
-    signon
-    imminence
-    publisher
-    need-o-tron
-    frontend
-    search
-    tariff
-  ).sort.freeze
-
-  SERVICE_NAMES.each do |service_name|
-    # Backward compatibility
-    method_name = service_name.gsub(/[^a-z]+/, '_')
-    define_method method_name do
-      name = PURPOSE_FOR_SERVICE[service_name] || service_name
-      puts "Plek##{method_name} is deprecated and will be removed in an " +
-           "upcoming release.\nUse `Plek#find('#{name}')` instead."
-      find name
-    end
-  end
-
   attr_accessor :environment
   private :environment=
 
@@ -109,34 +50,8 @@ class Plek
     self.environment = environment
   end
 
-  def to_xml
-    io = StringIO.new
-    builder = Builder::XmlMarkup.new :target => io, :spacing => 2
-    builder.services :environment => environment do |services|
-      SERVICE_TOKENS.each do |token|
-        uri = find token
-        services.service :token => token, :uri => uri
-      end
-    end
-    io.rewind
-    io.string
-  end
-
-  # Find the URI for a service.
-  #
-  # Services don't map directly to applications since we may replace an
-  # application but retain the service.
-  #
-  # Currently we have these services:
-  #
-  #    frontend: Where the public can see our output.
-  #    authentication: Where we send staff so they can log in.
-  #    publisher: Where we write content.
-  #    needs: Where we record the needs that we're going to fulfill.
-  #    data: Where our datasets live.
-  #    arbiter: organises data shared between the applications
-  #
-  def find service
+  # Find the URI for a service/application.
+  def find(service)
     name = name_for service
     host = SERVICES[service_key_for(name)]
     host ||= SERVICES["#{environment}.#{DEFAULT_PATTERN}"].to_s % name

data/lib/plek/version.rb

@@ -1,3 +1,3 @@
 class Plek
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -2,7 +2,7 @@
 name: plek
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Craig R Webster
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-02 00:00:00 Z
+date: 2012-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -71,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2873474734768778572
+      hash: 3393726885730147352
       segments: 
       - 0
       version: "0"
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2873474734768778572
+      hash: 3393726885730147352
       segments: 
       - 0
       version: "0"