ruby-net-nntp 0.0.9 → 0.1.0

data/CHANGELOG

@@ -1,4 +1,41 @@
-2007-07-02 20:51 +0200  Anton 'tony' Bangratz  <anton.bangratz@gmail.com>  (4399451e92c0 [tip])
+2007-07-14 12:22 +0200  Anton 'tony' Bangratz  <anton.bangratz@gmail.com>  (5de9968582e9 [tip])
+
+	* README, lib/net/nntp.rb, lib/net/nntp/article.rb,
+	lib/net/nntp/group.rb, lib/net/nntp/version.rb,
+	test/mock/mock_socket.rb, test/unit/test_nntp_article.rb,
+	test/unit/test_nntp_group.rb:
+	NNTP can QUIT, Article redesign: parse HEAD, BODY and ARTICLE,
+	renamed 'id' to 'number', headers and body along with proxies added
+		- added QUIT to Net::NNTP
+		- added parse from HEAD, BODY and ARTICLE to Net::NNTP::Article
+	(factory)
+		- redesigned Net::NNTP::Article: + separate headers
+	and body attributes + including proxies to mimick
+	old attributes, deprecated + renamed the conflicting
+	'id' attribute to 'number'
+		- improved documentation
+
+2007-07-09 14:34 +0200  Anton 'tony' Bangratz  <anton.bangratz@gmail.com>  (d97d95ec735b)
+
+	* lib/net/nntp.rb, lib/net/nntp/article.rb, lib/net/nntp/group.rb,
+	lib/net/nntp/version.rb, lib/net/nntp_article.rb,
+	lib/net/nntp_group.rb, test/functional/test_nntp.rb,
+	test/mock/mock_socket.rb:
+	fixed overview.fmt, fixed logging
+		- fixed overview.fmt bug
+		- fixed logging for autotest/test
+
+2007-07-02 21:35 +0200  Anton 'tony' Bangratz  <anton.bangratz@gmail.com>  (5ba29ac12969)
+
+	* lib/net/nntp/version.rb:
+	new release;version fix
+
+2007-07-02 21:34 +0200  Anton 'tony' Bangratz  <anton.bangratz@gmail.com>  (8441de3d244d)
+
+	* lib/net/nntp.rb:
+	bugfix read_response multiline read - introduced with last release
+
+2007-07-02 20:51 +0200  Anton 'tony' Bangratz  <anton.bangratz@gmail.com>  (4399451e92c0)
 
 	* lib/net/nntp/version.rb:
 	Release 0.0.8, fixed version

data/README

@@ -29,3 +29,12 @@ Net::NNTP uses a simple interface to wrap commands to communicate with an NNTP s
 
 * sudo gem install libruby-nntp or
 * sudo dpkg -r libruby-0.0.1.deb
+
+= CHANGES
+
+Version 0.1.0 introduces the Net::NNTP::Article#headers and #body attributes. 
+Due to this, the attribute Net::NNTP::Article#id has been changed to Net::NNTP::Article#number 
+to avoid conflicts with Object#id.
+
+Additionally, on request, Net::NNTP::Article has been changed from being a mere proxy for Net::NNTP#xover
+result lines to being able to parse HEAD, BODY and ARTICLE results and return a corresponding instance.

data/lib/net/nntp.rb

@@ -3,13 +3,14 @@
 require 'socket'
 require 'thread'
 require 'timeout' # :nodoc:
-require 'net/nntp_group'
-require 'net/nntp_article'
+require 'net/nntp/group'
+require 'net/nntp/article'
 require 'net/nntp/version.rb'
 require 'rubygems'
 require 'log4r' 
 
 
+
 module Net      
   class NNTP
     include Timeout # :nodoc:
@@ -62,6 +63,15 @@ module Net
       @welcome
     end
 
+    # Sends QUIT command to server and closes the connection (unless force_close is set to false). Returns response.
+    def quit(force_close=true)
+      send_cmd "QUIT"
+      response = read_response
+      close if force_close
+      response
+    end
+
+
     # Closes connection. If not reconnected, subsequent calls of commands raise exceptions
     def close
       debug 'closing connection per request'
@@ -195,7 +205,7 @@ module Net
         case keyword
         when /overview.fmt/
           @overview_format_raw = list
-          @overview_format = Net::NNTP.parse_overview_format list.join
+          @overview_format = Net::NNTP.parse_overview_format list
         else
           create_grouplist(list)
           list
@@ -208,9 +218,10 @@ module Net
 
     # prepares overview format as read from server, used by Net::NNTP::Article and list()
     def self.parse_overview_format(format)
-      overview_format = %w{id}
-      format.split(/\r?\n/).each do |line|
-        next if line[0] == ?2 || line[0] == ?.
+      overview_format = %w{number}
+      lines = format
+      lines.each do |line|
+        next if line[0] == ?2 || line[0] == ?. || line == 'full'
         ident = line.scan(/\w/).join.downcase
         unless ident[0..3] == 'xref'
           overview_format << ident 
@@ -287,7 +298,7 @@ module Net
       case code
       when '223'
         code, id, msgid, what = response.split
-        article.id = id
+        article.number = id
         article.messageid = msgid
       else
         raise CommandFailedError, response
@@ -300,6 +311,7 @@ module Net
       last_or_next("last")
     end
 
+    # Issues the NEXT command to the NNTP server, returning the raw response
     def next
       last_or_next("next")
     end
@@ -329,14 +341,24 @@ module Net
       linecnt = 0
       loop do
         str = @socket.readline
+        #debug "  -> got line: '#{str}'"
         ra << str.chomp if str
-        break if force_oneline || (str.chomp == "." || !str || (linecnt == 0 && ONELINE_STATUSES.include?(str[0..2])) )
+        break if force_oneline || (!str || str.chomp == "." || (linecnt == 0 && ONELINE_STATUSES.include?(str[0..2])) )
         linecnt += 1
       end
-      debug "Response: '#{ra}'"
+      debug "Response: '#{ra.inspect}'"
       ra
     end
 
+    # Parses a hash in the format {:from => int, :to => int} or {:message_id => int}
+    # and returns a string. :to is optional, :from has precedence over :message_id if
+    # both are given
+    #
+    # Examples:
+    #   numbers_or_id(:from => 1, :to => 100) #=> returns '1-100'
+    #   numbers_or_id(:from => 1)             #=> returns '1-'
+    #   numbers_or_id(:message_id = '<abc>'   #=> returns '<abc>'
+    #   numbers_or_id(:from => 5, :message_id = '<abc>'   #=> returns 'f-'
     def numbers_or_id(hash)
       return nil unless hash
       suffix = ''

data/lib/net/nntp/article.rb

@@ -0,0 +1,176 @@
+require 'ostruct'
+
+# a slightly modified  OpenStruct
+class HeaderStruct < OpenStruct
+  # adds of modifies a new key/value pair
+  def add_pair(key, value)
+    @table[key.to_sym] = value
+    new_ostruct_member(key)
+  end
+end
+
+module Net
+  class NNTP
+    class Article
+      attr_accessor  :group, :headers, :body
+      attr_reader :overview_format
+
+      def initialize
+        @overview_format = %w{number}
+        @headers ||= HeaderStruct.new
+        @body = []
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def number 
+        @headers.number
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def number=(number)
+        @headers.number = number
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def messageid
+        @headers.message_id
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def messageid=(id)
+        @headers.message_id = id
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def subject
+        @headers.subject
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def subject=(subject)
+        @headers.subject=subject
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def bytes
+        @headers.bytes
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def lines
+        @headers.lines
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def xref
+        @headers.xref
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def date
+        @headers.date
+      end
+
+      # Former versions attribute proxy
+      #
+      # Deprecated: use corresponding headers attribute instead
+      def from
+        @headers.from
+      end
+
+      # Sets the overview format to use for parsing article from XOVER command results.
+      #
+      #
+      # Takes either a tab separated line as result from 'LIST OVERVIEW.FMT' and 
+      # parses it into an array (see Net::NNTP::parse_overview_format) or takes
+      # an already parsed array to set the format directly.
+      def overview_format=(format)
+        if Array === format
+          @overview_format = format
+        else
+          @overview_format = Net::NNTP.parse_overview_format format
+        end
+      end
+
+      # Parses data from XOVER command
+      #
+      # Takes the tab separated line corresponding to an article from the XOVER command 
+      # result and sets the header fields accordingly. CAVEAT! The overview format (see
+      # Net::NNTP::Article#overview_format= has to be set prior of attempting this, and 
+      # has to actually correspond with the fields.
+      def overview(over)
+        over.split(/\t/).each_with_index do |value, index|
+          ident = @overview_format[index]
+          @headers.add_pair(ident, value)
+          if @headers.messageid
+            @headers.message_id = @headers.messageid
+          end
+        end
+      end
+
+      # Sets a header from the result line
+      #
+      # Parses a line of the format "Header: Value" and sets the @headers accordingly.
+      # (Example: "Message-ID: <abc@def.gh>" will become @headers.message_id with the 
+      # value '<abc@def.gh>'.
+      def set_header(line)
+        name, value = line.scan(/^(.*)?: (.*)$/).flatten
+        key = name.strip.gsub(/[^\w]/, '_').downcase
+        @headers.add_pair(key, value)
+        @headers
+      end
+
+      # Creates an Net::NNTP::Article from a HEAD, BODY or ARTICLE result
+      #
+      # Takes the full result (including response line and stop marker ".")
+      # and creates a Net::NNTP::Article instance with the headers in @headers and 
+      # the body in @body.
+      def self.parse(lines)
+        responsecode = lines[0][0..2]
+        do_header =  responsecode == '221' 
+        do_body =  responsecode == '222' 
+        if responsecode == '220'
+          do_header = do_body = true
+        end
+        article = Net::NNTP::Article.new
+        count = 0
+        lines.each do |line|
+          count += 1
+          next if count == 1
+          break if line =~ /^.$/
+            do_header = (do_header && line !~ /^$/)
+          next if line =~ /^$/
+            if do_header
+              article.set_header(line) 
+            else
+              if do_body
+                article.body << line
+              end
+            end
+        end
+        article
+      end
+
+    end # class Net::NNTP::Article
+  end
+end

