Ruby4Skype 0.2.1 → 0.2.2

data/lib/skypeapi/application.rb

@@ -8,27 +8,27 @@ module SkypeAPI
       end
       
       def to_s
-        @string
+        @id
       end
       
       def user
         @user
       end
       
-      def write cmd, &block
-        @app.write self, cmd, block
+      def write msg
+        @app.write self, cmd
       end
       
-      def datagram cmd, &block
-        @app.datagram self, cmd, block
+      def datagram msg, &block
+        @app.datagram self, cmd
       end
       
-      def read &block
-        @app.read self, block
+      def read
+        @app.read self
       end
       
-      def disconnect &block
-        @app.disconnect self, block
+      def disconnect
+        @app.disconnect self
       end
     end
     
@@ -44,7 +44,7 @@ module SkypeAPI
       end
       
       getter :Streams, 'STREAMS' do |str|
-        str.split(' ').collect{|i| Stream.new(self, i)}
+        str.split(' ').collect{|streamID| Stream.new(self, streamID)}
       end
       
       getter :Received, 'RECEIVED' do |str|
@@ -61,8 +61,8 @@ module SkypeAPI
         end
       end
       
-      def self.create id
-        app = new id
+      def self.create appName
+        app = new appName
         app.create
         app
       end
@@ -71,21 +71,21 @@ module SkypeAPI
         sendEcho "CREATE APPLICATION #{@id}"
       end
       
-      def connect handle
-        sendEcho "ALTER APPLICATION #{@id} CONNECT #{handle}"
+      def connect user
+        sendEcho "ALTER APPLICATION #{@id} CONNECT #{user}"
       end
       
-      def write stream, cmd
-        sendAlter "WRITE", "#{stream} #{cmd}"
+      def write stream, msg
+        sendAlter "WRITE", "#{stream} #{msg}"
       end
       
-      def datagram stream, cmd
-        sendAlter "DATAGRAM", "#{stream} #{cmd}"
+      def datagram stream, msg
+        sendAlter "DATAGRAM", "#{stream} #{msg}"
       end
       
       def read stream
         res = sendCMD "ALTER APPLICATION #{@id} READ #{stream}"
-        res =~ /^ALTER APPLICATION #{@id} READ #{stream} (.*)$/
+        res =~ /^ALTER APPLICATION #{@id} READ #{stream} (.*)$/m
         $1
       end
       
@@ -97,319 +97,5 @@ module SkypeAPI
         sendEcho "DELETE APPLICATION #{@id}"
       end
     end
-    
-    class A2A
-      extend Forwardable
-      include SkypeAPI::ShareFunctions
-      def initialize appName,base
-        @appName = appName
-        @eventListener = Hash.new
-        @base = base
-        @base.addNotify /^APPLICATION #{@appName} (.+)$/,method(:receiv)
-      end
-      
-      def_delegators :@base, :sendCMD, :sendCallBack,:sendBlock,:addNotify,:delNotify
-      #:attach, :wait,:polling, :attached, :attached=, :received, :received=, :sent, :sent=
-      
-      def getConnectable
-        sendSplit "GET APPLICATION #{@appName} CONNECTABLE","APPLICATION #{@appName} CONNECTABLE"
-      end
-      def getConnecting
-        sendSplit "GET APPLICATION #{@appName} CONNECTING","APPLICATION #{@appName} CONNECTING"
-      end
-      def getStreams
-        sendSplit "GET APPLICATION #{@appName} STREAMS","APPLICATION #{@appName} STREAMS"
-      end
-      def getReceived
-        streamByte2hash sendSplit("GET APPLICATION #{@appName} RECEIVED","APPLICATION #{@appName} RECEIVED")
-      end
-      def getSending
-        streamByte2hash sendSplit("GET APPLICATION #{@appName} SENDING","APPLICATION #{@appName} SENDING")
-      end
-      def create
-        sendEcho "CREATE APPLICATION #{@appName}"
-      end
-      def connect handle
-        sendEcho "ALTER APPLICATION #{@appName} CONNECT #{handle}"
-      end
-      def write stream, cmd, &block
-        if block_given?
-          sendCMD("ALTER APPLICATION #{@appName} WRITE #{stream} #{cmd}",&block)
-        else
-          sendEcho "ALTER APPLICATION #{@appName} WRITE #{stream} #{cmd}"
-        end
-      end
-      def datagram stream, cmd
-        sendEcho "ALTER APPLICATION #{@appName} DATAGRAM #{stream} #{cmd}"
-      end
-      def read stream, &block
-        if block_given?
-          sendCMD "ALTER APPLICATION #{@appName} READ #{stream}" do |res|
-            res =~ /^ALTER APPLICATION #{@appName} READ #{stream} (.*)$/m
-            block.call $1
-          end
-        else
-          sendCMD "ALTER APPLICATION #{@appName} READ #{stream}"
-        end
-      end
-      def disconnect stream
-        sendEcho "ALTER APPLICATION #{@appName} DISCONNECT #{stream}"
-      end
-      def delete
-        sendEcho "DELETE APPLICATION #{@appName}"
-        delNotify /^APPLICATION #{appName} (.+)$/
-      end
-      
-      def onEvent name,cb=Proc.new
-        @eventListener[name] = cb
-      end
-      
-      def receiv res
-        case res
-        when /^CONNECTING (.+)$/m
-          @eventListener[:connecting].call $1.split(" ") if @eventListener[:connecting]
-        when /^STREAMS (.+)$/m
-          @eventListener[:connected].call $1.split(" ") if @eventListener[:connected]
-        when /^RECEIVED (.+)$/m
-          @eventListener[:received].call streamByte2hash($1.split(" ")) if @eventListener[:received]
-        when /^READ (.+?) (.+)$/m
-          @eventListener[:read].call $1, $2 if @eventListener[:read]
-        when /^DATAGRAM (.+?) (.+)$/m
-          @eventListener[:datagram].call $1, $2 if @eventListener[:datagram]
-        when /^SENDING (.+?)$/m
-          @eventListener[:sending].call streamByte2hash($1.split(" ")) if @eventListener[:sending]
-        end
-      end
-      
-      private
-      def streamByte2hash arr
-        ret = Hash.new do |hash,key|
-          hash[key] = 0
-        end
-        arr.each do |streamByte|
-          streamByte = streamByte.split "="
-          ret[streamByte[0]] = streamByte[1].to_i
-        end
-        return ret
-      end
-    end
-
-    class A2AEx < A2A
-      TRANS_LIMIT = 65000
-      SPLIT_LIMIT = 65000-2
-      
-      extend Forwardable
-      include SkypeAPI::ShareFunctions
-      def initialize appName,base
-        super
-        @handle2stream = Hash.new
-        @sndBuffer = Hash.new do |hash,key|
-          hash[key] = Array.new
-        end
-        @rcvBuffer = Hash.new do |hash,key|
-          hash[key] = Array.new
-        end
-        @created = false
-      end
-      
-      attr_reader :created, :sndBuffer, :rcvBuffer
-      
-      def getStreams
-        streams = super
-        streamTreat streams
-        return @handle2stream.keys
-      end
-      
-      def getConnection
-        @handle2stream.keys
-      end
-      
-      def create
-        super
-        @created = true
-      end
-
-      def connect handles=getConnection
-        handles = [handles] unless handles.class == Array
-        handles.each do |handle|
-          super handle
-        end
-      end
-
-      def connectAndWait handles
-        waitFlag = false
-        @base.addNotify /^APPLICATION #{@appName} CONNECTING $/,(Proc.new do
-          waitFlag = true
-        end)
-        handles = [handles] unless handles.class == Array
-        handles.each do |handle|
-          sendCMD "ALTER APPLICATION #{@appName} CONNECT #{handle}"
-        end
-
-        startTime = Time.now
-        i = 0
-        loop do
-          @base.polling
-          break if waitFlag or Time.now - startTime > 3
-          sleep 0.001
-          i+=1
-        end
-        @base.delNotify /^APPLICATION #{@appName} CONNECTING $/
-      end
-
-      def disconnect handles=getStreams
-        handles = [handles] unless handles.class == Array
-        handles.each do |h|
-          begin
-            super @handle2stream[h]
-            @handle2stream.delete h
-          rescue =>e
-            p e
-          end
-        end
-      end
-
-      def transmit cmd, handles=getConnecting
-        handles = [handles] unless handles == Array
-        handles.each do |handle|
-          if cmd.size > SPLIT_LIMIT
-            tmp = Array.new
-            while cmd.size > SPLIT_LIMIT
-              tmp.push cmd[0,SPLIT_LIMIT] + "D"
-              cmd = cmd[SPLIT_LIMIT,cmd.length]
-            end
-            tmp.push cmd
-            cmd = tmp
-          else
-            cmd = [cmd]
-          end
-          handle = [handle] unless handle.class == Array
-          handle.each do |h|
-            @sndBuffer[h].concat cmd
-          end
-        end
-      end
-      
-      def polling
-        if @created
-          f = false
-          @sndBuffer.each_value do |buffer|
-            if buffer.length > 0
-              f = true
-              break
-            end
-          end
-          if f
-            h2b = getSending
-            streams = Hash.new
-            @sndBuffer.each do |handle,buffer|
-              if @handle2stream[handle]
-                while buffer.length > 0
-                  if buffer[0].size + h2b[handle] < TRANS_LIMIT
-                    h2b[handle] += buffer[0].size
-                    write handle,buffer.shift do |res|
-                      #do nothing
-                    end
-                  else
-                    break
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-      
-      def read handle, &block
-        handle = @handle2stream[handle]
-        unless handle
-          raise SkypeAPIError, "Read Error nonConnecting #{handle}"
-        else
-          super
-        end
-      end
-      
-      def write handle, cmd, &block
-        stream = @handle2stream[handle]
-        unless stream
-          raise SkypeAPIError,"Write Error nonConnecting #{handle} #{cmd}"
-        else
-          super stream, cmd, &block
-        end
-      end
-      
-      def datagram handle, cmd
-        handle = @handle2stream[handle]
-        super
-      end
-
-      private :write, :datagram, :read
-      
-      def receiv res
-        case res
-        when /^CONNECTING (.*)$/m
-          @eventListener[:connecting].call $1.split(" ") if @eventListener[:connecting]
-        when /^STREAMS (.*)$/m
-          streams = $1.split " "
-          streamTreat streams
-          @eventListener[:connected].call @handle2stream.keys if @eventListener[:connected]
-        when /^RECEIVED (.+)$/m
-          res = $1
-          res.split(" ").each do |info|
-            stream = info.split("=")[0]
-            byte = info.split("=")[1]
-            handle = info.split(":")[0]
-            read handle do |content|
-              if content and not content.empty?
-                if content.size > SPLIT_LIMIT
-                  @rcvBuffer[handle].push content[0,content.size-1]
-                else
-                  if @rcvBuffer.length > 0
-                    @rcvBuffer[handle].push content
-                    tmp = @rcvBuffer[handle].join ""
-                    @rcvBuffer[handle].clear
-                    @eventListener[:read].call handle, tmp if @eventListener[:read]
-                  else
-                    @eventListener[:read].call handle, content if @eventListener[:read]
-                  end
-                end
-              end
-            end
-          end
-          @eventListener[:received].call streamByte2hash(res.split(" ")) if @eventListener[:received] and res
-        when /^READ (.+?) (.+)$/m
-          #@eventListener[:read].call $1.split(":")[0], $2 if @eventListener[:read]
-        when /^DATAGRAM (.+?) (.+)$/m
-          @eventListener[:datagram].call $1.split(":")[0], $2 if @eventListener[:datagram]
-        when /^SENDING (.+?)$/m
-          @eventListener[:sending].call streamByte2hash($1.split(" ")) if @eventListener[:sending]
-        end
-      end
-      
-      private
-      def streamTreat streams
-        @handle2stream.each do |handle,stream|
-          unless streams.include? stream
-            @sndBuffer[handle].clear
-            @rcvBuffer[handle].clear
-          end
-        end
-        @handle2stream.clear
-        streams.each do |st|
-          @handle2stream[st.split(":")[0]] = st
-        end
-      end
-      
-      def streamByte2hash arr
-        ret = Hash.new do |hash, key|
-          hash[key] = 0
-        end
-        arr.each do |streamByte|
-          streamByte = streamByte.split "="
-          ret[streamByte[0].split(":")[0]] = streamByte[1].to_i
-        end
-        return ret
-      end
-    end
   end
 end

