asset_cloud 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1331f148d5e428464e3d7f539963c1c2651f528656a3c8ef0266d6aa299379c
-  data.tar.gz: 7f62fa26ae75e6e630aee982c08067cfbf38e1e6e3e49cd9afc99a33505825c3
+  metadata.gz: 2e767cf7119375ff7308f312b510f99cd89705e1d44ae556e89853bc8f55f2dd
+  data.tar.gz: 285705891684bc782af8326be994698a9282a4abf19d24df0759cc9a53461752
 SHA512:
-  metadata.gz: 03aca7a78234bbb51998cad8a0740e7f7ae2d0a14a2b3dc32ed9317bea003cf1e684845c56ae1554e90e2cf7d4f6ba64dbabdf63b1b90f2e85f7a8186b27c7d1
-  data.tar.gz: 7284d30086ea786bdc0b1a18fe6a8a27ea829bedacded167244d21a7334926aa8d444202ad594c98f0c8ed2cb7c998b7c9725fcf4ab4519008970865146908e0
+  metadata.gz: b10838d5eb09a7efcb7a09ecbdc0ac63e879b233e6208a28aefde0faa811f53464eafb944aaf46bc8f71de3115cdade371bcd8516ad09e18162b8bfe2e383eb7
+  data.tar.gz: 738c8e086da574cfe5200b19da555a765cf482c8df341eb6168ee3864f08a42a211844f340177fda5aa34573473552d764063e7df6510a11ae0b2d66c8aa5cfe

data/asset_cloud.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asset_cloud}
-  s.version = "2.2.8"
+  s.version = "2.2.9"
 
   s.authors = %w(Shopify)
   s.summary = %q{An abstraction layer around arbitrary and diverse asset stores.}

data/lib/asset_cloud.rb

@@ -41,8 +41,8 @@ AssetCloud::Asset.class_eval do
   validate :valid_key
 
   def execute_callbacks(symbol, args)
-    super
-    @extensions.each {|ext| ext.execute_callbacks(symbol, args)}
+    result = super
+    result && @extensions.all? { |ext| ext.execute_callbacks(symbol, args) }
   end
 
   protected

data/lib/asset_cloud/callbacks.rb

@@ -27,7 +27,7 @@ module AssetCloud
           result = nil
           if execute_callbacks(before, args)
             result = super(*args, &block)
-            execute_callbacks(after, args)
+            execute_callbacks(after, args) if result
           end
           result
         end

data/spec/callbacks_spec.rb

@@ -2,15 +2,20 @@ require 'spec_helper'
 
 class CallbackAsset < AssetCloud::Asset
   before_store :callback_before_store
+  before_delete :callback_before_delete
   after_delete :callback_after_delete
   before_validate :make_value_valid
   after_validate :add_spice
   validate :valid_value
 
   private
+
+  def callback_before_delete(*args); end
+
   def make_value_valid
     self.value = 'valid'
   end
+
   def add_spice
     self.value += ' spice'
   end
@@ -32,6 +37,9 @@ class CallbackCloud < AssetCloud::Base
 
   after_write :callback_after_write
   before_write :callback_before_write
+
+  def callback_before_write(*args); end
+  def callback_after_write(*args); end
 end
 
 class MethodRecordingCloud < AssetCloud::Base
@@ -48,21 +56,34 @@ class MethodRecordingCloud < AssetCloud::Base
 end
 
 describe CallbackCloud do
-  before { @fs = CallbackCloud.new(File.dirname(__FILE__) + '/files', 'http://assets/') }
+  before do
+    @fs = CallbackCloud.new(File.dirname(__FILE__) + '/files', 'http://assets/')
+    @fs.write('tmp/file.txt', 'foo')
+  end
 
   it "should invoke callbacks after store" do
     @fs.should_receive(:callback_before_write).with('tmp/file.txt', 'text').and_return(true)
     @fs.should_receive(:callback_after_write).with('tmp/file.txt', 'text').and_return(true)
 
 
-    @fs.write 'tmp/file.txt', 'text'
+    @fs.write('tmp/file.txt', 'text').should == true
+    @fs.read('tmp/file.txt').should == 'text'
   end
 
   it "should invoke callbacks after delete" do
     @fs.should_receive(:callback_before_delete).with('tmp/file.txt').and_return(true)
     @fs.should_receive(:callback_after_delete).with('tmp/file.txt').and_return(true)
 
-    @fs.delete 'tmp/file.txt'
+    @fs.delete('tmp/file.txt').should == 'foo'
+  end
+
+  it "should not invoke other callbacks when a before_ filter returns false" do
+    @fs.should_receive(:callback_before_delete)
+      .with('tmp/file.txt')
+      .and_return(false)
+    @fs.should_not_receive(:callback_after_delete)
+
+    @fs.delete('tmp/file.txt').should == nil
   end
 
   it "should invoke callbacks even when constructing a new asset" do
@@ -72,7 +93,7 @@ describe CallbackCloud do
 
     asset = @fs.build('tmp/file.txt')
     asset.value = 'hello'
-    asset.store
+    asset.store.should == true
   end
 end
 
@@ -113,6 +134,13 @@ describe CallbackAsset do
     @asset.should_not_receive(:callback_before_store)
     @asset.should_receive(:callback_after_delete).and_return(true)
 
-    @asset.delete
+    @asset.delete.should == 'bar'
+  end
+
+  it "not invoke other callbacks when a before_ filter returns false" do
+    @asset.should_receive(:callback_before_delete).and_return(false)
+    @asset.should_not_receive(:callback_after_delete)
+
+    @asset.delete.should == nil
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset_cloud
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport