asset_cloud 2.5.3 → 2.6.0

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.3
+  version: 2.6.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,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:
     - - ">="
@@ -81,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:
     - - ">="
@@ -102,6 +102,8 @@ extra_rdoc_files: []
 files:
 - ".github/probots.yml"
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - History.md
@@ -130,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
@@ -175,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