data/lib/skypeapi/call.rb

@@ -4,14 +4,13 @@ module SkypeAPI
       OBJECT_NAME = "CALL"
       
       def self.create *targets
-        targets = targets[0] if targets[0].class == Array
         res = (@@skypeApi.sendOne "CALL " + targets.join(", "),"CALL").split(" ")
         #return @@skypeApi.call(res[0]),res[2]
         new res[0]
       end
       
       getter :Timestamp, 'TIMESTAMP' do |str|
-        str.to_i
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Partner, 'PARTNER_HANDLE' do |str|
         @@skypeApi.user str
@@ -45,10 +44,10 @@ module SkypeAPI
         res
       end
       #?
-      def getConfParticipant n
-        str = sendGet "CONF_PARTICIPANT #{n}"
+      def getConfParticipant num
+        str = sendGet "CONF_PARTICIPANT #{num}"
         array = self::V2O[:ConfParticipant].call str
-        array.unshift n.to_s
+        array.unshift num.to_s
         array
       end
       
@@ -82,16 +81,16 @@ module SkypeAPI
       getter :TransferredBy, 'TRANSFERRED_BY'
       getter :TransferredTo, 'TRANSFERRED_TO'
 
+      def getCanTransfer user
+        res = sendGet "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
       end
-      def getCanTransfer user
-        res = sendGet "CAN_TRANSFER #{user}"
-        V2O[:CanTransffer].call(user.to_s + ' ' + res)
-      end
             
       getter :Seen, "SEEN" do |str|
         str._flag
@@ -127,12 +126,12 @@ module SkypeAPI
         setStatus "FINISHED"
       end
       
-      def setDTMF num
-        sendSet "DTMF #{num}"
+      def setDTMF number
+        sendSet "DTMF #{number}"
       end
       
-      def setJoinConference call
-        sendSet "JOIN_CONFERENCE", masterID.to_s
+      def setJoinConference masterCall
+        sendSet "JOIN_CONFERENCE", masterCall.to_s
       end
       
       def setStartVideoSend
@@ -171,8 +170,8 @@ module SkypeAPI
         sendAlter "END", val  
       end
       
-      def dtmf num
-        sendAlter "DTMF", num
+      def dtmf number
+        sendAlter "DTMF", number
       end
       
       def transfer *users
@@ -199,16 +198,16 @@ module SkypeAPI
         sendAlter"STOP_VIDEO_RECEIVE"
       end
       
-      def setInput arg
-        sendAlter "SET_INPUT", arg
+      def setInput device
+        sendAlter "SET_INPUT", device
       end
       
-      def setOutput arg
-        sendAlter "SET_INPUT", arg
+      def setOutput device
+        sendAlter "SET_INPUT", device
       end
       
-      def setCaptureMic arg
-        sendAlter "SET_CAPUTURE_MIC", arg
+      def setCaptureMic device
+        sendAlter "SET_CAPUTURE_MIC", device
       end
       
       

data/lib/skypeapi/chat.rb

@@ -3,9 +3,30 @@ module SkypeAPI
     class Chat < AbstractObject      
       OBJECT_NAME =  "CHAT"
       
+      def self.create *users
+        retVal = @@skypeApi.sendCMD "CHAT CREATE #{users.join(', ')}"
+        retVal =~ /^CHAT ([^ ]+) STATUS (.+)$/
+        chatID, status = $1, $2
+        return @@skypeApi.chat(chatID)#, status
+      end
+      
+      def self.findUsingBlob blob
+        retVal = @@skypeApi.sendCMD "CHAT FINDUSINGBLOB #{blob}"
+        retVal =~ /^CHAT ([^ ]+) STATUS (.+)$/
+        chatID, status = $1, $2
+        return @@skypeApi.chat(chatID)#, status
+      end
+      
+      def self.createUsingBlob blob
+        retVal = @@skypeApi.sendCMD "CHAT CREATEUSINGBLOB #{blob}"
+        retVal =~ /^CHAT ([^ ]+) STATUS (.+)$/
+        chatID, status = $1, $2
+        return @@skypeApi.chat(chatID)#, status
+      end
+            
       getter :Name, 'NAME'
       getter :Timestamp, 'TIMESTAMP' do |str|
-        str.to_i
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Adder, 'ADDER' do |str|
         str.empty? ? nil : @@skypeApi.user(str)
@@ -61,7 +82,7 @@ module SkypeAPI
         end
       end
       getter :ActivityTimestamp, 'ACTIVITY_TIMESTAMP' do |str|
-        str.to_i
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Type, 'TYPE'
       getter :MyStatus, 'MYSTATUS'
