bfs 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 689dbae3e78b15428f90cedacdff7e48fea896ba9af0c4342f6514d64a4efe65
-  data.tar.gz: 5587c11cf6160b8a6bb60cd3a1d28e78920cc489a131007255988bed4575e933
+  metadata.gz: 0b8d15cd430ed129880e1dcae5573b5ec7b9b7998094d950c7650f951c91a336
+  data.tar.gz: bd074f7b801ed837dc55db15f1dd7a192f050cc9f0ac7d0fe96ff401cc2dc660
 SHA512:
-  metadata.gz: 6184ff146d864c6697fb1957441263f27de7055adf259d02b3bec478f02464aa4ed954f314bc398758424e7cacb7f7e8a8101cf51ab3f0293160487d31cbe4a9
-  data.tar.gz: c503e81d75a02e8e11a4c9d7a3c0f7d701d51e938ac69e9afeadd0f37d0bde8dd598ad3ddbda2c8b784104bc6ab3dadab431e29a32352d1ad311964023acc213
+  metadata.gz: 8a10d11748fe17841ceddbb652f380da9d049c3f41efaed685209f41a47bc8b5d9fba86f5174f434644359a67d3905ca960fd20bc5797512bcad566b2241ab9c
+  data.tar.gz: c9ce56c64e7426c62db78750d0ef9e711d3a828c0bb9d901579b66d9f921c52a48cd7c86a86997f374488e3e78d870136165f5da1884addcee719961be2760b3

data/lib/bfs/blob.rb

@@ -5,8 +5,10 @@ module BFS
 
     def initialize(url)
       url = URI.parse(url) unless url.is_a?(::URI)
+      @path = BFS.norm_path(url.path)
+
+      url.path = '/'
       @bucket = BFS.resolve(url)
-      @path   = BFS.norm_path(url.path)
     end
 
     # Info returns the blob info

data/lib/bfs/bucket/fs.rb

@@ -1,5 +1,4 @@
 require 'bfs'
-require 'cgi'
 require 'fileutils'
 require 'pathname'
 
@@ -9,31 +8,31 @@ module BFS
     class FS < Abstract
       def initialize(root, _opts={})
         @root = Pathname.new(root.to_s)
-        @prefix = "#{@root}/"
+        @prefix = "#{@root.to_s.chomp('/')}/"
       end
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern='**/*', _opts={})
         Pathname.glob(@root.join(pattern)).select(&:file?).map do |name|
-          name.to_s.sub(@prefix, '')
+          trim_prefix(name.to_s)
         end
       end
 
       # Info returns the info for a single file
       def info(path, _opts={})
-        name = @root.join(norm_path(path))
-        path = name.to_s.sub(@prefix, '')
-        BFS::FileInfo.new(path, name.size, name.mtime)
+        full = @root.join(norm_path(path))
+        path = trim_prefix(full.to_s)
+        BFS::FileInfo.new(path, full.size, full.mtime)
       rescue Errno::ENOENT
         raise BFS::FileNotFound, path
       end
 
       # Creates a new file and opens it for writing
       def create(path, _opts={}, &block)
-        name = @root.join(norm_path(path))
-        FileUtils.mkdir_p(name.dirname.to_s)
+        full = @root.join(norm_path(path))
+        FileUtils.mkdir_p(full.dirname.to_s)
 
-        temp = BFS::TempWriter.new(name) {|t| FileUtils.mv t, name.to_s }
+        temp = BFS::TempWriter.new(full) {|t| FileUtils.mv t, full.to_s }
         return temp unless block
 
         begin
@@ -46,50 +45,49 @@ module BFS
       # Opens an existing file for reading
       def open(path, opts={}, &block)
         path = norm_path(path)
-        name = @root.join(path)
-        name.open('r', opts, &block)
+        full = @root.join(path)
+        full.open('r', opts, &block)
       rescue Errno::ENOENT
         raise BFS::FileNotFound, path
       end
 
       # Deletes a file.
       def rm(path, _opts={})
-        name = @root.join(norm_path(path))
-        FileUtils.rm_f name.to_s
+        full = @root.join(norm_path(path))
+        FileUtils.rm_f full.to_s
       end
 
       # Copies a file.
       def cp(src, dst, _opts={})
-        src = norm_path(src)
-        dst = norm_path(dst)
-        FileUtils.cp @root.join(src).to_s, @root.join(dst).to_s
+        full_src = @root.join(norm_path(src))
+        full_dst = @root.join(norm_path(dst))
+        FileUtils.mkdir_p full_dst.dirname.to_s
+        FileUtils.cp full_src.to_s, full_dst.to_s
       rescue Errno::ENOENT
-        raise BFS::FileNotFound, src
+        raise BFS::FileNotFound, norm_path(src)
       end
 
       # Moves a file.
       def mv(src, dst, _opts={})
-        src = norm_path(src)
-        dst = norm_path(dst)
-        FileUtils.mv @root.join(src).to_s, @root.join(dst).to_s
+        full_src = @root.join(norm_path(src))
+        full_dst = @root.join(norm_path(dst))
+        FileUtils.mkdir_p full_dst.dirname.to_s
+        FileUtils.mv full_src.to_s, full_dst.to_s
       rescue Errno::ENOENT