data/lib/net/{nntp_group.rb → nntp/group.rb}

@@ -13,6 +13,9 @@ module Net
         @article_first = @article_last = @article_count = nil
       end
 
+      # Set article_count, article_first, article_last (from GROUP command)
+      #
+      # Takes an array [count, first, last] as argument
       def article_info=(art_array)
         @article_count = art_array[0].to_i
         @article_first = art_array[1].to_i
@@ -27,6 +30,7 @@ module Net
         @articles = articles
       end
 
+      # Sets hi and lo watermark alont with postingmode (from LIST ACTIVE command)
       def listinfo(hi, lo, postingmode)
         @hi = hi
         @lo = lo
@@ -45,6 +49,7 @@ module Net
           @articles ||=[]
         end
 
+        # Stores articles in group attribute, using Net::NNTP::Article instances
         def build_from_over(over, format)
           article = Article.new
           article.overview_format = format
@@ -60,6 +65,8 @@ module Net
           @articles << article
         end
 
+        # Creates one Net::NNTP::Article instance, sets the group attribute to the
+        # including group instances and adds the article to articles before returning it
         def create
           a = Article.new
           a.group = self.group

data/lib/net/nntp/version.rb

@@ -1,5 +1,5 @@
 module Net      
-	class NNTP
-		VERSION = "0.0.9"
-	end
+  class NNTP
+    VERSION = "0.1.0"
+  end
 end

data/test/functional/test_nntp.rb

@@ -4,18 +4,18 @@ require 'net/nntp.rb'
 require 'mock/mock_socket'
 
 
+unless defined? log
+  log = Log4r::Logger.new('net::nntp')
+  fileout = Log4r::FileOutputter.new('net::nntp::fileout', :filename => File.join('logs', 'autotest.log'), :trunc => true)
+  fileout.formatter = Log4r::PatternFormatter.new(:pattern => '%d [%5l] : %m')
+  log.add fileout
+  log.level = Log4r::ALL
+end
 
 module TestNet
   class TestNNTP < Test::Unit::TestCase
 
     def setup
-      unless @log
-        @log = Log4r::Logger.new('net::nntp')
-        fileout = Log4r::FileOutputter.new('net::nntp::fileout', :filename => File.join('logs', 'autotest.log'))
-        fileout.formatter = Log4r::PatternFormatter.new(:pattern => '%d [%5l] : %m')
-        @log.add fileout
-        @log.level = Log4r::ALL
-      end
       nntp_connect_and_auth('localhost', 119, 'dummy', 'test')
     end
 

data/test/mock/mock_socket.rb

@@ -105,7 +105,7 @@ class MockSocket < Test::Unit::MockObject( TCPSocket )
     when /^list\b\s*(.*)\r\n$/
       case $1
       when /overview.fmt/i
