Made is_empty? work if another folder starts with the same name as th…

…is one (#5)
snowplow-archive · May 12, 2014 · 7e790e5 · 7e790e5
1 parent a124970
commit 7e790e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -13,7 +13,7 @@ Broke up s3.rb into separate files (#21)
 Updated alter_filename_lambda to accept original filepath as 2nd arg (#19)       - TODO
 Overrode equality operator for S3::Location to support tests (#10)
 Fixed break bugs in core Sluice process flow (#6)
-Made is_empty? work if another folder starts with the same name as this one (#5) - TODO
+Made is_empty? work if another folder starts with the same name as this one (#5)
 
 Version 0.1.5 (2013-10-13)
 --------------------------

diff --git a/lib/sluice/storage/s3/s3.rb b/lib/sluice/storage/s3/s3.rb
@@ -63,7 +63,7 @@ def new_fog_s3_from(region, access_key_id, secret_access_key)
       # Returns array of Fog::Storage::AWS::File's
       Contract FogStorage, Location => ArrayOf[FogFile]
       def list_files(s3, location)
-        files_and_dirs = s3.directories.get(location.bucket, prefix: location.dir).files
+        files_and_dirs = s3.directories.get(location.bucket, prefix: location.dir_as_path).files
 
         files = [] # Can't use a .select because of Ruby deep copy issues (array of non-POROs)
         files_and_dirs.each { |f|