asset_cloud 2.7.0 → 2.7.2

data/spec/memory_bucket_spec.rb

@@ -1,25 +1,26 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 class MemoryCloud < AssetCloud::Base
   bucket :memory, AssetCloud::MemoryBucket
 end
 
 describe AssetCloud::MemoryBucket do
-  directory = File.dirname(__FILE__) + '/files'
+  directory = File.dirname(__FILE__) + "/files"
 
   before do
-    @fs = MemoryCloud.new(directory, 'http://assets/files')
+    @fs = MemoryCloud.new(directory, "http://assets/files")
   end
 
-  describe 'modifying items in subfolder' do
+  describe "modifying items in subfolder" do
     it "should return nil when file does not exist" do
-      expect(@fs['memory/essay.txt'].exist?).to(eq(false))
+      expect(@fs["memory/essay.txt"].exist?).to(eq(false))
     end
 
     it "should return set content when asked for the same file" do
-      @fs['memory/essay.txt'] = 'text'
-      expect(@fs['memory/essay.txt'].value).to(eq('text'))
+      @fs["memory/essay.txt"] = "text"
+      expect(@fs["memory/essay.txt"].value).to(eq("text"))
     end
   end
 
@@ -29,15 +30,15 @@ describe AssetCloud::MemoryBucket do
     end
   end
 
-  describe '#ls' do
+  describe "#ls" do
     before do
-      %w{a b}.each do |letter|
-        2.times { |number| @fs.write("memory/#{letter}#{number}", '.') }
+      ["a", "b"].each do |letter|
+        2.times { |number| @fs.write("memory/#{letter}#{number}", ".") }
       end
     end
 
     it "should return a list of assets which start with the given prefix" do
-      expect(@fs.buckets[:memory].ls('memory/a').size).to(eq(2))
+      expect(@fs.buckets[:memory].ls("memory/a").size).to(eq(2))
     end
 
     it "should return a list of all assets when a prefix is not given" do

data/spec/mock_s3_interface.rb

@@ -1,10 +1,17 @@
 # frozen_string_literal: true
-require 'ostruct'
+
+require "ostruct"
 
 class MockS3Interface
-  VALID_ACLS = %w(
-    private public-read public-read-write authenticated-read aws-exec-read bucket-owner-read bucket-owner-full-control
-  )
+  VALID_ACLS = [
+    "private",
+    "public-read",
+    "public-read-write",
+    "authenticated-read",
+    "aws-exec-read",
+    "bucket-owner-read",
+    "bucket-owner-full-control",
+  ]
 
   attr_reader :bucket_storage
 
@@ -39,6 +46,7 @@ class MockS3Interface
 
   class Bucket
     attr_reader :name, :client
+
     def initialize(client, name)
       @client = client
       @name = name
@@ -62,7 +70,7 @@ class MockS3Interface
         raise "Invalid ACL `#{options[:acl].inspect}`, must be one of: #{VALID_ACLS.inspect}"
       end
 
-      options[:body] = options[:body].force_encoding(Encoding::BINARY)
+      options[:body] = options[:body].dup.force_encoding(Encoding::BINARY)
 
       key = options.delete(:key)
 
@@ -81,6 +89,7 @@ class MockS3Interface
 
   class NullS3Object
     attr_reader :key
+
     def initialize(bucket, key)
       @bucket = bucket
       @key = key
@@ -101,6 +110,8 @@ class MockS3Interface
   class S3Object
     attr_reader :key, :options
 
+    GottenObject = Struct.new(:body, keyword_init: true)
+
     def initialize(bucket, key, options = {})
       @bucket = bucket
       @key = key
@@ -113,7 +124,7 @@ class MockS3Interface
     end
 
     def get(*)
-      OpenStruct.new(options)
+      GottenObject.new(**options)
     end
 
     def put(options = {})

data/spec/remote_s3_bucket_spec.rb

@@ -1,85 +1,88 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 class RemoteS3Cloud < AssetCloud::Base
   attr_accessor :s3_connection
+
   bucket :tmp, AssetCloud::S3Bucket
 
   def s3_bucket(_key)
-    s3_connection.bucket(ENV['S3_BUCKET_NAME'])
+    s3_connection.bucket(ENV["S3_BUCKET_NAME"])
   end
 end
 
-describe 'Remote test for AssetCloud::S3Bucket', if: ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY'] && ENV['S3_BUCKET_NAME'] do
-  directory = File.dirname(__FILE__) + '/files'
+describe "Remote test for AssetCloud::S3Bucket",
+  if: ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"] && ENV["S3_BUCKET_NAME"] do
+  directory = File.dirname(__FILE__) + "/files"
 
   before(:all) do
     Aws.config = {
-      region: ENV.fetch('AWS_REGION', 'us-east-1'),
+      region: ENV.fetch("AWS_REGION", "us-east-1"),
       credentials: Aws::Credentials.new(
-        ENV['AWS_ACCESS_KEY_ID'],
-        ENV['AWS_SECRET_ACCESS_KEY'],
+        ENV["AWS_ACCESS_KEY_ID"],
+        ENV["AWS_SECRET_ACCESS_KEY"],
       ),
     }
 
