weechat 0.0.3 → 0.0.4

data/ChangeLog

@@ -1,5 +1,13 @@
 2009-12-24  Dominik Honnef  <dominikho@gmx.net>
 
+	* lib/weechat.rb (Weechat): bumped version to 0.0.4
+
+	* lib/weechat/properties.rb (Weechat::Properties::InstanceMethods#get_infolist)
+	(Weechat::Properties::InstanceMethods#get_infolist_property)
+	(Weechat::Properties::InstanceMethods#valid_property): more specific infolist querying; performance tweaks
+	* lib/weechat/infolist.rb (Weechat::Infolist.parse): more specific infolist querying; performance tweaks
+	* lib/weechat/channel.rb (Weechat::IRC::Channel#get_infolist): more specific infolist querying; performance tweaks
+
 	* lib/weechat.rb (Weechat): bumped version to 0.0.3
 
 	* lib/weechat/buffer.rb (Weechat::Buffer.find): added method for finding buffers

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake/gempackagetask'
 
-VERSION = "0.0.3"
+VERSION = "0.0.4"
 
 spec = Gem::Specification.new do |s|
   s.name              = "weechat"

data/TODO

@@ -90,7 +90,7 @@ hooks:
 [x] hook_process
 [ ] hook_connect
 [x] hook_print
-[ ] hook_signal
+[x] hook_signal
 [ ] hook_signal_send
 [x] hook_config
 [ ] hook_completion

data/lib/weechat.rb

@@ -6,7 +6,7 @@ end
 require 'pp'
 
 module Weechat
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
   module Helper
     def command_callback(id, buffer, args)
       Weechat::Command.find_by_id(id).call(Weechat::Buffer.new(buffer), args)

data/lib/weechat/channel.rb

@@ -34,11 +34,8 @@ module Weechat
         end
       end
 
-      def get_infolist
-        list = Weechat::Infolist.parse("irc_channel", "", server.name).select{|channel|
-          channel[:buffer] == @ptr
-        }
-
+      def get_infolist(*fields)
+        list = Weechat::Infolist.parse("irc_channel", "", server.name, {:buffer => [:pointer, @ptr]}, *fields)
         list.empty? ? [{}] : list
       end
 

data/lib/weechat/infolist.rb

@@ -1,66 +1,40 @@
 module Weechat
   class Infolist
-    # class Item
-    #   def initialize(infolist)
-    #     @ptr = Weechat.infolist_new_item(infolist.ptr)
-    #   end
-
-    #   def []=(name, value)
-    #     type = case value
-    #            when String
-    #              value = value.to_s
-    #              'string'
-    #            when Numeric
-    #              'integer'
-    #            when Weechat::Pointer
-    #              value = value.ptr
-    #              'pointer'
-    #            when Date, Time, DateTime
-    #              # TODO implement time
-    #            else
-    #              value= value.to_s
-    #              'string'
-    #            end
-
-    #     m = "infolist_new_var_#{type}"
-    #     Weechat.__send__(m, name.to_s, value)
-    #   end
-    # end
-
-    # attr_reader :ptr
-    # def initialize
-    #   @ptr = Weechat.infolist_new
-    #   @items = Hash.new {|hash, key| hash[key] = Infolist::Item.new(self)}
-    # end
-
-    # def [](item)
-    #   @items[item]
-    # end
-
-    def self.parse(type, ptr="", arguments="")
+    def self.parse(type, ptr="", arguments="", requirements = {}, *fields)
       infolist_ptr = Weechat.infolist_get(type, ptr, arguments)
       ret = []
       while Weechat.infolist_next(infolist_ptr) > 0
-        h = { }
-        str = Weechat.infolist_fields(infolist_ptr)
-        str.split(/,/).each do |item|
-          type, name = item.split(/:/)
-          h[name.to_sym] = case type
-                           when 'p'
-                             Weechat.infolist_pointer(infolist_ptr, name)
-                           when 'i'
-                             Weechat.infolist_integer(infolist_ptr, name)
-                           when 's'
-                             Weechat.infolist_string(infolist_ptr, name)
-                           when 'b'
-                             # FIXME: not exposed to script API yet.
-                             # Weechat.infolist_buffer(infolist_ptr, name)
-                           when 't'
-                             Weechat.infolist_time(infolist_ptr, name)
-                           end
-        end
+        h = {}
+        not_matching = requirements.any? {|option, value|
+          type, value = value
+          Weechat.__send__("infolist_#{type}", infolist_ptr, option.to_s) != value
+        }
 
-        ret.push h
+        if not_matching
+          next
+        else
+          str = Weechat.infolist_fields(infolist_ptr)
+          str.split(/,/).each do |item|
+            type, name = item.split(/:/)
+            sname = name.to_sym
+            next if !fields.empty? && !fields.include?(sname)
+            h[sname] = case type
+                             when 'p'
+                               Weechat.infolist_pointer(infolist_ptr, name)
+                             when 'i'
+                               Weechat.infolist_integer(infolist_ptr, name)
+                             when 's'
+                               Weechat.infolist_string(infolist_ptr, name)
+                             when 'b'
+                               # FIXME: not exposed to script API yet.
+                               # Weechat.infolist_buffer(infolist_ptr, name)
+                             when 't'
+                               Weechat.infolist_time(infolist_ptr, name)
+                             end
+          end
+
+          ret << h
+        end
       end
       Weechat.infolist_free(infolist_ptr)
       return ret

data/lib/weechat/properties.rb

@@ -167,8 +167,8 @@ module Weechat
       # Returns a hash representation of the associated infolist.
       #
       # @return [Hash{Symbol => Object}] All properties in the infolist
-      def get_infolist
-        Weechat::Infolist.parse(self.class.type, @ptr)
+      def get_infolist(*fields)
+        Weechat::Infolist.parse(self.class.type, @ptr, {}, fields)
       end
 
       # Returns a property obtained by an infolist.
@@ -180,7 +180,7 @@ module Weechat
       # @see #get_integer_property
       def get_infolist_property(property)
         property = property.to_sym
-        values = get_infolist.first
+        values = get_infolist(property).first
         raise Exception::UnknownProperty, property.to_s unless values.has_key?(property)
         values[property]
       end
@@ -268,7 +268,8 @@ module Weechat
         when :localvar
           property =~ /^localvar_.+$/
         when :infolist
-          get_infolist.first.has_key?(property.to_sym)
+          sproperty = property.to_sym
+          get_infolist(sproperty).first.has_key?(sproperty)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weechat
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Dominik Honnef