bfs-s3 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1adf9c2f6f6a8897454fafcaf5d347a323d5252476cc26a012aa945aea4b5328
-  data.tar.gz: 2a659245fa4feda255a9928577469c24f05c5b56fd01e885dd322647c929299e
+  metadata.gz: 64e82eeda72f79a41868973bca6120a9533742f28e3387fc3ea43a62ff7e2ac5
+  data.tar.gz: bbba7f07472b885148ec0ad66c3278412ecdb16ebdff4b1f06b2ca8604f43f6a
 SHA512:
-  metadata.gz: bf7acda8109779860069f9fe76ebfea00602cab33f8a3b8df81578b5ad5ced2b671508c6b48feef1cbdcc99a4280dd7b692f3d804f7dd3d55acfde020597c64b
-  data.tar.gz: f2ee02fcee3f640f2e151d28bc55bc4fa539a26fa85ae3060d1e09412d443ce5d52a5cfe87590845246dda71ca9fbb3d32119be250b731f8319f0a41d8eaaff6
+  metadata.gz: 594b23762958eb90c9d200d081939be4eba894593d56191772cc55dad3c6f596766481b7834a696fd65220e52a31bfe99b8169d1a5ec1e268b8bd7b188654b27
+  data.tar.gz: bed98d39b1423065bf49077947ac85dcedf36ae31e61d7cb6d921194d20597c4bb9850a90f20bb36331bf4a8d0866e1f9f93114a23c8bd691162d1ebe8e185c5

data/lib/bfs/bucket/s3.rb

@@ -55,13 +55,12 @@ module BFS
         path = norm_path(path)
         opts = opts.merge(
           bucket: name,
-          max_keys: 1,
-          prefix: opts[:prefix] ? File.join(opts[:prefix], path) : path,
+          key: opts[:prefix] ? File.join(opts[:prefix], path) : path,
         )
-        object = @client.list_objects_v2(opts).contents.first
-        raise BFS::FileNotFound, path unless object
+        info = @client.head_object(opts)
+        raise BFS::FileNotFound, path unless info
 
-        BFS::FileInfo.new(path, object.size, object.last_modified)
+        BFS::FileInfo.new(path, info.content_length, info.last_modified, info.content_type, info.metadata)
       rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NoSuchBucket
         raise BFS::FileNotFound, path
       end

data/spec/bfs/bucket/s3_spec.rb

@@ -27,16 +27,14 @@ RSpec.describe BFS::Bucket::S3 do
 
     allow(client).to receive(:list_objects_v2).with(bucket: 'mock-bucket', continuation_token: nil) do |*|
       contents = files.keys.map {|key| Aws::S3::Types::Object.new(key: key) }
-      double 'ListObjectsV2Response', contents: contents, next_continuation_token: ''
+      Aws::S3::Types::ListObjectsV2Output.new contents: contents, next_continuation_token: ''
     end
-    allow(client).to receive(:list_objects_v2).with(bucket: 'mock-bucket', max_keys: 1, prefix: 'a/b/c.txt') do |*|
-      obj = Aws::S3::Types::Object.new(key: 'a/b/c.txt', size: 10, last_modified: Time.now)
-      double 'ListObjectsV2Response', contents: [obj]
+    allow(client).to receive(:head_object).with(bucket: 'mock-bucket', key: 'a/b/c.txt') do |*|
+      Aws::S3::Types::HeadObjectOutput.new content_length: 10, last_modified: Time.now, content_type: 'text/plain', metadata: { 'key' => 'val' }
     end
-    allow(client).to receive(:list_objects_v2).with(bucket: 'mock-bucket', max_keys: 1, prefix: 'missing.txt') do |*|
-      double 'ListObjectsV2Response', contents: []
+    allow(client).to receive(:head_object).with(bucket: 'mock-bucket', key: 'missing.txt') do |*|
+      raise Aws::S3::Errors::NoSuchKey.new(nil, nil)
     end
-
     allow(client).to receive(:copy_object).with(hash_including(bucket: 'mock-bucket')) do |opts|
       src = opts[:copy_source].sub('/mock-bucket/', '')
       raise Aws::S3::Errors::NoSuchKey.new(nil, nil) unless files.key?(src)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 description: https://github.com/bsm/bfs.rb
 email: dimitrij@blacksquaremedia.com
 executables: []