From ce44746ea3a98fab1af65c75ec32eeadd67b1b5f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 1 Jul 2017 00:13:50 +0200
Subject: No need to normalize since we generate our own keys

---
 lib/active_file/site.rb            | 6 ------
 lib/active_file/sites/disk_site.rb | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/active_file/site.rb b/lib/active_file/site.rb
index 8a915c2e17..7a3b1f14ba 100644
--- a/lib/active_file/site.rb
+++ b/lib/active_file/site.rb
@@ -27,10 +27,4 @@ class ActiveFile::Site
   def move(from_key:, to_key:)
   end
 
-
-  private
-    def normalize_key(key)
-      # disallow "." and ".." segments in the key
-      key.split(%r[/]).reject { |s| s == "." || s == ".." }
-    end
 end
diff --git a/lib/active_file/sites/disk_site.rb b/lib/active_file/sites/disk_site.rb
index 71dc8d078b..da9c44a612 100644
--- a/lib/active_file/sites/disk_site.rb
+++ b/lib/active_file/sites/disk_site.rb
@@ -40,7 +40,7 @@ class ActiveFile::Sites::DiskSite < ActiveFile::Site
 
   private
     def path_for(key)
-      File.join(root, folder_for(key), normalize(key))
+      File.join(root, folder_for(key), key)
     end
 
     def folder_for(key)
-- 
cgit v1.2.3