bfs 0.7.1 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4851ad3e633d9ba6e2e1533206f9810390ff29959d047916f32004c4432bc282
-  data.tar.gz: 9129b8d9d6a87a8a5e97bd45145b4936f07bfd27c6c088bad6797477afcbf795
+  metadata.gz: cd67ecfdb038d1809be4193caf014dfd9e8bcba4e26a4cd04da3c64e61522ddc
+  data.tar.gz: 17586a9b02836e8bdcbf4da6bc822d9c169cca9823b5817357dba1d4a5f1a072
 SHA512:
-  metadata.gz: 015a5be095930a9f2a4b446809ac4d2684cd4c49ff3b56fc7a28b1f43b2bfe49953625092fcdced43969407d9d40e63eabc6f127fcb58d139d7de55b4b6f98d3
-  data.tar.gz: 8a3dcc158679457ba9881a29d47c0e4a1c316b040c2080bba61f80c596f20245125b1071a47c9540f65a588e94cccdf519bf0d975a38693c6b5e89ccee5c9326
+  metadata.gz: e1ab4426da76e5a0de997d9b1f355c549197e4bd199629a37f6f787a9dcd068020c04ed190f117461490bb75d86a4070b475d481cc679005de731dacabb8fd64
+  data.tar.gz: 355cd6811da84829fad5f59927535b681c3f357968681d175c8a400f4e0b445920120daba944ea679dc965b582d65781063e2be199ffc372cda4e7df6739f89c

data/lib/bfs.rb

@@ -4,6 +4,8 @@ require 'cgi'
 module BFS
   class FileInfo < Hash
     def initialize(**attrs)
+      super(nil)
+
       update(size: 0, mtime: Time.at(0), mode: 0, metadata: {})
       update(attrs)
     end
@@ -36,10 +38,23 @@ module BFS
   def self.register(*schemes, &resolver)
     @registry ||= {}
     schemes.each do |scheme|
+      scheme = scheme.to_s
+      raise(ArgumentError, "scheme #{scheme} is already registered") if @registry.key?(scheme)
+
       @registry[scheme] = resolver
     end
   end
 
+  def self.unregister(*schemes)
+    @registry ||= {}
+    schemes.each do |scheme|
+      scheme = scheme.to_s
+      raise(ArgumentError, "scheme #{scheme} is not registered") unless @registry.key?(scheme)
+
+      @registry.delete(scheme)
+    end
+  end
+
   def self.resolve(url, &block)
     url = url.is_a?(::URI) ? url.dup : URI.parse(url)
     rsl = @registry[url.scheme]

data/lib/bfs/blob.rb

@@ -7,12 +7,13 @@ module BFS
     # If a block is given, blobs are automatically closed after the block is yielded.
     def self.open(url)
       blob = new(url)
+      return blob unless block_given?
+
       begin
         yield blob
       ensure
         blob.close
-      end if block_given?
-      blob
+      end
     end
 
     def initialize(url)

data/lib/bfs/bucket/abstract.rb

@@ -9,12 +9,13 @@ module BFS
       # If a block is given, buckets are automatically closed after the block is yielded.
       def self.open(*args, **opts)
         bucket = new(*args, **opts)
+        return bucket unless block_given?
+
         begin
           yield bucket
         ensure
           bucket.close
-        end if block_given?
-        bucket
+        end
       end
 
       # Initializes a new bucket

data/lib/bfs/bucket/fs.rb

@@ -42,14 +42,9 @@ module BFS
         full = @root.join(norm_path(path))
         FileUtils.mkdir_p(full.dirname.to_s)
 
-        temp = BFS::TempWriter.new(full, encoding: encoding, perm: perm) {|t| FileUtils.mv t, full.to_s }
-        return temp unless block
-
-        begin
-          yield temp
-        ensure
-          temp.close
-        end
+        BFS::TempWriter.new(full, encoding: encoding, perm: perm) do |temp|
+          FileUtils.mv temp, full.to_s
+        end.perform(&block)
       end
 
       # Opens an existing file for reading

data/lib/bfs/bucket/in_mem.rb

@@ -7,6 +7,37 @@ module BFS
     class InMem < Abstract
       Entry = Struct.new(:io, :mtime, :content_type, :metadata)
 
+      class Writer < DelegateClass(::StringIO)
+        def initialize(encoding:, &closer)
+          @closer = closer
+
+          sio = StringIO.new
+          sio.set_encoding(encoding)
+          super sio
+        end
+
+        def close
+          super.tap do
+            @closer&.call(self)
+          end
+        end
+
+        def close!
+          __getobj__.close
+        end
+
+        def perform
+          return self unless block_given?
+
+          begin
+            yield self
+            close
+          ensure
+            close!
+          end
+        end
+      end
+
       def initialize(**opts)
         super(**opts.dup)
         @files = {}
@@ -43,18 +74,9 @@ module BFS
       # @option opts [String] :content_type Custom content type.
       # @option opts [Hash] :metadata Metadata key-value pairs.
       def create(path, encoding: self.encoding, content_type: nil, metadata: nil, **_opts, &block)
-        io = StringIO.new
-        io.set_encoding(encoding)
-
-        entry = Entry.new(io, Time.now, content_type, norm_meta(metadata))
-        @files[norm_path(path)] = entry
-        return io unless block
-
-        begin
-          yield(io)
-        ensure
-          io.close
-        end
+        Writer.new(encoding: encoding) do |wio|
+          @files[norm_path(path)] = Entry.new(wio, Time.now, content_type, norm_meta(metadata))
+        end.perform(&block)
       end
 
       # Opens an existing file for reading

data/lib/bfs/helpers.rb

@@ -4,19 +4,31 @@ require 'delegate'
 module BFS
   class TempWriter < DelegateClass(::Tempfile)
     def initialize(name, tempdir: nil, perm: nil, **opts, &closer)
-      @closer   = closer
-      @tempfile = ::Tempfile.new(File.basename(name.to_s), tempdir, **opts)
-      @tempfile.chmod(perm) if perm
-      super @tempfile
+      @closer = closer
+
+      tempfile = ::Tempfile.new(File.basename(name.to_s), tempdir, **opts)
+      tempfile.chmod(perm) if perm
+      super tempfile
+    end
+
+    def perform
+      return self unless block_given?
+
+      begin
+        yield self
+        close
+      ensure
+        close!
+      end
     end
 
     def close
       return if closed?
 
-      path = @tempfile.path
-      @tempfile.close
-      @closer&.call(path)
-      @tempfile.unlink
+      super.tap do
+        @closer&.call(path)
+      end
+      unlink
     end
   end
 end

data/spec/bfs/blob_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe BFS::Blob do
+RSpec.describe BFS::Blob, core: true do
   describe 'default' do
     let(:bucket) { BFS::Bucket::InMem.new }
     before       { allow(BFS).to receive(:resolve).and_return(bucket) }

data/spec/bfs/bucket/abstract_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe BFS::Bucket::Abstract do
+RSpec.describe BFS::Bucket::Abstract, core: true do
   it 'should open with a block' do
     sub_class = Class.new(described_class) do
       def close
@@ -13,10 +13,12 @@ RSpec.describe BFS::Bucket::Abstract do
     end
 
     bucket = nil
-    sub_class.open do |bkt|
+    result = sub_class.open do |bkt|
       expect(bkt).not_to be_closed
       bucket = bkt
+      21
     end
+    expect(result).to eq(21)
     expect(bucket).to be_instance_of(sub_class)
     expect(bucket).to be_closed
   end

data/spec/bfs/bucket/fs_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe BFS::Bucket::FS do
+RSpec.describe BFS::Bucket::FS, core: true do
   let(:tmpdir) { Dir.mktmpdir }
   after   { FileUtils.rm_rf tmpdir }
   subject { described_class.new(tmpdir) }
@@ -15,6 +15,7 @@ RSpec.describe BFS::Bucket::FS do
     bucket = BFS.resolve("file://#{tmpdir}")
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.ls.to_a).to eq(['test.txt'])
+    bucket.close
   end
 
   it 'should support custom perms on #initialize' do

data/spec/bfs/bucket/in_mem_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-RSpec.describe BFS::Bucket::InMem do
+RSpec.describe BFS::Bucket::InMem, core: true do
   it_behaves_like 'a bucket'
 end

data/spec/bfs/helpers_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe BFS::TempWriter do
+RSpec.describe BFS::TempWriter, core: true do
   let(:closer) { proc {} }
   subject { described_class.new 'test', &closer }
 
@@ -15,8 +15,14 @@ RSpec.describe BFS::TempWriter do
     expect(subject.close).to be_truthy
   end
 
-  it 'should exectute a closer block' do
-    expect(closer).to receive(:call).with(subject.path)
+  it 'should execute a closer block' do
+    expect(closer).to receive(:call).with(subject.path).once
     expect(subject.close).to be_truthy
+    expect(subject.close).to be_nil
+  end
+
+  it 'may skip closer block' do
+    expect(closer).not_to receive(:call)
+    expect(subject.close!).to be_truthy
   end
 end

data/spec/bfs_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe BFS do
+RSpec.describe BFS, core: true do
   it 'should resolve' do
     bucket = BFS.resolve("file://#{Dir.tmpdir}")
     expect(bucket).to be_instance_of(BFS::Bucket::FS)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.6
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies: []
 description: Minimalist abstraction for bucket storage
 email: dimitrij@blacksquaremedia.com
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Multi-platform cloud bucket adapter