-    @cloud = RemoteS3Cloud.new(directory, 'testing/assets/files')
+    @cloud = RemoteS3Cloud.new(directory, "testing/assets/files")
     @cloud.s3_connection = Aws::S3::Resource.new
     @bucket = @cloud.buckets[:tmp]
   end
 
   after(:all) do
-    listing = @bucket.ls('tmp')
+    listing = @bucket.ls("tmp")
     listing.each(&:delete)
   end
 
   it "#ls should return assets with proper keys" do
-    @cloud['tmp/test1.txt'] = 'test1'
-    @cloud['tmp/test2.txt'] = 'test2'
+    @cloud["tmp/test1.txt"] = "test1"
+    @cloud["tmp/test2.txt"] = "test2"
 
-    ls = @bucket.ls('tmp')
+    ls = @bucket.ls("tmp")
 
     expect(ls).to(all(be_an(AssetCloud::Asset)))
-    expect(ls.map(&:key) - ['tmp/test1.txt', 'tmp/test2.txt']).to(be_empty)
+    expect(ls.map(&:key) - ["tmp/test1.txt", "tmp/test2.txt"]).to(be_empty)
   end
 
   it "#ls returns all assets" do
-    @cloud['tmp/test1.txt'] = 'test1'
-    @cloud['tmp/test2.txt'] = 'test2'
+    @cloud["tmp/test1.txt"] = "test1"
+    @cloud["tmp/test2.txt"] = "test2"
 
     ls = @bucket.ls
 
     expect(ls).to(all(be_an(AssetCloud::Asset)))
-    expect(ls.map(&:key) - ['tmp/test1.txt', 'tmp/test2.txt']).to(be_empty)
+    expect(ls.map(&:key) - ["tmp/test1.txt", "tmp/test2.txt"]).to(be_empty)
   end
 
   it "#delete should ignore errors when deleting" do
-    @bucket.delete('tmp/a_file_that_should_not_exist.txt')
+    @bucket.delete("tmp/a_file_that_should_not_exist.txt")
   end
 
   it "#delete should always return true" do
-    @cloud['tmp/test1.txt'] = 'test1'
+    @cloud["tmp/test1.txt"] = "test1"
 
-    expect(@bucket.delete('tmp/test1.txt')).to(eq(true))
+    expect(@bucket.delete("tmp/test1.txt")).to(eq(true))
   end
 
   it "#stat should get metadata from S3" do
     start_time = Time.now
-    value = 'hello world'
-    @cloud.build('tmp/new_file.test', value).store
-    metadata = @bucket.stat('tmp/new_file.test')
+    value = "hello world"
+    @cloud.build("tmp/new_file.test", value).store
+    metadata = @bucket.stat("tmp/new_file.test")
     expect(metadata.size).to(eq(value.size))
     expect(metadata.updated_at).to(be >= start_time)
   end
 
   it "#stat a missing asset" do
-    metadata = @bucket.stat('i_do_not_exist_and_never_will.test')
+    metadata = @bucket.stat("i_do_not_exist_and_never_will.test")
     expect(metadata).to(be_an(AssetCloud::Metadata))
     expect(metadata.exist).to(be(false))
   end
 
   it "#read " do
-    value = 'hello world'
-    key = 'tmp/new_file.txt'
+    value = "hello world"
+    key = "tmp/new_file.txt"
     @bucket.write(key, value)
     data = @bucket.read(key)
     expect(data).to(eq(value))
@@ -90,11 +93,11 @@ describe 'Remote test for AssetCloud::S3Bucket', if: ENV['AWS_ACCESS_KEY_ID'] &&
   end
 
   it "#reads first bytes when passed options" do
-    value = 'hello world'
-    key = 'tmp/new_file.txt'
+    value = "hello world"
+    key = "tmp/new_file.txt"
     options = { range: 0...5 }
     @bucket.write(key, value)
     data = @bucket.read(key, options)
-    expect(data).to(eq('hello'))
+    expect(data).to(eq("hello"))
   end
 end

data/spec/s3_bucket_spec.rb

@@ -1,5 +1,7 @@
-require 'spec_helper'
-require 'mock_s3_interface'
+# frozen_string_literal: true
+
+require "spec_helper"
+require "mock_s3_interface"
 
 class S3Cloud < AssetCloud::Base
   bucket :tmp, AssetCloud::S3Bucket
@@ -11,19 +13,19 @@ class S3Cloud < AssetCloud::Base
 end
 
 describe AssetCloud::S3Bucket do
-  directory = File.dirname(__FILE__) + '/files'
+  directory = File.dirname(__FILE__) + "/files"
 
   before(:all) do
-    @cloud = S3Cloud.new(directory, 'http://assets/files')
-    @cloud.s3_connection = MockS3Interface.new('a', 'b')
-    @cloud.s3_bucket_name = 'asset-cloud-test'
+    @cloud = S3Cloud.new(directory, "http://assets/files")
+    @cloud.s3_connection = MockS3Interface.new("a", "b")
+    @cloud.s3_bucket_name = "asset-cloud-test"
 
     @bucket = @cloud.buckets[:tmp]
-    FileUtils.mkdir_p(directory + '/tmp')
+    FileUtils.mkdir_p(directory + "/tmp")
   end
 
   after(:each) do
-    FileUtils.rm_rf(directory + '/tmp')
+    FileUtils.rm_rf(directory + "/tmp")
   end
 
   it "#ls should return assets with proper keys" do
@@ -32,35 +34,35 @@ describe AssetCloud::S3Bucket do
     end
     expect_any_instance_of(MockS3Interface::Bucket).to(receive(:objects).and_return(collection))
 
-    ls = @bucket.ls('tmp')
+    ls = @bucket.ls("tmp")
 
     expect(ls).to(all(be_an(AssetCloud::Asset)))
-    expect(ls.map(&:key) - ['tmp/blah.gif', 'tmp/add_to_cart.gif']).to(be_empty)
+    expect(ls.map(&:key) - ["tmp/blah.gif", "tmp/add_to_cart.gif"]).to(be_empty)
   end
 
   it "#delete should not ignore errors when deleting" do
     expect_any_instance_of(MockS3Interface::NullS3Object).to(receive(:delete).and_raise(StandardError))
 
-    expect { @bucket.delete('assets/fail.gif') }.to(raise_error(StandardError))
+    expect { @bucket.delete("assets/fail.gif") }.to(raise_error(StandardError))
   end
 
   it "#delete should always return true" do
     expect_any_instance_of(MockS3Interface::NullS3Object).to(receive(:delete).and_return(nil))
 
-    expect(@bucket.delete('assets/fail.gif')).to(eq(true))
+    expect(@bucket.delete("assets/fail.gif")).to(eq(true))
   end
 
   it "#stat should get metadata from S3" do
-    value = 'hello world'
-    @cloud.build('tmp/new_file.test', value).store
-    metadata = @bucket.stat('tmp/new_file.test')
+    value = "hello world"
+    @cloud.build("tmp/new_file.test", value).store
+    metadata = @bucket.stat("tmp/new_file.test")
     expect(metadata.size).to(eq(value.size))
     expect(metadata.updated_at).to(eq(Time.parse("Mon Aug 27 17:37:51 UTC 2007")))
   end
 
   it "#read " do
-    value = 'hello world'
-    key = 'tmp/new_file.txt'
+    value = "hello world"
+    key = "tmp/new_file.txt"
     @bucket.write(key, value)
     data = @bucket.read(key)
     expect(data).to(eq(value))

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
-require 'rubygems'
-require 'rspec'
-require 'pry-byebug' if RUBY_VERSION >= '2.0.0'
-require 'active_support/all'
+
+require "rubygems"
+require "rspec"
+require "pry-byebug" if RUBY_VERSION >= "2.0.0"
+require "active_support/all"
 $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
-require 'asset_cloud'
-require 'asset_cloud/buckets/s3_bucket'
-require 'asset_cloud/buckets/gcs_bucket'
+require "asset_cloud"
+require "asset_cloud/buckets/s3_bucket"
+require "asset_cloud/buckets/gcs_bucket"

data/spec/validations_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 class ValidatedAsset < AssetCloud::Asset
   validate :no_cats
@@ -7,8 +8,8 @@ class ValidatedAsset < AssetCloud::Asset
   private
 
   def no_cats
-    add_error('no cats allowed!') if value =~ /cat/i
-    add_warning('bad dog!', 'wet dog smell!') if value =~ /dog/i
+    add_error("no cats allowed!") if value =~ /cat/i
+    add_warning("bad dog!", "wet dog smell!") if value =~ /dog/i
   end
 end
 
@@ -18,24 +19,24 @@ end
 
 describe ValidatedAsset do
   before(:each) do
-    @cloud = BasicCloud.new(File.dirname(__FILE__) + '/files', 'http://assets/')
-    @cat = @cloud.build('dog_pound/fido', 'cat')
-    @dog = @cloud.build('dog_pound/fido', 'dog')
+    @cloud = BasicCloud.new(File.dirname(__FILE__) + "/files", "http://assets/")
+    @cat = @cloud.build("dog_pound/fido", "cat")
+    @dog = @cloud.build("dog_pound/fido", "dog")
   end
 
   describe "#store" do
     it "should not store the asset unless validations pass" do
-      expect(@cloud).to(receive(:write).with('dog_pound/fido', 'dog').and_return(true))
+      expect(@cloud).to(receive(:write).with("dog_pound/fido", "dog").and_return(true))
 
       @cat.store
       expect(@cat.store).to(eq(false))
-      expect(@cat.errors).to(eq(['no cats allowed!']))
+      expect(@cat.errors).to(eq(["no cats allowed!"]))
       expect(@dog.store).to(eq(true))
     end
 
     it "should store asset with warnings and save them in the warnings array" do
       expect(@dog.store).to(eq(true))
-      expect(@dog.warnings).to(eq(['bad dog!', 'wet dog smell!']))
+      expect(@dog.warnings).to(eq(["bad dog!", "wet dog smell!"]))
       expect(@cat.store).to(eq(false))
       expect(@cat.warnings).to(eq([]))
     end
@@ -54,10 +55,10 @@ describe ValidatedAsset do
   describe "#valid?" do
     it "should clear errors, run validations, and return validity" do
       @cat.store
-      expect(@cat.errors).to(eq(['no cats allowed!']))
+      expect(@cat.errors).to(eq(["no cats allowed!"]))
       expect(@cat.valid?).to(eq(false))
-      expect(@cat.errors).to(eq(['no cats allowed!']))
-      @cat.value = 'disguised feline'
+      expect(@cat.errors).to(eq(["no cats allowed!"]))
+      @cat.value = "disguised feline"
       expect(@cat.valid?).to(eq(true))
       expect(@cat.errors).to(be_empty)
     end

data/spec/versioned_memory_bucket_spec.rb

@@ -1,36 +1,37 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 class VersionedMemoryCloud < AssetCloud::Base
   bucket :memory, AssetCloud::VersionedMemoryBucket
 end
 
 describe AssetCloud::VersionedMemoryBucket do
-  directory = File.dirname(__FILE__) + '/files'
+  directory = File.dirname(__FILE__) + "/files"
 
   before do
-    @fs = VersionedMemoryCloud.new(directory, 'http://assets/files')
-    %w{one two three}.each do |content|
+    @fs = VersionedMemoryCloud.new(directory, "http://assets/files")
+    ["one", "two", "three"].each do |content|
       @fs.write("memory/foo", content)
     end
   end
 
-  describe '#versioned?' do
+  describe "#versioned?" do
     it "should return true" do
       expect(@fs.buckets[:memory].versioned?).to(eq(true))
     end
   end
 
-  describe '#read_version' do
+  describe "#read_version" do
     it "should return the appropriate data when given a key and version" do
-      expect(@fs.read_version('memory/foo', 1)).to(eq('one'))
-      expect(@fs.read_version('memory/foo', 3)).to(eq('three'))
+      expect(@fs.read_version("memory/foo", 1)).to(eq("one"))
+      expect(@fs.read_version("memory/foo", 3)).to(eq("three"))
     end
   end
 
-  describe '#versions' do
+  describe "#versions" do
     it "should return a list of available version identifiers for the given key" do
-      expect(@fs.versions('memory/foo')).to(eq([1, 2, 3]))
+      expect(@fs.versions("memory/foo")).to(eq([1, 2, 3]))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset_cloud
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -100,11 +100,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/probots.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/cla.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - History.md
 - LICENSE
@@ -172,30 +171,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.12
 signing_key: 
 specification_version: 4
 summary: An abstraction layer around arbitrary and diverse asset stores.
-test_files:
-- spec/active_record_bucket_spec.rb
-- spec/asset_cloud/metadata_spec.rb
-- spec/asset_extension_spec.rb
-- spec/asset_spec.rb
-- spec/base_spec.rb
-- spec/blackhole_bucket_spec.rb
-- spec/bucket_chain_spec.rb
-- spec/bucket_spec.rb
-- spec/callbacks_spec.rb
-- spec/file_system_spec.rb
-- spec/files/products/key.txt
-- spec/files/versioned_stuff/foo
-- spec/find_free_key_spec.rb
-- spec/gcs_bucket_remote_spec.rb
-- spec/gcs_bucket_spec.rb
-- spec/memory_bucket_spec.rb
-- spec/mock_s3_interface.rb
-- spec/remote_s3_bucket_spec.rb
-- spec/s3_bucket_spec.rb
-- spec/spec_helper.rb
-- spec/validations_spec.rb
-- spec/versioned_memory_bucket_spec.rb
+test_files: []

data/.github/probots.yml

@@ -1,2 +0,0 @@
-enabled:
-  - cla