asset_cloud 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 893b7f80adf628a9de0991dce7f9febe75c5a72766dc30c2493d9d38c6f229c0
-  data.tar.gz: 668804b41b67252ef633ad568d2faeb79499fd97817b12686e4c0b8344a8aec1
+  metadata.gz: b8da870cd7f0377f18b1ae46d7a4e8e69c2e4549f224e28df123f565d9e454d3
+  data.tar.gz: 190fea72f1ef76ffa7aad5931324be4cfc172903f41826a1485c2e859fae50dc
 SHA512:
-  metadata.gz: c25c855f466f47cfbc425f603e43c1e29d12398c24d65fd75be116c3bbf7f71127637c30092e077133c514404f9bfe3ed9af56baacf2044407076f99dcb83195
-  data.tar.gz: 1e22a454de1001f1c696d5880134a4a91bf5abd33fe3490d6202fc0e2d698d6a2c1314c3bfb2019924a0e6a90c39bf622f9bfca9818a6f1f4cca692759443d02
+  metadata.gz: fb1dff12c4fb90328182f23c96daf17f3f9fddbc13c42dd569b0855545c4be0621aa8bd218c43fc57eb44716f27026e1ca703fea67cd214231ee654853decca6
+  data.tar.gz: e29ebc045b6eeac9705f5f758aca3fce768c6e9f8085ecc0502cbdecf1037621b504ab0c3c175f61e8faa912d16d5abef16f79c90941c02bbce865e8cc50cae1

data/asset_cloud.gemspec

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

data/lib/asset_cloud/callbacks.rb

@@ -3,6 +3,17 @@ module AssetCloud
     extend ActiveSupport::Concern
 
     module ClassMethods
+      attr_writer :_callbacks
+
+      def inherited(child)
+        super if defined? super
+        child._callbacks = _callbacks.deep_dup.freeze
+      end
+
+      def _callbacks
+        @_callbacks ||= {}.freeze
+      end
+
       def callback_methods(*symbols)
         symbols.each do |method|
           define_callbacks(method)
@@ -23,12 +34,14 @@ module AssetCloud
 
         define_singleton_method(before) do |*callbacks, &block|
           callbacks << block if block_given?
-          write_inheritable_array(before, callbacks)
+          callbacks = (_callbacks[before] || []) + callbacks
+          self._callbacks = _callbacks.merge(before => callbacks).freeze
         end
 
         define_singleton_method(after) do |*callbacks, &block|
           callbacks << block if block_given?
-          write_inheritable_array(after, callbacks)
+          callbacks = (_callbacks[after] || []) + callbacks
+          self._callbacks = _callbacks.merge(after => callbacks).freeze
         end
       end
 
@@ -49,7 +62,7 @@ module AssetCloud
 
         result = case callback
         when Symbol
-          self.send(callback, *args)
+          send(callback, *args)
         when Proc, Method
           callback.call(self, *args)
         else
@@ -65,7 +78,7 @@ module AssetCloud
     end
 
     def callbacks_for(symbol)
-      self.class.send(symbol) || []
+      self.class._callbacks[symbol] || []
     end
   end
 end

data/lib/asset_cloud/validations.rb

@@ -14,9 +14,12 @@ module AssetCloud
     end
 
     module ClassMethods
-      def validate(*validations, &block)
+      def validate(*extra_validations, &block)
+        validations = self._callbacks[:validate] || []
+        validations += extra_validations
         validations << block if block_given?
-        write_inheritable_array(:validate, validations)
+
+        self._callbacks = _callbacks.merge(validate: validations.freeze).freeze
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset_cloud
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport