bfs-s3 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e10fdc93aa067bed7a72b5bcbccbc8b05bebad755e1bdd5091f6ed03b78206
-  data.tar.gz: 6db5a4abb0b6b6825785eff4a18ca74e5bf6083c2a6ce3f0344e3ea28b7e0446
+  metadata.gz: e49f967d04b05a36711b1c2b858347af451e6c6aa9690739c524b21249137aee
+  data.tar.gz: dfe6415867f0e4af1a8b2106123972aa12f3531729b65bf0806081076cd1b903
 SHA512:
-  metadata.gz: 37ddc5cd5672316032a45fe30e99ee1a29b8e17b83c770542fd7998c2bf4c3f6046acb374e3440ae4ea646c88437dc7cf065b8d6f40b6456d81d56fa2d8786f4
-  data.tar.gz: c3744960bc91b119af9fe51c52429662b6d7e13aee85c4d373efc579e11492df599ddd0fbd35e1a5dd107cd870c2937add208db43ce9d6a96a8068b82e27f1f8
+  metadata.gz: f29025c22ba7bb6bb72c0a7c517da339de233964ced69e6aae02dba86f2a69a54d80a6eb7d3915808b303159c6a864fe498703583932de1368314458ef414b4e
+  data.tar.gz: 4fd3e4ebac13f4f7f21698f8e193e977319c906902d1510e6879fdae74eecc51c41cfe3f7b1d24994511d1a8beaa2484fadde2d145a5e332c80508d3749412f2

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

@@ -1,6 +1,5 @@
 require 'bfs'
 require 'aws-sdk-s3'
-require 'cgi'
 
 module BFS
   module Bucket
@@ -21,7 +20,6 @@ module BFS
       # @option opts [Symbol] :acl canned ACL
       # @option opts [String] :storage_class storage class
       # @option opts [Aws::S3::Client] :client custom client, uses default_client by default
-      # @option opts [String] :encoding Custom encoding.
       def initialize(name, **opts)
         super(**opts)
 
@@ -35,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)
@@ -74,9 +72,8 @@ module BFS
       # @option opts [String] :acl custom ACL override
       # @option opts [String] :server_side_encryption SSE override
       # @option opts [String] :storage_class storage class override
-      def create(path, encoding: nil, perm: nil, **opts, &block)
+      def create(path, encoding: self.encoding, perm: self.perm, **opts, &block)
         path = full_path(path)
-        enc  = encoding || @encoding
         opts = opts.merge(
           bucket: name,
           key: path,
@@ -85,8 +82,8 @@ module BFS
         opts[:server_side_encryption] ||= @sse if @sse
         opts[:storage_class] ||= @storage_class if @storage_class
 
-        temp = BFS::TempWriter.new(path, encoding: enc, perm: perm) do |t|
-          File.open(t, encoding: enc) do |file|
+        temp = BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
+          File.open(t, encoding: encoding) do |file|
             @client.put_object(opts.merge(body: file))
           end
         end
@@ -104,10 +101,9 @@ module BFS
       # @param [Hash] opts options
       # @option opts [String] :encoding Custom encoding.
       # @option opts [String] :tempdir Custom temp dir.
-      def open(path, encoding: nil, tempdir: nil, **opts, &block)
+      def open(path, encoding: self.encoding, tempdir: nil, **opts, &block)
         path = full_path(path)
-        enc  = encoding || @encoding
-        temp = Tempfile.new(File.basename(path), tempdir, encoding: enc)
+        temp = Tempfile.new(File.basename(path), tempdir, encoding: encoding)
         temp.close
 
         opts = opts.merge(
@@ -117,7 +113,7 @@ module BFS
         )
         @client.get_object(**opts)
 
-        File.open(temp.path, encoding: enc, &block)
+        File.open(temp.path, encoding: encoding, &block)
       rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NoSuchBucket, Aws::S3::Errors::NotFound
         raise BFS::FileNotFound, trim_prefix(path)
       end
@@ -162,17 +158,10 @@ module BFS
   end
 end
 
-BFS.register('s3') do |url|
-  params = CGI.parse(url.query.to_s)
-  prefix = BFS.norm_path(params.key?('prefix') ? params['prefix'].first : url.path)
-  prefix = nil if prefix.empty?
-
-  BFS::Bucket::S3.new url.host,
-                      prefix: prefix,
-                      region: params.key?('region') ? params['region'].first : nil,
-                      sse: params.key?('sse') ? params['sse'].first : nil,
-                      access_key_id: params.key?('access_key_id') ? params['access_key_id'].first : nil,
-                      secret_access_key: params.key?('secret_access_key') ? params['secret_access_key'].first : nil,
-                      acl: params.key?('acl') ? params['acl'].first : nil,
-                      storage_class: params.key?('storage_class') ? params['storage_class'].first : nil
+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.open url.host, **opts, &block
 end

data/spec/bfs/bucket/s3_spec.rb

@@ -25,10 +25,11 @@ RSpec.describe BFS::Bucket::S3, if: run_spec do
   it_behaves_like 'a bucket'
 
   it 'should resolve from URL' do
-    bucket = BFS.resolve("s3://#{sandbox[:bucket]}/?acl=private")
+    bucket = BFS.resolve("s3://#{sandbox[:bucket]}/?acl=private&encoding=binary")
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.name).to eq(sandbox[:bucket])
     expect(bucket.acl).to eq(:private)
+    expect(bucket.encoding).to eq('binary')
     expect(bucket.instance_variable_get(:@prefix)).to be_nil
 
     bucket = BFS.resolve("s3://#{sandbox[:bucket]}/a/b/")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-07-02 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.2
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.1
 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.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: S3 bucket adapter for bfs