ircparser 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87f09fe2f8c39d5f6b97ccc979663bc6440c2ce5
-  data.tar.gz: 2c1831eb6b7dffb26f89c6a516e8b60bb03e99d6
+  metadata.gz: f1217812391fbfc6ef203d02f1254b972c443616
+  data.tar.gz: 3f6e7b53c42321bb34c2a47cf2d0913189ce68c4
 SHA512:
-  metadata.gz: 067017dc63e5b00e5b69377aad611ed71535ace6a476785318de659e186933b467b2948eafd3cf04029730976c63f1ebe3619e9e433fdd6f1ae21d4532b7ae77
-  data.tar.gz: 34826d0a23573067c3f4a1d8a233f15566a124cfb5f941c66685914a74938f74f076af6c0b79256b94f21855f7ef8dde9c2aa8534a288c715c5f963195d4f4fd
+  metadata.gz: 8f26235c8c3962bcb916d708e065aad027248343795fd449aea0bfcb19fea064403a34fd3da3a374dc12663af738e03d7ee68c3f0d5a62835a5cebc6696095bc
+  data.tar.gz: a4a9d6960f9ff92967009db8e3f1cdfdfb6cfd9557afaa20a682df46d871c4aab4301177e6221f2f989188dc6790b7c8e7f2ee7480bbde6dcf57dea2e0392fef

data/lib/ircparser/source.rb

@@ -19,10 +19,10 @@ module IRCParser
 	class Source
 
 		# Internal: A regular expression which matches a n!u@h mask.
-		MATCH_USER = /^(\S+)!(\S+)@(\S+)$/
+		MATCH_USER = /^(?<nick>[^\s!@]+?)(?:!(?<user>[^\s!@]+?))?(?:@(?<host>[^\s!@]+?))?$/
 
 		# Internal: A regular expression which matches a server name.
-		MATCH_SERVER = /^(\S+\.\S+)$/
+		MATCH_SERVER = /^(?<host>\S+\.\S+)$/
 
 		# Public: The hostname of this source.
 		attr_reader :host
@@ -37,14 +37,14 @@ module IRCParser
 		#
 		# source - Either a n!u@h mask or a server name.
 		def initialize source
-			if MATCH_USER =~ source
-				@type = :user
-				@nick = $~[1]
-				@user = $~[2]
-				@host = $~[3]
-			elsif MATCH_SERVER =~ source
+			if MATCH_SERVER =~ source
 				@type = :server
-				@host = $~[1]
+				@host = $~[:host]
+			elsif MATCH_USER =~ source
+				@type = :user
+				@nick = $~[:nick]
+				@user = $~[:user]
+				@host = $~[:host]
 			else
 				raise IRCParser::Error.new(source), 'source is not a user mask or server name'
 			end
@@ -67,7 +67,13 @@ module IRCParser
 
 		# Public: serialises this source to the serialised form.
 		def to_s
-			return is_user? ? "#{@nick}!#{@user}@#{@host}" : @host
+			if is_user?
+				buffer = @nick
+				buffer += "!#{@user}" unless @user.nil?
+				buffer += "@#{@host}" unless @host.nil?
+				return buffer
+			end
+			return @host
 		end
 	end
 end

data/lib/ircparser.rb

@@ -16,7 +16,7 @@
 module IRCParser
 
 	# Public: The version of IRCParser in use.
-	VERSION = '0.1.1'
+	VERSION = '0.2.0'
 end
 
 require_relative 'ircparser/error'

data/test/test_source.rb

@@ -38,28 +38,30 @@ describe IRCParser::Source do
 		end
 	end
 
-	describe 'when checking a valid user source' do
-		before do
-			@text = 'nick!user@host'
-			@source = IRCParser::Source.new @text
-		end
-		it 'should consist of the correct components' do
-			@source.nick.must_equal 'nick'
-			@source.user.must_equal 'user'
-			@source.host.must_equal 'host'
-		end
-		it 'should be a user not a server' do
-			@source.is_server?.must_equal false
-			@source.is_user?.must_equal true
-		end
-		it 'should serialise back to the same text' do
-			@source.to_s.must_equal @text
-		end
-	end
+	USER_MASKS = {
+		'nick!user@host' => { nick: 'nick', user: 'user', host: 'host' },
+		'nick!user'      => { nick: 'nick', user: 'user', host: nil    },
+		'nick@host'      => { nick: 'nick', user: nil,    host: 'host' },
+		'nick'           => { nick: 'nick', user: nil,    host: nil    }
+	}
 
-	describe 'when checking an invalid server source' do
-		it 'should throw an IRCParser::Error' do
-			proc { IRCParser::Source.new 'test' }.must_raise IRCParser::Error
+	USER_MASKS.each do |serialized, deserialized|
+		describe 'when checking a valid user source' do
+			before do
+				@source = IRCParser::Source.new serialized
+			end
+			it 'should consist of the correct components' do
+				@source.nick.must_equal deserialized[:nick]
+				@source.user.must_equal deserialized[:user]
+				@source.host.must_equal deserialized[:host]
+			end
+			it 'should be a user not a server' do
+				@source.is_server?.must_equal false
+				@source.is_user?.must_equal true
+			end
+			it 'should serialise back to the same text' do
+				@source.to_s.must_equal serialized
+			end
 		end
 	end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ircparser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter "SaberUK" Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest