Ruby4Skype 0.2.3 → 0.3.1

data/lib/skypeapi/application.rb

@@ -1,106 +1,108 @@
 module SkypeAPI
-  module Object
+  class Application < AbstractObject
     class Stream
       def initialize app, streamString
         @app = app
         @id = streamString
         @user = SkypeAPI.user(@id.split(':')[0])
       end
-      
+
       def to_s
         @id
       end
-      
+
       def user
         @user
       end
-      
+
       def write msg
         @app.write self, cmd
       end
-      
+
       def datagram msg, &block
         @app.datagram self, cmd
       end
-      
+
       def read
         @app.read self
       end
-      
+
       def disconnect
         @app.disconnect self
       end
     end
-    
-    class Application < AbstractObject
-      OBJECT_NAME = "APPLICATION"
-      
-      getter :Connectable , 'CONNECTABLE' do |str|
-        str.split(' ').collect{|i| SkypeAPI.user(i)}
-      end
-      
-      getter :Connecting,'CONNECTING' do |str|
-        str.split(' ').collect{|i| SkypeAPI.user(i)}
-      end
-      
-      getter :Streams, 'STREAMS' do |str|
-        str.split(' ').collect{|streamID| Stream.new(self, streamID)}
-      end
-      
-      getter :Received, 'RECEIVED' do |str|
-        str.split(' ').collect do |i|
-          streamID, byte = i.split('=')
-          {:stream => Stream.new(self, streamID),:bytes => byte.to_i}
-        end
-      end
-      
-      getter :Sending, 'SENDING' do |str|
-        str.split(' ').collect do |i|
-          streamID, byte = i.split('=')
-          {:stream => Stream.new(self, streamID),:bytes => byte.to_i}
-        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
-        app
-      end
-      
-      def create
-        invoke_echo "CREATE APPLICATION #{@id}"
-      end
-      
-      def connect user
-        invoke_echo "ALTER APPLICATION #{@id} CONNECT #{user}"
-      end
-      
-      def write stream, msg
-        invoke_alter "WRITE", "#{stream} #{msg}"
-      end
-      
-      def datagram stream, msg
-        invoke_alter "DATAGRAM", "#{stream} #{msg}"
-      end
-      
-      def read stream
-        res = invoke "ALTER APPLICATION #{@id} READ #{stream}"
-        res =~ /^ALTER APPLICATION #{@id} READ #{stream} (.*)$/m
-        $1
-      end
-      
-      def disconnect stream
-        invoke_echo "ALTER APPLICATION #{@id} DISCONNECT #{stream}"
-      end
-      
-      def delete
-        invoke_echo "DELETE APPLICATION #{@id}"
-      end
+
+    OBJECT_NAME = "APPLICATION"
+
+    def get_connectable() parse :connectable, invoke_get("CONNECTABLE") end
+    def_parser(:connectable){|str| str.split(' ').collect{|i| SkypeAPI.user(i)}}
+    alias getConnectable get_connectable
+
+    def get_connecting() parse :connecting, invoke_get("CONNECTING") end
+    def_parser(:connecting){|str| str.split(' ').collect{|i| SkypeAPI.user(i)}}
+    alias getConnecting get_connecting
+
+    def get_streams() parse :streams, invoke_get("STREAMS") end
+    def_parser(:streams){|str| str.split(' ').collect{|stream_id| Stream.new(self, stream_id)}}
+    alias getStreams get_streams
+
+    def get_received() parse :received, invoke_get("RECEIVED") end
+    def_parser(:received){|str|
+      str.split(' ').collect{|i|
+        streamID, byte = i.split('=')
+        {:stream => Stream.new(self, streamID), :bytes => byte.to_i}
+      }
+    }
+    alias getReceived get_received
+
+    def get_sending() parse :sending, invoke_get("SENDING") end
+    def_parser(:sending){|str|
+      str.split(' ').collect{ |i|
+        streamID, byte = i.split('=')
+        {:stream => Stream.new(self, streamID),:bytes => byte.to_i}
+      }
+    }
+    alias getSending get_sending
+
+    def_parser(:datagram){|str|
+      user,data = str.split(' ',2)
+      [SkypeAPI.user(user), data]
+    }
+
+    def self.create appName
+      app = new appName
+      app.create
+      app
+    end
+
+    def create
+      invoke_echo "CREATE APPLICATION #{@id}"
+    end
+
+    def connect user
+      invoke_echo "ALTER APPLICATION #{@id} CONNECT #{user}"
+    end
+
+    def write stream, msg
+      invoke_alter "WRITE", "#{stream} #{msg}"
+    end
+
+    def datagram stream, msg
+      invoke_alter "DATAGRAM", "#{stream} #{msg}"
+    end
+
+    def read stream
+      res = invoke "ALTER APPLICATION #{@id} READ #{stream}"
+      res =~ /^ALTER APPLICATION #{@id} READ #{stream} (.*)$/m
+      $1
+    end
+
+    def disconnect stream
+      invoke_echo "ALTER APPLICATION #{@id} DISCONNECT #{stream}"
+    end
+
+    def delete
+      invoke_echo "DELETE APPLICATION #{@id}"
     end
   end
 end

data/lib/skypeapi/call.rb

@@ -1,234 +1,247 @@
 module SkypeAPI
-  module Object
-    class Call < AbstractObject
-      OBJECT_NAME = "CALL"
-      
-      def self.create *targets
-        res = (SkypeAPI.invoke_one "CALL " + targets.join(", "),"CALL").split(" ")
-        #return SkypeAPI::Call.new(res[0]),res[2]
-        new res[0]
-      end
-      
-      getter :Timestamp, 'TIMESTAMP' do |str|
-        if str.empty? then nil else Time.at(str.to_i) end
-      end
-      getter :Partner, 'PARTNER_HANDLE' do |str|
-        SkypeAPI::User.new str
-      end
-      getter :PartnerDispname, 'PARTNER_DISPNAME'
-      getter :TargetIdentity, 'TARGET_IDENTITY'
-      getter :ConfID, 'CONF_ID' do |str|
-        str.to_i
-      end
-      getter :Type, 'TYPE'
-      getter :Status, 'STATUS'
-      getter :VideoStatus, 'VIDEO_STATUS'
-      getter :VideoSendStatus, 'VIDEO_SEND_STATUS'
-      getter :VideoReceiveStatus, 'VIDEO_RECEIVE_STATUS'
-      getter :FailureReason, 'FAILUREREASON' do |str|
-        str.to_i
-      end
-      #getter :Subject, 'SUBJECT'
-      getter :PSTNNumber, 'PSTN_NUMBER'
-      getter :Duration, 'DURATION' do |str|
-        str.to_i
-      end
-      getter :PSTNStatus, 'PSTN_STATUS'
-      getter :ConfParticipantsCount, 'CONF_PARTICIPANTS_COUNT' do |str|
-        str.to_i
-      end
-      
-      notice :ConfParticipant, 'CONF_PARTICIPANT'  do |str|
-        res = str.split(' ')
-        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 = invoke_get "CONF_PARTICIPANT #{num}"
-        res = str.split(' ')
-        res[0] = SkypeAPI::User.new res[0]
-        res
-      end
-      
-      getter :VMDuration, 'VM_DURATION' do |str|
-        str.to_i
-      end
-      getter :VMAllowedDuration, 'VM_ALLOWED_DURATION' do |str|
-        str.to_i
-      end
-      
-      getter :Rate, 'RATE' do |str|
-        str.to_i
-      end
-      getter :RateCurrency, 'RATE_CURRENCY'
-      getter :RatePrecision, 'RATE_PRECISION' do |str|
-        str.to_f #?
-      end
-      
-      getter :Input, 'INPUT'
-      getter :Output, 'OUTPUT'
-      getter :CaptureMic, 'CAPTURE_MIC'
-      getter :VAAInputStatus, 'VAA_INPUT_STATUS' do |str|
-        str._flag
-      end
-            
-      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' 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 = invoke_get "CAN_TRANSFER #{user}"
-        V2O[:CanTransffer].call(user.to_s + ' ' + res)
-      end
-      notice :CanTransffer, 'CAN_TRANSFER' do |str|
-        str.split(' ')[1]._flag
-      end
-            
-      getter :Seen, "SEEN" do |str|
-        str._flag
-      end
-      
-      #Notify?
-      #getter :DTMF, "DTMF" do |str|
-      #  str.to_i
-      #end
-      #getter :JoinConference, "JOIN_CONFERENCE"
-      #getter :StartVideoSend, "START_VIDEO_SEND"
-      #getter :StopVideoSend, "STOP_VIDEO_SEND"
-      #getter :StartVideoReceive, "START_VIDEO_RECEIVE"
-      #getter :StopVideoReceive, "STOP_VIDEO_RECEIVE"
-      
-      def setSeen
-        invoke_set "SEEN"
-      end
-      
-      def setStatus s
-        invoke_set "STATUS", s
-      end
-      
-      def setStatusOnHold
-        setStatus "ONHOLD"
-      end
-      
-      def setStatusInprogress
-        setStatus "INPROGRESS"
-      end
-      
-      def setStatusFinished
-        setStatus "FINISHED"
-      end
-      
-      #def setDTMF number
-      #  invoke_set "DTMF #{number}"
-      #end
-      
-      def setJoinConference masterCall
-        invoke_set "JOIN_CONFERENCE", masterCall.to_s
-      end
-      
-      def setStartVideoSend
-        invoke_set "START_VIDEO_SEND"
-      end
-      
-      def setStopVideoSend
-        invoke_set "STOP_VIDEO_SEND"
-      end
-      
-      def setStartVideoReceive
-        invoke_set "START_VIDEO_RECEIVE"
-      end
-      
-      def setStopVideoReceive
-        invoke_set "STOP_VIDEO_RECEIVE"
-      end
-      
-      def answer
-        invoke_alter "ANSWER"
-      end
-      
-      def hold
-        invoke_alter "HOLD"
-      end
-      
-      def resume
-        invoke_alter "RESUME"
-      end
-      
-      def hangup
-        invoke_alter "HANGUP"
-      end
-      
-      def end val=''
-        invoke_alter "END", val  
-      end
-      
-      def dtmf number
-        invoke_alter "DTMF", number
-      end
-      
-      def transfer *users
-        invoke_alter "TRANSFER", users.join(', ')
-      end
-      
-      def joinConference call
-        invoke_alter "JOIN_CONFERENCE"
-      end
-      
-      def startVideoSend
-        invoke_alter "START_VIDEO_SEND"
-      end
-
-      def stopVideoSend
-        invoke_alter "STOP_VIDEO_SEND"
-      end
-      
-      def startVideoReceive
-        invoke_alter "START_VIDEO_RECEIVE"
-      end
-      
-      def stopVideoReceive
-        invoke_alter"STOP_VIDEO_RECEIVE"
-      end
-      
-      def setInput device
-        invoke_alter "SET_INPUT", device
-      end
-      
-      def setOutput device
-        invoke_alter "SET_OUTPUT", device
-      end
-      
-      def setCaptureMic device
-        invoke_alter "SET_CAPTURE_MIC", device
-      end
-      
-      
-      def alter value
-        invoke_one "ALTER CALL #{@id} #{value}","ALTER CALL #{@id}"
-      end
+  class Call < AbstractObject
+    OBJECT_NAME = "CALL"
+
+    def self.create *targets
+      res = (SkypeAPI.invoke_one "CALL " + targets.join(", "),"CALL").split(" ")
+      #return SkypeAPI::Call.new(res[0]),res[2]
+      new res[0]
+    end
+
+    def get_timestamp() parse :timestamp, invoke_get("TIMESTAMP") end
+    def_parser(:timestamp){|str| str.empty? ? nil : Time.at(str.to_i)}
+    alias getTimestamp get_timestamp
+
+    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_target_identity() invoke_get("TARGET_IDENTITY") end
+    def_parser(:target_identity)
+    alias getTargetIdentity get_target_identity
+
+    def get_conf_id() parse :conf_id, invoke_get("CONF_ID") end
+    def_parser(:conf_id){|str| str.to_i}
+    alias getConfID get_conf_id
+
+    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_video_status() invoke_get("VIDEO_STATUS") end
+    def_parser(:video_status)
+    alias getVideoStatus get_video_status
+
+    def get_video_send_status() invoke_get("VIDEO_SEND_STATUS") end
+    def_parser(:video_send_status)
+    alias getVideoSendStatus get_video_send_status
+
+    def get_video_receive_status() invoke_get("VIDEO_RECEIVE_STATUS") end
+    def_parser(:video_receive_status)
+    alias getVideoReceiveStatus get_video_receive_status
+
+    def get_failure_reason() parse :failure_reason, invoke_get("FAILUREREASON") end
+    def_parser(:failure_reason,'FAILUREREASON'){|str| str.to_i}
+    alias getFailureReason get_failure_reason
+
+    #getter :Subject, 'SUBJECT'
+
+    def get_pstn_number() invoke_get("PSTN_NUMBER") end
+    def_parser(:pstn_number)
+    alias getPSTNNumber get_pstn_number
+
+    def get_duration() parse :duration, invoke_get("DURATION") end
+    def_parser(:duration){|str| str.to_i}
+    alias getDuration get_duration
+
+    def get_pstn_status() invoke_get("PSTN_STATUS") end
+    def_parser(:pstn_status)
+    alias getPSTNStatus get_pstn_status
+
+    def get_conf_participants_count() parse :conf_participants_count, invoke_get("CONF_PARTICIPANTS_COUNT") end
+    def_parser(:conf_participants_count){|str| str.to_i}
+    alias getConfParticipantsCount get_conf_participants_count
+
+
+    #?CALL 59 CONF_PARTICIPANT 1 echo123 INCOMING_P2P INPROGRESS Echo Test Service .
+    def_parser(:conf_participant, 'CONF_PARTICIPANT'){|str|
+      res = str.split(' ')
+      res[1] = SkypeAPI::User.new res[1] if res[1]
+      res
+    }
+
+    #????
+    def get_conf_participant num
+      str = invoke_get "CONF_PARTICIPANT #{num}"
+      res = str.split(' ')
+      res[0] = SkypeAPI::User.new res[0]
+      res
     end
