shrine 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a38bb3cd054c90665a75f94355bdb28ae598591
-  data.tar.gz: eda94865fdc8f5fbcdff3464015a77e5d8bcfd45
+  metadata.gz: 0c096588cbb135f27c0646661a10884af2d130aa
+  data.tar.gz: cb699c483ecd3e9309dbdcbddfd1c7fb919664b8
 SHA512:
-  metadata.gz: 9160317e038ce1e401b716e49a812ef513ad3ff1cd9cc1a6663b71c3523f948db79c126e187615067e8af8f2436f495c5de3308a41cd27091ba3057dbc8c9e8a
-  data.tar.gz: da114a5953c31b3868f1bbb31e385b572919cb8ca854ecb1601b5c85a90336b7629628230a5b1c287c6f1b303ac17105b18ff6ad7660bf10fa33fd471f2c3d67
+  metadata.gz: 62d92df4fb94a72f6f6f4e31331ac50b116f0536da7594240d517bb9fa7553cc73e3ff53221b4dc68dbe95fb67e957f6ca34d7f62abb0034889fbfb09498e011
+  data.tar.gz: f01073235dce4eaa882c5b419e162bcfe1ef327754978ae55a6f47b0c7687c4331d9143485dd32696729f83e8087c56e60c9c3c584128416f322efa158c7393b

data/lib/shrine/plugins/activerecord.rb

@@ -23,12 +23,10 @@ class Shrine
     #
     # Also note that if your tests are wrapped in transactions, the
     # `after_commit` callbacks won't get called, so in order to test uploading
-    # you should first disable these transactions for those tests.
+    # you should first disable transactions for those tests.
     #
     # 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.
+    # see the backgrounding plugin.
     #
     # Additionally, any Shrine validation errors will be added to
     # ActiveRecord's errors upon validation. If you want to validate presence
@@ -85,8 +83,6 @@ class Shrine
             record.save(validate: false)
           end
         rescue ::ActiveRecord::RecordNotFound
-        rescue ::ActiveRecord::StaleObjectError
-          retry
         end
       end
     end

data/lib/shrine/plugins/sequel.rb

@@ -16,10 +16,9 @@ class Shrine
     # * `after_commit` -- Promotes the attachment, deletes replaced ones.
     # * `after_destroy_commit` -- Deletes the attachment.
     #
-    # Note that if your tests are wrapped in transactions, for testing
-    # attachments you should set `Sequel::Model.use_transactions` to `false`,
-    # so that `after_commit` and `after_destroy_commit` callbacks get properly
-    # called.
+    # Also note that if your tests are wrapped in transactions, the
+    # `after_commit` callbacks won't get called, so in order to test uploading
+    # you should first disable transactions for those tests.
     #
     # If you want to put some parts of this lifecycle into a background job,
     # see the backgrounding plugin.
@@ -76,10 +75,13 @@ class Shrine
         # Updates the current attachment with the new one, unless the current
         # attachment has changed.
         def update(uploaded_file)
-          record.instance_filter(:"#{name}_data" => record.send("#{name}_data"))
-          record.send("#{name}_data=", uploaded_file.to_json)
-          record.save(validate: false)
+          if record.send("#{name}_data") == record.reload.send("#{name}_data")
+            record.send("#{name}_data=", uploaded_file.to_json)
+            record.save(validate: false)
+          end
         rescue ::Sequel::NoExistingObject
+        rescue ::Sequel::Error => error
+          raise unless error.message == "Record not found" # prior to version 4.28
         end
 
         # Support for Postgres JSON columns.

data/lib/shrine/version.rb

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