asset_cloud 2.7.1 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b202062a28470fab35e4aadafe3600f7944d2cb075d0076274acfd72dd93a6e
-  data.tar.gz: ad42d5f81dbe67cfde24248c3f8f8b2cb5d9bd1694be44d98546f234c8ef703b
+  metadata.gz: bed261dca11417616d233595b006d2bd53e3f19c542320d387d0edc2dc76182f
+  data.tar.gz: 8c19949270fd24f85ac239c15e063be7369679bb235adcd26f96d2f13590aec9
 SHA512:
-  metadata.gz: c22411e548811567b511d54b55b79591835721aefd3a34b89ab504871473a477eddbb0903e7c30292c2fefa0e7c51b54b0a94e8ae3081961b40bfb8a69287de4
-  data.tar.gz: 822630e44304e0e2507d01a9e162898bd0c053ade3eabe785c625e407216c7a54166087c270f5166c63261cc98757664c201a6472cb474034b5c7a3af389679f
+  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

@@ -3,25 +3,39 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     name: Ruby ${{ matrix.ruby }}
     strategy:
+      fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7"]
+        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
 
-    - name: RuboCop
-      run: bundle exec rubocop || true # until we fix offenses due to outdated config
-
     - name: Tests
       run: bundle exec rspec
+
+  lint:
+    runs-on: ubuntu-latest
+    name: RuboCop
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+      with:
+        bundler-cache: true
+
+    - name: RuboCop
+      run: bundle exec rubocop

data/.github/workflows/cla.yml

@@ -0,0 +1,22 @@
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request 
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      ) 
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}

data/.gitignore

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

data/.rubocop.yml

@@ -1,3 +1,2 @@
 inherit_gem:
   rubocop-shopify: rubocop.yml
-inherit_from: .rubocop_todo.yml

data/.ruby-version

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

data/Gemfile

@@ -1,6 +1,8 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
-gem 'aws-sdk-s3', '>= 1.60.2', require: false
-gem 'google-cloud-storage'
+source "https://rubygems.org"
+
+gem "aws-sdk-s3", ">= 1.60.2", require: false
+gem "google-cloud-storage"
 
 gemspec

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,14 @@
 # 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)
+
 ## Version 2.7.1, 2022-03-18
 
 * Fix incorrect invocation of callbacks defined in external classes (https://github.com/Shopify/asset_cloud/issues/71)

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/Rakefile

@@ -1,28 +1,30 @@
-require 'bundler/gem_tasks'
-require 'rspec'
+# frozen_string_literal: true
 
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
+require "bundler/gem_tasks"
+require "rspec"
 
-desc 'Default: run unit tests and style checks.'
+require "rake"
+require "rake/testtask"
+require "rdoc/task"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
+
+desc "Default: run unit tests and style checks."
 task default: [:spec, :rubocop]
 
 desc "Run all spec examples"
 RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.rspec_opts = ['--color']
+  t.pattern = "spec/**/*_spec.rb"
+  t.rspec_opts = ["--color"]
 end
 
-desc 'Generate documentation for the asset_cloud plugin.'
+desc "Generate documentation for the asset_cloud plugin."
 Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'AssetCloud'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "AssetCloud"
+  rdoc.options << "--line-numbers" << "--inline-source"
+  rdoc.rdoc_files.include("README")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 RuboCop::RakeTask.new

data/asset_cloud.gemspec

@@ -1,29 +1,30 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
+require "English"
 Gem::Specification.new do |s|
-  s.name = %q{asset_cloud}
-  s.version = "2.7.1"
+  s.name = "asset_cloud"
+  s.version = "2.7.3"
 
-  s.authors = %w(Shopify)
-  s.summary = %q{An abstraction layer around arbitrary and diverse asset stores.}
-  s.description = %q{An abstraction layer around arbitrary and diverse asset stores.}
+  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 = %q{developers@shopify.com}
-  s.homepage = %q{http://github.com/Shopify/asset_cloud}
-  s.require_paths = %w(lib)
+  s.email = "developers@shopify.com"
+  s.homepage = "http://github.com/Shopify/asset_cloud"
+  s.require_paths = ["lib"]
 
-  s.files = `git ls-files`.split($/)
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.files = %x(git ls-files).split($INPUT_RECORD_SEPARATOR)
 
-  s.add_dependency 'activesupport'
+  s.add_dependency("activesupport")
 
-  s.metadata['allowed_push_host'] = "https://rubygems.org"
+  s.metadata["allowed_push_host"] = "https://rubygems.org"
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'pry-byebug'
-  s.add_development_dependency 'rubocop-shopify'
+  s.add_development_dependency("pry")
+  s.add_development_dependency("pry-byebug")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rspec")
+  s.add_development_dependency("rubocop-shopify")
 end

data/dev.yml

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

data/lib/asset_cloud/asset.rb

@@ -1,5 +1,6 @@
-module AssetCloud
+# frozen_string_literal: true
 
+module AssetCloud
   class AssetError < StandardError
   end
 
@@ -8,8 +9,9 @@ module AssetCloud
 
   class Asset
     include Comparable
-    attr_accessor :key, :value, :cloud, :metadata, :new_asset
+    attr_accessor :key, :cloud, :new_asset
     attr_reader   :extensions
+    attr_writer   :value, :metadata
 
     def initialize(cloud, key, value = nil, metadata = Metadata.non_existing)
       @new_asset = true
@@ -27,10 +29,12 @@ module AssetCloud
       yield self if block_given?
     end
 
-    def self.at(cloud, key, value = nil, metadata = nil, &block)
-      file = self.new(cloud, key, value, metadata,  &block)
-      file.new_asset = false
-      file
+    class << self
+      def at(cloud, key, value = nil, metadata = nil, &block)
+        file = new(cloud, key, value, metadata, &block)
+        file.new_asset = false
+        file
+      end
     end
 
     def <=>(other)
@@ -42,11 +46,11 @@ module AssetCloud
     end
 
     def relative_key
-      @key.split("/",2).last
+      @key.split("/", 2).last
     end
 
     def relative_key_without_ext
-      relative_key.gsub(/\.[^.]+$/,"")
+      relative_key.gsub(/\.[^.]+$/, "")
     end
 
     def dirname
@@ -58,7 +62,7 @@ module AssetCloud
     end
 
     def format
-      extname.sub('.', '')
+      extname.sub(".", "")
     end
 
     def basename
@@ -122,7 +126,7 @@ module AssetCloud
     end
 
     def store!
-      store or raise(AssetNotSaved, "Validation failed: #{errors.join(', ')}")
+      store || raise(AssetNotSaved, "Validation failed: #{errors.join(", ")}")
     end
 
     def to_param
@@ -134,11 +138,11 @@ module AssetCloud
     end
 
     def url(options = {})
-      cloud.url_for key, options
+      cloud.url_for(key, options)
     end
 
     def bucket_name
-      @key.split('/').first
+      @key.split("/").first
     end
 
     def bucket
@@ -169,7 +173,7 @@ module AssetCloud
     end
 
     def method_missing(method, *args)
-      if extension = @extensions.find { |e| e.respond_to?(method) }
+      if (extension = @extensions.find { |e| e.respond_to?(method) })
         extension.public_send(method, *args)
       else
         super

data/lib/asset_cloud/asset_extension.rb

@@ -1,9 +1,17 @@
+# frozen_string_literal: true
+
 module AssetCloud
   class AssetExtension
     class AssetMismatch < StandardError
     end
-    def store; true; end
-    def delete; true; end
+
+    def store
+      true
+    end
+
+    def delete
+      true
+    end
 
     include AssetCloud::Callbacks
     include AssetCloud::Validations
@@ -11,31 +19,35 @@ module AssetCloud
     callback_methods :store, :delete, :validate
 
     attr_reader :asset
-    delegate :add_error, :to => :asset
+
+    delegate :add_error, to: :asset
 
     class_attribute :extnames
 
-    def self.applies_to(*args)
-      extnames = args.map do |arg|
-        arg = arg.to_s.downcase
-        arg = ".#{arg}" unless arg.starts_with?('.')
-        arg
+    class << self
+      def applies_to(*args)
+        extnames = args.map do |arg|
+          arg = arg.to_s.downcase
+          arg = ".#{arg}" unless arg.starts_with?(".")
+          arg
+        end
+        self.extnames = extnames
       end
-      self.extnames = extnames
-    end
 
-    def self.applies_to_asset?(asset)
-      extnames = self.extnames || []
-      extnames.each do |extname|
-        return true if asset.key.downcase.ends_with?(extname)
+      def applies_to_asset?(asset)
+        extnames = self.extnames || []
+        extnames.each do |extname|
+          return true if asset.key.downcase.ends_with?(extname)
+        end
+        false
       end
-      false
     end
 
     def initialize(asset)
       unless self.class.applies_to_asset?(asset)
         raise AssetMismatch, "Instances of #{self.class.name} cannot be applied to asset #{asset.key.inspect}"
       end
+
       @asset = asset
     end
   end