ircp 1.1.2 → 1.1.3

data/lib/ircp/message.rb

@@ -2,6 +2,8 @@ require 'ircp/prefix'
 
 module Ircp
   class Message
+    CRLF = "\r\n"
+
     attr_accessor :raw, :prefix, :command, :params
 
     def initialize(*args)
@@ -13,14 +15,27 @@ module Ircp
     end
 
     def inspect
-      variables = instance_variables.map { |name| "#{name.inspect}=#{instance_variable_get(name).inspect}" }
+      variables = instance_variables.map { |name| "#{name}=#{instance_variable_get(name).inspect}" }
       variables.unshift "#{self.class}"
       "<#{variables.join ' '}>"
     end
 
     def to_irc
-      msg = [@prefix, @command, *@params].map { |v| v.to_s }.reject { |v| v.empty? }.join(' ')
-      msg << "\r\n" unless msg.end_with?("\r\n")
+      command = @command.to_s.upcase
+
+      tokens = []
+      tokens << ":#{@prefix}" if @prefix
+      tokens << command
+
+      unless @params.empty?
+        last = @params.pop.to_s
+        last.insert 0, ':' if !last.start_with?(':') && last.include?(' ')
+        @params << last
+      end
+      tokens += @params
+
+      msg = tokens.map { |token| token.to_s } .reject { |token| token.empty? }.join(' ')
+      msg << CRLF unless msg.end_with?(CRLF)
       msg
     end
     alias_method :to_s, :to_irc

data/lib/ircp/prefix.rb

@@ -15,16 +15,16 @@ module Ircp
     end
 
     def inspect
-      variables = instance_variables.map { |name| "#{name.inspect}=#{instance_variable_get(name).inspect}" }
+      variables = instance_variables.map { |name| "#{name}=#{instance_variable_get(name).inspect}" }
       variables.unshift "#{self.class}"
       "<#{variables.join ' '}>"
     end
 
     def to_irc
       if @servername
-        ":#{servername}"
+        "#{servername}"
       else
-        [[':', @nick], ['!', @user], ['@', @host]].map do |mark, value|
+        [['', @nick], ['!', @user], ['@', @host]].map do |mark, value|
           "#{mark}#{value}" unless value.to_s.empty?
         end.compact.join('')
       end

data/lib/ircp/version.rb

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

data/spec/ircp/message_spec.rb

@@ -25,7 +25,24 @@ describe Ircp::Message do
   end
 
   describe '#to_s' do
-    include_context 'initialize message', :command => 'TEST', :params => ['foo', 'bar', 'buzz']
-    its(:to_s) { should eq "TEST foo bar buzz\r\n" }
+    context ":command => 'test', :params => ['foo', 'bar', 'buzz']" do
+      include_context 'initialize message', :command => 'TEST', :params => ['foo', 'bar', 'buzz']
+      it { subject.to_s.should eq "TEST foo bar buzz\r\n" }
+    end
+
+    context ":command => 'TEST', :params => ['foo', 'bar buzz']" do
+      include_context 'initialize message', :command => 'TEST', :params => ['foo', 'bar buzz']
+      it { subject.to_s.should eq "TEST foo :bar buzz\r\n" }
+    end
+
+    context ":prefix => {:servername => 'example.com'}, :command => 'TEST', :params => ['foo', 'bar buzz']" do
+      include_context 'initialize message', :prefix => {:servername => 'example.com'}, :command => 'TEST', :params => ['foo', 'bar buzz']
+      it { subject.to_s.should eq ":example.com TEST foo :bar buzz\r\n" }
+    end
+
+    context ":prefix => {:servername => 'example.com'}, :command => 'TEST', :params => ['foo', ':bar buzz']" do
+      include_context 'initialize message', :prefix => {:servername => 'example.com'}, :command => 'TEST', :params => ['foo', ':bar buzz']
+      it { subject.to_s.should eq ":example.com TEST foo :bar buzz\r\n" }
+    end
   end
 end

data/spec/ircp/prefix_spec.rb

@@ -21,13 +21,13 @@ describe Ircp::Prefix do
     context 'with servername' do
       before { @prefix = Ircp::Prefix.new(:servername => 'example.com') }
       subject { @prefix }
-      its(:to_s) { should eq ':example.com' }
+      its(:to_s) { should eq 'example.com' }
     end
 
     context 'with nick, user and host' do
       before { @prefix = Ircp::Prefix.new(:nick => 'foo', :user => 'bar', :host => 'example.com') }
       subject { @prefix }
-      its(:to_s) { should eq ':foo!bar@example.com' }
+      its(:to_s) { should eq 'foo!bar@example.com' }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ircp
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-03 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: -4241097157584953199
+      hash: 3404966832797746809
 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: -4241097157584953199
+      hash: 3404966832797746809
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21