Un-deprecate FileSystem#upload receiving unrecognized options

In tests, people will often use FileSystem storage as a replacement for S3 storage, and they will likely pass some S3-specific options. I think this is a completely valid use case, and I don't see any strong reasons for not allowing FileSystem storage to receive this options and ignore them. So we undo the deprecation warning.
shrinerb · Aug 9, 2019 · 4945c45 · 4945c45
1 parent d5661d5
commit 4945c45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## HEAD
+
+* `file_system` – Un-deprecate `FileSystem#upload` receiving unrecognized options (@janko)
+
 ## 2.19.2 (2018-07-25)
 
 * `default_url_options` – Allow deleting passed options when using a block (@janko)

diff --git a/lib/shrine/storage/file_system.rb b/lib/shrine/storage/file_system.rb
@@ -50,9 +50,7 @@ def initialize(directory, prefix: nil, host: nil, clean: true, permissions: 0644
       end
 
       # Copies the file into the given location.
-      def upload(io, id, move: false, shrine_metadata: {}, **options)
-        Shrine.deprecation("Unrecognized options for FileSystem#upload: #{options.inspect}. Passing unrecognized options to FileSystem#upload will not be supported in Shrine 3.") if options.any?
-
+      def upload(io, id, move: false, **)
         if move && movable?(io, id)
           move(io, id)
         else