Ruby4Skype 0.2.3 → 0.3.1

data/lib/skypeapi/error.rb

@@ -0,0 +1,8 @@
+module SkypeAPI
+  class Error < StandardError
+    class Attach < Error; end
+    class API < Error; end
+    class Timeout < Error; end
+    class NotImprement < Error; end
+  end
+end

data/lib/skypeapi/event.rb

@@ -1,21 +1,22 @@
 module SkypeAPI
-  module Object    
-    class Event  < AbstractObject
-      OBJECT_NAME = "EVENT"
-      
-      def self.create id, caption, hint, block=Proc.new
+  class Event  < AbstractObject
+    OBJECT_NAME = "EVENT"
+
+    class << self
+      def create id, caption, hint, block=Proc.new
         res = SkypeAPI.invoke "CREATE EVENT #{id} CAPTION #{caption} HINT #{hint}"
         res == "EVENT #{id} CREATED"
         instance = new id
         instance.setNotify block if block
         instance
       end
-      
-      def self.setNotify id=nil, block=Proc.new
+
+      def set_notify id=nil, block=Proc.new
         @notify[id] = block
       end
-      
-      def self.notified msg
+      alias setNotify set_notify
+
+      def notified msg
         if msg =~ /^([^ ]+) CLICKED$/m
           id = $1
           instance = new $1
@@ -24,27 +25,25 @@ module SkypeAPI
           @@instance[self][id].notified if @@instance[self][id]
         end
       end
-      
-      def notified
-        @notify.call self if @notify
-      end
-      
-      def setNotify block=Proc.new
-        @notify = block
-      end
-      
-      def self.delete id
+
+      def delete id
         new(id).delete
       end
-      
-      def delete
-        res = invoke "DELETE EVENT #{@id}"
-        res == "DELETE EVENT #{@id}"
-      end
 
-      alias set_notify setNotify
-      #alias del_notify delNotify
+    end
+
+    def notified
+      @notify.call self if @notify
+    end
+
+    def set_notify block=Proc.new
+      @notify = block
+    end
+    alias setNotify set_notify
 
+    def delete
+      res = invoke "DELETE EVENT #{@id}"
+      res == "DELETE EVENT #{@id}"
     end
   end
 end

data/lib/skypeapi/filetransfer.rb

@@ -1,31 +1,50 @@
 module SkypeAPI
-  module Object
-    class FileTransfer < AbstractObject
-      OBJECT_NAME = "FILETRANSFER"
-      
-      getter :Type, 'TYPE'
-      getter :Status, 'STATUS'
-      getter :FailureReason, 'FAILUREREASON'
-      getter :Partner, 'PARTNER_HANDLE' do |str|
-        @@skypeApi.user str
-      end
-      getter :PartnerDispname, 'PARTNER_DISPNAME'
-      getter :StartTime, 'STARTTIME' do |str|
-        if str.empty? then nil else Time.at(str.to_i) end
-      end
-      getter :FinishTime, 'FINISHTIME' do |str|
-        if str.empty? then nil else Time.at(str.to_i) end
-      end
-      getter :FilePath, 'FILEPATH'
-      getter :FileSize, 'FILESIZE' do |str|
-        str.to_i
-      end
-      getter :BytesPerSecond, 'BYTESPERSECOND' do |str|
-        str.to_i
-      end
-      getter :BytesTransferred, 'BYTESTRANSFERRED' do |str|
-        str.to_i
-      end
-    end
+  class FileTransfer < AbstractObject
+    OBJECT_NAME = "FILETRANSFER"
+
+    def get_type() invoke_get("TYPE") end
+    def_parser(:type)
+    alias getType get_type
+
+    def get_status() invoke_get("STATUS") end
+    def_parser(:status)
+    alias getStatus get_status
+
+    def get_failure_reason() invoke_get("FAILUREREASON") end
+    def_parser(:failure_reason, "FAILUREREASON")
+    alias getFailureReason get_failure_reason
+
+    def get_partner() parse :partner, invoke_get("PARTNER_HANDLE") end
+    def_parser(:partner, 'PARTNER_HANDLE'){|str| SkypeAPI::User.new str}
+    alias getPartner get_partner
+
+    def get_partner_dispname() invoke_get("PARTNER_DISPNAME") end
+    def_parser(:partner_dispname)
+    alias getPartnerDispname get_partner_dispname
+
+    def get_start_time() parse :start_time, invoke_get("STARTTIME") end
+    def_parser(:start_time,'STARTTIME'){|str| str.empty? ? nil : Time.at(str.to_i)}
+    alias getStartTime get_start_time
+
+    def get_finish_time() parse :finish_time, invoke_get("FINISHTIME") end
+    def_parser(:finish_time, 'FINISHTIME'){|str| str.empty? ? nil : Time.at(str.to_i)}
+    alias getFinishTime get_finish_time
+
+    def get_file_path() invoke_get("FILEPATH") end
+    def_parser(:file_path, 'FILEPATH')
+    alias getFilePath get_file_path
+
+    def get_file_size() parse :file_size, invoke_get("FILESIZE") end
+    def_parser(:file_size, 'FILESIZE'){|str| str.to_i}
+    alias getFileSize get_file_size
+
+    def get_bytes_per_second() parse :bytes_per_second, invoke_get("BYTESPERSECOND") end
+    def_parser(:bytes_per_second, 'BYTEPERSECOND'){|str| str.to_i}
+    alias getBytesPerSecond get_bytes_per_second
+
+    def get_bytes_transferred() parse :bytes_transferred, invoke_get("BYTESTRANSFERRED") end
+    def_parser(:bytes_transferred, 'BYTETRASFERRED'){|str| str.to_i}
+    alias getBytesTransferred get_bytes_transferred
+
   end
 end

data/lib/skypeapi/group.rb

@@ -1,81 +1,80 @@
 module SkypeAPI
-  module Object
-    class Group < AbstractObject
-      OBJECT_NAME = "GROUP"
-      
-      def self.create displayName
-        @@skypeApi.invoke("CREATE GROUP #{displayName}")
-        group = nil
-        tmp = nil
-        if @@skypeApi.Group.notify[:displayname] and @@skypeApi.Group.notify[:displayname][displayName]
-          tmp = @@skypeApi.Group.notify[:displayname][displayName]
-        end
-        @@skypeApi.Group.setNotify :DisplayName, displayName do |g|
-          group = g
-        end
-        until group
-          @@skypeApi.polling
-          sleep 0.0123
-        end
-        if tmp
-          @@skypeApi.Group.setNotify :DisplayName, displayName, tmp
-          tmp.call group
-        else
-          @@skypeApi.Group.notify[:displayname][displayName] = nil
-        end
-        group
-        #ThreadSafe ����ς��낤�Ȃ��B�B�B
+  class Group < AbstractObject
+    OBJECT_NAME = "GROUP"
+
+    #FASdfklasjidfojsdlkjljfaslkdjf!!!!!!!!!!!!!!!!!!!!
+    def self.create displayName
+      SkypeAPI.invoke("CREATE GROUP #{displayName}")
+      group = nil
+      tmp = nil
+      if SkypeAPI::Group.notify[:displayname] and SkypeAPI::Group.notify[:displayname][displayName]
+        tmp = SkypeAPI::Group.notify[:displayname][displayName]
       end
-      
-      getter :Type, 'TYPE'
-      getter :CustomGroupID, 'CUSTOM_GROUP_ID' do |str|
-        str.to_i
+      SkypeAPI::Group.setNotify :DisplayName, displayName do |g|
+        group = g
       end
-      getter :DisplayName, 'DISPLAYNAME'
-      getter :NrofUsers, 'NROFUSERS' do |str|
-        str.to_i
+      until group
+        SkypeAPI.polling
+        sleep 0.0123
       end
-      getter :NrofUsersOnline, 'NROFUSERS_ONLINE' do |str|
-        str.to_i
+      if tmp
+        SkypeAPI::Group.setNotify :DisplayName, displayName, tmp
+        tmp.call group
+      else
+        SkypeAPI::Group.notify[:displayname][displayName] = nil
       end
-      getter :Users, 'USERS' do |str|
-        str.split('./')
-      end
-      getter :Visible, 'VISIBLE' do |str|
-        str._flag
-      end
-      getter :Expanded, 'EXPANDED' do |str|
-        str._flag
-      end
-      
-      def setDisplayName dispname
-        invoke_set "DISPLAYNAME", dispname
-      end
-      
-      def delete
-        invoke_echo "DELETE GROUP #{@id}"
-      end
-      
-      def addUser user
-        invoke_alter "ADDUSER", user
-      end
-      
-      def removeUser user
-        invoke_alter "REMOVEUSER", user
-      end
-      
-      def share msg=''
-        invoke_alter "Share", msg
-      end
-      
-      def accept
-        invoke_alter "ACCEPT"
-      end
-      
-      def decline
-        invoke_alter "DECLINE"
-      end
-      
+      group
+      #ThreadSafe ����ς��낤�Ȃ��B�B�B
     end
