fffs 0.0.11 → 0.0.12

data/lib/fffs/directory.rb

@@ -66,13 +66,38 @@ class Directory < Hash
     self[id.to_s]
   end
 
-  alias __set []=
+  def [] (path)
+    if path.include?('/')
+      result = path.start_with?('/') ? filesystem : self
+      last   = nil
+
+      path.split(%r{/+}).each {|piece|
+        next if piece.empty? || piece == '.'
+
+        if !result.is_a?(Directory)
+          raise RuntimeError.new "#{last} isn't a directory"
+        end
+
+        if piece == '..'
+          result = result.parent
+        else
+          result = result[piece]
+        end
+
+        last = piece
+      }
+
+      result
+    else
+      super(path)
+    end
+  end
 
   def []= (name, value)
     value.parent     = self
     value.filesystem = self.filesystem
 
-    __set(name, value)
+    super(name, value)
   end
 
   def push (file)

data/lib/fffs/filesystem.rb

@@ -74,33 +74,19 @@ class FileSystem < Directory
         content = Base64.decode64(content)
       end
 
-      if path == '.'
-        parent = self 
+      into = self
 
-        if link
-          self << Link.new(name, link)
-        else
-          self << File.new(name, content)
+      path.split('/').each {|dir|
+        into = into[dir] || (into << Directory.new(dir))
+      }
 
-          if mime
-            self[name].mime = mime
-          end
-        end
+      if link
+        into << Link.new(name, link)
       else
-        into = self
-
-        path.split('/').each {|dir|
-          into = into[dir] || (into << Directory.new(dir))
-        }
-
-        if link
-          into << Link.new(name, link)
-        else
-          into << File.new(name, content)
+        into << File.new(name, content)
 
-          if mime
-            into[name].mime = mime
-          end
+        if mime
+          into[name].mime = mime
         end
       end
     }

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fffs
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 11
-  version: 0.0.11
+  prerelease: 
+  version: 0.0.12
 platform: ruby
 authors: 
 - meh.
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 +02:00
-default_executable: 
+date: 2011-05-29 00:00:00 Z
 dependencies: []
 
 description: A virtual filesystem for embedded data.
@@ -33,7 +28,6 @@ files:
 - lib/fffs/link.rb
 - lib/fffs/directory.rb
 - lib/fffs/filesystem.rb
-has_rdoc: true
 homepage: http://github.com/meh/fffs
 licenses: []
 
@@ -47,21 +41,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: A virtual filesystem.