fffs 0.0.2 → 0.0.3

data/lib/fffs/directory.rb

@@ -17,9 +17,13 @@
 # along with fffs. If not, see <http://www.gnu.org/licenses/>.
 #++
 
+require 'fffs/node'
+
 module FFFS
 
 class Directory < Hash
+  include Node
+
   attr_accessor :filesystem, :parent
 
   attr_reader :name
@@ -78,18 +82,6 @@ class Directory < Hash
     }
   end
 
-  def path
-    path    = []
-    current = self
-
-    begin
-      path   << current.name
-      current = current.parent
-    end while current != current.parent
-
-    "/#{path.reverse.join('/')}/".sub(%r{/*/}, '/')
-  end
-
   def inspect
     output = "#{self.path}\n"
 

data/lib/fffs/file.rb

@@ -17,9 +17,13 @@
 # along with fffs. If not, see <http://www.gnu.org/licenses/>.
 #++
 
+require 'fffs/node'
+
 module FFFS
 
 class File
+  include Node
+
   attr_accessor :filesystem, :parent
 
   attr_accessor :content
@@ -41,16 +45,8 @@ class File
     @parent << self
   end
 
-  def path
-    path    = []
-    current = self
-
-    begin
-      path   << current.name
-      current = current.parent
-    end while current != current.parent
-
-    "/#{path.reverse.join('/')}"
+  def to_s
+    @content
   end
 
   def inspect

data/lib/fffs/filesystem.rb

@@ -38,7 +38,6 @@ class FileSystem < Directory
   def parse (text)
     separator = Regexp.escape(text.match(/^(.+)$/)[1])
     text      = text.sub(/^.*$/, '').gsub(/\r/, '')
-    text[-1]  = ''
 
     data = text.split(/\n\n#{separator} (.+?) #{separator}\n\n/)
     data.shift

data/lib/fffs/node.rb

@@ -0,0 +1,36 @@
+#--
+# Copyleft meh. [http://meh.doesntexist.org | meh@paranoici.org]
+#
+# This file is part of fffs.
+#
+# fffs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# fffs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with fffs. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module FFFS
+
+module Node
+  def path
+    path    = []
+    current = self
+
+    begin
+      path   << current.name
+      current = current.parent
+    end while current != current.parent
+
+    "/#{path.reverse.join('/')}/".sub(%r{/*/}, '/')
+  end
+end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - meh.
@@ -29,6 +29,7 @@ extra_rdoc_files: []
 files: 
 - lib/fffs.rb
 - lib/fffs/file.rb
+- lib/fffs/node.rb
 - lib/fffs/link.rb
 - lib/fffs/directory.rb
 - lib/fffs/filesystem.rb