bfs-gs 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 122c702df719f9cad5d305bfeec70c467ce65bda54eafdac2a73c098dbcdee96
-  data.tar.gz: 123e412eea2104d88de883be1dba69ab628a91e8b315b5189ebd5cea6e4faad8
+  metadata.gz: 361c56113182e489c7373029e15e134fe2f65a0cdec35b00f97a72ed8b8b94b7
+  data.tar.gz: 8f969343d8848f1ba073ce0948836290591fd1096995ed0456a7715c89e7cc70
 SHA512:
-  metadata.gz: eea22b92b0ad8ccbdceab4ef01cd7462877deee8fcc395faca70c8b338bf4edaaa1d592f31642b189383e78649132e6c9810c16efea707a962a0f51052cdb77b
-  data.tar.gz: ed44218f277442eca35210dc574409167857c2ff50f9f6a9b1af3680c9430dd39089750a057370d0a2573c674152cacf440cb3d2f620d69f4b8eeb5644f353c2
+  metadata.gz: '04359b81560d94527826da03a81d00b2f399a7e2d77e8d5c563aa6f1587d8163aa863f69288aaecdc5213b07e1d26e579c129958d7d761a797ddf11bc013de84'
+  data.tar.gz: b3656acbcfaf1074bdcebabb4c6df76801bb913bceb37bb5be5a68e4099543d0a31e0953f7606af280faa2368aa415e4d36bce375e0ab6b87241d39b05158165

data/lib/bfs/bucket/gs.rb

@@ -33,14 +33,18 @@ module BFS
 
       # Lists the contents of a bucket using a glob pattern
       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 |acc|
+          walk(pattern, **opts) do |name, _|
+            acc << name
+          end
+        end
+      end
 
-        Enumerator.new do |y|
-          @bucket.files(**opts).all do |file|
-            name = trim_prefix(file.name)
-            y << name if File.fnmatch?(pattern, name, File::FNM_PATHNAME)
+      # Iterates over the contents of a bucket using a glob pattern
+      def glob(pattern = '**/*', **opts)
+        Enumerator.new do |acc|
+          walk(pattern, **opts) do |name, file|
+            acc << file_info(name, file)
           end
         end
       end
@@ -52,7 +56,7 @@ module BFS
         raise BFS::FileNotFound, trim_prefix(path) unless file
 
         name = trim_prefix(file.name)
-        BFS::FileInfo.new(path: name, size: file.size, mtime: file.updated_at.to_time, content_type: file.content_type, metadata: norm_meta(file.metadata))
+        file_info(name, file)
       end
 
       # Creates a new file and opens it for writing
@@ -94,6 +98,23 @@ module BFS
 
         file.copy(full_path(dst), **opts)
       end
+
+      private
+
+      def walk(pattern, **opts)
+        prefix = pattern[%r{^[^*?\{\}\[\]]+/}]
+        prefix = File.join(*[@prefix, prefix].compact) if @prefix
+        opts   = opts.merge(prefix: prefix) if prefix
+
+        @bucket.files(**opts).all do |file|
+          name = trim_prefix(file.name)
+          yield(name, file) if File.fnmatch?(pattern, name, File::FNM_PATHNAME)
+        end
+      end
+
+      def file_info(name, file)
+        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
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-gs
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: GS bucket adapter for bfs