1221 modify configuration to configure pipes

Modify configuration such that each pipe can be
independantly configured via settings

spec/amber/environment/settings_spec.cr

@@ -37,13 +37,13 @@ module Amber::Environment
       it "sets default headers value as empty map" do
         test_yaml = File.read(File.expand_path("./spec/support/config/test.yml"))
         settings = Amber::Settings.from_yaml(test_yaml)
-        settings.public_file_server["headers"].should eq({} of String => String)
+        settings.pipes.dig?("static", "headers").should eq({} of String => Amber::Settings::SettingValue)
       end
 
       it "sets header file settings from environment yaml file" do
-        test_yaml = File.read(File.expand_path("./spec/support/config/with_public_file_server.yml"))
+        test_yaml = File.read(File.expand_path("./spec/support/config/with_static_pipe_settings.yml"))
         settings = Amber::Settings.from_yaml(test_yaml)
-        settings.public_file_server["headers"].should eq({"Cache-Control" => "private, max-age=7200"})
+        settings.pipes.dig?("static", "headers").should eq({"Cache-Control" => "private, max-age=7200"})
       end
     end
   end

spec/amber/pipes/static_spec.cr

@@ -64,9 +64,9 @@ module Amber
 
         response = create_request_and_return_io(static, request)
 
-        response.headers["Cache-Control"].should eq "private, max-age=3600"
         response.headers["Accept-Ranges"].should eq "bytes"
         response.headers["X-Content-Type-Options"].should eq "nosniff"
+        response.headers["Cache-Control"].should eq "no-store"
       end
     end
   end

spec/support/config/test.yml

@@ -22,6 +22,10 @@ session:
   store: "signed_cookie"
   expires: 0
 
+pipes:
+  static:
+    headers:
+      "Cache-Control": "no-store"
+
 secrets:
   description: "Store your test secrets credentials and settings here."
-

spec/support/config/with_public_file_server.yml → spec/support/config/with_static_pipe_settings.yml

@@ -9,9 +9,10 @@ session:
   store: "encrypted_cookie"
   expires: 10
 
+pipes:
+  static:
+    headers:
+      "Cache-Control": "private, max-age=7200"
+
 secrets:
   description: "Store your test secrets credentials and settings here."
-
-public_file_server:
-  headers:
-    "Cache-Control": "private, max-age=7200"

src/amber/cli/templates/app/config/environments/development.yml.ecr

@@ -34,9 +34,10 @@ session:
 smtp:
   enabled: false
 
+pipes:
+  static:
+    headers:
+      "Cache-Control": "no-store"
+
 secrets:
   description: Store your development secrets credentials and settings here.
-
-public_file_server:
-  headers:
-    "Cache-Control": "no-store"

src/amber/cli/templates/app/config/environments/production.yml.ecr

@@ -38,9 +38,10 @@ smtp:
   username: api_key
   enabled: false
 
+pipes:
+  static:
+    headers:
+      "Cache-Control": "private, max-age=3600"
+
 secrets:
   description: Store your production secrets credentials and settings here.
-
-public_file_server:
-  headers:
-    "Cache-Control": "private, max-age=3600"

src/amber/environment/settings.cr

@@ -74,11 +74,13 @@ module Amber::Environment
         },
       },
       auto_reload: {type: Bool, default: false},
-      public_file_server: {
-        type:    Hash(String, Hash(String, String)),
+      pipes: {
+        type: Hash(String, Hash(String, Hash(String, SettingValue))),
         default: {
-          "headers" => {} of String => String,
-        },
+          "static" => {
+            "headers" => {} of String => SettingValue
+          }
+        }
       }
     )
 

src/amber/pipes/static.cr

@@ -132,14 +132,20 @@ module Amber
       end
 
       private def add_response_headers(env : HTTP::Server::Context)
-        {
+        pipes = Amber.settings.pipes
+        default_headers = {
           "Accept-Ranges"          => "bytes",
           "X-Content-Type-Options" => "nosniff",
           "Cache-Control"          => "private, max-age=3600",
-        }.merge(
-          Amber.settings.public_file_server["headers"]
-        ).each do |key, value|
-          env.response.headers[key] = value
+        } of String => Amber::Settings::SettingValue
+
+        headers = if pipes.has_key?("static") && pipes["static"].has_key?("headers")
+                    default_headers.merge(pipes["static"]["headers"])
+                  else
+                    default_headers
+                  end
+        headers.each do |key, value|
+           env.response.headers[key] = value.as(String)
         end
       end