blur 1.5 → 1.5.1

data/library/blur.rb

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

data/library/blur/enhancements.rb

@@ -9,5 +9,9 @@ class Exception
 end
 
 class String
+  def numeric?
+    self =~ /^\d+$/
+  end
+
   alias_method :starts_with?, :start_with?
 end

data/library/blur/handling.rb

@@ -150,6 +150,26 @@ module Blur
         end
       end
 
+      def got_mode network, command
+        name, modes, limit, nick, mask = command.params
+
+        if channel = network.channel_by_name(name)
+          if limit
+            unless limit.numeric?
+              nick = limit
+            end
+
+            if user = channel.user_by_nick(nick)
+              emit :user_mode, user, modes
+              user.merge_modes modes
+            end
+          else
+            emit :channel_mode, channel, modes
+            channel.merge_modes modes
+          end
+        end
+      end
+
       alias_method :got_422, :got_end_of_motd
       alias_method :got_376, :got_end_of_motd
     end

data/library/blur/network/channel.rb

@@ -3,16 +3,32 @@
 module Blur
   class Network
     class Channel
-      attr_accessor :name, :users, :topic, :network
+      attr_accessor :name, :users, :topic, :modes, :network
 
       def initialize name, network = nil, users = []
         @name    = name
         @users   = users
+        @modes   = ""
         @network = network
 
         users.each { |user| user.channel = self }
       end
 
+      def merge_modes modes
+        addition = true
+
+        modes.each_char do |char|
+          case char
+          when ?+
+            addition = true
+          when ?-
+            addition = false
+          else
+            addition ? @modes.concat(char) : @modes.delete!(char)
+          end
+        end
+      end
+
       def say message
         @network.say self, message
       end
@@ -30,4 +46,4 @@ module Blur
       end
     end
   end
-end
+end

data/library/blur/network/user.rb

@@ -3,10 +3,41 @@
 module Blur
   class Network
     class User
-      attr_accessor :nick, :name, :host, :channel
-      
+      attr_accessor :nick, :name, :host, :modes, :channel
+
+      def self.map_mode name, character
+        define_method(:"#{name}?") { @modes.include? character.to_s }
+      end
+
+      map_mode :admin,         :a
+      map_mode :voice,         :v
+      map_mode :owner,         :q
+      map_mode :operator,      :o
+      map_mode :half_operator, :h
+
       def initialize nick
-        @nick = nick.sub /^[@|~|\+|%|&]/, ''
+        @nick  = nick
+        @modes = ""
+        
+        if modes = prefix_to_mode(nick[0])
+          @nick  = nick[1..-1]
+          @modes = modes
+        end
+      end
+
+      def merge_modes modes
+        addition = true
+
+        modes.each_char do |char|
+          case char
+          when ?+
+            addition = true
+          when ?-
+            addition = false
+          else
+            addition ? @modes.concat(char) : @modes.delete!(char)
+          end
+        end
       end
       
       def say message
@@ -20,6 +51,18 @@ module Blur
       def to_s
         @nick
       end
+
+    private
+
+      def prefix_to_mode prefix
+        case prefix
+        when '@' then 'o'
+        when '+' then 'v'
+        when '%' then 'h'
+        when '&' then 'a'
+        when '~' then 'q'
+        end
+      end
     end
   end
-end
+end

data/library/blur/script.rb

@@ -32,6 +32,10 @@ module Blur
       
       __send__ :unloaded if respond_to? :unloaded
     end
+
+    def script name
+      @client.scripts.find { |script| script.name == name }
+    end
     
     def cache
       @cache ||= Cache.new self
@@ -44,11 +48,10 @@ module Blur
   private
   
     def evaluate
-      if module_eval File.read(@path), File.basename(@path), 0
-        @evaluated = true
-      end
+      module_eval File.read(@path), File.basename(@path), 0
+      @evaluated = true
     rescue Exception => exception
       puts "\e[1m#{File.basename @path}:#{exception.line}: \e[31merror:\e[39m #{exception.message}\e[0m"
     end
   end
-end
+end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  version: "1.5"
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Mikkel Kroman
@@ -13,7 +14,7 @@ autorequire:
 bindir: executables
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +01:00
+date: 2011-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -26,18 +27,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- library/blur.rb
 - library/blur/client.rb
 - library/blur/enhancements.rb
 - library/blur/handling.rb
+- library/blur/network.rb
 - library/blur/network/channel.rb
 - library/blur/network/command.rb
 - library/blur/network/connection.rb
 - library/blur/network/user.rb
-- library/blur/network.rb
+- library/blur/script.rb
 - library/blur/script/cache.rb
 - library/blur/script/messageparsing.rb
-- library/blur/script.rb
-- library/blur.rb
 has_rdoc: true
 homepage: 
 licenses: []