bfs-gs 0.4.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4159d1f71708e97bbc8305a18e671cd8c875908b23b907009d2e23ad3da2c14
-  data.tar.gz: 8700ac725661a73623efea456c0ed3c41cf452352c06edc93855daa21586d046
+  metadata.gz: 9a2d8c79d6fb88844a374b8f776967c20fcd7477815e4868fb2cb0534886a142
+  data.tar.gz: 65c9d7dbeecc7be84d77423a6fdfc40848511809af145315b6bf21de3807a9d6
 SHA512:
-  metadata.gz: 3150b437e030322aa18f9ec5eeaa5365658a9e15ad854c7e38b0a8b3ca8cbe0621251343cf3d920b1e4f5933cc6e4e19b90df0fe1003b585e63172e417ef4064
-  data.tar.gz: fc84d5ac79ae6999e25361ac208945aae929704c2401a7d6bf322c5c1110d0baf199061e155e6bf97ee3e88cfcadd9d45b59cbada9ed327fd3bbd092c8716d74
+  metadata.gz: 57b26012045b16b2dade58bd711c44dfd75cfede1bcba4a534386aab11ef2e44a9d3951e6f7f553594e7d0f3d0e44c05ee55d6243d632c1afe5f18e6eb2ac27e
+  data.tar.gz: 2e2eec782845273aebe39753d4424943b42519e70d39973ebd50969a5ddb4d320eca49fc70e241f37891deac5eb90ff8be50de19de7a3b654c1ff1758c61c922

data/bfs-gs.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 'bfs', s.version
   s.add_dependency 'google-cloud-storage', '~> 1.18'

data/lib/bfs/bucket/gs.rb

@@ -20,18 +20,18 @@ module BFS
       # @option opts [Integer] :timeout request timeout, in seconds.
       # @option opts [String] :acl set the default ACL.
       # @option opts [Google::Cloud::Storage] :client custom client.
-      # @option opts [String] :encoding default encoding to use, default: 'binary'
-      def initialize(name, opts={})
+      # @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)
+        super(**opts)
 
         @prefix = opts.delete(:prefix)
         acl     = opts.delete(:acl)
-        client  = opts.delete(:client) || Google::Cloud::Storage.new(opts)
+        client  = opts.delete(:client) || Google::Cloud::Storage.new(**opts)
 
         @name   = name.to_s
         @bucket = client.bucket(@name)
@@ -39,13 +39,13 @@ module BFS
       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
         opts   = opts.merge(prefix: prefix) if prefix
 
         Enumerator.new do |y|
-          @bucket.files(opts).all do |file|
+          @bucket.files(**opts).all do |file|
             name = trim_prefix(file.name)
             y << name if File.fnmatch?(pattern, name, File::FNM_PATHNAME)
           end
@@ -53,22 +53,23 @@ module BFS
       end
 
       # Info returns the object info
-      def info(path, _opts={})
+      def info(path, **_opts)
         path = full_path(path)
         file = @bucket.file(path)
         raise BFS::FileNotFound, trim_prefix(path) unless file
 
         name = trim_prefix(file.name)
-        BFS::FileInfo.new(name, file.size, file.updated_at.to_time, file.content_type, file.metadata)
+        BFS::FileInfo.new(name, file.size, file.updated_at.to_time, file.content_type, norm_meta(file.metadata))
       end
 
       # Creates a new file and opens it for writing
-      def create(path, opts={}, &block)
+      def create(path, **opts, &block)
+        opts[:metadata] = norm_meta(opts[:metadata])
         path = full_path(path)
         enc  = opts.delete(:encoding) || @encoding
         temp = BFS::TempWriter.new(path, encoding: enc) do |t|
           File.open(t, encoding: enc) do |file|
-            @bucket.create_file(file, path, opts)
+            @bucket.create_file(file, path, **opts)
           end
         end
         return temp unless block
@@ -81,7 +82,7 @@ module BFS
       end
 
       # Opens an existing file for reading
-      def open(path, opts={}, &block)
+      def open(path, **opts, &block)
         path = full_path(path)
         enc  = opts.delete(:encoding) || @encoding
         file = @bucket.file(path)
@@ -95,19 +96,19 @@ module BFS
       end
 
       # Deletes a file.
-      def rm(path, opts={})
+      def rm(path, **opts)
         path = full_path(path)
         file = @bucket.file(path)
-        file&.delete(opts)
+        file&.delete(**opts)
       end
 
       # Copies a file.
-      def cp(src, dst, opts={})
+      def cp(src, dst, **opts)
         src  = full_path(src)
         file = @bucket.file(src)
         raise BFS::FileNotFound, trim_prefix(src) unless file
 
-        file.copy(full_path(dst), opts)
+        file.copy(full_path(dst), **opts)
       end
     end
   end
@@ -119,10 +120,10 @@ BFS.register('gs') do |url|
   prefix = nil if prefix.empty?
 
   BFS::Bucket::GS.new url.host,
-    prefix: prefix,
-    project_id: params.key?('project_id') ? params['project_id'].first : nil,
-    credentials: params.key?('credentials') ? params['credentials'].first : nil,
-    acl: params.key?('acl') ? params['acl'].first : nil,
-    timeout: params.key?('timeout') ? params['timeout'].first.to_i : nil,
-    retries: params.key?('retries') ? params['retries'].first.to_i : nil
+                      prefix: prefix,
+                      project_id: params.key?('project_id') ? params['project_id'].first : nil,
+                      credentials: params.key?('credentials') ? params['credentials'].first : nil,
+                      acl: params.key?('acl') ? params['acl'].first : nil,
+                      timeout: params.key?('timeout') ? params['timeout'].first.to_i : nil,
+                      retries: params.key?('retries') ? params['retries'].first.to_i : nil
 end

data/spec/bfs/bucket/gs_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe BFS::Bucket::GS, if: run_spec do
   it_behaves_like 'a bucket'
 
   it 'should resolve from URL' do
-    bucket = BFS.resolve("gs://#{sandbox[:bucket]}/?acl=private&project_id=#{sandbox[:project]}")
+    bucket = BFS.resolve("gs://#{sandbox[:bucket]}/?project_id=#{sandbox[:project]}")
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.name).to eq(sandbox[:bucket])
     expect(bucket.instance_variable_get(:@prefix)).to be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-gs
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.6.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -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.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: GS bucket adapter for bfs