-        @io = ["215 Order of fields in overview database.\r\nSubject:\r\nFrom:\r\nDate:\r\nMessage-ID:\r\nReferences:\r\nBytes:\r\nLines:\r\nXref:full\r\n.\r\n" ]
+        @io = ["215 Order of fields in overview database.\r\n", "Subject:\r\n", "From:\r\n", "Date:\r\n", "Message-ID:\r\n", "References:\r\n", "Bytes:\r\n", "Lines:\r\n", "Xref:full\r\n", ".\r\n" ]
       when /active\s*(.*)/
         @io = ["215 Newsgroups in form \"group high low flags\".", "at.test 200 100 y\r\n", "at.linux 100 90 n\r\n", ".\r\n"]
       when /^\s*$/
@@ -186,10 +186,10 @@ class MockSocket < Test::Unit::MockObject( TCPSocket )
   "1374\r\n", 
   "1375\r\n",
   ".\r\n"
-    ]
-    else 
-      if @group_selected
-        @io = [
+      ]
+      else 
+        if @group_selected
+          @io = [
     "211 Article list for at.linux follows\r\n",
   "1363\r\n", 
   "1364\r\n", 
@@ -205,31 +205,31 @@ class MockSocket < Test::Unit::MockObject( TCPSocket )
   "1374\r\n", 
   "1375\r\n",
   ".\r\n"
-      ]
+          ]
+        else
+          @io = ['412 No Group selected']
+        end
+      end
+    when "quit\r\n" then
+      @io = ["200 Good bye"]
+    when "authinfo user dummy\r\n"
+      @io = ["381 More authentication details needed"]
+    when "authinfo pass test\r\n"
+      @io = ["281 Welcome to dummytest"]
+    when /^group\s+(.+)\s*\r\n$/
+      case $1
+      when 'at.linux'
+        @io = ["211 12 1363 1375 at.linux"]
+        @group_selected = 'at.linux'
       else
-        @io = ['412 No Group selected']
+        @io = ["411 No such group"]
       end
-    end
-  when "quit\r\n" then
-    @io = ["200 Good bye"]
-  when "authinfo user dummy\r\n"
-    @io = ["381 More authentication details needed"]
-  when "authinfo pass test\r\n"
-    @io = ["281 Welcome to dummytest"]
-  when /^group\s+(.+)\s*\r\n$/
-    case $1
-    when 'at.linux'
-      @io = ["211 12 1363 1375 at.linux"]
-      @group_selected = 'at.linux'
-    else
-      @io = ["411 No such group"]
-    end
-  when "xhdr subject <slrnf26akq.ci5.hjp-usenet2@zeno.hjp.at>\r\n"
-    @io = 
-    ["1375 Re: Bitte um Meinungen ==> Virtualisierung\r\n"]
-  when "xhdr subject 1363-1375\r\n"
-    if @group_selected
-      @io = [
+    when "xhdr subject <slrnf26akq.ci5.hjp-usenet2@zeno.hjp.at>\r\n"
+      @io = 
+      ["1375 Re: Bitte um Meinungen ==> Virtualisierung\r\n"]
+    when "xhdr subject 1363-1375\r\n"
+      if @group_selected
+        @io = [
     "221 Subject header (from overview) for postings 1363-1375\r\n",
     "1363 Re: Bitte um Meinungen ==> Virtualisierung\r\n", 
     "1364 Re: Bitte um Meinungen ==> Virtualisierung\r\n", 
@@ -245,11 +245,11 @@ class MockSocket < Test::Unit::MockObject( TCPSocket )
     "1374 Re: Bitte um Meinungen ==> Virtualisierung\r\n", 
     "1375 Re: Bitte um Meinungen ==> Virtualisierung\r\n",
     ".\r\n"
-    ]
-    else
-      @io = ['412 No group selected']
-    end
-  when "xover 1363-1375\r\n"
+        ]
+      else
+        @io = ['412 No group selected']
+      end
+    when "xover 1363-1375\r\n"
       if @group_selected
         @io = [
   "224 Overview information for postings 1363-1375:\r\n",
@@ -267,9 +267,9 @@ class MockSocket < Test::Unit::MockObject( TCPSocket )
   "1374    Re: Bitte um Meinungen ==> Virtualisierung      Andreas Labres <al-nospam0310&bounce@labres.at> Mon, 16 Apr 2007 08:57:43 +0200 <1tnru1ccirb05.dlg@al.lab.at>  <4621dbb8$0$2310$91cee783@newsreader01.highway.telekom.at> <dh49f4-qem.ln1@this.is.a.news.server.you.goddamn.stupid.program> <slrnf23snh.dfm.hjp-usenet2@zeno.hjp.at> <4621ff58$0$2307$91cee783@newsreader01.highway.telekom.at>       1702    19      Xref: sensor.twincode.net at.linux:1374\r\n",
   "1375    Re: Bitte um Meinungen ==> Virtualisierung      \"Peter J. Holzer\" <hjp-usenet2@hjp.at>  Mon, 16 Apr 2007 09:49:46 +0200 <slrnf26akq.ci5.hjp-usenet2@zeno.hjp.at>       <4621dbb8$0$2310$91cee783@newsreader01.highway.telekom.at> <dh49f4-qem.ln1@this.is.a.news.server.you.goddamn.stupid.program> <slrnf23snh.dfm.hjp-usenet2@zeno.hjp.at> <4621ff58$0$2307$91cee783@newsreader01.highway.telekom.at> <1tnru1ccirb05.dlg@al.lab.at> 2127    33      Xref: sensor.twincode.net at.linux:1375\r\n",
   ".\r\n"
-  ]
-    else
-      @io = ["412 No Group selected"]
+        ]
+      else
+        @io = ["412 No Group selected"]
       end
     when /xover \<.+\>/
       @io = ["502 Usage: OVER first[-[last]]"]