@@ -72,29 +93,7 @@ module SkypeAPI
           @@skypeApi.user handle
         end
       end
-      
-      
-      def self.create *users
-        retVal = @@skypeApi.sendCMD "CHAT CREATE #{users.join(', ')}"
-        retVal =~ /^CHAT ([^ ]+) STATUS (.+)$/
-        chatID, status = $1, $2
-        return @@skypeApi.chat(chatID)#, status
-      end
-      
-      def self.findUsingBlob blob
-        retVal = @@skypeApi.sendCMD "CHAT FINDUSINGBLOB #{blob}"
-        retVal =~ /^CHAT ([^ ]+) STATUS (.+)$/
-        chatID, status = $1, $2
-        return @@skypeApi.chat(chatID)#, status
-      end
-      
-      def self.createUsingBlob blob
-        retVal = @@skypeApi.sendCMD "CHAT CREATEUSINGBLOB #{blob}"
-        retVal =~ /^CHAT ([^ ]+) STATUS (.+)$/
-        chatID, status = $1, $2
-        return @@skypeApi.chat(chatID)#, status
-      end
-      
+            
       #���[
       #def open
       #  retVal = sendCMD "OPEN CHAT #{@id}"
@@ -102,16 +101,16 @@ module SkypeAPI
       #  return @@skypeApi.chat($1)
       #end
       
-      def setTopic str
-        sendAlter "SETTOPIC", str
+      def setTopic topic
+        sendAlter "SETTOPIC", topic
       end
 
-      def setTopicXML str
-        sendAlter "SETTOPICXML", str
+      def setTopicXML topic
+        sendAlter "SETTOPICXML", topic
       end
       
-      def addMembers *member
-        sendAlter "ADDMEMBERS",  member.join(', ')
+      def addMembers *members
+        sendAlter "ADDMEMBERS",  members.join(', ')
       end
       
       def leave
@@ -135,8 +134,8 @@ module SkypeAPI
         sendAlter "CLEARRECENTMESSAGES"
       end
       
-      def setAlertString str
-        sendAlter "SETALERTSTRING", str
+      def setAlertString string
+        sendAlter "SETALERTSTRING", string
       end
       
       def acceptadd
@@ -148,7 +147,7 @@ module SkypeAPI
       end
       
       
-      def setPassword password, passwordHint=''
+      def setPassword(password,passwordHint='')
         sendAlter "SETPASSWORD", password + ' ' + passwordHint
       end
       

data/lib/skypeapi/chatmessage.rb

@@ -3,8 +3,8 @@ module SkypeAPI
     class ChatMessage < AbstractObject
       OBJECT_NAME = "CHATMESSAGE"
 
-      def self.create chatId ,msg
-        res = @@skypeApi.sendCMD "CHATMESSAGE #{chatId} #{msg}"
+      def self.create chat ,msg
+        res = @@skypeApi.sendCMD "CHATMESSAGE #{chat} #{msg}"
         if res =~ /^CHATMESSAGE (\d+) STATUS (.+)$/
           return @@skypeApi.chatMessage($1)#, $2
         else
@@ -14,7 +14,7 @@ module SkypeAPI
       
       getter :Body, 'BODY'
       getter :Timestamp, 'TIMESTAMP' do |str|
-        str.to_i
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Partner, 'PARTNER_HANDLE' do |str|
         @@skypeApi.user str
@@ -39,10 +39,10 @@ module SkypeAPI
         str._flag
       end
       getter :EditedBy, 'EDITED_BY' do |str|
-        str.empty? ? nil : @@skypeApi.user(str)
+        if str.empty? then nil else @@skypeApi.user(str) end
       end
       getter :EditedTimestamp, 'EDITED_TIMESTAMP' do |str|
-        str.to_i
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Options, 'OPTIONS' do |str|
         str.to_i
@@ -58,7 +58,7 @@ module SkypeAPI
         end
       end
       
-      def setBody (val) sendSet('BODY',val._str); end
+      def setBody(text) sendSet('BODY',text._str); end
     end
   end
 end

data/lib/skypeapi/event.rb

@@ -39,7 +39,7 @@ module SkypeAPI
       
       def delete
         res = sendCMD "DELETE EVENT #{@id}"
-        res == "DLEETE EVENT #{@id}"
+        res == "DELEETE EVENT #{@id}"
       end
     end
   end

data/lib/skypeapi/filetransfer.rb

@@ -11,10 +11,10 @@ module SkypeAPI
       end
       getter :PartnerDispname, 'PARTNER_DISPNAME'
       getter :StartTime, 'STARTTIME' do |str|
-        str.to_i
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :FinishTime, 'FINISHTIME' do |str|
-        str.to_i
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :FilePath, 'FILEPATH'
       getter :FileSize, 'FILESIZE' do |str|

data/lib/skypeapi/group.rb

@@ -3,14 +3,14 @@ module SkypeAPI
     class Group < AbstractObject
       OBJECT_NAME = "GROUP"
       
-      def self.create family
-        @@skypeApi.sendCMD("CREATE GROUP #{family}")
+      def self.create displayName
+        @@skypeApi.sendCMD("CREATE GROUP #{displayName}")
         group = nil
         tmp = nil
-        if @@skypeApi.Group.notify[:displayname] and @@skypeApi.Group.notify[:displayname][family]
-          tmp = @@skypeApi.Group.notify[:displayname][family]
+        if @@skypeApi.Group.notify[:displayname] and @@skypeApi.Group.notify[:displayname][displayName]
+          tmp = @@skypeApi.Group.notify[:displayname][displayName]
         end
-        @@skypeApi.Group.setNotify :DisplayName, family do |g|
+        @@skypeApi.Group.setNotify :DisplayName, displayName do |g|
           group = g
         end
         until group
