ircp 1.1.1 → 1.1.2

data/lib/ircp/message.rb

@@ -19,16 +19,7 @@ module Ircp
     end
 
     def to_irc
-      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
-
+      msg = [@prefix, @command, *@params].map { |v| v.to_s }.reject { |v| v.empty? }.join(' ')
       msg << "\r\n" unless msg.end_with?("\r\n")
       msg
     end

data/lib/ircp/prefix.rb

@@ -21,18 +21,12 @@ module Ircp
     end
 
     def to_irc
-      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
+      if @servername
+        ":#{servername}"
       else
-        @raw.to_s
+        [[':', @nick], ['!', @user], ['@', @host]].map do |mark, value|
+          "#{mark}#{value}" unless value.to_s.empty?
+        end.compact.join('')
       end
     end
     alias_method :to_s, :to_irc

data/lib/ircp/version.rb

@@ -1,3 +1,3 @@
 module Ircp
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ircp
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4246548536809339078
+      hash: -4241097157584953199
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4246548536809339078
+      hash: -4241097157584953199
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21