cinch 2.2.4 → 2.2.5

data/lib/cinch/irc.rb

@@ -616,7 +616,7 @@ module Cinch
     def on_307(msg, events)
       # RPL_WHOISREGNICK
       user = User(msg.params[1])
-      update_whois(user, {:authname => user.nick})
+      update_whois(user, {:registered => true})
     end
 
     def on_311(msg, events)

data/lib/cinch/target.rb

@@ -18,7 +18,7 @@ module Cinch
     # @return [void]
     # @see #safe_notice
     def notice(text)
-      msg(text, true)
+      send(text, true)
     end
 
     # Sends a PRIVMSG to the target.
@@ -36,29 +36,13 @@ module Cinch
       split_start = @bot.config.message_split_start || ""
       split_end   = @bot.config.message_split_end   || ""
       command = notice ? "NOTICE" : "PRIVMSG"
+      prefix = ":#{@bot.mask} #{command} #{@name} :"
 
-      text.split(/\r\n|\r|\n/).each do |line|
-        maxlength = 510 - (":" + " #{command} " + " :").size
-        maxlength = maxlength - @bot.mask.to_s.length - @name.to_s.length
-        maxlength_without_end = maxlength - split_end.bytesize
-
-        if line.bytesize > maxlength
-          splitted = []
-
-          while line.bytesize > maxlength_without_end
-            pos = line.rindex(/\s/, maxlength_without_end)
-            r = pos || maxlength_without_end
-            splitted << line.slice!(0, r) + split_end.tr(" ", "\u00A0")
-            line = split_start.tr(" ", "\u00A0") + line.lstrip
-          end
-
-          splitted << line
-          splitted[0, (@bot.config.max_messages || splitted.size)].each do |string|
-            string.tr!("\u00A0", " ") # clean string from any non-breaking spaces
-            @bot.irc.send("#{command} #@name :#{string}")
-          end
-        else
-          @bot.irc.send("#{command} #@name :#{line}")
+      text.lines.map(&:chomp).each do |line|
+        splitted = split_message(line, prefix, split_start, split_end)
+
+        splitted[0, (@bot.config.max_messages || splitted.size)].each do |string|
+          @bot.irc.send("#{command} #@name :#{string}")
         end
       end
     end
@@ -182,5 +166,33 @@ module Cinch
         nil
       end
     end
+
+    private
+    def split_message(msg, prefix, split_start, split_end)
+      max_bytesize = 510 - prefix.bytesize
+      max_bytesize_without_end = max_bytesize - split_end.bytesize
+
+      if msg.bytesize <= max_bytesize
+        return [msg]
+      end
+
+      splitted = []
+      while msg.bytesize > max_bytesize_without_end
+        acc = 0
+        acc_rune_sizes = msg.each_char.map {|ch|
+          acc += ch.bytesize
+        }
+
+        max_rune = acc_rune_sizes.rindex {|bs| bs <= max_bytesize_without_end} || 0
+        r = [msg.rindex(/\s/, max_rune) || (max_rune + 1), 1].max
+
+        splitted << (msg[0...r] + split_end)
+        msg = split_start.tr(" ", "\z") + msg[r..-1].lstrip
+      end
+      splitted << msg
+
+      # clean string from any substitute characters
+      splitted.map {|string| string.tr("\z", " ")}
+    end
   end
 end

data/lib/cinch/user.rb

@@ -303,6 +303,10 @@ module Cinch
         return
       end
 
+      if values[:registered]
+        values[:authname] ||= self.nick
+        values.delete(:registered)
+      end
       {
         :authname => nil,
         :idle     => 0,

data/lib/cinch/version.rb

@@ -1,4 +1,4 @@
 module Cinch
   # Version of the library
-  VERSION = '2.2.4'
+  VERSION = '2.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies: []
 description: A simple, friendly DSL for creating IRC bots
 email: