bfs-gs 0.5.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07979739046a829f6b63c0c83e5405fa91f1d8cb602ae9c921d6bb330dd85f1c'
-  data.tar.gz: 645e9c6eb121efd9f872ef028c2630eb0e4db7672053b004550dcc8e412359bb
+  metadata.gz: 3d983acad48732ac1b9aefe1c9e24d38e69555a16d5888ab44628e3961af8248
+  data.tar.gz: 5b2c07919f56f3063fa2dd2f6f7446305dca58fb0686e3c3a035812580a25735
 SHA512:
-  metadata.gz: 463ddade4c9135d1f08ef08320b94535113f0ce9dde7645342def7dd69006cf68d808dbc8c4bfddf3787432c07a157ade9ff2a12cb760333ffa058112bc02a95
-  data.tar.gz: a0e7accd57342843962cb5c95db971becf5f42d453656dd0ce03236ec03914673f7ca4feab5e569b2dd8eac188287b05acacc80da626e3d5deb7010a152106bc
+  metadata.gz: 22f44daf6914f672d9c214e0a2f048cdd413a977ba180ed08010cf5c6bef55f7bba85d792fc16f0389ea0027277ef83cc47573edf9d0482791d598438c36b7ad
+  data.tar.gz: 213fa8a1545fbae970c01d54cb0665967a2b10db6c1f07603836d83a505125fe04870d3304a1688e6ec783eeee37a1f74e702333291a512a5ecfe096a90c1023

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

@@ -1,6 +1,5 @@
 require 'bfs'
 require 'google/cloud/storage'
-require 'cgi'
 
 module BFS
   module Bucket
@@ -20,18 +19,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 +32,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,23 +46,22 @@ 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, norm_meta(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: self.encoding, perm: self.perm, **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)
+        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
         return temp unless block
@@ -82,48 +74,43 @@ module BFS
       end
 
       # Opens an existing file for reading
-      def open(path, opts={}, &block)
+      def open(path, encoding: self.encoding, tempdir: nil, **opts, &block)
         path = full_path(path)
-        enc  = opts.delete(: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: 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.
-      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
 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|
+  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
+  BFS::Bucket::GS.new url.host, **opts.slice(:project_id, :credentials, :acl),
+                      prefix: prefix,
+                      timeout: opts.key?(:timeout) ? opts[:timeout].to_i : nil,
+                      retries: opts.key?(:retries) ? opts[:retries].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.5.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.3
 - !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