bfs-s3 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d45908f3dcc0517ee7beab0c08841a516c140069f2a4e3a6166ae0333ca2c5f0
-  data.tar.gz: 2c845b22f0fb5776ba1e8be311f1de7cd0ff9caf5cd88d61f8b0782712810dc0
+  metadata.gz: 1e2a56db1b3250b2054d01e38788642c887f4c747c17570b49e0c5efed3e28e2
+  data.tar.gz: 43462a7a5cb5b7d1eb86a45422f1f4ed2d2dab5409309a39be859d02027c4a39
 SHA512:
-  metadata.gz: 64de3e661d1bf09aa264ad045eaeeff4c5a86320ab90be4b96e4c46fb9675379babd0ebe24cf98c56552db05fa7dec2ae7530283b7f65fdb27c1819d929199ca
-  data.tar.gz: 7a4707fbfed527b5e3f3ebd48887cbdd759c78bd28951647579a213d49ab418fb9db2e37584c28964a292c0dd180c9f3f73e3a5d6c6de1f087da0a4a63d6aadc
+  metadata.gz: 72798b2b002302d858556669318977a4b74ea32a7c76fd703e1cb368e0b3f426150d6eb760f7fe77f59e34c36db7d3ce36d45b4a72198c7dd8a1b21b4fa32277
+  data.tar.gz: f9a7376141e5aaab374ac62887245a7458e04de47d9208222559b6b041a28e965cc18d7dd81ee3128f39b748515511ab40ae4b5e48ed6c1aa1d5a1d5503342bf

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,13 +20,7 @@ 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)
-        opts = opts.dup
-        opts.keys.each do |key|
-          val = opts.delete(key)
-          opts[key.to_sym] = val unless val.nil?
-        end
         super(**opts)
 
         @name = name
@@ -67,7 +60,7 @@ module BFS
         info = @client.head_object(**opts)
         raise BFS::FileNotFound, path unless info
 
-        BFS::FileInfo.new(path, info.content_length, info.last_modified, info.content_type, norm_meta(info.metadata))
+        BFS::FileInfo.new(path: path, size: info.content_length, mtime: info.last_modified, content_type: info.content_type, metadata: norm_meta(info.metadata))
       rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NoSuchBucket, Aws::S3::Errors::NotFound
         raise BFS::FileNotFound, path
       end
@@ -79,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, **opts, &block)
+      def create(path, encoding: self.encoding, perm: self.perm, **opts, &block)
         path = full_path(path)
-        enc  = opts.delete(:encoding) || @encoding
         opts = opts.merge(
           bucket: name,
           key: path,
@@ -90,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) 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
@@ -108,10 +100,10 @@ module BFS
       # @param [String] path
       # @param [Hash] opts options
       # @option opts [String] :encoding Custom encoding.
-      def open(path, **opts, &block)
+      # @option opts [String] :tempdir Custom temp dir.
+      def open(path, encoding: self.encoding, tempdir: nil, **opts, &block)
         path = full_path(path)
-        enc  = opts.delete(:encoding) || @encoding
-        temp = Tempfile.new(File.basename(path), encoding: enc)
+        temp = Tempfile.new(File.basename(path), tempdir, encoding: encoding)
         temp.close
 
         opts = opts.merge(
@@ -121,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
@@ -134,7 +126,7 @@ module BFS
           key: path,
         )
         @client.delete_object(**opts)
-      rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NoSuchBucket, Aws::S3::Errors::NotFound # rubocop:disable Lint/SuppressedException
+      rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NoSuchBucket, Aws::S3::Errors::NotFound
       end
 
       # Copies a file.
@@ -166,17 +158,9 @@ 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|
+  prefix = BFS.norm_path(opts[:prefix] || url.path)
+  opts[:prefix] = prefix.empty? ? nil : prefix
+
+  BFS::Bucket::S3.new url.host, **opts.slice(:prefix, :region, :sse, :access_key_id, :secret_access_key, :acl, :storage_class, :encoding)
 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.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-05-28 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.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 description: https://github.com/bsm/bfs.rb
 email: dimitrij@blacksquaremedia.com
 executables: []
@@ -60,7 +60,7 @@ 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:
   - - ">="