bfs-s3 0.6.4 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a17fa4c95e7bb5c0bfe6fa5720da47e6a10f21794d739dec0aeab622c1ee555
-  data.tar.gz: 01fad734ca0c8d2b35dbfd0911157b93e978f036e85b48b44d4343363c62970d
+  metadata.gz: 439b5c3e0e7cc280d527e238e6dc0d67404e720b8899b79f8cfd201950e059ea
+  data.tar.gz: 433ea64a8b6feec47b683be92ad07e5f5e044189f1b04609176b7bdd724a0e0f
 SHA512:
-  metadata.gz: b5f8feb07e6a717660c4d719e0803303ff6effa9970f8704b711f77d7853caa2d586c4a5d36819a29565b839a6d1c81c6b179f653d7c438cc2189bc59c2de10b
-  data.tar.gz: 2f9ac79db0fb819341a005ec251335c9f496a25c2a8050b6d6ad8f71914c8a6334f26a8b47662248807f2e581bac277ec022639befc88076f23e22972138963c
+  metadata.gz: 1d180808ac5fc59950da69521a97fe989ac28dd614c88d2f299cf413af9e9ed221dedb692e5d1e4ae8793b2b0e976d16b15f3af6a5d2c0124dc99dbf6b86320c
+  data.tar.gz: 1aed0a7496aae52534cb2fe082d161682bfbc343fb2e82944f94075338829080163a0d37e84d0ed978f6283c0848c3fec282b886bca32b400fcc5590234fed8e

data/bfs-s3.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.add_dependency 'aws-sdk-s3', '~> 1.38'
   s.add_dependency 'bfs', s.version

data/lib/bfs/bucket/s3.rb

@@ -33,7 +33,7 @@ module BFS
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **opts)
-        prefix = pattern[%r{^[^\*\?\{\}\[\]]+/}]
+        prefix = pattern[%r{^[^*?\{\}\[\]]+/}]
         prefix = File.join(*[@prefix, prefix].compact) if @prefix
 
         opts = opts.merge(bucket: name, prefix: @prefix)
@@ -158,9 +158,10 @@ module BFS
   end
 end
 
-BFS.register('s3') do |url, opts|
+BFS.register('s3') do |url, opts, block|
   prefix = BFS.norm_path(opts[:prefix] || url.path)
   opts[:prefix] = prefix.empty? ? nil : prefix
+  opts = opts.slice(:prefix, :region, :sse, :access_key_id, :secret_access_key, :acl, :storage_class, :encoding)
 
-  BFS::Bucket::S3.new url.host, **opts.slice(:prefix, :region, :sse, :access_key_id, :secret_access_key, :acl, :storage_class, :encoding)
+  BFS::Bucket::S3.open url.host, **opts, &block
 end

data/spec/bfs/bucket/s3_spec.rb

@@ -1,17 +1,8 @@
 require 'spec_helper'
 
-sandbox  = { bucket: 'bsm-bfs-unittest' }.freeze
-run_spec = \
-  begin
-    s = Aws::S3::Client.new
-    s.head_bucket(bucket: sandbox[:bucket])
-    true
-  rescue StandardError => e
-    warn "WARNING: unable to run #{File.basename __FILE__}: #{e.message}"
-    false
-  end
+sandbox = { bucket: 'bsm-bfs-unittest' }.freeze
 
-RSpec.describe BFS::Bucket::S3, if: run_spec do
+RSpec.describe BFS::Bucket::S3, s3: true do
   let(:prefix) { "x/#{SecureRandom.uuid}/" }
 
   subject do
@@ -31,15 +22,18 @@ RSpec.describe BFS::Bucket::S3, if: run_spec do
     expect(bucket.acl).to eq(:private)
     expect(bucket.encoding).to eq('binary')
     expect(bucket.instance_variable_get(:@prefix)).to be_nil
+    bucket.close
 
     bucket = BFS.resolve("s3://#{sandbox[:bucket]}/a/b/")
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.name).to eq(sandbox[:bucket])
     expect(bucket.instance_variable_get(:@prefix)).to eq('a/b')
+    bucket.close
   end
 
   it 'should enumerate over a large number of files' do
     bucket = described_class.new sandbox[:bucket], prefix: 'm/'
     expect(bucket.ls('**/*').count).to eq(2121)
+    bucket.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.3
 description: https://github.com/bsm/bfs.rb
 email: dimitrij@blacksquaremedia.com
 executables: []
@@ -60,14 +60,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: S3 bucket adapter for bfs