-        raise BFS::FileNotFound, src
+        raise BFS::FileNotFound, norm_path(src)
+      end
+
+      private
+
+      def trim_prefix(path)
+        path.slice!(0, @prefix.size) if path.slice(0, @prefix.size) == @prefix
+        path
       end
     end
   end
 end
 
 BFS.register('file') do |url|
-  params = CGI.parse(url.query.to_s)
-
   parts = [url.host, url.path].compact
-  root  = case params.key?('scope') && params['scope'].first
-          when 'root'
-            '/'
-          when 'dir'
-            File.dirname(File.join(*parts))
-          else
-            File.join(*parts)
-          end
-  BFS::Bucket::FS.new root
+  BFS::Bucket::FS.new File.join(*parts)
 end

data/spec/bfs/blob_spec.rb

@@ -1,27 +1,64 @@
 require 'spec_helper'
 
 RSpec.describe BFS::Blob do
-  let(:bucket) { BFS::Bucket::InMem.new }
-  before       { allow(BFS).to receive(:resolve).and_return(bucket) }
-  subject      { described_class.new('memtest://bucket/path/to/file.txt') }
+  describe 'default' do
+    let(:bucket) { BFS::Bucket::InMem.new }
+    before       { allow(BFS).to receive(:resolve).and_return(bucket) }
+    subject      { described_class.new('memtest://bucket/path/to/file.txt') }
 
-  it 'should move' do
-    expect(subject.path).to eq('path/to/file.txt')
-    expect { subject.mv('/to/other/path.txt') }.to raise_error(BFS::FileNotFound)
+    it 'should move' do
+      expect(subject.path).to eq('path/to/file.txt')
+      expect { subject.mv('/to/other/path.txt') }.to raise_error(BFS::FileNotFound)
 
-    subject.write('TESTDATA')
-    subject.mv('/to/other/path.txt')
-    expect(subject.path).to eq('to/other/path.txt')
+      subject.write('TESTDATA')
+      subject.mv('/to/other/path.txt')
+      expect(subject.path).to eq('to/other/path.txt')
+    end
+
+    it 'should write/read' do
+      expect { subject.read }.to raise_error(BFS::FileNotFound)
+      subject.write('TESTDATA')
+
+      info = subject.info
+      expect(info).to eq(BFS::FileInfo.new('path/to/file.txt', 8, info.mtime))
+      expect(info.mtime).to be_within(1).of(Time.now)
+
+      expect(subject.read).to eq('TESTDATA')
+    end
   end
 
-  it 'should write/read' do
-    expect { subject.read }.to raise_error(BFS::FileNotFound)
-    subject.write('TESTDATA')
+  describe 'file system' do
+    let(:tmpdir) { Dir.mktmpdir }
+    let(:path)   { "#{tmpdir}/path/to/file.txt".sub('/', '') }
+    after   { FileUtils.rm_rf tmpdir }
+    subject { described_class.new("file:///#{path}") }
+
+    it 'should move' do
+      expect(subject.path).to eq(path)
+      expect { subject.mv("#{tmpdir}/to/other/path.txt") }.to raise_error(BFS::FileNotFound)
+
+      subject.write('TESTDATA')
+      subject.mv("#{tmpdir}/to/other/path.txt")
+
+      expect(subject.path).to eq("#{tmpdir}/to/other/path.txt".sub('/', ''))
+      expect(Pathname.glob("#{tmpdir}/**/*").select(&:file?).map(&:to_s)).to eq [
+        "#{tmpdir}/to/other/path.txt",
+      ]
+    end
+
+    it 'should write/read' do
+      expect { subject.read }.to raise_error(BFS::FileNotFound)
+
+      subject.write('TESTDATA')
+      expect(subject.read).to eq('TESTDATA')
 
-    info = subject.info
-    expect(info).to eq(BFS::FileInfo.new('path/to/file.txt', 8, info.mtime))
-    expect(info.mtime).to be_within(1).of(Time.now)
+      info = subject.info
+      expect(info).to eq(BFS::FileInfo.new(path, 8, info.mtime))
+      expect(info.mtime).to be_within(1).of(Time.now)
 
-    expect(subject.read).to eq('TESTDATA')
+      expect(Pathname.glob("#{tmpdir}/**/*").select(&:file?).map(&:to_s)).to eq [
+        "#{tmpdir}/path/to/file.txt",
+      ]
+    end
   end
 end

data/spec/bfs/bucket/fs_spec.rb

@@ -13,13 +13,5 @@ RSpec.describe BFS::Bucket::FS do
     bucket = BFS.resolve("file://#{tmpdir}")
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.ls).to eq(['test.txt'])
-
-    bucket = BFS.resolve("file://#{tmpdir}/test.txt?scope=dir")
-    expect(bucket).to be_instance_of(described_class)
-    expect(bucket.ls).to eq(['test.txt'])
-
-    bucket = BFS.resolve("file://#{tmpdir}/test.txt?scope=root")
-    expect(bucket).to be_instance_of(described_class)
-    expect(bucket.instance_variable_get(:@root).to_s).to eq('/')
   end
 end

metadata

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