asset_cloud 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 568dd22b66b6a00beacf0a8d099cad040bcddac422b3932b946573d823e67291
-  data.tar.gz: 8e97aa129cc5c6617722a6f5212ff51562cee437ba22476ceb63d7ad9dc62d25
+  metadata.gz: bed261dca11417616d233595b006d2bd53e3f19c542320d387d0edc2dc76182f
+  data.tar.gz: 8c19949270fd24f85ac239c15e063be7369679bb235adcd26f96d2f13590aec9
 SHA512:
-  metadata.gz: 3cde8568299bb0b63c31ce9affa4880bcc7aa1940a63d1541210289f25dc7766528846d110a9b00ae7d1a412bc5bb2e695294b4bff851fb7aa0cc090856ed2bb
-  data.tar.gz: 821d7f7f2fe4c37df691d52b40217168638ff2d2d5cc3ee2dd056ec231e30f44584b1dbd538dc98d167d07d1a29ac0948bbde798d1b7f1870324f593090ecf88
+  metadata.gz: 8eadac3515bc1efafa9e563a0596a74f84a2faa26234cc451ddd412935de975f5047b412149b0daeb9c93f0a733590fd244df983432fd68591aef7fb75d7bb34
+  data.tar.gz: f1ad4789ac383943515c389f1ec20b778c1bfcec7efe1cdab6970204646bace030bee8e22fef8c99bffe117b9559829db6bb56e4206d22933c05875b368f278d

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly

data/.github/workflows/ci.yml

@@ -9,14 +9,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "3.2"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
     steps:
 
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
@@ -30,12 +30,11 @@ jobs:
     steps:
 
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
       with:
-        ruby-version: '3.2'
         bundler-cache: true
 
     - name: RuboCop

data/.gitignore

@@ -1,6 +1,5 @@
 .bundle
 .DS_Store
-Gemfile.lock
 *.orig
 .dotest
 .rvmrc

data/.rubocop.yml

@@ -1,5 +1,2 @@
 inherit_gem:
   rubocop-shopify: rubocop.yml
-
-AllCops:
-  TargetRubyVersion: 2.5

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/Gemfile.lock

@@ -0,0 +1,180 @@
+PATH
+  remote: .
+  specs:
+    asset_cloud (2.7.3)
+      activesupport
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.922.0)
+    aws-sdk-core (3.193.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.80.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.148.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    declarative (0.0.20)
+    diff-lcs (1.5.1)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    drb (2.2.1)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    google-apis-core (0.14.1)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.20.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-apis-storage_v1 (0.37.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (2.1.1)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.51.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-core (~> 0.13)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (~> 0.37)
+      google-cloud-core (~> 1.6)
+      googleauth (~> 1.9)
+      mini_mime (~> 1.0)
+    googleauth (1.11.0)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    httpclient (2.8.3)
+    i18n (1.14.4)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.6.2)
+    json (2.7.2)
+    jwt (2.8.1)
+      base64
+    language_server-protocol (3.17.0.3)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    minitest (5.22.3)
+    multi_json (1.15.0)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
+    os (1.1.4)
+    parallel (1.24.0)
+    parser (3.3.1.0)
+      ast (~> 2.4.1)
+      racc
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
+    public_suffix (5.0.5)
+    racc (1.7.3)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.0)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.3.9)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.63.4)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-shopify (2.15.1)
+      rubocop (~> 1.51)
+    ruby-progressbar (1.13.0)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    trailblazer-option (0.1.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uber (0.1.0)
+    unicode-display_width (2.5.0)
+    uri (0.13.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  asset_cloud!
+  aws-sdk-s3 (>= 1.60.2)
+  google-cloud-storage
+  pry
+  pry-byebug
+  rake
+  rspec
+  rubocop-shopify
+
+BUNDLED WITH
+   2.5.9

data/History.md

@@ -1,5 +1,10 @@
 # Asset Cloud Version History
 
+## Version 2.7.3, 2025-07-31
+
+* Refactor AssetCloud::Callbacks.execute_callbacks to allow for subclassing
+* Fix usage of Procs with callback methods
+
 ## Version 2.7.2, 2023-04-20
 
 * Swap the order of operations for checking UUID and asset exist logic in free key locator (https://github.com/Shopify/asset_cloud/pull/83)

data/README.rdoc

@@ -1,5 +1,3 @@
-{<img src="https://travis-ci.org/Shopify/asset_cloud.png?branch=master" alt="Build Status" />}[https://travis-ci.org/Shopify/asset_cloud]
-
 = AssetCloud
 
 An abstraction layer around arbitrary and diverse asset stores.
@@ -43,4 +41,4 @@ Note that the automatic process does not create a new {release}[https://github.c
 
 == Copyright
 
-Copyright (c) 2008-2014 Tobias Lütke & Shopify, Inc. Released under the MIT license (see LICENSE for details).
+Copyright (c) 2008-2025 Tobias Lütke & Shopify, Inc. Released under the MIT license (see LICENSE for details).

data/asset_cloud.gemspec

@@ -4,13 +4,13 @@
 require "English"
 Gem::Specification.new do |s|
   s.name = "asset_cloud"
-  s.version = "2.7.2"
+  s.version = "2.7.3"
 
   s.authors = ["Shopify"]
   s.summary = "An abstraction layer around arbitrary and diverse asset stores."
   s.description = "An abstraction layer around arbitrary and diverse asset stores."
 
-  s.required_ruby_version = ">= 2.5.0"
+  s.required_ruby_version = ">= 3.0.0"
 
   s.email = "developers@shopify.com"
   s.homepage = "http://github.com/Shopify/asset_cloud"

data/dev.yml

@@ -1,8 +1,7 @@
 name: asset-cloud
 
 up:
-  - ruby:
-      version: 3.2.2
+  - ruby
   - bundler
 
 commands:

data/lib/asset_cloud/callbacks.rb

@@ -35,13 +35,13 @@ module AssetCloud
         end
 
         define_singleton_method(before) do |*callbacks, &block|
-          callbacks << block if block_given?
+          callbacks << block unless block.nil?
           callbacks = (_callbacks[before] || []) + callbacks
           self._callbacks = _callbacks.merge(before => callbacks).freeze
         end
 
         define_singleton_method(after) do |*callbacks, &block|
-          callbacks << block if block_given?
+          callbacks << block unless block.nil?
           callbacks = (_callbacks[after] || []) + callbacks
           self._callbacks = _callbacks.merge(after => callbacks).freeze
         end
@@ -61,26 +61,30 @@ module AssetCloud
 
     def execute_callbacks(symbol, args)
       callbacks_for(symbol).each do |callback|
-        result = case callback
-        when Symbol
-          send(callback, *args)
-        when Proc, Method
-          callback.call(self, *args)
-        else
-          if callback.respond_to?(symbol)
-            callback.send(symbol, self, *args)
-          else
-            raise StandardError,
-              "Callbacks must be a symbol denoting the method to call, " \
-                "a string to be evaluated, a block to be invoked, " \
-                "or an object responding to the callback method."
-          end
-        end
+        result = execute_callback(symbol, callback, args)
         return false if result == false
       end
       true
     end
 
+    def execute_callback(symbol, callback, args)
+      case callback
+      when Symbol
+        send(callback, *args)
+      when Proc, Method
+        callback.call(self, *args)
+      else
+        if callback.respond_to?(symbol)
+          callback.send(symbol, self, *args)
+        else
+          raise StandardError,
+            "Callbacks must be a symbol denoting the method to call, " \
+              "a string to be evaluated, a block to be invoked, " \
+              "or an object responding to the callback method."
+        end
+      end
+    end
+
     def callbacks_for(symbol)
       self.class._callbacks[symbol] || []
     end

data/lib/asset_cloud.rb

@@ -32,7 +32,7 @@ require "asset_cloud/asset_extension"
 AssetCloud::Base.class_eval do
   include AssetCloud::FreeKeyLocator
   include AssetCloud::Callbacks
-  callback_methods :create, :update, :write, :delete
+  callback_methods :write, :delete
 end
 
 AssetCloud::Asset.class_eval do

data/spec/callbacks_spec.rb

@@ -16,8 +16,14 @@ class CallbackAsset < AssetCloud::Asset
   after_validate :add_spice
   validate :valid_value
 
+  before_validate(&:proc_executed_before)
+  after_validate(&:proc_executed_after)
+
   after_store ::AfterStoreCallback
 
+  def proc_executed_before(*args); end
+  def proc_executed_after(*args); end
+
   private
 
   def callback_before_delete(*args); end
@@ -139,6 +145,24 @@ describe CallbackAsset do
     expect(@asset.value).to(eq("valid spice"))
   end
 
+  it "should run before_validate with procs" do
+    expect(@asset).to(receive(:callback_before_store).and_return(true))
+    expect(@asset).to(receive(:proc_executed_before))
+
+    @asset.value = "foo"
+
+    expect(@asset.store).to(eq(true))
+  end
+
+  it "should run after_validate with procs" do
+    expect(@asset).to(receive(:callback_before_store).and_return(true))
+    expect(@asset).to(receive(:proc_executed_after))
+
+    @asset.value = "foo"
+
+    expect(@asset.store).to(eq(true))
+  end
+
   it "should run its after_delete callback after delete is called" do
     expect(@asset).not_to(receive(:callback_before_store))
     expect(@asset).to(receive(:callback_after_delete).and_return(true))

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: asset_cloud
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Shopify
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,11 +99,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - History.md
 - LICENSE
 - README.rdoc
@@ -156,7 +158,6 @@ homepage: http://github.com/Shopify/asset_cloud
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -164,15 +165,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An abstraction layer around arbitrary and diverse asset stores.
 test_files: []