ruby-net-nntp 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,4 +1,9 @@
-2007-06-28 17:02 +0200  Anton 'tony' Bangratz  <anton.bangratz@gmail.com>  (650cf04a9829 [tip])
+2007-06-28 17:11 +0200  Anton 'tony' Bangratz  <anton.bangratz@gmail.com>  (43d551bd69a3 [tip])
+
+	* Rakefile, lib/net/nntp.rb, lib/net/nntp/version.rb:
+	moved version to separate file
+
+2007-06-28 17:02 +0200  Anton 'tony' Bangratz  <anton.bangratz@gmail.com>  (650cf04a9829)
 
 	* lib/net/nntp.rb, lib/net/nntp_article.rb:
 	fixed bug in article overview parser

data/lib/net/nntp.rb

@@ -6,53 +6,92 @@ require 'timeout' # :nodoc:
 require 'net/nntp_group'
 require 'net/nntp_article'
 require 'net/nntp/version.rb'
+require 'rubygems'
+require 'log4r' 
 
 
 module Net      
 	class NNTP
 		include Timeout # :nodoc:
 
+		# Statuses of one-line responses
+		ONELINE_STATUSES = %w( 111 200 201 223 281 381 411 412 422 480 500 501 ).freeze
+
+		# Statuses of multiline responses
+		MULTILINE_STATUSES = %w( 100 215 220 221 222 224 ).freeze
+
 		# Error to indicate that NNTP Command failed gracefully
 		class CommandFailedError < StandardError
 		end
 		# Error to indicate that a Protocol Error occured during NNTP command execution
 		class ProtocolError < StandardError
 		end
+		
+
 		attr_reader :socket, :grouplist, :overview_format
 
+		def self.logger=(logger)
+			@@logger = logger
+		end
+
+		def self.logger
+			@@logger
+		end
+
+		def logger
+			@@logger
+		end
+		def debug(message)
+			@@logger.debug(message)
+		end
+
 		# initializes NNTP class with host and port
 		def initialize(host, port = 119)
 			@host = host
 			@port = port
 			@socket_class = TCPSocket
 			@group = nil
+			@@logger = Log4r::Logger['net::nntp'] || Log4r::Logger.new('net::nntp')
 		end
 
 		# Actually connects to NNTP host and port given in new()
 		def connect
 			@socket = @socket_class.new(@host, @port)
-			@welcome = @socket.recv 1024
+			@welcome = read_response()
+			debug "Welcome: #{@welcome[0]} "
+			@welcome
 		end
 
 		# Closes connection. If not reconnected, subsequent calls of commands raise exceptions
 		def close
+			debug 'closing connection per request'
 			@socket.close unless socket.closed?
 		end
 
+		def has_xover?
+			!help.select {|i| i =~ /\bxover\b/i}.empty?
+		end
+
+		def has_over?
+			!help.select {|i| i =~ /\bover\b/i}.empty?
+		end
 		# Uses authinfo commands to authenticate. Timeout for first command is set to 10 seconds. 
 		#
 		# Returns true on success, false on failure.
 		def authenticate(user, pass)
 			cmd = "authinfo user #{user}"
+			debug "Authenticating: Sending #{cmd}"
 			send_cmd cmd
-			response = nil
-			timeout(10) do
-				response = @socket.recv 1024
-			end
+			response_array = read_response()
+			response = response_array[0]
+			debug "Authenticating: Response #{response}"
 			if response[0..2] == '381' then
 				cmd = "authinfo pass #{pass}"
+				debug "Authenticating: Sending #{cmd}"
 				send_cmd cmd
-				response = @socket.recv 1024
+				response_array = read_response()
+				response = response_array[0]
+			debug "Authenticating: Response #{response}"
 			end
 			return response && response[0..2] == '281'
 		end
@@ -63,14 +102,14 @@ module Net
 		#
 		def group(group)
 			send_cmd "group #{group}"
-			response = @socket.readline
-			responsecode, cnt, first, last, name = response.split
+			response = read_response(true)
+			responsecode, cnt, first, last, name = response[0].split
 			if responsecode == '211'
 				@group = Group.new(name)
 				@group.article_info = [cnt, first, last]
 				@group
 			else
-				raise CommandFailedError, response
+				raise CommandFailedError, response[0]
 			end
 		end
 
@@ -222,7 +261,7 @@ module Net
 		def last_or_next(cmd)
 			raise ProtocolError, "No group selected" unless @group
 			send_cmd(cmd)
-			response = @socket.recv(1024)
+			response = read_response()[0]
 			code = response[0..2]
 			article = @group.articles.create
 			case code
@@ -247,8 +286,8 @@ module Net
 
 		def create_grouplist(response)
 			@grouplist = {}
-			response.each do |line|
-				next if line[0..2] == '215'
+			response.each_with_index do |line, idx|
+				next if idx == 0
 				break if line =~ /^\.\r\n$/
 				groupinfo = line.split 
 				group = Group.new groupinfo.shift
@@ -259,20 +298,20 @@ module Net
 		end
 
 		def send_cmd(cmd)
+			debug "Sending: '#{cmd}'"
 			@socket.write(cmd+"\r\n")
 		end
 
-		def read_response
+		def read_response(force_oneline=false)
 			response = ''
-			queue = Queue.new
 			str = ''
 			ra = []
 			loop do
 				str = @socket.readline
-				queue << str
 				ra << str
-				break if str == ".\r\n" || !str
+				break if force_oneline || (str == ".\r\n" || !str || ONELINE_STATUSES.include?(str[0..2]) )
 			end
+			debug "Response: '#{ra}'"
 			ra
 		end
 
@@ -291,7 +330,6 @@ module Net
 			suffix
 		end
 
-
 		private :read_response, :numbers_or_id, :send_cmd, :last_or_next, :create_grouplist
 
 	end

data/lib/net/nntp/version.rb

@@ -1,5 +1,5 @@
 module Net      
 	class NNTP
-		VERSION = "0.0.4"
+		VERSION = "0.0.5"
 	end
 end

data/lib/net/nntp_article.rb

@@ -2,7 +2,7 @@ module Net
 	class NNTP
 		class Article
 			attr_accessor :id, :messageid, :subject, :group
-			attr_reader :overview_format, :bytes, :lines, :xref, :date
+			attr_reader :overview_format, :bytes, :lines, :xref, :date, :from
 
 			def initialize
 				@overview_format = %w{id}

data/test/functional/test_nntp.rb

@@ -9,6 +9,13 @@ 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
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-net-nntp
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2007-06-28 00:00:00 +02:00
+  version: 0.0.5
+date: 2007-07-02 00:00:00 +02:00
 summary: Net::XXX style NNTP Library for easy access.
 require_paths: 
 - lib
@@ -30,11 +30,11 @@ authors:
 - Anton Bangratz
 files: 
 - lib/net
+- lib/net/nntp.rb
 - lib/net/nntp_group.rb
-- lib/net/nntp_article.rb
 - lib/net/nntp
 - lib/net/nntp/version.rb
-- lib/net/nntp.rb
+- lib/net/nntp_article.rb
 - test/functional
 - test/functional/test_nntp.rb
 - test/mock
@@ -68,5 +68,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: