asset_cloud 2.5.1 → 2.7.0

data/spec/memory_bucket_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 class MemoryCloud < AssetCloud::Base
@@ -8,41 +9,39 @@ describe AssetCloud::MemoryBucket do
   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
-
     it "should return nil when file does not exist" do
-      @fs['memory/essay.txt'].exist?.should == 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'
-      @fs['memory/essay.txt'].value.should == 'text'
+      expect(@fs['memory/essay.txt'].value).to(eq('text'))
     end
-
   end
 
   describe "#versioned?" do
     it "should return false" do
-      @fs.buckets[:memory].versioned?.should == false
+      expect(@fs.buckets[:memory].versioned?).to(eq(false))
     end
   end
 
   describe '#ls' do
     before do
       %w{a b}.each do |letter|
-        2.times {|number| @fs.write("memory/#{letter}#{number}",'.')}
+        2.times { |number| @fs.write("memory/#{letter}#{number}", '.') }
       end
     end
 
     it "should return a list of assets which start with the given prefix" do
-      @fs.buckets[:memory].ls('memory/a').size.should == 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
-      @fs.buckets[:memory].ls.size.should == 4
+      expect(@fs.buckets[:memory].ls.size).to(eq(4))
     end
   end
 end

data/spec/mock_s3_interface.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ostruct'
 
 class MockS3Interface
@@ -7,7 +8,7 @@ class MockS3Interface
 
   attr_reader :bucket_storage
 
-  def initialize(aws_access_key_id = nil, aws_secret_access_key = nil, params = {})
+  def initialize(_aws_access_key_id = nil, _aws_secret_access_key = nil, _params = {})
     @buckets = {}
   end
 
@@ -32,7 +33,7 @@ class MockS3Interface
 
     {
       content_length: options.body.size,
-      last_modified: Time.parse("Mon Aug 27 17:37:51 UTC 2007")
+      last_modified: Time.parse("Mon Aug 27 17:37:51 UTC 2007"),
     }
   end
 
@@ -60,7 +61,7 @@ class MockS3Interface
       if options[:acl] && !VALID_ACLS.include?(options[:acl])
         raise "Invalid ACL `#{options[:acl].inspect}`, must be one of: #{VALID_ACLS.inspect}"
       end
-      
+
       options[:body] = options[:body].force_encoding(Encoding::BINARY)
 
       key = options.delete(:key)

data/spec/remote_s3_bucket_spec.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 class RemoteS3Cloud < AssetCloud::Base
   attr_accessor :s3_connection
   bucket :tmp, AssetCloud::S3Bucket
 
-  def s3_bucket(key)
+  def s3_bucket(_key)
     s3_connection.bucket(ENV['S3_BUCKET_NAME'])
   end
 end
@@ -21,14 +22,14 @@ describe 'Remote test for AssetCloud::S3Bucket', if: ENV['AWS_ACCESS_KEY_ID'] &&
       ),
     }
 
-    @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.each { |object| object.delete }
+    listing.each(&:delete)
   end
 
   it "#ls should return assets with proper keys" do
@@ -37,8 +38,8 @@ describe 'Remote test for AssetCloud::S3Bucket', if: ENV['AWS_ACCESS_KEY_ID'] &&
 
     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).to(all(be_an(AssetCloud::Asset)))
+    expect(ls.map(&:key) - ['tmp/test1.txt', 'tmp/test2.txt']).to(be_empty)
   end
 
   it "#ls returns all assets" do
@@ -47,8 +48,8 @@ describe 'Remote test for AssetCloud::S3Bucket', if: ENV['AWS_ACCESS_KEY_ID'] &&
 
     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).to(all(be_an(AssetCloud::Asset)))
+    expect(ls.map(&:key) - ['tmp/test1.txt', 'tmp/test2.txt']).to(be_empty)
   end
 
   it "#delete should ignore errors when deleting" do
@@ -58,7 +59,7 @@ describe 'Remote test for AssetCloud::S3Bucket', if: ENV['AWS_ACCESS_KEY_ID'] &&
   it "#delete should always return true" do
     @cloud['tmp/test1.txt'] = 'test1'
 
-    @bucket.delete('tmp/test1.txt').should == true
+    expect(@bucket.delete('tmp/test1.txt')).to(eq(true))
   end
 
   it "#stat should get metadata from S3" do
@@ -66,14 +67,14 @@ describe 'Remote test for AssetCloud::S3Bucket', if: ENV['AWS_ACCESS_KEY_ID'] &&
     value = 'hello world'
     @cloud.build('tmp/new_file.test', value).store
     metadata = @bucket.stat('tmp/new_file.test')
-    metadata.size.should == value.size
-    metadata.updated_at.should >= start_time
+    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')
-    expect(metadata).to be_an(AssetCloud::Metadata)
-    expect(metadata.exist).to be false
+    expect(metadata).to(be_an(AssetCloud::Metadata))
+    expect(metadata.exist).to(be(false))
   end
 
   it "#read " do
@@ -81,19 +82,19 @@ describe 'Remote test for AssetCloud::S3Bucket', if: ENV['AWS_ACCESS_KEY_ID'] &&
     key = 'tmp/new_file.txt'
     @bucket.write(key, value)
     data = @bucket.read(key)
-    data.should == value
+    expect(data).to(eq(value))
   end
 
   it "#read a missing asset" do
-    expect { @bucket.read("i_do_not_exist_and_never_will.test") }.to raise_error(AssetCloud::AssetNotFoundError)
+    expect { @bucket.read("i_do_not_exist_and_never_will.test") }.to(raise_error(AssetCloud::AssetNotFoundError))
   end
 
   it "#reads first bytes when passed options" do
     value = 'hello world'
     key = 'tmp/new_file.txt'
-    options = {range: 0...5}
+    options = { range: 0...5 }
     @bucket.write(key, value)
     data = @bucket.read(key, options)
-    data.should == 'hello'
+    expect(data).to(eq('hello'))
   end
 end

data/spec/s3_bucket_spec.rb

@@ -5,7 +5,7 @@ class S3Cloud < AssetCloud::Base
   bucket :tmp, AssetCloud::S3Bucket
   attr_accessor :s3_connection, :s3_bucket_name
 
-  def s3_bucket(key)
+  def s3_bucket(_key)
     s3_connection.bucket(s3_bucket_name)
   end
 end
@@ -14,7 +14,7 @@ describe AssetCloud::S3Bucket do
   directory = File.dirname(__FILE__) + '/files'
 
   before(:all) do
-    @cloud = S3Cloud.new(directory , 'http://assets/files')
+    @cloud = S3Cloud.new(directory, 'http://assets/files')
     @cloud.s3_connection = MockS3Interface.new('a', 'b')
     @cloud.s3_bucket_name = 'asset-cloud-test'
 
@@ -30,32 +30,32 @@ describe AssetCloud::S3Bucket do
     collection = ["#{@cloud.url}/tmp/blah.gif", "#{@cloud.url}/tmp/add_to_cart.gif"].map do |key|
       MockS3Interface::S3Object.new(nil, key)
     end
-    expect_any_instance_of(MockS3Interface::Bucket).to receive(:objects).and_return(collection)
+    expect_any_instance_of(MockS3Interface::Bucket).to(receive(:objects).and_return(collection))
 
     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).to(all(be_an(AssetCloud::Asset)))
+    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_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_any_instance_of(MockS3Interface::NullS3Object).to(receive(:delete).and_return(nil))
 
-    @bucket.delete('assets/fail.gif').should == 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')
-    metadata.size.should == value.size
-    metadata.updated_at.should == Time.parse("Mon Aug 27 17:37:51 UTC 2007")
+    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
@@ -63,6 +63,6 @@ describe AssetCloud::S3Bucket do
     key = 'tmp/new_file.txt'
     @bucket.write(key, value)
     data = @bucket.read(key)
-    data.should == value
+    expect(data).to(eq(value))
   end
 end

data/spec/spec_helper.rb

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

data/spec/validations_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 class ValidatedAsset < AssetCloud::Asset
   validate :no_cats
 
   private
+
   def no_cats
     add_error('no cats allowed!') if value =~ /cat/i
     add_warning('bad dog!', 'wet dog smell!') if value =~ /dog/i
@@ -11,7 +13,7 @@ class ValidatedAsset < AssetCloud::Asset
 end
 
 class BasicCloud < AssetCloud::Base
-  bucket :dog_pound, AssetCloud::MemoryBucket, :asset_class => ValidatedAsset
+  bucket :dog_pound, AssetCloud::MemoryBucket, asset_class: ValidatedAsset
 end
 
 describe ValidatedAsset do
@@ -23,41 +25,41 @@ describe ValidatedAsset do
 
   describe "#store" do
     it "should not store the asset unless validations pass" do
-      @cloud.should_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
-      @cat.store.should == false
-      @cat.errors.should == ['no cats allowed!']
-      @dog.store.should == true
+      expect(@cat.store).to(eq(false))
+      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
-      @dog.store.should == true
-      @dog.warnings.should == ['bad dog!', 'wet dog smell!']
-      @cat.store.should == false
-      @cat.warnings.should == []
+      expect(@dog.store).to(eq(true))
+      expect(@dog.warnings).to(eq(['bad dog!', 'wet dog smell!']))
+      expect(@cat.store).to(eq(false))
+      expect(@cat.warnings).to(eq([]))
     end
   end
 
   describe "#store!" do
     it "should raise AssetNotFound with error message when validation fails" do
-      expect { @cat.store! }.to raise_error(AssetCloud::AssetNotSaved, "Validation failed: no cats allowed!")
+      expect { @cat.store! }.to(raise_error(AssetCloud::AssetNotSaved, "Validation failed: no cats allowed!"))
     end
 
     it "should return true when validations pass" do
-      @dog.store!.should == true
+      expect(@dog.store!).to(eq(true))
     end
   end
 
   describe "#valid?" do
     it "should clear errors, run validations, and return validity" do
       @cat.store
-      @cat.errors.should == ['no cats allowed!']
-      @cat.valid?.should == false
-      @cat.errors.should == ['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'
-      @cat.valid?.should == true
-      @cat.errors.should be_empty
+      expect(@cat.valid?).to(eq(true))
+      expect(@cat.errors).to(be_empty)
     end
   end
 end

data/spec/versioned_memory_bucket_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 class VersionedMemoryCloud < AssetCloud::Base
@@ -8,7 +9,7 @@ describe AssetCloud::VersionedMemoryBucket do
   directory = File.dirname(__FILE__) + '/files'
 
   before do
-    @fs = VersionedMemoryCloud.new(directory , 'http://assets/files' )
+    @fs = VersionedMemoryCloud.new(directory, 'http://assets/files')
     %w{one two three}.each do |content|
       @fs.write("memory/foo", content)
     end
@@ -16,21 +17,20 @@ describe AssetCloud::VersionedMemoryBucket do
 
   describe '#versioned?' do
     it "should return true" do
-      @fs.buckets[:memory].versioned?.should == true
+      expect(@fs.buckets[:memory].versioned?).to(eq(true))
     end
   end
 
   describe '#read_version' do
     it "should return the appropriate data when given a key and version" do
-      @fs.read_version('memory/foo', 1).should == 'one'
-      @fs.read_version('memory/foo', 3).should == '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
     it "should return a list of available version identifiers for the given key" do
-      @fs.versions('memory/foo').should == [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.5.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rubocop-shopify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,6 +102,8 @@ extra_rdoc_files: []
 files:
 - ".github/probots.yml"
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - History.md
@@ -144,6 +132,7 @@ files:
 - lib/asset_cloud/validations.rb
 - shipit.rubygems.yml
 - 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
@@ -189,6 +178,7 @@ 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