@@ -18,10 +18,10 @@ module SkypeAPI
           sleep 0.0123
         end
         if tmp
-          @@skypeApi.Group.setNotify :DisplayName, family, tmp
+          @@skypeApi.Group.setNotify :DisplayName, displayName, tmp
           tmp.call group
         else
-          @@skypeApi.Group.notify[:displayname][family] = nil
+          @@skypeApi.Group.notify[:displayname][displayName] = nil
         end
         group
         #ThreadSafe ����ς��낤�Ȃ��B�B�B
@@ -48,8 +48,8 @@ module SkypeAPI
         str._flag
       end
       
-      def setDisplayName name
-        sendSet "DISPLAYNAME", name
+      def setDisplayName dispname
+        sendSet "DISPLAYNAME", dispname
       end
       
       def delete
@@ -64,8 +64,8 @@ module SkypeAPI
         sendAlter "REMOVEUSER", user
       end
       
-      def share text
-        sendAlter "Share", text
+      def share msg=''
+        sendAlter "Share", msg
       end
       
       def accept

data/lib/skypeapi/menuitem.rb

@@ -4,7 +4,7 @@ module SkypeAPI
       OBJECT_NAME = 'MENU_ITEM'
       
       def self.create h, block=Proc.new
-        raise ArgumentError unless h[:id] and h[:context] and h[:context]
+        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.sendCMD "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]}"}"
         res == "MENU_ITEM #{h[:id]} CREATED"
@@ -45,19 +45,19 @@ module SkypeAPI
         res == "DELETE MENU_ITEM #{@id}"
       end
       
-      def setCaption value
-        res = sendCMD "SET MENU_ITEM #{@id} CAPTION #{value}"
-        res == "MENU_ITEM #{@id} CAPTION \"#{value}\""
+      def setCaption caption
+        res = sendCMD "SET MENU_ITEM #{@id} CAPTION #{caption}"
+        res == "MENU_ITEM #{@id} CAPTION \"#{caption}\""
       end
       
-      def setHint value
-        res = sendCMD "SET MENU_ITEM #{@id} HINT #{value}"
-        res == "MENU_ITEM #{@id} HINT \"#{value}\""
+      def setHint hint
+        res = sendCMD "SET MENU_ITEM #{@id} HINT #{hint}"
+        res == "MENU_ITEM #{@id} HINT \"#{hint}\""
       end
       
-      def setEnabled value
-        res = sendCMD "SET MENU_ITEM #{@id} ENABLED #{value._str}"
-        res == "MENU_ITEM #{@id} ENABLED #{value._str}"
+      def setEnabled flag
+        res = sendCMD "SET MENU_ITEM #{@id} ENABLED #{flag._str}"
+        res == "MENU_ITEM #{@id} ENABLED #{flag._str}"
       end
     end
   end

data/lib/skypeapi/object.rb

@@ -40,6 +40,11 @@ module SkypeAPI
           str = sendGet skypeProperty
           callBack ? callBack.call(str) : str
         end
+        
+        #code4doc
+        #className = (defined? self::OBJECT_NAME) ? self::OBJECT_NAME : ''#'SkypeAPI'
+        #puts "'" + className + "::" + 'get' + methodName.to_s + "',"
+        
         self::P2M[skypeProperty] = methodName.to_sym
         self::V2O[skypeProperty] = callBack if callBack
       end
@@ -69,8 +74,10 @@ module SkypeAPI
       #Class  P2M
       #Instance P2M �ŃA�N�Z�X�B
       def self.inherited sub
-        sub.const_set :P2M, Hash.new{|hash,key| hash[key] = key}
-        sub.const_set :V2O, Hash.new
+        if self == AbstractObject
+          sub.const_set :P2M, Hash.new{|hash,key| hash[key] = key}
+          sub.const_set :V2O, Hash.new
+        end
         sub.instance_variable_set :@notify, Hash.new
       end
       
@@ -100,7 +107,9 @@ module SkypeAPI
           return @@instance[self][id]
         else
           instance = super id
-          instance.instance_variable_set :@notify, Hash.new
+          instance.instance_variable_set(:@notify, Hash.new do |h,k|
+            h[k] = Hash.new
+          end)
           @@instance[self][id] = instance
           return instance
         end

data/lib/skypeapi/os.rb

@@ -1,9 +1,10 @@
 module SkypeAPI
   module OS
     module Share
-      WAIT_CMD_LIMIT = 15.0 #sec
+      WAIT_CMD_LIMIT = 30.0 #sec
       PING_CYCLE = 30.0 #sec
       PING_LIMIT = 10.0 # < PING_CYCLE
+      SLEEP_INTERVAL = 0.001
       
       def sendCMD cmd,method=nil,&block
         if method
@@ -62,7 +63,8 @@ module SkypeAPI
             end
           end
           #Thread.pass
-          sleep 0.00123
+          sleep SLEEP_INTERVAL
+          #sleep 0.00123
           #sleep 0.000001
           #sleep 0.01
         end
@@ -75,6 +77,7 @@ module SkypeAPI
         end
         while flag
           polling
+          sleep SLEEP_INTERVAL
           #sleep 0.0123
         end
       end
@@ -141,33 +144,37 @@ module SkypeAPI
       end
 
       def pushQueue res
+        @queue.push(proc{doEvent(:received, res.chop)}) if existEvent? :received
+        
         if res =~ /^(#(\d+?) )?(.+?)\000$/m
           if $2
             if @callBack[$2.to_i]
               cb = @callBack[$2.to_i]
               val = $3
-              @queue.push(proc{cb.call val})
+              if @singleThread
+                @sent = proc{cb.call val}
+              else
+                @queue.push(proc{cb.call val})
+              end
               @callBack.delete($2.to_i)
             end
-            cmd = "#" + $2 + " " + $3
           else
             cmd = $3
             flag = false
             @notify.each do |reg,action|
               if cmd =~ reg
-                res = $1
-                @queue.push(proc{action.call(res)})
+                tmp = $1
+                @queue.push(proc{action.call(tmp)})
                 flag = true
               end
             end
+            
             unless flag
               action = @notify[nil]
               @queue.push(proc{action.call(cmd)})
             end
           end
         end
-        
-        @queue.push(proc{doEvent(:received, cmd)}) if existEvent? :received
       end
       
       def queueProcess
@@ -177,8 +184,19 @@ module SkypeAPI
           @pingTime = Time.now
         end
         
-        while e = @queue.shift
-          e.call
+        if @singleThread
+          if @sent == nil
+            while e = @queue.shift
+              e.call
+            end
+          elsif(@sent.class == Proc)
+            @sent.call
+            @sent = nil
+          end
+        else
+          while e = @queue.shift
+            e.call
+          end
         end
       end
       
@@ -203,7 +221,7 @@ module SkypeAPI
               raise SkypeAPIError::TimeOut
             end
             i+=1
-            sleep 0.001
+            sleep SLEEP_INTERVAL
           end
         rescue SkypeAPIError::Reconnect,SkypeAPIError::TimeOut
           unless existEvent? :reconnect
@@ -249,6 +267,7 @@ module SkypeAPI
         @event = Hash.new do |h,k|
           h[k] = Array.new
         end
+        @singleThread = true
         
         addEvent :reconnect do
           flag = true
@@ -284,28 +303,23 @@ module SkypeAPI
                 @queue.push Proc.new{@skypeAPI.sendCMD "PROTOCOL 9999"}
                 @queue.push Proc.new{@skypeAPI.doEvent(:attach,:success)}
                 @queue.push Proc.new{@skypeAPI.doEvent(:attached)}
-                sMsg.retval = 1
               when SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION:
                 @queue.push Proc.new{@skypeAPI.doEvent(:attach,:authorize)}
                 @queue.push Proc.new{@skypeAPI.doEvent(:pendingAuthorization)}
-                sMsg.retval = 1
               when SKYPECONTROLAPI_ATTACH_REFUSED:
                 unless @skypeAPI.existEvent? :attach
                   raise SkypeAPIError::Attach,"Refused"
                 else
                   @queue.push Proc.new{@skypeAPI.doEvent(:attach,:refused)}
                 end
-                sMsg.retval = 1
               when SKYPECONTROLAPI_ATTACH_NOT_AVAILABLE:
                 unless @skypeAPI.existEvent? :attach
                   raise SkypeAPIError::Attach,"Not available."
                 else
                   @queue.push Proc.new{@skypeAPI.doEvent(:attach,:notAvailable)}
                 end
-                sMsg.retval = 1
               when SKYPECONTROLAPI_ATTACH_API_AVAILABLE:
                 @queue.push Proc.new{@skypeAPI.doEvent(:apiAvailable)}
-                sMsg.retval = 1
               else
                 unless @skypeAPI.existEvent? :attach
                   raise SkypeAPIError::Attach,"Skype API attach unknown message"
@@ -313,6 +327,7 @@ module SkypeAPI
                   @queue.push Proc.new{@skypeAPI.doEvent(:attach,:unkown)}
                 end
               end
+              sMsg.retval = 1
               #return true
             when WM_COPYDATA
               if sMsg.wParam == @hSkypeAPIWindowHandle
@@ -367,6 +382,7 @@ module SkypeAPI
         
         cmd = '#' + @sendCount.to_s + ' ' + cmd
         @wmBuffer[@sendCount] = cmd
+        @sent = true if @singleThread
         pCopyData = @wmHandler.application.arg2cstructStr("LLS",0,@wmBuffer[@sendCount].length+1,@wmBuffer[@sendCount])
         unless PostMessage.call(@wmHandler.hWnd, WM_USER_MSG, @wmHandler.hSkypeAPIWindowHandle, pCopyData)
           @wmHandler.instance_variable_set :@hSkypeAPIWindowHandle,nil

data/lib/skypeapi/profile.rb

@@ -3,7 +3,9 @@ module SkypeAPI
     class Profile < AbstractObject
       OBJECT_NAME = "PROFILE"
       
-      #def initialize(id); end
+      def initialize(id=nil)
+        super nil
+      end
       
       def self.notified msg
         if msg =~ /^([^ ]+) (.*)$/m
@@ -73,51 +75,44 @@ module SkypeAPI
         str.split(', ')
       end
       
-      def setFullname(val) sendSet('FULLNAME', val); end
-      def setBirthday(*val)
-        val = val[0].class == Date ? val[0].strftime('%Y%m%d') : sprintf("%04d%02d%02d",val[0],val[1],val[2])
+      def setFullname(name) sendSet('FULLNAME', name); end
+      def setBirthday(dateOrYear, month=nil, day=nil)
+        val = dateOrYear.class == Date ? dateOrYear.strftime('%Y%m%d') : sprintf("%04d%02d%02d",dateOrYear,month,day)
         sendSet('BIRTHDAY', val)
       end
-      def setSex(val) sendSet('SEX', val); end
-      def setLanguages(*val)
-        if val[0].class == Array
-          val = val[0].join(' ')
-        else
-          val = val.join(' ')
-        end
-        sendSet('LANGUAGES', val)
+      def setSex(sex) sendSet('SEX', sex); end
+      def setLanguages(*langs)
+        sendSet('LANGUAGES', langs.join(' '))
       end
-      def setCountry(val) sendSet('COUNTRY', val); end
+      def setCountry(iso) sendSet('COUNTRY', iso); end
       #def setIpcountry(val) sendSet('IPCOUNTRY', val); end
-      def setProvince (val) sendSet('PROVINCE', val); end
-      def setCity (val) sendSet('CITY', val); end
-      def setPhoneHome (val) sendSet('PHONE_HOME', val); end
-      def setPhoneOffice (val) sendSet('PHONE_OFFICE', val); end
-      def setPhoneMobile (val) sendSet('PHONE_MOBILE', val); end
-      def setHomepage (val) sendSet('HOMEPAGE', val); end
-      def setAbout (val) sendSet('ABOUT', val); end
-      def setMoodText (val) sendSet('MOOD_TEXT', val); end
-      def setRichMoodText (val) sendSet('RICH_MOOD_TEXT', val); end
-      def setTimezone (val) sendSet('TIMEZONE', val); end
-      def setCallApplyCF (val)
-        sendSet('CALL_APPLY_CF', val._str)
-      end
-      def setCallNoanswerTimeout (val) sendSet('CALL_NOANSWER_TIMEOUT', val); end
-      def setCallForwardRules(*val)
-        unless val[0] == nil
-          val = val[0] if val.length == 1
-          val = [val] unless val[0].class == Array
-          val.map! do |rule|
+      def setProvince(province) sendSet('PROVINCE', province); end
+      def setCity(city) sendSet('CITY', city); end
+      def setPhoneHome(numbers) sendSet('PHONE_HOME', numbers); end
+      def setPhoneOffice(numbers) sendSet('PHONE_OFFICE', numbers); end
+      def setPhoneMobile(numbers) sendSet('PHONE_MOBILE', numbers); end
+      def setHomepage(url) sendSet('HOMEPAGE', url); end
+      def setAbout(text) sendSet('ABOUT', text); end
+      def setMoodText(text) sendSet('MOOD_TEXT', text); end
+      def setRichMoodText(text) sendSet('RICH_MOOD_TEXT', text); end
+      def setTimezone(timezone) sendSet('TIMEZONE', timezone); end
+      def setCallApplyCF(flag)
+        sendSet('CALL_APPLY_CF', flag._str)
+      end
+      def setCallNoanswerTimeout(sec) sendSet('CALL_NOANSWER_TIMEOUT', sec); end
+      def setCallForwardRules(*rules)
+        if rules[0] == nil
+          sendSet('CALL_FORWARD_RULES', '')
+        else
+          rules.map! do |rule|
             rule.join ','
           end
-          val = val.join ' '
-          sendSet('CALL_FORWARD_RULES', val)
-        else
-          sendSet('CALL_FORWARD_RULES', '')
+          rules = rules.join ' '
+          sendSet('CALL_FORWARD_RULES', rules)
         end
       end
-      def setCallSendToVM (val)
-        sendSet('CALL_SEND_TO_VM', val._str)
+      def setCallSendToVM(flag)
+        sendSet('CALL_SEND_TO_VM', flag._str)
       end
     end
   end

data/lib/skypeapi/sms.rb

@@ -28,7 +28,7 @@ module SkypeAPI
       getter :FailureReason, 'FAILUREREASON'
       getter :FailedUnseen?, 'IS_FAILED_UNSEEN'
       getter :Timestamp, 'TIMESTAMP' do |str|
-        str.to_i
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Price, 'PRICE' do |str|
         str.to_i

data/lib/skypeapi/user.rb

@@ -44,7 +44,7 @@ module SkypeAPI
       #getter :skypeOut, 'SkypeOut'
       #getter :skypeMe, 'SKYPEME'
       getter :LastOnlineTimestamp, 'LASTONLINETIMESTAMP' do |str|
-        str._int
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :CanLeaveVM, 'CAN_LEAVE_VM' do |str|
         str._flag
@@ -67,8 +67,8 @@ module SkypeAPI
       end
       getter :DisplayName, 'DISPLAYNAME'
       
-      def getAvatar(path)
-        sendCMD("GET USER #{@id} AVATAR 1 #{path}") =~ /^USER #{@id} AVATAR \d+ (.+)$/
+      def getAvatar(filePath)
+        sendCMD("GET USER #{@id} AVATAR 1 #{filePath}") =~ /^USER #{@id} AVATAR \d+ (.+)$/
         if $1
           return $1
         else
@@ -77,18 +77,18 @@ module SkypeAPI
       end
       notice :Avatar, 'AVATAR 1'
       
-      def setBuddyStatus(num, msg="") 
-        raise ArgumentErorr unless num.to_i == 1 or num.to_i == 2
-        sendSet('BUDDYSTATUS',"#{num} #{msg}")
+      def setBuddyStatus(statusCode, msg="")
+        raise ArgumentErorr unless statusCode.to_i == 1 or statusCode.to_i == 2
+        sendSet('BUDDYSTATUS',"#{statusCode} #{msg}")
       end
       
-      def setIsBlocked (val) sendSet('ISBLOCKED',val._str); end
+      def setIsBlocked(flag) sendSet('ISBLOCKED', flag._str); end
       
-      def setIsAuthorized (val) sendSet('ISAUTHORIZED',val._str); end
+      def setIsAuthorized(flag) sendSet('ISAUTHORIZED', flag._str); end
       
-      def setSpeedDial (val) sendSet('SPEEDDIAL',val); end
+      def setSpeedDial(numbers) sendSet('SPEEDDIAL', numbers); end
       
-      def setDisplayName (val) sendSet('DISPLAYNAME',val);end
+      def setDisplayName(name) sendSet('DISPLAYNAME', name);end
       
 =begin
       def addContactList msg=""

data/lib/skypeapi/version.rb

@@ -0,0 +1,9 @@
+module SkypeAPI
+  module VERSION
+    MAJOR = 0
+    MINOR = 2
+    TINY  = 2
+
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+end

data/lib/skypeapi/voicemail.rb

@@ -20,7 +20,7 @@ module SkypeAPI
       getter :FailureReason, 'FAILUREREASON'
       #getter :Subject, 'SUBJECT'
       getter :Timestamp, 'TIMESTAMP' do |str|
-        str.to_i
+        if str.empty? then nil else Time.at(str.to_i) end
       end
       getter :Duration, 'DURATION' do |str|
         str.to_i

data/lib/skypeapi.rb

@@ -1,22 +1,22 @@
 require "forwardable.rb"
 require "skypeApi/os.rb"
-require "skypeApi/shareFunctions.rb"
-require "skypeApi/object.rb"
-
-require "skypeApi/user.rb"
-require "skypeApi/profile.rb"
-require "skypeApi/call.rb"
-require "skypeApi/message.rb"
-require "skypeApi/chat.rb"
-require "skypeApi/chatmessage.rb"
-require "skypeApi/chatmember.rb"
-require "skypeApi/voicemail.rb"
-require "skypeApi/sms.rb"
-require "skypeApi/application.rb"
-require "skypeApi/group.rb"
-require "skypeApi/filetransfer.rb"
-require "skypeApi/event.rb"
-require "skypeApi/menuitem.rb"
+require "skypeapi/shareFunctions.rb"
+require "skypeapi/object.rb"
+require "skypeapi/version.rb"
+require "skypeapi/user.rb"
+require "skypeapi/profile.rb"
+require "skypeapi/call.rb"
+require "skypeapi/message.rb"
+require "skypeapi/chat.rb"
+require "skypeapi/chatmessage.rb"
+require "skypeapi/chatmember.rb"
+require "skypeapi/voicemail.rb"
+require "skypeapi/sms.rb"
+require "skypeapi/application.rb"
+require "skypeapi/group.rb"
+require "skypeapi/filetransfer.rb"
+require "skypeapi/event.rb"
+require "skypeapi/menuitem.rb"
 
 class SkypeAPIError < StandardError
   class Attach < SkypeAPIError; end
@@ -28,8 +28,6 @@ class SkypeAPIError < StandardError
 end
 
 module SkypeAPI
-  VERSION = "0.2.1"
-  
   include SkypeAPI::Object
   extend Notify
   extend Get
@@ -70,7 +68,7 @@ module SkypeAPI
       )
       
       #�O���p�B
-      self.class.__send__(:define_method, :os, Proc.new{@os})
+      #self.class.__send__(:define_method, :os, Proc.new{@os})
       
       @notify = Hash.new
       @os.addNotify nil, method(:notified)
@@ -87,6 +85,10 @@ module SkypeAPI
     self
   end
   
+  def self.os
+    @os
+  end
+  
   def self.notified msg
     skypeProperty = nil
     propertyReg = '(?:' + [
@@ -210,17 +212,17 @@ module SkypeAPI
   
   def self.setMute(flag) sendSet("MUTE", flag._swi) ; end
   
-  def self.getAvatar(file, num=1) sendGet("AVATAR #{num} #{file}") ; end
+  def self.getAvatar(filePath, num=1) sendGet("AVATAR #{num} #{filePath}") ; end
   notice :Avator, 'AVATOR'
   #?
   
-  def self.setAvatar(file, idx="", num=1)
-    sendSet("AVATAR", "#{num} #{file}#{idx.empty? ? '' : ':'+idx.to_s}").split(' ')[1]
+  def self.setAvatar(filePath, idx="", num=1)
+    sendSet("AVATAR", "#{num} #{filePath}#{idx.empty? ? '' : ':'+idx.to_s}").split(' ')[1]
   end
   
   def self.getRingtone(id=1) sendGet("RINGTONE #{id}") ; end
   
-  def self.setRingtone(file, idx="", id=1) sendSet("RINGTONE","#{id} #{file}:#{idx}") ; end
+  def self.setRingtone(filePath, idx="", id=1) sendSet("RINGTONE","#{id} #{filePath}:#{idx}") ; end
   
   notice :Ringtone, "RINGTONE 1" do |str|
     num, file = str.split(' ',2)
@@ -371,8 +373,8 @@ module SkypeAPI
     open 'GETTINGSTARTED'
   end
   
-  def self.openAuthorization handle
-    open 'AUTHORIZATION', handle
+  def self.openAuthorization user
+    open 'AUTHORIZATION', user
   end
   
   def self.BTNPressed key
@@ -394,7 +396,7 @@ module SkypeAPI
   
   getter :WallPaper, 'WALLPAPER'
   
-  def self.setWallPaper(file) sendSet('WALLPAPER', file) ; end
+  def self.setWallPaper(filePath) sendSet('WALLPAPER', filePath) ; end
   
   def self.setSilentMode(flag) sendSet('SILENT_MODE', flag._swi)._flag ; end
   
@@ -506,8 +508,8 @@ module SkypeAPI
     end
   end
   
-  def self.searchChatMessages val=''
-    search('CHATMESSAGES','CHATMESSAGES',val).map do |id|
+  def self.searchChatMessages target=''
+    search('CHATMESSAGES','CHATMESSAGES', target).map do |id|
       chatMessage id
     end
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: Ruby4Skype
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2008-02-01 00:00:00 +09:00
+  version: 0.2.2
+date: 2008-02-07 00:00:00 +09:00
 summary: SkypeAPI wrapper
 require_paths: 
 - lib
@@ -46,6 +46,7 @@ files:
 - lib/skypeapi/sharefunctions.rb
 - lib/skypeapi/sms.rb
 - lib/skypeapi/user.rb
+- lib/skypeapi/version.rb
 - lib/skypeapi/voicemail.rb
 - lib/skypeapi.rb
 test_files: []