@@ -300,11 +300,11 @@ class MockSocket < Test::Unit::MockObject( TCPSocket )
       "X-Complaints-To: usenet-abuse@arcor.de\r\n",
       "Xref: sensor.twincode.net at.linux:1430\r\n",
       ".\r\n"
-  ]
+      ]
 
       when /^\s?$/
-  if @group_selected 
-  @io = [
+        if @group_selected 
+          @io = [
       "221 1430 <462dfa6f$0$23135$9b4e6d93@newsspool1.arcor-online.net> article retrieved - head follows\r\n",
       "Path: vietwist00.chello.at!newsfeed02.chello.at!newsfeed01.chello.at!newsfeed.arcor.de!newsspool1.arcor-online.net!news.arcor.de.POSTED!not-for-mail\r\n",
       "Message-ID: <462dfa6f$0$23135$9b4e6d93@newsspool1.arcor-online.net>\r\n",
@@ -326,18 +326,18 @@ class MockSocket < Test::Unit::MockObject( TCPSocket )
       "X-Complaints-To: usenet-abuse@arcor.de\r\n",
       "Xref: sensor.twincode.net at.linux:1430\r\n",
       ".\r\n"
-      ]
-      else 
-        @io = ["412 No Group selected"]
-      end
+          ]
+        else 
+          @io = ["412 No Group selected"]
+        end
       else
         @io = ["501 Bad Command"]
       end
-      else
-        @io = ["500 Unknown Command"]
-      end
-    return str.length
+    else
+      @io = ["500 Unknown Command"]
     end
+    return str.length
+  end
 
   def readline
     super
@@ -349,4 +349,4 @@ class MockSocket < Test::Unit::MockObject( TCPSocket )
     $stdout.puts x
   end
 
-  end
+end

data/test/unit/test_nntp_article.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require 'net/nntp.rb'
-
 class TestNNTPArticle < Test::Unit::TestCase
 
   def setup
@@ -12,9 +9,9 @@ class TestNNTPArticle < Test::Unit::TestCase
     a = Net::NNTP::Article.new
   end
 
-  def test_article_id
-    @article.id = 1
-    assert_equal 1, @article.id
+  def test_article_number
+    @article.number = 1
+    assert_equal 1, @article.number
   end
 
   def test_article_messageid
@@ -32,7 +29,7 @@ class TestNNTPArticle < Test::Unit::TestCase
   def test_from_xover
     over = "1\tTesting\t\"abc\" abc@ide.invalid\t17 Aug 2004 14:00:00 GMT\t<this.post@is.invalid>\t\t200\t2\tXref: this.host.invalid alt.test:1"
     @article.overview(over)
-    assert_equal '1', @article.id
+    assert_equal '1', @article.number
     assert_equal '<this.post@is.invalid>', @article.messageid
     assert_equal 'Testing', @article.subject
     assert_equal 200, @article.bytes.to_i
@@ -41,8 +38,8 @@ class TestNNTPArticle < Test::Unit::TestCase
   end
 
   def test_overview_fmt=
-
     @article.overview_format = "215 Order of fields in overview database.\r\nSubject:\r\nFrom:\r\nDate:\r\nMessage-ID:\r\nReferences:\r\nBytes:\r\nLines:\r\nXref:full\r\n.\r\n"
