bfs 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c790272a036559149178dadb5932e424a90bbc535f842a298516457051912310
-  data.tar.gz: 9f673793872f84f34f4cd95fb396cac88d44d7fc338ac20888149303584790f1
+  metadata.gz: 61e0b8f8c56a60a7d3b933aacce3e476d400389bfa991b14b3adddf3af667108
+  data.tar.gz: ab0da145b04da234825c0c418a5e5dc0fc3028627431072df04c5f2f7f45b652
 SHA512:
-  metadata.gz: 53547ee9f745695a72196d8eb3d9b09054ea2d6cc106993bce0fe22d563e31cb67f450edc28424de2d9aa6b7f72126235dcd5a31c179b5c15c27ed739da21214
-  data.tar.gz: b6e0927840f82b058d2662e8b29e33fe9a6697b4219cf451c0ce49cb778e79070ce684ab8bc37e4f9dd2756898275fa872cd29d3dd20e175487649a216794f5b
+  metadata.gz: 4ba809e64dfdab6a918a807323acffd3228783d5c4c6a3ecc9712011ca742a2510e830fe7c2cbf73f2b0d900bdd9d5a9386e133c16ba3170b6be972366db0405
+  data.tar.gz: 1999418b45ed5c090b7bf578f9ea6c8964eb49538b98068c6eff583480b1682d63ef61a04a3f9183ba54f027e9bd876b618d5297795c469c43127474e808449d

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,36 @@ 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
+          close!
+          @closer&.call(self)
+        end
+
+        def close!
+          __getobj__.close
+        end
+
+        def perform(&block)
+          return self unless block
+
+          begin
+            yield self
+            close
+          ensure
+            close!
+          end
+        end
+      end
+
       def initialize(**opts)
         super(**opts.dup)
         @files = {}
@@ -43,18 +73,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,33 @@ 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(&block)
+      return self unless block
+
+      begin
+        yield self
+        close
+      ensure
+        close!
+      end
     end
 
     def close
       return if closed?
 
-      path = @tempfile.path
-      @tempfile.close
-      @closer&.call(path)
-      @tempfile.unlink
+      tempfile = __getobj__
+      tempfile.close
+      @closer&.call(tempfile.path)
+      true
+    ensure
+      tempfile.unlink
     end
   end
 end

data/spec/bfs/helpers_spec.rb

@@ -19,4 +19,9 @@ RSpec.describe BFS::TempWriter, core: true do
     expect(closer).to receive(:call).with(subject.path)
     expect(subject.close).to be_truthy
   end
+
+  it 'may skip closer block' do
+    expect(closer).not_to receive(:call)
+    expect(subject.close!).to be_truthy
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies: []
 description: Minimalist abstraction for bucket storage
 email: dimitrij@blacksquaremedia.com