net-ftp-list 0.4 → 0.5

data/README.txt

@@ -28,8 +28,9 @@ See the RFC for more guff on LIST and NLST: http://www.ietf.org/rfc/rfc0959.txt
   require 'net/ftp/list'
 
   ftp = Net::FTP.open('somehost.com', 'user', 'pass')
-  ftp.extend Net::FTP::List # Tweak list, ls and dir to returned parsed content.
-  ftp.list('/some/path') do |entry|
+  ftp.list('/some/path') do |e|
+    entry = Net::FTP::List.parse(e)
+    
     # Ignore everything that's not a file (so symlinks, directories and devices etc.)
     next unless entry.file?
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 
 NAME = 'net-ftp-list'
-VERS = '0.4'
+VERS = '0.5'
 
 CLEAN.include ['**/*.log', '*.gem']
 CLOBBER.include ['**/*.log']

data/lib/net/ftp/list.rb

@@ -10,17 +10,15 @@ module Net #:nodoc:
 
     # Parse FTP LIST responses.
     #
-    # Mixin the +Net::FTP::List+ module and subsequent calls to the Net::FTP +list+, +ls+ or +dir+ methods will be
-    # parsed by the LIST parser as best it can.
-    #
     # == Creation
     #
     #   require 'net/ftp' # Not really required but I like to list dependencies sometimes.
     #   require 'net/ftp/list'
     #
     #   ftp = Net::FTP.open('somehost.com', 'user', 'pass')
-    #   ftp.extend Net::FTP::List
-    #   ftp.list('/some/path') do |entry|
+    #   ftp.list('/some/path') do |e|
+    #     entry = Net::FTP::List.parse(e)
+    #
     #     # Ignore everything that's not a file (so symlinks, directories and devices etc.)
     #     next unless entry.file?
     #
@@ -34,29 +32,10 @@ module Net #:nodoc:
     # None at this time. At worst you'll end up with an Net::FTP::List::Unknown instance which won't have any extra
     # useful information. Methods like <tt>dir?</tt>, <tt>file?</tt> and <tt>symlink?</tt> will all return +false+.
     module List
-
-      def self.extended(klass) #:nodoc:
-        class << klass
-  
-          alias_method :raw_list, :list
-          def list(*args, &block)
-            if block
-              raw_list(*args) do |raw|
-                Net::FTP::List::Parser.parse(raw)
-                yield raw
-              end
-            else
-              raw_list(*args).map do |raw|
-                Net::FTP::List::Parser.parse(raw)
-              end
-            end
-          end
-
-        end
+      def self.parse(*args)
+        Parser.parse(*args)
       end
-
     end
-
   end
 end
 

data/test/test_net_ftp_list.rb

@@ -4,8 +4,8 @@ require 'net/ftp/list'
 class TestNetFTPList < Test::Unit::TestCase
 
   def setup
-    @dir  = Net::FTP::List::Parser.parse('drwxr-xr-x   4 user     group       4096 Dec 10 20:23 etc')
-    @file = Net::FTP::List::Parser.parse('-rw-r--r--   1 root     other        531 Jan 29 03:26 README')
+    @dir  = Net::FTP::List.parse('drwxr-xr-x   4 user     group       4096 Dec 10 20:23 etc')
+    @file = Net::FTP::List.parse('-rw-r--r--   1 root     other        531 Jan 29 03:26 README')
   end
 
   def test_parse_new
@@ -14,7 +14,7 @@ class TestNetFTPList < Test::Unit::TestCase
   end
 
   def test_rubbish_lines
-    assert_instance_of Net::FTP::List::Unknown, Net::FTP::List::Parser.parse("++ bah! ++")
+    assert_instance_of Net::FTP::List::Unknown, Net::FTP::List.parse("++ bah! ++")
   end
 
   def test_ruby_unix_like_dir

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: net-ftp-list
 version: !ruby/object:Gem::Version 
-  version: "0.4"
-date: 2008-01-16 00:00:00 +11:00
+  version: "0.5"
+date: 2008-01-17 00:00:00 +11:00
 summary: Parse FTP LIST command output.
 require_paths: 
 - lib