+
+    def get_type() invoke_get("TYPE") end
+    def_parser(:type)
+    alias getType get_type
+
+    def get_custom_group_id() parse :custom_group_id, invoke_get("CUSTOM_GROUP_ID") end
+    def_parser(:custom_group_id){|str| str.to_i}
+    alias getCustomGroupID get_custom_group_id
+
+    def get_displayname() invoke_get("DISPLAYNAME") end
+    def_parser(:displayname)
+    alias getDisplayname get_displayname
+
+    def get_nrof_users() parse :nrof_users, invoke_get("NROFUSERS") end
+    def_parser(:nrof_users,"NROFUSERS"){|str| str.to_i}
+    alias getNrofUsers get_nrof_users
+
+    def get_nrof_users_online() parse :nrof_users_online, invoke_get("NROFUSERS_ONLINE") end
+    def_parser(:nrof_users_online,"NROFUSERS_ONLINE"){|str| str.to_i}
+    alias getNrofUsersOnline get_nrof_users_online
+
+    def get_users() parse :users, invoke_get("USERS") end
+    def_parser(:users){|str| str.split('./')}
+    alias getUsers get_users
+
+    def get_visible() parse :visible, invoke_get("VISIBLE") end
+    def_parser(:visible){|str| str._flag}
+    alias getVisible get_visible
+
+    def get_expanded() parse :expanded, invoke_get("EXPANDED") end
+    def_parser(:expanded){|str| str._flag}
+    alias getExpanded get_expanded
+
+    def set_displayname(dispname) invoke_set "DISPLAYNAME", dispname end
+    alias setDisplayname set_displayname
+
+    def delete() invoke_echo "DELETE GROUP #{@id}" end
+
+    def add_user(user) invoke_alter "ADDUSER", user end
+    alias addUser add_user
+
+    def remove_user(user) invoke_alter "REMOVEUSER", user end
+    alias removeUser remove_user
+
+    def share(msg='') invoke_alter "Share", msg end
+
+    def accept() invoke_alter "ACCEPT" end
+
+    def decline() invoke_alter "DECLINE" end
+
   end
 end

data/lib/skypeapi/menuitem.rb

@@ -1,9 +1,9 @@
 module SkypeAPI
-  module Object
-    class MenuItem < AbstractObject
-      OBJECT_NAME = 'MENU_ITEM'
-      
-      def self.create h, block=Proc.new
+  class MenuItem < AbstractObject
+    OBJECT_NAME = 'MENU_ITEM'
+
+    class << self
+      def create h, block=Proc.new
         raise ArgumentError unless h[:id] and h[:context] and h[:caption]
         #id, context, caption, hint=nil, icon=nil, enabled=nil, enableMultipleContacts=nil, &block
         res = SkypeAPI.invoke "CREATE MENU_ITEM #{h[:id]} CONTEXT #{h[:context]} CAPTION #{h[:caption]}#{h[:hint].nil? ? '' : " HINT #{h[:hint]}"}#{h[:icon].nil? ? '' : " ICON #{h[:icon]}"}#{h[:enable].nil? ? '' : " ENABLED #{h[:enabled]}"}#{h[:enableMultipleContacts].nil? ? '' : " ENABLE_MULTIPLE_CONTACTS #{h[:enableMultipleContacts]}"}"
@@ -13,11 +13,11 @@ module SkypeAPI
         instance
       end
 
-      def self.setNotify sym=nil, block=Proc.new
+      def set_notify sym=nil, block=Proc.new
         @notify[sym] = block
       end
-      
-      def self.notified msg
+
+      def notified msg
         if msg =~ /^([^ ]+) CLICKED( ([^ ]+))? CONTEXT ([^ ]+)( CONTEXT_ID (.+))?$/m
           id = $1; context = $4; userID = $3; contextID = $6
           user = userID ? SkypeAPI.user(userID) : nil
@@ -27,44 +27,44 @@ module SkypeAPI
           @@instance[self][id].notified instance, context, user, contextID if @@instance[self][id]
         end
       end
-      
-      def notified instance, context, user, contextID
-        @notify.call instance, context, user, contextID if @notify
-      end
-      
-      def setNotify block=Proc.new
-        @notify = block
-      end
-      
-      def self.delete id
+
+      def delete id
         new(id).delete
       end
-      
-      def delete
-        res = SkypeAPI.invoke "DELETE MENU_ITEM #{@id}"
-        res == "DELETE MENU_ITEM #{@id}"
-      end
-      
-      def setCaption caption
-        res = invoke "SET MENU_ITEM #{@id} CAPTION #{caption}"
-        res == "MENU_ITEM #{@id} CAPTION \"#{caption}\""
-      end
-      
-      def setHint hint
-        res = invoke "SET MENU_ITEM #{@id} HINT #{hint}"
-        res == "MENU_ITEM #{@id} HINT \"#{hint}\""
-      end
-      
-      def setEnabled flag
-        res = invoke "SET MENU_ITEM #{@id} ENABLED #{flag._str}"
-        res == "MENU_ITEM #{@id} ENABLED #{flag._str}"
-      end
-      
-      alias set_notify setNotify
-      #alias del_notify delNotify
-      alias set_caption setCaption
-      alias set_hint setHint
-      alias set_enabled setEnabled
+
+    end
+
+    def notified instance, context, user, contextID
+      @notify.call instance, context, user, contextID if @notify
     end
