diff --git a/CHANGELOG.md b/CHANGELOG.md index 073e938c7..270c96f65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## HEAD +* `store_dimensions` – Ignore dimensions extraction errors by default (@janko) + * `file_system` – Un-deprecate `FileSystem#upload` receiving unrecognized options (@janko) ## 2.19.2 (2018-07-25) diff --git a/lib/shrine/plugins/store_dimensions.rb b/lib/shrine/plugins/store_dimensions.rb index 414638f4b..d8cd840eb 100644 --- a/lib/shrine/plugins/store_dimensions.rb +++ b/lib/shrine/plugins/store_dimensions.rb @@ -14,7 +14,7 @@ module StoreDimensions end def self.configure(uploader, opts = {}) - uploader.opts[:store_dimensions] ||= { analyzer: :fastimage, on_error: :warn, log_subscriber: LOG_SUBSCRIBER } + uploader.opts[:store_dimensions] ||= { analyzer: :fastimage, on_error: :ignore, log_subscriber: LOG_SUBSCRIBER } uploader.opts[:store_dimensions].merge!(opts) # resolve error strategy diff --git a/test/plugin/store_dimensions_test.rb b/test/plugin/store_dimensions_test.rb index 45804e137..128b469af 100644 --- a/test/plugin/store_dimensions_test.rb +++ b/test/plugin/store_dimensions_test.rb @@ -22,9 +22,7 @@ end it "returns nil for non-images" do - assert_logged /SHRINE WARNING: Error occurred/ do - assert_nil @shrine.extract_dimensions(fakeio) - end + assert_nil @shrine.extract_dimensions(fakeio) end end @@ -43,9 +41,7 @@ end it "returns nil for non-images" do - assert_logged /SHRINE WARNING: Error occurred/ do - assert_nil @shrine.extract_dimensions(fakeio) - end + assert_nil @shrine.extract_dimensions(fakeio) end end unless ENV["CI"] @@ -64,9 +60,7 @@ end it "returns nil for non-images" do - assert_logged /SHRINE WARNING: Error occurred/ do - assert_nil @shrine.extract_dimensions(fakeio) - end + assert_nil @shrine.extract_dimensions(fakeio) end end unless ENV["CI"]