s3fsr 1.6 → 1.7

data/lib/s3fsr.rb

@@ -58,8 +58,8 @@ class SBaseDir
     get_contents << SFile.new(self, AWS::S3::S3Object.find(child_key, bucket))
   end
   def create_dir child_key
-    AWS::S3::S3Object.store(child_key, S3SYNC_DIR_CONTENTS, bucket)
-    get_contents << SFakeDir.new(self, child_key)
+    AWS::S3::S3Object.store(child_key + '/', '', bucket)
+    get_contents << SPrefixDir.new(self, child_key + '/')
   end
   def delete
     AWS::S3::S3Object.delete @key, bucket
@@ -99,7 +99,7 @@ class SBaseDir
           end
         end
         s3_bucket.common_prefix_cache.reject { |p| p == '/' }.each do |prefix|
-          hidden = SFakeDir.new(self, prefix[0..-2])
+          hidden = SPrefixDir.new(self, prefix)
           @data << hidden unless @data.find { |i| i.name == hidden.name }
         end
         break unless s3_bucket.object_cache.length > 0 && s3_bucket.object_cache.length % 1000 == 0
@@ -110,6 +110,26 @@ class SBaseDir
     end
 end
 
+# for either non-existent or aws console-created fake directories that end with /
+class SPrefixDir < SBaseDir
+  def initialize(parent, key)
+    @parent = parent
+    @key = key
+    @data = nil
+  end
+  def name
+    @key.split('/')[-1]
+  end
+  def bucket
+    @parent.bucket
+  end
+  private
+    def prefix
+      @key
+    end
+end
+
+# for s3sync/s3organizer fake directories
 class SFakeDir < SBaseDir
   def initialize(parent, key)
     @parent = parent

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: s3fsr
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
-  - 6
-  version: "1.6"
+  - 7
+  version: "1.7"
 platform: ruby
 authors: 
 - Stephen Haberman