+    assert_equal 'number', @article.overview_format[0]
     assert_equal 'subject', @article.overview_format[1]
     assert_equal 'from', @article.overview_format[2]
     assert_equal 'date', @article.overview_format[3]
@@ -53,4 +50,41 @@ class TestNNTPArticle < Test::Unit::TestCase
     assert_equal 'xref', @article.overview_format[8]
   end
 
+  def test_set_header
+    @article.set_header('Subject: Test')
+    assert_equal 'Test', @article.headers.subject
+    @article.set_header('Message-ID: <this.post@is.invalid>')
+    assert_equal '<this.post@is.invalid>', @article.headers.message_id
+  end
+
+  def test_parse
+    article = Net::NNTP::Article.parse(["220 1 article retrieved - text follows", 
+                                        "Date: 17 Aug 2004 14:00:00 GMT", 
+                                        "From: \"abc\" abc@ide.invalid", 
+                                        "Message-ID: <this.post@is.invalid>", 
+                                        "Subject: ignore test", 
+                                        "", 
+                                        "test please ignore", 
+                                        "test   ", 
+                                        "."])
+    assert_equal '17 Aug 2004 14:00:00 GMT', article.headers.date
+    assert_equal '"abc" abc@ide.invalid', article.headers.from
+    assert_equal '<this.post@is.invalid>', article.headers.message_id
+    assert_equal 'ignore test', article.headers.subject
+    assert_equal 2, article.body.size
+    assert_equal 'test please ignore', article.body[0]
+    assert_equal 'test   ', article.body[1]
+    article = Net::NNTP::Article.parse(["221 1 article retrieved - head follows", "Date: 17 Aug 2004 14:00:00 GMT", "From: \"abc\" abc@ide.invalid", 
+              "Message-ID: <this.post@is.invalid>", "Subject: ignore test", "."])
+    assert_equal '17 Aug 2004 14:00:00 GMT', article.headers.date
+    assert_equal '"abc" abc@ide.invalid', article.headers.from
+    assert_equal '<this.post@is.invalid>', article.headers.message_id
+    assert_equal 'ignore test', article.headers.subject
+    assert_equal 0, article.body.size
+    article = Net::NNTP::Article.parse(["222 1 article retrieved - body follows", "test please ignore", "test   ", "."])
+    assert_equal 2, article.body.size
+    assert_equal 'test please ignore', article.body[0]
+    assert_equal 'test   ', article.body[1]
+  end
+
 end

data/test/unit/test_nntp_group.rb

@@ -56,5 +56,5 @@ class TestNNTPGroup< Test::Unit::TestCase
     assert_kind_of String, @group.inspect
   end
 
-    
+
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-net-nntp
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
-date: 2007-07-02 00:00:00 +02:00
+  version: 0.1.0
+date: 2007-07-14 00:00:00 +02:00
 summary: Net::XXX style NNTP Library for easy access.
 require_paths: 
 - lib
@@ -31,9 +31,9 @@ authors:
 files: 
 - lib/net
 - lib/net/nntp
+- lib/net/nntp/article.rb
+- lib/net/nntp/group.rb
 - lib/net/nntp/version.rb
-- lib/net/nntp_article.rb
-- lib/net/nntp_group.rb
 - lib/net/nntp.rb
 - test/functional
 - test/functional/test_nntp.rb
@@ -42,6 +42,7 @@ files:
 - test/unit
 - test/unit/test_nntp_article.rb
 - test/unit/test_nntp_group.rb
+- test/logs
 - README
 - CHANGELOG
 - MIT-LICENSE
@@ -53,6 +54,7 @@ test_files:
 - test/unit
 - test/unit/test_nntp_article.rb
 - test/unit/test_nntp_group.rb
+- test/logs
 rdoc_options: 
 - -S
 - -N

data/lib/net/nntp_article.rb

@@ -1,28 +0,0 @@
-module Net
-  class NNTP
-    class Article
-      attr_accessor :id, :messageid, :subject, :group
-      attr_reader :overview_format, :bytes, :lines, :xref, :date, :from
-
-      def initialize
-        @overview_format = %w{id}
-      end
-
-      def overview_format=(format)
-        if Array === format
-          @overview_format = format
-        else
-          @overview_format = Net::NNTP.parse_overview_format format
-        end
-      end
-
-      def overview(over)
-        over.split(/\t/).each_with_index do |value, index|
-          ident = @overview_format[index]
-          eval "@#{ident} = value;"
-        end
-      end
-
-    end
-  end
-end