Fixing #1557 - Environments are now in REST URIs

This commit includes multiple, related changes, all
in one commit because the whole thing was necessary to
reach a functional tree again:

* The URI starts with the environment, so:
  /production/certificate/foo
  /development/file_content/path/to/your/file
* All REST handling is done by a single instance mounted
  at / for webrick and Mongrel, rather than having individual
  instances mounted at, say, /certificate.
* All REST URI translation is done by an API module.  Currently
  only the 'v1' module exists with no support for additional modules,
  but it's well-separated and will be easy to expand as we need it.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/puppet/network/http/api/v1.rb b/lib/puppet/network/http/api/v1.rb
index 2ee1a815f..13df7c3d0 100644
--- a/lib/puppet/network/http/api/v1.rb
+++ b/lib/puppet/network/http/api/v1.rb
@@ -51,7 +51,12 @@ module Puppet::Network::HTTP::API::V1
     end
 
     def plurality(indirection)
-        result = (indirection == handler.to_s + "s") ? :plural : :singular
+        # NOTE This specific hook for facts is ridiculous, but it's a *many*-line
+        # fix to not need this, and our goal is to move away from the complication
+        # that leads to the fix being too long.
+        return :singular if indirection == "facts"
+
+        result = (indirection =~ /s$/) ? :plural : :singular
 
         indirection.sub!(/s$/, '') if result