bfs-gs 0.4.4 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0ffe7adec5e56bdc0c6ebf5becb4c61c172a15c4a3174f8c658711ddb88dc8
-  data.tar.gz: c5d30528ecb0b9e2a9e6246e27f4c3aa99ba7088b5cb6292a608e0e0c719100e
+  metadata.gz: ce3945c75293459554de992abd3feb7f5e67dc37f4c85277aed1a00e25fc6f12
+  data.tar.gz: f8f4de972d679ec3bd44bfff8c4cfaef30b7fb3f864b28eaa366df3d1ff28007
 SHA512:
-  metadata.gz: 7fbe8cb95159dc5a96f9206a797100ab9cee9738b974b6c998ff2468325d74c846bca33bb64c702e7144827c7fbd64699f5a9143f3badd77bab02e23d8bdbb40
-  data.tar.gz: 2bc7bbe37de5a80a92ef782c66c60d938e401da98f5e300da537927faddfef836e09210fc72815a908cd6d8e614786b4ec6ed411ff242c9c15e8c617019d4ab2
+  metadata.gz: 06bc1b3093aad6a6be0dcdbfd7c17ed10d3121c5785b1aaa8ce12460ef40df05d26cdd3ba47d149d9e91ca9445cc38456b70abe17af87db023490959cd98959f
+  data.tar.gz: 4c6e3a77f3c0c63fa1e7eafb58c5ddb585984fbdc76b5960ab96e2ceff2a147df3f48bd9f8dbcfe66a45718a6411b0d21c1bd7dea1f005f81e338b7d4b7acf82

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,12 @@ 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={})
-        opts = opts.dup
-        opts.keys.each do |key|
-          val = opts.delete(key)
-          opts[key.to_sym] = val unless val.nil?
-        end
-        super(opts)
+      # @option opts [String] :encoding Custom encoding.
+      def initialize(name, prefix: nil, acl: nil, client: nil, **opts)
+        super(**opts)
 
-        @prefix = opts.delete(:prefix)
-        acl     = opts.delete(:acl)
-        client  = opts.delete(:client) || Google::Cloud::Storage.new(opts)
+        @prefix = prefix
+        client ||= Google::Cloud::Storage.new(**opts)
 
         @name   = name.to_s
         @bucket = client.bucket(@name)
@@ -39,13 +33,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 +47,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(path: name, size: file.size, mtime: file.updated_at.to_time, content_type: file.content_type, metadata: norm_meta(file.metadata))
       end
 
       # Creates a new file and opens it for writing
-      def create(path, opts={}, &block)
+      def create(path, encoding: nil, perm: nil, **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|
+        enc  = encoding || @encoding
+        temp = BFS::TempWriter.new(path, encoding: enc, perm: perm) 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,13 +76,13 @@ module BFS
       end
 
       # Opens an existing file for reading
-      def open(path, opts={}, &block)
+      def open(path, encoding: nil, tempdir: nil, **opts, &block)
         path = full_path(path)
-        enc  = opts.delete(:encoding) || @encoding
+        enc  = encoding || @encoding
         file = @bucket.file(path)
         raise BFS::FileNotFound, trim_prefix(path) unless file
 
-        temp = Tempfile.new(File.basename(path), encoding: enc)
+        temp = Tempfile.new(File.basename(path), tempdir, encoding: enc)
         temp.close
         file.download temp.path, opts
 
@@ -95,19 +90,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 +114,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.4
+  version: 0.6.2
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-02-12 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.4
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.6.2
 - !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.0.6
 signing_key: 
 specification_version: 4
 summary: GS bucket adapter for bfs