ruby-net-nntp 0.2.0 → 0.2.1

data/lib/net/nntp/article.rb

@@ -11,6 +11,7 @@ end
 
 module Net
   class NNTP
+    # Article parsing class
     class Article
       attr_accessor  :group, :headers, :body
       attr_reader :overview_format
@@ -132,10 +133,21 @@ module Net
       #
       # 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>'.
+      # value '<abc@def.gh>'. Scans multiline headers (if header does start with a 
+      # whitespace, it is part of the last header.
       def set_header(line)
-        name, value = line.scan(/^(.*?): (.*)$/).flatten
-        key = name.strip.gsub(/[^\w]/, '_').downcase
+        value = nil
+        if line =~ /^\s/ # line starts with a whitespace
+          oldval = @headers.send(@last_header)
+          value = []
+          value << oldval.strip
+          value << line.strip
+          key = @last_header
+        else
+          name, value = line.scan(/^(.*?): (.*)$/).flatten
+          key = name.strip.gsub(/[^\w]/, '_').downcase
+        end
+        @last_header = key
         @headers.add_pair(key, value)
         @headers
       end
@@ -157,7 +169,7 @@ module Net
         lines.each do |line|
           count += 1
           next if count == 1
-          break if line =~ /^.$/
+          break if line =~ /^\.$/
             do_header = (do_header && line !~ /^$/)
           next if line =~ /^$/
             if do_header

data/lib/net/nntp/version.rb

@@ -1,5 +1,5 @@
 module Net      
   class NNTP
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/test/unit/test_nntp_article.rb

@@ -55,6 +55,12 @@ class TestNNTPArticle < Test::Unit::TestCase
     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
+    @article.set_header('References: <this.is.a.reference.test@invalid>')
+    @article.set_header(' <this.is.another.reference.test@invalid>')
+    assert_kind_of Array, @article.headers.references
+    assert_equal 2, @article.headers.references.size
+    assert_equal '<this.is.a.reference.test@invalid>', @article.headers.references[0]
+    assert_equal '<this.is.another.reference.test@invalid>', @article.headers.references[1]
   end
 
   def test_parse
@@ -66,14 +72,16 @@ class TestNNTPArticle < Test::Unit::TestCase
                                         "", 
                                         "test please ignore", 
                                         "test   ", 
+                                        "\t",
                                         "."])
     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 3, article.body.size
     assert_equal 'test please ignore', article.body[0]
     assert_equal 'test   ', article.body[1]
+    assert_equal "\t", article.body[2]
     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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-net-nntp
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-08-22 00:00:00 +02:00
+  version: 0.2.1
+date: 2007-11-19 00:00:00 +01:00
 summary: Net::XXX style NNTP Library for easy access.
 require_paths: 
 - lib
@@ -40,8 +40,8 @@ files:
 - test/mock
 - test/mock/mock_socket.rb
 - test/unit
-- test/unit/test_nntp_article.rb
 - test/unit/test_nntp_group.rb
+- test/unit/test_nntp_article.rb
 - README
 - CHANGELOG
 - MIT-LICENSE
@@ -51,8 +51,8 @@ test_files:
 - test/mock
 - test/mock/mock_socket.rb
 - test/unit
-- test/unit/test_nntp_article.rb
 - test/unit/test_nntp_group.rb
+- test/unit/test_nntp_article.rb
 rdoc_options: 
 - -S
 - -N