+
+    def set_notify block=Proc.new
+      @notify = block
+    end
+    alias setNotify set_notify
+
+    def delete
+      res = SkypeAPI.invoke "DELETE MENU_ITEM #{@id}"
+      res == "DELETE MENU_ITEM #{@id}"
+    end
+
+    def set_caption caption
+      res = invoke "SET MENU_ITEM #{@id} CAPTION #{caption}"
+      res == "MENU_ITEM #{@id} CAPTION \"#{caption}\""
+    end
+    alias setCaption set_caption
+
+    def set_hint hint
+      res = invoke "SET MENU_ITEM #{@id} HINT #{hint}"
+      res == "MENU_ITEM #{@id} HINT \"#{hint}\""
+    end
+    alias setHint set_hint
+
+    def set_enabled flag
+      res = invoke "SET MENU_ITEM #{@id} ENABLED #{flag._str}"
+      res == "MENU_ITEM #{@id} ENABLED #{flag._str}"
+    end
+    alias setEnabled set_enabled
+
   end
 end

data/lib/skypeapi/message.rb

@@ -1,46 +1,44 @@
 module SkypeAPI
-  module Object
-    class Message < AbstractObject
-      OBJECT_NAME = "MESSAGE"
- 
-      PROPERTY2METHOD =  {
-        'TIMESTAMP' => :timestamp,
-        'PARTNER_HANDLE' => :partnerHandle,
-        'PARTNER_DISPNAME' => :partnerDispname,
-        'CONF_ID' => :confIdD,
-        'TYPE' => :type,
-        'STATUS' => :status,
-        'FAILUREREASON' => :failureReason,
-        'BODY' => :body,
-      }
-      
-      def self.create target,text
-        if defined? target.getHandle
-          target = target.getHandle
-        elsif target.class == String
-        else
-          raise target
-        end
-        res = @skypeApi.invoke_one "MESSAGE #{target} #{text}","MESSAGE"
-        if res =~ /^(\d+) STATUS (.+)$/
-          return @skypeApi.getMessage($1),"getStatus",$2
-        else
-          raise #????
-        end
+  class Message < AbstractObject
+    OBJECT_NAME = "MESSAGE"
+
+    PROPERTY2METHOD =  {
+      'TIMESTAMP' => :timestamp,
+      'PARTNER_HANDLE' => :partnerHandle,
+      'PARTNER_DISPNAME' => :partnerDispname,
+      'CONF_ID' => :confIdD,
+      'TYPE' => :type,
+      'STATUS' => :status,
+      'FAILUREREASON' => :failureReason,
+      'BODY' => :body,
+    }
+
+    def self.create target,text
+      if defined? target.getHandle
+        target = target.getHandle
+      elsif target.class == String
+      else
+        raise target
+      end
+      res = @skypeApi.invoke_one "MESSAGE #{target} #{text}","MESSAGE"
+      if res =~ /^(\d+) STATUS (.+)$/
+        return @skypeApi.getMessage($1),"getStatus",$2
+      else
+        raise #????
       end
-      
-      def timestamp() invoke_get('TIMESTAMP'); end
-      def partnerHandle() invoke_get('PARTNER_HANDLE'); end
-      def partnerDispname() invoke_get('PARTNER_DISPNAME'); end
-      def confIdD() invoke_get('CONF_ID'); end
-      def type() invoke_get('TYPE'); end
-      def status() invoke_get('STATUS'); end
-      def failureReason() invoke_get('FAILUREREASON'); end
-      def body() invoke_get('BODY'); end
-      
-      #def setSeen
-      #  str2object invoke_one("SET MESSAGE #{@id} SEEN","SET MESSAGE #{@id} STATUS")
-      #end
     end
+
+    def timestamp() invoke_get('TIMESTAMP'); end
+    def partnerHandle() invoke_get('PARTNER_HANDLE'); end
+    def partnerDispname() invoke_get('PARTNER_DISPNAME'); end
+    def confIdD() invoke_get('CONF_ID'); end
+    def type() invoke_get('TYPE'); end
+    def status() invoke_get('STATUS'); end
+    def failureReason() invoke_get('FAILUREREASON'); end
+    def body() invoke_get('BODY'); end
+
+    #def setSeen
+    #  str2object invoke_one("SET MESSAGE #{@id} SEEN","SET MESSAGE #{@id} STATUS")
+    #end
   end
 end