shrine 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd828e546e0d244ed304996054f0bd01b790800d
-  data.tar.gz: 46f44feb2075dd6d8001e990199acd99deae4223
+  metadata.gz: 8a38bb3cd054c90665a75f94355bdb28ae598591
+  data.tar.gz: eda94865fdc8f5fbcdff3464015a77e5d8bcfd45
 SHA512:
-  metadata.gz: a2f0a33b73fb8a012b0e8036c6e1c62b2ad661ec38af4f16b72e80f3f7a39d9f42273232f5fd718f20330848c4db09b65f4f5fa28ca754bdaa31a56b32801fde
-  data.tar.gz: c3e3791da4e71e600b0c973edc27a6f40145dffedbc8e0b2c835415d25990caed5d5f651f77091a4f12a7fdef26452a2ad53f20158486f0f486a1743470e5943
+  metadata.gz: 9160317e038ce1e401b716e49a812ef513ad3ff1cd9cc1a6663b71c3523f948db79c126e187615067e8af8f2436f495c5de3308a41cd27091ba3057dbc8c9e8a
+  data.tar.gz: da114a5953c31b3868f1bbb31e385b572919cb8ca854ecb1601b5c85a90336b7629628230a5b1c287c6f1b303ac17105b18ff6ad7660bf10fa33fd471f2c3d67

data/doc/creating_storages.md

@@ -111,6 +111,9 @@ class Shrine
 end
 ```
 
+You should also yield the total filesize as the second argument, so that
+download_endpoint can set `Content-Length` before it starts streaming.
+
 ## Moving
 
 If your storage can move files, you can add 2 additional methods, and they will

data/lib/shrine/plugins/activerecord.rb

@@ -25,8 +25,10 @@ class Shrine
     # `after_commit` callbacks won't get called, so in order to test uploading
     # you should first disable these transactions for those tests.
     #
-    # If you want to put some parts of this lifecycle into a background job, see
-    # the backgrounding plugin.
+    # If you want to put some parts of this lifecycle into a background job,
+    # see the backgrounding plugin. In that case you might want to use
+    # ActiveRecord's [optimistic locking] to eliminate the chance of race
+    # conditions.
     #
     # Additionally, any Shrine validation errors will be added to
     # ActiveRecord's errors upon validation. If you want to validate presence
@@ -36,6 +38,8 @@ class Shrine
     #       include ImageUploader[:avatar]
     #       validates_presence_of :avatar
     #     end
+    #
+    # [optimistic locking]: http://api.rubyonrails.org/classes/ActiveRecord/Locking/Optimistic.html
     module Activerecord
       module AttachmentMethods
         def included(model)
@@ -76,11 +80,13 @@ class Shrine
         # Updates the current attachment with the new one, unless the current
         # attachment has changed.
         def update(uploaded_file)
-          record.class.where(record.class.primary_key => record.id)
-            .where(:"#{name}_data" => record.send(:"#{name}_data"))
-            .update_all(:"#{name}_data" => uploaded_file.to_json)
-          record.reload
+          if record.send("#{name}_data") == record.reload.send("#{name}_data")
+            record.send("#{name}_data=", uploaded_file.to_json)
+            record.save(validate: false)
+          end
         rescue ::ActiveRecord::RecordNotFound
+        rescue ::ActiveRecord::StaleObjectError
+          retry
         end
       end
     end

data/lib/shrine/plugins/download_endpoint.rb

@@ -3,9 +3,9 @@ require "roda"
 class Shrine
   module Plugins
     # The download_endpoint plugin provides a [Roda] endpoint for downloading
-    # uploaded files from specified storages. This is useful when files from
-    # your storages aren't accessible over URL (e.g. database storages) or if
-    # you want to authenticate your downloads.
+    # uploaded files from specified storages. This can be useful when files
+    # from your storages aren't accessible over URL (e.g. database storages) or
+    # if you want to authenticate your downloads.
     #
     #     plugin :download_endpoint, storages: [:store], prefix: "attachments"
     #
@@ -21,7 +21,7 @@ class Shrine
     # to the endpoint for specified storages, so it's not needed to change the
     # code:
     #
-    #     user.avatar_url #=> "/attachments/store/sdg0lsf8.jpg"
+    #     user.avatar.url #=> "/attachments/store/sdg0lsf8.jpg"
     #
     # :storages
     # :  An array of storage keys which the download endpoint should be used for.

data/lib/shrine/plugins/sequel.rb

@@ -1,5 +1,7 @@
 require "sequel"
 
+Sequel::Model.plugin :instance_filters
+
 class Shrine
   module Plugins
     # The sequel plugin extends the "attachment" interface with support for
@@ -19,8 +21,8 @@ class Shrine
     # so that `after_commit` and `after_destroy_commit` callbacks get properly
     # called.
     #
-    # If you want to put some parts of this lifecycle into a background job, see
-    # the backgrounding plugin.
+    # If you want to put some parts of this lifecycle into a background job,
+    # see the backgrounding plugin.
     #
     # Additionally, any Shrine validation errors will added to Sequel's
     # errors upon validation. Note that if you want to validate presence of the
@@ -74,11 +76,10 @@ class Shrine
         # Updates the current attachment with the new one, unless the current
         # attachment has changed.
         def update(uploaded_file)
-          record.this
-            .where(:"#{name}_data" => record.send(:"#{name}_data"))
-            .update(:"#{name}_data" => uploaded_file.to_json)
-          record.reload
-        rescue ::Sequel::Error
+          record.instance_filter(:"#{name}_data" => record.send("#{name}_data"))
+          record.send("#{name}_data=", uploaded_file.to_json)
+          record.save(validate: false)
+        rescue ::Sequel::NoExistingObject
         end
 
         # Support for Postgres JSON columns.

data/lib/shrine/plugins/versions.rb

@@ -44,7 +44,7 @@ class Shrine
     #     user.avatar[:medium].width #=> 500
     #     user.avatar[:small].width  #=> 300
     #
-    # You probably want to load the `delete_uploaded` plugin to automatically
+    # You probably want to load the delete_raw plugin to automatically
     # delete processed files after they have been uploaded.
     #
     # The plugin also extends the `avatar_url` method to accept versions:

data/lib/shrine/storage/linter.rb

@@ -95,6 +95,7 @@ class Shrine
 
         if Array(streamed.first).size == 2
           error :stream, "yielded content length isn't a number" if !content_length.is_a?(Integer)
+          error :stream, "yielded chunks don't sum up to given content length" if content_length != chunks.inject("", :+).length
         end
       end
 

data/lib/shrine/version.rb

@@ -6,7 +6,7 @@ class Shrine
   module VERSION
     MAJOR = 1
     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: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down