ircp 0.0.2 → 0.0.3

data/lib/ircp/message.rb

@@ -19,13 +19,18 @@ module Ircp
     end
 
     def to_s
-      return @raw unless @raw.nil?
+      if @raw.nil? || @raw.empty?
+        tokens = []
+        tokens << @prefix
+        tokens << @command
+        @params.each { |param| tokens << param }
+        msg = tokens.delete_if { |token| token.nil? || token.empty? }.join(' ')
+      else
+        msg = @raw.to_s
+      end
 
-      tokens = []
-      tokens.push @prefix unless @prefix.empty?
-      tokens.push @command unless @command.nil?
-      tokens.push *@params
-      tokens.join ' '
+      msg << "\r\n" unless msg.end_with?("\r\n")
+      msg
     end
   end
 end

data/lib/ircp/prefix.rb

@@ -21,16 +21,18 @@ module Ircp
     end
 
     def to_s
-      return @raw unless @raw.nil?
-
-      if @servername
-        ":#{servername}"
+      if @raw.nil? || @raw.empty?
+        if @servername
+          ":#{servername}"
+        else
+          tokens = []
+          tokens << ":#{@nick}" unless @nick.nil?
+          tokens << "!#{@user}" unless @user.nil?
+          tokens << "@#{@host}" unless @host.nil?
+          tokens.join ''
+        end
       else
-        tokens = []
-        tokens.push ":#{@nick}" unless @nick.nil?
-        tokens.push "!#{@user}" unless @user.nil?
-        tokens.push "@#{@host}" unless @host.nil?
-        tokens.join ''
+        @raw.to_s
       end
     end
   end

data/lib/ircp/version.rb

@@ -1,3 +1,3 @@
 module Ircp
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ircp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &12892860 !ruby/object:Gem::Requirement
+  requirement: &15966740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12892860
+  version_requirements: *15966740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12892440 !ruby/object:Gem::Requirement
+  requirement: &15966320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12892440
+  version_requirements: *15966320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12892020 !ruby/object:Gem::Requirement
+  requirement: &15965900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12892020
+  version_requirements: *15965900
 description: irc parser
 email:
 - mail@mashiro.org