+    alias getConfParticipant get_conf_participant
+
+    def get_vm_duration() parse :vm_duration, invoke_get("VM_DURATION") end
+    def_parser(:vm_duration){|str| str.to_i}
+    alias getVMDuration get_vm_duration
+
+    def get_vm_allowed_duration() parse :vm_allowed_duration, invoke_get("VM_ALLOWED_DURATION") end
+    def_parser(:vm_allowed_duration){|str| str.to_i}
+    alias getVMAllowedDuration get_vm_allowed_duration
+
+    def get_rate() parse :rate, invoke_get("RATE") end
+    def_parser(:rate){|str| str.to_i}
+    alias getRate get_rate
+
+    def get_rate_currency() invoke_get("RATE_CURRENCY") end
+    def_parser(:rate_currency)
+    alias getRateCurrency get_rate_currency
+
+    def get_rate_precision() parse :rate_precision, invoke_get("RATE_PRECISION") end
+    def_parser(:rate_precision){|str| str.to_f} #?
+    alias getRatePrecision get_rate_precision
+
+    def get_input() invoke_get("INPUT") end
+    def_parser(:input)
+    alias getInput get_input
+
+    def get_output() invoke_get("OUTPUT") end
+    def_parser(:output)
+    alias getOutput get_output
+
+    def get_capture_mic() invoke_get("CAPTURE_MIC") end
+    def_parser(:capture_mic)
+    alias getCaptureMic get_capture_mic
+
+    def get_vaa_input_status() parse :vaa_input_status, invoke_get("VAA_INPUT_STATUS") end
+    def_parser(:vaa_input_status){|str| str._flag}
+    alias getVAAInputStatus get_vaa_input_status
+
+    def get_forwarded_by() parse :forwarded_by, invoke_get("FORWARDED_BY") end
+    def_parser(:forwarded_by){|str| (str.empty? or str == '?') ? nil : SkypeAPI::User.new(str)}
+    alias getForwardedBy get_forwarded_by
+
+    def get_transfer_active?() parse :transfer_active, invoke_get("TRANSFER_ACTIVE") end
+    def_parser(:transfer_active){|str| str._flag}
+    alias getTransferActive? get_transfer_active?
+
+    def get_transfer_status() invoke_get("TRANSFER_STATUS") end
+    def_parser(:transfer_status)
+    alias getTransferStatus get_transfer_status
+
+    def get_transferred_by() parse :transferred_by, invoke_get("TRANSFERRED_BY") end
+    def_parser(:transferred_by){|str| str.empty? ? nil : SkypeAPI::User.new(str)}
+    alias getTransferredBy get_transferred_by
+
+    def get_transferred_to() parse :transferred_to, invoke_get("TRANSFERRED_TO") end
+    def_parser(:transferred_to){|str| str.empty? ? nil : SkypeAPI::User.new(str)}
+    alias getTransferredTo get_transferred_to
+
+    def get_can_transfer user
+      parse :can_transffer, user.to_s + ' ' + invoke_get("CAN_TRANSFER #{user}")
+    end
+    def_parser(:can_transffer){|str| str.split(' ')[1]._flag}
+    alias getCanTransfer get_can_transfer
+
+    def get_seen() parse :seen, invoke_get("SEEN") end
+    def_parser(:seen){|str| str._flag}
+    alias getSeen get_seen
+
+    #Notify?
+    #getter :DTMF, "DTMF" do |str|
+    #  str.to_i
+    #end
+    #getter :JoinConference, "JOIN_CONFERENCE"
+    #getter :StartVideoSend, "START_VIDEO_SEND"
+    #getter :StopVideoSend, "STOP_VIDEO_SEND"
+    #getter :StartVideoReceive, "START_VIDEO_RECEIVE"
+    #getter :StopVideoReceive, "STOP_VIDEO_RECEIVE"
+
+    #
+    def set_seen() invoke_set "SEEN" end
+    alias setSeen set_seen
+
+    def set_status(status) invoke_set "STATUS", status end
+    alias setStatus set_status
+
+    def set_status_onhold() set_status "ONHOLD" end
+    alias setStatusOnhold set_status_onhold
+
+    def set_status_inprogress() set_status "INPROGRESS" end
+    alias setStatusInprogress set_status_inprogress
+
+    def set_status_finished() setStatus "FINISHED" end
+    alias setStatusFinished set_status_finished
+
+    #def setDTMF number
+    #  invoke_set "DTMF #{number}"
+    #end
+    #alias set_dtmf setDTMF
+
+    #
+    def set_join_conference(master_call) invoke_set "JOIN_CONFERENCE", master_call.to_s end
+    alias setJoinConference set_join_conference
+
+    def set_start_video_send() invoke_set "START_VIDEO_SEND" end
+    alias setStartVideoSend set_start_video_send
+
+    def set_stop_video_send() invoke_set "STOP_VIDEO_SEND" end
+    alias setStopVideoSend set_stop_video_send
+
+    def set_start_video_receive() invoke_set "START_VIDEO_RECEIVE" end
+    alias setStartVideoReceive set_start_video_receive
+
+    def set_stop_video_receive() invoke_set "STOP_VIDEO_RECEIVE" end
+    alias setStopVideoReceive set_stop_video_receive
+
+    def answer() invoke_alter "ANSWER" end
+
+    def hold() invoke_alter "HOLD" end
+
+    def resume() invoke_alter "RESUME" end
+
+    def hangup() invoke_alter "HANGUP" end
+
+    def end(value='') invoke_alter "END", value end
+
+  def dtmf(number) invoke_alter "DTMF", number end
+
+  def transfer(*users) invoke_alter "TRANSFER", users.join(', ') end
+
+  #???
+  def join_conference(call) invoke_alter "JOIN_CONFERENCE" end
+  alias joinConference join_conference
+
+  def start_video_send() invoke_alter "START_VIDEO_SEND" end
+  alias startVideoSend start_video_send
+
+  def stop_video_send() invoke_alter "STOP_VIDEO_SEND" end
+  alias stop_video_send startVideoSend
+
+  def start_video_receive() invoke_alter "START_VIDEO_RECEIVE" end
+  alias startVideoReceive start_video_receive
+
+  def stop_video_receive() invoke_alter"STOP_VIDEO_RECEIVE" end
+  alias stopVideoReceive stop_video_receive
+
+  def set_input(device) invoke_alter "SET_INPUT", device end
+  alias setInput set_input
+
+  def set_output(device) invoke_alter "SET_OUTPUT", device end
+  alias set_output set_output
+
+  def set_capture_mic(device) invoke_alter "SET_CAPTURE_MIC", device end
+  alias setCaptureMic set_capture_mic
+
+  #???
+  def alter value
+    invoke_one "ALTER CALL #{@id} #{value}","ALTER CALL #{@id}"
   end
 end
+end