bfs-gs 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce3945c75293459554de992abd3feb7f5e67dc37f4c85277aed1a00e25fc6f12
-  data.tar.gz: f8f4de972d679ec3bd44bfff8c4cfaef30b7fb3f864b28eaa366df3d1ff28007
+  metadata.gz: 0205b7e3e0a0657a5573c76e214761e8cb094370a9ec9f2e438a917cac121ea7
+  data.tar.gz: 73482e997b5d16fdbc0e18fbf3c40aa70316d41a0540aafd1e04f7be7cdf4742
 SHA512:
-  metadata.gz: 06bc1b3093aad6a6be0dcdbfd7c17ed10d3121c5785b1aaa8ce12460ef40df05d26cdd3ba47d149d9e91ca9445cc38456b70abe17af87db023490959cd98959f
-  data.tar.gz: 4c6e3a77f3c0c63fa1e7eafb58c5ddb585984fbdc76b5960ab96e2ceff2a147df3f48bd9f8dbcfe66a45718a6411b0d21c1bd7dea1f005f81e338b7d4b7acf82
+  metadata.gz: 62bfd2c665b53f6ba4cd9e80a57d8014337a771cae1b1bc129e720959163f9c99de6b881e3bbe8e4aa4e9075d4db40bd29fc414387519f66255271b89a16d12e
+  data.tar.gz: 5f1c3741bf46866c0917b908f7cc778087a9e97a04003dbade21f9e5e8e5d51f740cbc30b570a6f3112b91b606741b353f75dad1da40af289bc8de979b0668e8

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.5.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.add_dependency 'bfs', s.version
   s.add_dependency 'google-cloud-storage', '~> 1.18'

data/lib/bfs/bucket/gs.rb

@@ -1,6 +1,5 @@
 require 'bfs'
 require 'google/cloud/storage'
-require 'cgi'
 
 module BFS
   module Bucket
@@ -34,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(prefix: prefix) if prefix
 
@@ -57,12 +56,11 @@ module BFS
       end
 
       # Creates a new file and opens it for writing
-      def create(path, encoding: nil, perm: nil, **opts, &block)
+      def create(path, encoding: self.encoding, perm: self.perm, **opts, &block)
         opts[:metadata] = norm_meta(opts[:metadata])
         path = full_path(path)
-        enc  = encoding || @encoding
-        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|
             @bucket.create_file(file, path, **opts)
           end
         end
@@ -76,17 +74,16 @@ module BFS
       end
 
       # Opens an existing file for reading
-      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
         file = @bucket.file(path)
         raise BFS::FileNotFound, trim_prefix(path) unless file
 
-        temp = Tempfile.new(File.basename(path), tempdir, encoding: enc)
+        temp = Tempfile.new(File.basename(path), tempdir, encoding: encoding)
         temp.close
-        file.download temp.path, opts
+        file.download(temp.path, **opts)
 
-        File.open(temp.path, encoding: enc, &block)
+        File.open(temp.path, encoding: encoding, &block)
       end
 
       # Deletes a file.
@@ -108,16 +105,15 @@ module BFS
   end
 end
 
-BFS.register('gs') do |url|
-  params = CGI.parse(url.query.to_s)
-  prefix = BFS.norm_path(params.key?('prefix') ? params['prefix'].first : url.path)
+BFS.register('gs') do |url, opts, block|
+  prefix = BFS.norm_path(opts.key?(:prefix) ? opts[:prefix] : url.path)
   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
+  opts   = opts.slice(:project_id, :credentials, :acl)
+  extra  = {
+    prefix: prefix,
+    timeout: opts.key?(:timeout) ? opts[:timeout].to_i : nil,
+    retries: opts.key?(:retries) ? opts[:retries].to_i : nil,
+  }
+
+  BFS::Bucket::GS.open url.host, **opts, **extra, &block
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-gs
 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: bfs
@@ -16,14 +16,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
 - !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.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: GS bucket adapter for bfs