bfs-s3 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38a6e4ebfc80f1a6c0ba16102d5b6cc95ff281fbe407ef9a899a2bd1feed0859
-  data.tar.gz: 9eceadd7e77b1c936693980e05e77e1abad489cf7afec06a1025ba5a4e283586
+  metadata.gz: d45908f3dcc0517ee7beab0c08841a516c140069f2a4e3a6166ae0333ca2c5f0
+  data.tar.gz: 2c845b22f0fb5776ba1e8be311f1de7cd0ff9caf5cd88d61f8b0782712810dc0
 SHA512:
-  metadata.gz: 8b06966e6a520392599ca26eea644b49e3de8de468d46bd440ac1e1f18bce806476b02bcf416af28337073eb98f0852a27d2e822d406d7a5ce5bcc1810824be1
-  data.tar.gz: dd1356a5237995a4dafe935ef793debaeebdcb97b0238d12c2654fc2ff029fc53870c54bdaa5c314ef8d8e09ce36059ff73283ac23c90e219b0d9747f6ab8d62
+  metadata.gz: 64de3e661d1bf09aa264ad045eaeeff4c5a86320ab90be4b96e4c46fb9675379babd0ebe24cf98c56552db05fa7dec2ae7530283b7f65fdb27c1819d929199ca
+  data.tar.gz: 7a4707fbfed527b5e3f3ebd48887cbdd759c78bd28951647579a213d49ab418fb9db2e37584c28964a292c0dd180c9f3f73e3a5d6c6de1f087da0a4a63d6aadc

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.4.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.add_dependency 'aws-sdk-s3', '~> 1.38'
   s.add_dependency 'bfs', s.version

data/lib/bfs/bucket/s3.rb

@@ -22,24 +22,24 @@ module BFS
       # @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={})
+      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)
+        super(**opts)
 
         @name = name
         @sse = opts[:sse] || opts[:server_side_encryption]
         @prefix = opts[:prefix]
         @acl = opts[:acl].to_sym if opts[:acl]
         @storage_class = opts[:storage_class]
-        @client = opts[:client] || init_client(opts)
+        @client = opts[:client] || init_client(**opts)
       end
 
       # Lists the contents of a bucket using a glob pattern
-      def ls(pattern='**/*', opts={})
+      def ls(pattern = '**/*', **opts)
         prefix = pattern[%r{^[^\*\?\{\}\[\]]+/}]
         prefix = File.join(*[@prefix, prefix].compact) if @prefix
 
@@ -61,10 +61,10 @@ module BFS
       end
 
       # Info returns the object info
-      def info(path, opts={})
+      def info(path, **opts)
         path = norm_path(path)
         opts = opts.merge(bucket: name, key: full_path(path))
-        info = @client.head_object(opts)
+        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))
@@ -79,7 +79,7 @@ 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, **opts, &block)
         path = full_path(path)
         enc  = opts.delete(:encoding) || @encoding
         opts = opts.merge(
@@ -108,7 +108,7 @@ module BFS
       # @param [String] path
       # @param [Hash] opts options
       # @option opts [String] :encoding Custom encoding.
-      def open(path, opts={}, &block)
+      def open(path, **opts, &block)
         path = full_path(path)
         enc  = opts.delete(:encoding) || @encoding
         temp = Tempfile.new(File.basename(path), encoding: enc)
@@ -119,7 +119,7 @@ module BFS
           bucket: name,
           key: path,
         )
-        @client.get_object(opts)
+        @client.get_object(**opts)
 
         File.open(temp.path, encoding: enc, &block)
       rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NoSuchBucket, Aws::S3::Errors::NotFound
@@ -127,18 +127,18 @@ module BFS
       end
 
       # Deletes a file.
-      def rm(path, opts={})
+      def rm(path, **opts)
         path = full_path(path)
         opts = opts.merge(
           bucket: name,
           key: path,
         )
-        @client.delete_object(opts)
+        @client.delete_object(**opts)
       rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NoSuchBucket, Aws::S3::Errors::NotFound # rubocop:disable Lint/SuppressedException
       end
 
       # Copies a file.
-      def cp(src, dst, opts={})
+      def cp(src, dst, **opts)
         src = full_path(src)
         dst = full_path(dst)
         opts = opts.merge(
@@ -146,14 +146,14 @@ module BFS
           copy_source: "/#{name}/#{src}",
           key: dst,
         )
-        @client.copy_object(opts)
+        @client.copy_object(**opts)
       rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NoSuchBucket, Aws::S3::Errors::NotFound
         raise BFS::FileNotFound, trim_prefix(src)
       end
 
       private
 
-      def init_client(opts)
+      def init_client(**opts)
         config = {}
         config[:region] = opts[:region] if opts[:region]
         config[:credentials] = opts[:credentials] if opts[:credentials]
@@ -172,11 +172,11 @@ BFS.register('s3') do |url|
   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
+                      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
 end

metadata

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