bfs-gs 0.3.7 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2d0a63a07421fb4c5f1a92f17ea41691cfffce5b5c4bcf708d2fba02e33155
-  data.tar.gz: 83e4ae9f78f3c5694f84920040e7b9c7de1ee5eaccabaffddf0747001aa27def
+  metadata.gz: fc0ffe7adec5e56bdc0c6ebf5becb4c61c172a15c4a3174f8c658711ddb88dc8
+  data.tar.gz: c5d30528ecb0b9e2a9e6246e27f4c3aa99ba7088b5cb6292a608e0e0c719100e
 SHA512:
-  metadata.gz: 64844e32961bf6d3ec8c808347a050194be42d41014832ae86c16fba596b3ac48e0dcc50c635a9da0caa7130eb872c2929da323718546a415eae8648375bad2d
-  data.tar.gz: a208ce6d19b0790059df252deee526b68a664f405a2e1ddd2ef2d1f9750f2366e3030657ecfcc7932654c0f9debb11b6beb3c9485f93675fae1b85b024f86618
+  metadata.gz: 7fbe8cb95159dc5a96f9206a797100ab9cee9738b974b6c998ff2468325d74c846bca33bb64c702e7144827c7fbd64699f5a9143f3badd77bab02e23d8bdbb40
+  data.tar.gz: 2bc7bbe37de5a80a92ef782c66c60d938e401da98f5e300da537927faddfef836e09210fc72815a908cd6d8e614786b4ec6ed411ff242c9c15e8c617019d4ab2

data/bfs-gs.gemspec

@@ -15,8 +15,8 @@ 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.2.0'
+  s.required_ruby_version = '>= 2.4.0'
 
   s.add_dependency 'bfs', s.version
-  s.add_dependency 'google-cloud-storage'
+  s.add_dependency 'google-cloud-storage', '~> 1.18'
 end

data/lib/bfs/bucket/gs.rb

@@ -12,7 +12,7 @@ module BFS
       #
       # @param [String] name the bucket name.
       # @param [Hash] opts options.
-      # @option opts [String] :project_id project ID. Defaults to GCP_PROJECT env var. Required.
+      # @option opts [String] :project_id project ID. Defaults to GCP_PROJECT env var.
       # @option opts [String, Hash, Google::Auth::Credentials] :credentials
       #   the path to the keyfile as a String, the contents of the keyfile as a Hash, or a Google::Auth::Credentials object.
       # @option opts [String] :prefix custom namespace within the bucket
@@ -20,12 +20,14 @@ 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)
 
         @prefix = opts.delete(:prefix)
         acl     = opts.delete(:acl)
@@ -63,8 +65,9 @@ module BFS
       # Creates a new file and opens it for writing
       def create(path, opts={}, &block)
         path = full_path(path)
-        temp = BFS::TempWriter.new(path, encoding: opts.delete(:encoding)) do |t|
-          File.open(t, binmode: true) do |file|
+        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)
           end
         end
@@ -80,21 +83,22 @@ module BFS
       # Opens an existing file for reading
       def open(path, 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), binmode: true)
+        temp = Tempfile.new(File.basename(path), encoding: enc)
         temp.close
         file.download temp.path, opts
 
-        File.open(temp.path, binmode: true, &block)
+        File.open(temp.path, encoding: enc, &block)
       end
 
       # Deletes a file.
       def rm(path, opts={})
         path = full_path(path)
         file = @bucket.file(path)
-        file.delete(opts) if file
+        file&.delete(opts)
       end
 
       # Copies a file.
@@ -111,8 +115,11 @@ 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)
+  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,

data/spec/bfs/bucket/gs_spec.rb

@@ -11,7 +11,8 @@ run_spec = \
   begin
     s = Google::Cloud::Storage.new(project_id: sandbox[:project])
     !s.bucket(sandbox[:bucket]).nil?
-  rescue Signet::AuthorizationError
+  rescue Signet::AuthorizationError => e
+    warn "WARNING: unable to run #{File.basename __FILE__}: #{e.message}"
     false
   end
 
@@ -29,9 +30,15 @@ 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]}/?acl=private&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
+
+    bucket = BFS.resolve("gs://#{sandbox[:bucket]}/a/b/")
+    expect(bucket).to be_instance_of(described_class)
+    expect(bucket.name).to eq(sandbox[:bucket])
+    expect(bucket.instance_variable_get(:@prefix)).to eq('a/b')
   end
 
   it 'should enumerate over a large number of files' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-gs
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.4
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.18'
 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.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: GS bucket adapter for bfs