blur 1.5.2 → 1.5.3

data/library/blur.rb

@@ -9,7 +9,7 @@ require 'openssl'
 Dir.glob("#{File.dirname __FILE__}/blur/**/*.rb").each &method(:require)
 
 module Blur
-  class << Version = [1,5,2]
+  class << Version = [1,5,3]
     def to_s; join '.' end
   end
 

data/library/blur/client.rb

@@ -46,7 +46,7 @@ module Blur
       
       Dir.glob("#{script_path}/scripts/*.rb").each do |path|
         script = Script.new path
-        script.client = self
+        script.__client = self
         
         @scripts << script
       end
@@ -84,9 +84,10 @@ module Blur
           rescue StandardError => exception
             if network.connected?
               network.disconnect
-              emit :connection_terminated, network
             end
 
+            emit :connection_terminated, network
+
             puts "#{"Network error" ^ :red} (#{exception.class.name}): #{exception.message}"
           end
         end
@@ -104,7 +105,7 @@ module Blur
         begin
           script.__send__ name, *args if script.respond_to? name
         rescue Exception => exception
-          puts ("#{File.basename script.path}:#{exception.line}" ^ :bold) + ": #{"error:" ^ :red} #{exception.message}"
+          puts ("#{File.basename script.__path}:#{exception.line}" ^ :bold) + ": #{"error:" ^ :red} #{exception.message}"
         end
       end
     end

data/library/blur/handling.rb

@@ -23,6 +23,8 @@ module Blur
         if channel = network.channel_by_name(name)
           users.each do |user|
             user.channel = channel
+            user.network = network
+
             channel.users << user
           end
         else
@@ -77,6 +79,13 @@ module Blur
           else
             # Odd… this shouldn't happen
           end
+        else # This is a private message
+          user = Network::User.new command.sender.nickname
+          user.name = command.sender.username
+          user.host = command.sender.hostname
+          user.network = network
+
+          emit :private_message, user, message
         end
       end
       
@@ -89,6 +98,7 @@ module Blur
           user.name = command.sender.username
           user.host = command.sender.hostname
           user.channel = channel
+          user.network = network
           
           channel.users << user
           

data/library/blur/network.rb

@@ -4,13 +4,21 @@ module Blur
   class Network
     class ConnectionError < StandardError; end
 
-    attr_accessor :options, :channels, :delegate, :connection
+    attr_accessor :options, :channels, :dialogues, :delegate, :connection
 
     def connected?; @connection.established? end
+
+    def host
+      @options[:hostname]
+    end
+
+    def port
+      @options[:port] ||= secure? ? 6697 : 6667
+    end
     
-    def ssl?; @options[:secure] == true end
-    def host; @options[:hostname] end
-    def port; @options[:port] ||= ssl? ? 6697 : 6667 end
+    def secure?
+      @options[:secure] == true
+    end
 
     def initialize options = {}
       @options  = options
@@ -45,7 +53,7 @@ module Blur
 
     def connect
       @connection.establish
-      @connection.enable_ssl OpenSSL::SSL::VERIFY_NONE if ssl?
+      @connection.enable_ssl OpenSSL::SSL::VERIFY_NONE if secure?
       
       transmit :PASS, @options[:password] if @options[:password]
       transmit :NICK, @options[:nickname]
@@ -54,6 +62,9 @@ module Blur
     
     def disconnect
       @connection.terminate
+
+      @channels.each { |channel| channel.users.clear }
+      @channels.clear
     end
     
     def transmit name, *arguments

data/library/blur/network/connection.rb

@@ -18,11 +18,11 @@ module Blur
         @socket = TCPSocket.new @host, @port
       end
 
-      def enable_ssl validator
+      def enable_ssl verification
         @secure = true
 
         context = OpenSSL::SSL::SSLContext.new
-        context.set_params verify_mode: validator
+        context.set_params verify_mode: verification
 
         sslsocket = OpenSSL::SSL::SSLSocket.new @socket, context
         sslsocket.sync = true

data/library/blur/network/user.rb

@@ -3,7 +3,7 @@
 module Blur
   class Network
     class User
-      attr_accessor :nick, :name, :host, :modes, :channel
+      attr_accessor :nick, :name, :host, :modes, :channel, :network
 
       def self.map_mode name, character
         define_method(:"#{name}?") { @modes.include? character.to_s }
@@ -41,7 +41,7 @@ module Blur
       end
       
       def say message
-        @channel.network.say self, message
+        @network.say self, message
       end
       
       def inspect

data/library/blur/script.rb

@@ -2,25 +2,25 @@
 
 module Blur
   class Script < Module
-    attr_accessor :name, :author, :version, :path, :client
+    attr_accessor :__name, :__author, :__version, :__path, :__client
     
-    def evaluated?; @evaluated end
+    def evaluated?; @__evaluated end
     
     def initialize path
-      @path = path
-      @evaluated = false
+      @__path = path
+      @__evaluated = false
       
-      if evaluate and @evaluated
-        cache.load if Cache.exists? @name
+      if evaluate and @__evaluated
+        cache.load if Cache.exists? @__name
         
         __send__ :loaded if respond_to? :loaded
       end
     end
     
     def Script name, version = [1,0], author = nil, &block
-      @name    = name
-      @author  = author
-      @version = version
+      @__name    = name
+      @__author  = author
+      @__version = version
       
       instance_eval &block
       
@@ -28,31 +28,31 @@ module Blur
     end
     
     def unload!
-      cache.save if @cache
+      cache.save if @__cache
       __send__ :unloaded if respond_to? :unloaded
 
-      @cache = nil
+      @__cache = nil
     end
 
     def script name
-      @client.scripts.find { |script| script.name == name }
+      @__client.scripts.find { |script| script.__name == name }
     end
     
     def cache
-      @cache ||= Cache.new self
+      @__cache ||= Cache.new self
     end
     
     def inspect
-      %{#<#{self.class.name} @name=#{@name.inspect} @version=#{@version.inspect} @author=#{@author.inspect}>}
+      %{#<#{self.class.name} @name=#{@__name.inspect} @version=#{@__version.inspect} @author=#{@__author.inspect}>}
     end
     
   private
   
     def evaluate
-      module_eval File.read(@path), File.basename(@path), 0
-      @evaluated = true
+      module_eval File.read(@__path), File.basename(@__path), 0
+      @__evaluated = true
     rescue Exception => exception
-      puts "#{File.basename(@path) ^ :bold}:#{exception.line.to_s ^ :bold}: #{"error:" ^ :red} #{exception.message ^ :bold}"
+      puts "#{File.basename(@__path) ^ :bold}:#{exception.line.to_s ^ :bold}: #{"error:" ^ :red} #{exception.message ^ :bold}"
     end
   end
 end

data/library/blur/script/cache.rb

@@ -45,7 +45,7 @@ module Blur
     private
     
       def path
-        %{#{Cache.path}/#{@script.name}.yml}
+        %{#{Cache.path}/#{@script.__name}.yml}
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: blur
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors: 
 - Mikkel Kroman
@@ -10,7 +10,7 @@ autorequire:
 bindir: executables
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +01:00
 default_executable: 
 dependencies: []