shrine 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4039e8d8350766e0bbe1555e0039672f4224915
-  data.tar.gz: b8200b69674d031d15c82fd19e704eee55d049b9
+  metadata.gz: 93c5aa709ec2574b80b2a5d3b62f1f6d5b2cd312
+  data.tar.gz: f6f13f2f4b24c6961a846634462c9d1aa2c16e7e
 SHA512:
-  metadata.gz: 0cf6ec31cb22d1396575720a5a8543f71875e9a5c9851ea1f8311aec34a5ef1dc1c83be64b32434dac3e825dd3b52c06bd9035eb15a02fe11572cbceb9584c45
-  data.tar.gz: 49ac2e4d1065b37733c82b7dacb8498db1784a2c7c2dadfb643b8d2348d9b8fea0ca84062dafa1dc7ce836ef142a101202b83abe2870003a7d803dd2230ace5c
+  metadata.gz: 712eaa97b81d90b928b0e7967740d79e0f4320af5b67a811e8a991f0e91e103568f70cc08683aa5e38fd3235021869a5c8634f08d67d961971edacc0aa9cb5b9
+  data.tar.gz: fa531d81b429dbd94cfab836f50180aa6eed61e33eceaffe0b4d901398228cedfb19d9add18a0ebdb5c131d803b6c072a8e6972b9ea1c9cd9095f4da6e0f401f

data/doc/testing.md

@@ -80,7 +80,7 @@ Shrine.plugin :data_uri
 ```yml
 # test/fixtures/photos.yml
 photo:
-  image_data_uri: "data:image/png,<%= File.read("test/files/image.png") %>"
+  image_data_uri: "data:image/png;base64,<%= Base64.encode64(File.binread("test/files/image.png")) %>"
 ```
 
 ## Background jobs

data/lib/shrine.rb

@@ -660,12 +660,12 @@ class Shrine
         # Converts the UploadedFile to a data hash and writes it to the
         # attribute.
         def _set(uploaded_file)
-          write(uploaded_file ? convert_to_data(uploaded_file) : nil)
+          data = convert_to_data(uploaded_file) if uploaded_file
+          write(data ? convert_before_write(data) : nil)
         end
 
         # Writes to the `<attachment>_data` attribute on the model instance.
         def write(value)
-          value = convert_before_write(value) unless value.nil?
           record.send(:"#{data_attribute}=", value)
         end
 
@@ -773,7 +773,7 @@ class Shrine
           if storage.respond_to?(:download)
             storage.download(id)
           else
-            tempfile = Tempfile.new(["shrine", File.extname(id)], binmode: true)
+            tempfile = Tempfile.new(["shrine", ".#{extension}"], binmode: true)
             open { |io| IO.copy_stream(io, tempfile.path) }
             tempfile.tap(&:open)
           end

data/lib/shrine/plugins/remove_invalid.rb

@@ -1,7 +1,8 @@
 class Shrine
   module Plugins
     # The `remove_invalid` plugin automatically deletes a cached file if it was
-    # invalid and deassigns it from the record.
+    # invalid and deassigns it from the record. If there was a previous file
+    # attached, it will be assigned back, otherwise `nil` will be assigned.
     #
     #     plugin :remove_invalid
     module RemoveInvalid
@@ -9,9 +10,9 @@ class Shrine
         def validate
           super
         ensure
-          if errors.any? && cache.uploaded?(get)
+          if errors.any? && cached?
             _delete(get, action: :validate)
-            _set(nil)
+            _set(@old)
           end
         end
       end

data/lib/shrine/storage/file_system.rb

@@ -1,5 +1,3 @@
-require "down"
-
 require "fileutils"
 require "pathname"
 
@@ -48,7 +46,7 @@ class Shrine
     # the following in a periodic Rake task:
     #
     #     file_system = Shrine.storages[:cache]
-    #     file_system.clear!(older_than: 1.week.ago) # adjust the time
+    #     file_system.clear!(older_than: Time.now - 7*24*60*60) # delete files older than 1 week
     #
     # ## Permissions
     #
@@ -122,11 +120,6 @@ class Shrine
         path(id).chmod(permissions) if permissions
       end
 
-      # Downloads the file from the given location, and returns a `Tempfile`.
-      def download(id)
-        open(id) { |file| Down.copy_to_tempfile(id, file) }
-      end
-
       # Moves the file to the given location. This gets called by the `moving`
       # plugin.
       def move(io, id, shrine_metadata: {}, **upload_options)
@@ -189,6 +182,17 @@ class Shrine
         end
       end
 
+      # Catches the deprecated `#download` method.
+      def method_missing(name, *args)
+        if name == :download
+          warn "Shrine::Storage::FileSystem#download is deprecated and will be removed in Shrine 3."
+          require "down"
+          open(id) { |file| Down.copy_to_tempfile(id, file) }
+        else
+          super
+        end
+      end
+
       protected
 
       # Returns the full path to the file.

data/lib/shrine/version.rb

@@ -6,7 +6,7 @@ class Shrine
   module VERSION
     MAJOR = 2
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down