Ruby4Skype 0.2.2 → 0.2.3

data/lib/skypeapi/application.rb

@@ -61,6 +61,11 @@ module SkypeAPI
         end
       end
       
+      notice :Datagram, 'DATAGRAM' do |str|
+        user,data = str.split(' ',2)
+        [SkypeAPI.user(user), data]
+      end
+      
       def self.create appName
         app = new appName
         app.create
@@ -68,33 +73,33 @@ module SkypeAPI
       end
       
       def create
-        sendEcho "CREATE APPLICATION #{@id}"
+        invoke_echo "CREATE APPLICATION #{@id}"
       end
       
       def connect user
-        sendEcho "ALTER APPLICATION #{@id} CONNECT #{user}"
+        invoke_echo "ALTER APPLICATION #{@id} CONNECT #{user}"
       end
       
       def write stream, msg
-        sendAlter "WRITE", "#{stream} #{msg}"
+        invoke_alter "WRITE", "#{stream} #{msg}"
       end
       
       def datagram stream, msg
-        sendAlter "DATAGRAM", "#{stream} #{msg}"
+        invoke_alter "DATAGRAM", "#{stream} #{msg}"
       end
       
       def read stream
-        res = sendCMD "ALTER APPLICATION #{@id} READ #{stream}"
+        res = invoke "ALTER APPLICATION #{@id} READ #{stream}"
         res =~ /^ALTER APPLICATION #{@id} READ #{stream} (.*)$/m
         $1
       end
       
       def disconnect stream
-        sendEcho "ALTER APPLICATION #{@id} DISCONNECT #{stream}"
+        invoke_echo "ALTER APPLICATION #{@id} DISCONNECT #{stream}"
       end
       
       def delete
-        sendEcho "DELETE APPLICATION #{@id}"
+        invoke_echo "DELETE APPLICATION #{@id}"
       end
     end
   end

data/lib/skypeapi/call.rb

@@ -4,8 +4,8 @@ module SkypeAPI
       OBJECT_NAME = "CALL"
       
       def self.create *targets
-        res = (@@skypeApi.sendOne "CALL " + targets.join(", "),"CALL").split(" ")
-        #return @@skypeApi.call(res[0]),res[2]
+        res = (SkypeAPI.invoke_one "CALL " + targets.join(", "),"CALL").split(" ")
+        #return SkypeAPI::Call.new(res[0]),res[2]
         new res[0]
       end
       
@@ -13,7 +13,7 @@ module SkypeAPI
         if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Partner, 'PARTNER_HANDLE' do |str|
-        @@skypeApi.user str
+        SkypeAPI::User.new str
       end
       getter :PartnerDispname, 'PARTNER_DISPNAME'
       getter :TargetIdentity, 'TARGET_IDENTITY'
@@ -28,7 +28,7 @@ module SkypeAPI
       getter :FailureReason, 'FAILUREREASON' do |str|
         str.to_i
       end
-      getter :Subject, 'SUBJECT'
+      #getter :Subject, 'SUBJECT'
       getter :PSTNNumber, 'PSTN_NUMBER'
       getter :Duration, 'DURATION' do |str|
         str.to_i
@@ -40,15 +40,15 @@ module SkypeAPI
       
       notice :ConfParticipant, 'CONF_PARTICIPANT'  do |str|
         res = str.split(' ')
-        res[1] = @@skypeApi.user(res[1]) if res[1]
+        res[1] = SkypeAPI::User.new res[1] if res[1]
         res
       end
-      #?
+      #?CALL 59 CONF_PARTICIPANT 1 echo123 INCOMING_P2P INPROGRESS Echo Test Service . 
       def getConfParticipant num
-        str = sendGet "CONF_PARTICIPANT #{num}"
-        array = self::V2O[:ConfParticipant].call str
-        array.unshift num.to_s
-        array
+        str = invoke_get "CONF_PARTICIPANT #{num}"
+        res = str.split(' ')
+        res[0] = SkypeAPI::User.new res[0]
+        res
       end
       
       getter :VMDuration, 'VM_DURATION' do |str|
@@ -73,23 +73,38 @@ module SkypeAPI
         str._flag
       end
             
-      getter :ForwardedBy, 'FORWARDED_BY'
+      getter :ForwardedBy, 'FORWARDED_BY' do |str|
+        if str.empty? or str == '?'
+          nil
+        else
+          SkypeAPI::User.new str
+        end
+      end
       getter :TransferActive, 'TRANSFER_ACTIVE' do |str|
         str._flag
       end
       getter :TransferStatus, 'TRANSFER_STATUS'
-      getter :TransferredBy, 'TRANSFERRED_BY'
-      getter :TransferredTo, 'TRANSFERRED_TO'
+      getter :TransferredBy, 'TRANSFERRED_BY' do |str|
+        if str.empty?
+          nil
+        else
+          SkypeAPI::User.new str
+        end
+      end
+      getter :TransferredTo, 'TRANSFERRED_TO' do |str|
+        if str.empty?
+          nil
+        else
+          SkypeAPI::User.new str
+        end
+      end
 
       def getCanTransfer user
-        res = sendGet "CAN_TRANSFER #{user}"
+        res = invoke_get "CAN_TRANSFER #{user}"
         V2O[:CanTransffer].call(user.to_s + ' ' + res)
       end
-      notice :CanTransffer, 'CAN_TRANSFER'  do |str|
-        res = str.split ' '
-        res[0] = @@skypeApi.user res[0]
-        res[1] = res[1]._flag
-        res
+      notice :CanTransffer, 'CAN_TRANSFER' do |str|
+        str.split(' ')[1]._flag
       end
             
       getter :Seen, "SEEN" do |str|
@@ -107,11 +122,11 @@ module SkypeAPI
       #getter :StopVideoReceive, "STOP_VIDEO_RECEIVE"
       
       def setSeen
-        sendSet "SEEN"
+        invoke_set "SEEN"
       end
       
       def setStatus s
-        sendSet "STATUS", s
+        invoke_set "STATUS", s
       end
       
       def setStatusOnHold
@@ -126,93 +141,93 @@ module SkypeAPI
         setStatus "FINISHED"
       end
       
-      def setDTMF number
-        sendSet "DTMF #{number}"
-      end
+      #def setDTMF number
+      #  invoke_set "DTMF #{number}"
+      #end
       
       def setJoinConference masterCall
-        sendSet "JOIN_CONFERENCE", masterCall.to_s
+        invoke_set "JOIN_CONFERENCE", masterCall.to_s
       end
       
       def setStartVideoSend
-        sendSet "START_VIDEO_SEND"
+        invoke_set "START_VIDEO_SEND"
       end
       
       def setStopVideoSend
-        sendSet "STOP_VIDEO_SEND"
+        invoke_set "STOP_VIDEO_SEND"
       end
       
       def setStartVideoReceive
-        sendSet "START_VIDEO_RECEIVE"
+        invoke_set "START_VIDEO_RECEIVE"
       end
       
       def setStopVideoReceive
-        sendSet "STOP_VIDEO_RECEIVE"
+        invoke_set "STOP_VIDEO_RECEIVE"
       end
       
       def answer
-        sendAlter "ANSWER"
+        invoke_alter "ANSWER"
       end
       
       def hold
-        sendAlter "HOLD"
+        invoke_alter "HOLD"
       end
       
       def resume
-        sendAlter "RESUME"
+        invoke_alter "RESUME"
       end
       
       def hangup
-        sendAlter "HANGUP"
+        invoke_alter "HANGUP"
       end
       
       def end val=''
-        sendAlter "END", val  
+        invoke_alter "END", val  
       end
       
       def dtmf number
-        sendAlter "DTMF", number
+        invoke_alter "DTMF", number
       end
       
       def transfer *users
-        sendAlter "TRANSFER", users.join(', ')
+        invoke_alter "TRANSFER", users.join(', ')
       end
       
       def joinConference call
-        sendAlter "JOIN_CONFERENCE", call.to_s
+        invoke_alter "JOIN_CONFERENCE"
       end
       
       def startVideoSend
-        sendAlter "START_VIDEO_SEND"
+        invoke_alter "START_VIDEO_SEND"
       end
 
       def stopVideoSend
-        sendAlter "STOP_VIDEO_SEND"
+        invoke_alter "STOP_VIDEO_SEND"
       end
       
       def startVideoReceive
-        sendAlter "START_VIDEO_RECEIVE"
+        invoke_alter "START_VIDEO_RECEIVE"
       end
       
       def stopVideoReceive
-        sendAlter"STOP_VIDEO_RECEIVE"
+        invoke_alter"STOP_VIDEO_RECEIVE"
       end
       
       def setInput device
-        sendAlter "SET_INPUT", device
+        invoke_alter "SET_INPUT", device
       end
       
       def setOutput device
-        sendAlter "SET_INPUT", device
+        invoke_alter "SET_OUTPUT", device
       end
       
       def setCaptureMic device
-        sendAlter "SET_CAPUTURE_MIC", device
+        invoke_alter "SET_CAPTURE_MIC", device
       end
       
       
       def alter value
-        sendOne "ALTER CALL #{@id} #{value}","ALTER CALL #{@id}"
+        invoke_one "ALTER CALL #{@id} #{value}","ALTER CALL #{@id}"
       end
     end
   end

data/lib/skypeapi/chat.rb

@@ -4,24 +4,24 @@ module SkypeAPI
       OBJECT_NAME =  "CHAT"
       
       def self.create *users
-        retVal = @@skypeApi.sendCMD "CHAT CREATE #{users.join(', ')}"
+        retVal = SkypeAPI.invoke "CHAT CREATE #{users.join(', ')}"
         retVal =~ /^CHAT ([^ ]+) STATUS (.+)$/
         chatID, status = $1, $2
-        return @@skypeApi.chat(chatID)#, status
+        return SkypeAPI::Chat.new(chatID)#, status
       end
       
       def self.findUsingBlob blob
-        retVal = @@skypeApi.sendCMD "CHAT FINDUSINGBLOB #{blob}"
+        retVal = SkypeAPI.invoke "CHAT FINDUSINGBLOB #{blob}"
         retVal =~ /^CHAT ([^ ]+) STATUS (.+)$/
         chatID, status = $1, $2
-        return @@skypeApi.chat(chatID)#, status
+        return SkypeAPI::Chat.new(chatID)#, status
       end
       
       def self.createUsingBlob blob
-        retVal = @@skypeApi.sendCMD "CHAT CREATEUSINGBLOB #{blob}"
+        retVal = SkypeAPI.invoke "CHAT CREATEUSINGBLOB #{blob}"
         retVal =~ /^CHAT ([^ ]+) STATUS (.+)$/
         chatID, status = $1, $2
-        return @@skypeApi.chat(chatID)#, status
+        return SkypeAPI::Chat.new(chatID)#, status
       end
             
       getter :Name, 'NAME'
@@ -29,35 +29,35 @@ module SkypeAPI
         if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Adder, 'ADDER' do |str|
-        str.empty? ? nil : @@skypeApi.user(str)
+        str.empty? ? nil : SkypeAPI::User.new(str)
       end
       getter :Status, 'STATUS'
       getter :Posters, 'POSTERS' do |str|
         str.split(', ').map do |handle|
-          @@skypeApi.user handle
+          SkypeAPI::User.new handle
         end
       end
       getter :Members, 'MEMBERS' do |str|
         str.split(' ').map do |handle|
-          @@skypeApi.user handle
+          SkypeAPI::User.new handle
         end
       end
       getter :Topic, 'TOPIC'
       getter :TopicXML, 'TOPICXML'
       getter :ChatMessages, 'CHATMESSAGES' do |str|
         str.split(' ').map do |id|
-          @@skypeApi.chatMessage id
+          SkypeAPI::ChatMessage.new id
         end
       end
       getter :ActiveMembers, 'ACTIVEMEMBERS' do |str|
         str.split(' ').map do |handle|
-          @@skypeApi.user handle
+          SkypeAPI::User.new handle
         end
       end
       getter :FriendlyName, 'FRIENDLYNAME'
       getter :RecentChatMessages, 'RECENTCHATMESSAGES' do |str|
         str.split(' ').map do |handle|
-          @@skypeApi.chatMessage handle
+          SkypeAPI::ChatMessage.new handle
         end
       end
       getter :Bookmarked, 'BOOKMARKED' do |str|
@@ -65,7 +65,7 @@ module SkypeAPI
       end
       getter :MemberObjects, 'MEMBEROBJECTS' do |str|
         str.split(', ').map do |id|
-          @@skypeApi.chatMember id
+          SkypeAPI::ChatMember.new id
         end
       end
       getter :PasswordHint, 'PASSWORDHINT'
@@ -78,7 +78,7 @@ module SkypeAPI
         if str.empty?
            nil
         else
-          @@skypeApi.user str
+          SkypeAPI::User.new str
         end
       end
       getter :ActivityTimestamp, 'ACTIVITY_TIMESTAMP' do |str|
@@ -90,96 +90,97 @@ module SkypeAPI
       getter :Blob, 'BLOB'
       getter :Applicants, 'APPLICANTS' do |str|
         str.split(' ').map do |handle|
-          @@skypeApi.user handle
+          SkypeAPI::User.new handle
         end
       end
             
       #���[
       #def open
-      #  retVal = sendCMD "OPEN CHAT #{@id}"
+      #  retVal = invoke "OPEN CHAT #{@id}"
       #  retVal =~ /^OPEN CHAT (.+)$/
-      #  return @@skypeApi.chat($1)
+      #  return SkypeAPI.chat($1)
       #end
       
       def setTopic topic
-        sendAlter "SETTOPIC", topic
+        invoke_alter "SETTOPIC", topic
       end
 
       def setTopicXML topic
-        sendAlter "SETTOPICXML", topic
+        invoke_alter "SETTOPICXML", topic
       end
       
       def addMembers *members
-        sendAlter "ADDMEMBERS",  members.join(', ')
+        invoke_alter "ADDMEMBERS",  members.join(', ')
       end
       
       def leave
-        sendAlter "LEAVE"
+        invoke_alter "LEAVE"
       end
       
       def bookmarked
-        sendAlter "BOOKMARK"
+        invoke_alter "BOOKMARK"
       end
       
       def unbookmarked
-        sendAlter "UNBOOKMARK"
+        invoke_alter "UNBOOKMARK"
       end
       
       def join
         #
-        sendAlter "JOIN"
+        invoke_alter "JOIN"
       end
       
       def clearRecentMessages
-        sendAlter "CLEARRECENTMESSAGES"
+        invoke_alter "CLEARRECENTMESSAGES"
       end
       
       def setAlertString string
-        sendAlter "SETALERTSTRING", string
+        invoke_alter "SETALERTSTRING", string
       end
       
       def acceptadd
-        sendAlter "ACCEPTADD"
+        invoke_alter "ACCEPTADD"
       end
       
       def disband
-        sendAlter "DISBAND"
+        invoke_alter "DISBAND"
       end
       
       
-      def setPassword(password,passwordHint='')
-        sendAlter "SETPASSWORD", password + ' ' + passwordHint
+      def setPassword(password, passwordHint='')
+        invoke_alter "SETPASSWORD", password + ' ' + passwordHint
       end
       
       def enterPassword password
-        sendAlter "ENTERPASSWORD", password
+        invoke_alter "ENTERPASSWORD", password
       end
       
       def setOptions option
-        sendAlter "SETOPTIONS", option
+        invoke_alter "SETOPTIONS", option
       end
 
       def kick *users
         users = users.join ', '
-        sendAlter "KICK", users
+        invoke_alter "KICK", users
       end
       
       def kickBan *users
         users = users.join ', '
-        sendAlter "KICKBAN", users
+        invoke_alter "KICKBAN", users
       end
       
       def setGuideLines guidlines
-        sendAlter 'SETGUIDELINES', guidlines
+        invoke_alter 'SETGUIDELINES', guidlines
       end
       
       def setOptions optionsBitmap
-        sendAlter 'SETOPTIONS', optionsBitmap.to_s
+        invoke_alter 'SETOPTIONS', optionsBitmap.to_s
       end
       
       def sendMessage msg
-        @@skypeApi.ChatMessage.create self, msg
+        SkypeAPI::ChatMessage.create self, msg
       end
+      alias send_message sendMessage
     end
   end
 end

data/lib/skypeapi/chatmember.rb

@@ -18,12 +18,12 @@ module SkypeAPI
       end
       
       def setRoleTo role
-        sendAlter('SETROLETO', role)
+        invoke_alter('SETROLETO', role)
       end
       
       def canSetRoleTo role
         #ALTER�ŕԂ茌������ɂ߂ē����B
-        res = sendCMD("ALTER CHATMEMBER #{@id} CANSETROLETO #{role}")
+        res = invoke("ALTER CHATMEMBER #{@id} CANSETROLETO #{role}")
         res =~ /ALTER CHATMEMBER CANSETROLETO (TRUE|FALSE)/
         $1._flag
       end

data/lib/skypeapi/chatmessage.rb

@@ -4,11 +4,11 @@ module SkypeAPI
       OBJECT_NAME = "CHATMESSAGE"
 
       def self.create chat ,msg
-        res = @@skypeApi.sendCMD "CHATMESSAGE #{chat} #{msg}"
+        res = SkypeAPI.invoke "CHATMESSAGE #{chat} #{msg}"
         if res =~ /^CHATMESSAGE (\d+) STATUS (.+)$/
-          return @@skypeApi.chatMessage($1)#, $2
+          return SkypeAPI.chatMessage($1)#, $2
         else
-          raise #????
+          raise res
         end
       end
       
@@ -17,29 +17,35 @@ module SkypeAPI
         if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Partner, 'PARTNER_HANDLE' do |str|
-        @@skypeApi.user str
+        SkypeAPI::User.new str
       end
       getter :PartnerDispname, 'PARTNER_DISPNAME'
       getter :From, 'FROM_HANDLE' do |str|
-        @@skypeApi.user str
+        SkypeAPI::User.new str
       end
       getter :FromDispname, 'FROM_DISPNAME'
       getter :Type, 'TYPE'
       getter :Status, 'STATUS'
-      getter :LeaveReason, 'LEAVEREASON'
+      getter :LeaveReason, 'LEAVEREASON' do |str|
+        if str.empty?
+          nil
+        else
+          str
+        end
+      end
       getter :Chat, 'CHATNAME' do |str|
-        @@skypeApi.chat str
+        SkypeAPI::Chat.new str
       end
       getter :Users, 'USERS' do |str|
         str.split(',').map do |handle|
-          @@skypeApi.user handle
+          SkypeAPI::User.new handle
         end
       end
       getter :IsEditable, 'IS_EDITABLE' do |str|
         str._flag
       end
       getter :EditedBy, 'EDITED_BY' do |str|
-        if str.empty? then nil else @@skypeApi.user(str) end
+        if str.empty? then nil else SkypeAPI::User.new(str) end
       end
       getter :EditedTimestamp, 'EDITED_TIMESTAMP' do |str|
         if str.empty? then nil else Time.at(str.to_i) end
@@ -50,7 +56,7 @@ module SkypeAPI
       getter :Role, 'ROLE'
       
       def setSeen
-        str = @@skypeApi.sendCMD "SET CHATMESSAGE #{@id} SEEN"
+        str = SkypeAPI.invoke "SET CHATMESSAGE #{@id} SEEN"
         if str =~ /^CHATMESSAGE #{@id} STATUS (.+)$/
           return true
         else
@@ -58,7 +64,7 @@ module SkypeAPI
         end
       end
       
-      def setBody(text) sendSet('BODY',text._str); end
+      def setBody(text) invoke_set('BODY',text._str); end
     end
   end
 end

data/lib/skypeapi/event.rb

@@ -4,7 +4,7 @@ module SkypeAPI
       OBJECT_NAME = "EVENT"
       
       def self.create id, caption, hint, block=Proc.new
-        res = @@skypeApi.sendCMD "CREATE EVENT #{id} CAPTION #{caption} HINT #{hint}"
+        res = SkypeAPI.invoke "CREATE EVENT #{id} CAPTION #{caption} HINT #{hint}"
         res == "EVENT #{id} CREATED"
         instance = new id
         instance.setNotify block if block
@@ -38,9 +38,13 @@ module SkypeAPI
       end
       
       def delete
-        res = sendCMD "DELETE EVENT #{@id}"
-        res == "DELEETE EVENT #{@id}"
+        res = invoke "DELETE EVENT #{@id}"
+        res == "DELETE EVENT #{@id}"
       end
+
+      alias set_notify setNotify
+      #alias del_notify delNotify
+
     end
   end
 end

data/lib/skypeapi/group.rb

@@ -4,7 +4,7 @@ module SkypeAPI
       OBJECT_NAME = "GROUP"
       
       def self.create displayName
-        @@skypeApi.sendCMD("CREATE GROUP #{displayName}")
+        @@skypeApi.invoke("CREATE GROUP #{displayName}")
         group = nil
         tmp = nil
         if @@skypeApi.Group.notify[:displayname] and @@skypeApi.Group.notify[:displayname][displayName]
@@ -49,31 +49,31 @@ module SkypeAPI
       end
       
       def setDisplayName dispname
-        sendSet "DISPLAYNAME", dispname
+        invoke_set "DISPLAYNAME", dispname
       end
       
       def delete
-        sendEcho "DELETE GROUP #{@id}"
+        invoke_echo "DELETE GROUP #{@id}"
       end
       
       def addUser user
-        sendAlter "ADDUSER", user
+        invoke_alter "ADDUSER", user
       end
       
       def removeUser user
-        sendAlter "REMOVEUSER", user
+        invoke_alter "REMOVEUSER", user
       end
       
       def share msg=''
-        sendAlter "Share", msg
+        invoke_alter "Share", msg
       end
       
       def accept
-        sendAlter "ACCEPT"
+        invoke_alter "ACCEPT"
       end
       
       def decline
-        sendAlter "DECLINE"
+        invoke_alter "DECLINE"
       end
       
     end