Ruby4Skype 0.2.3 → 0.3.1

data/lib/skypeapi/user.rb

@@ -1,109 +1,169 @@
 module SkypeAPI
-  module Object
-    class User < AbstractObject
-      OBJECT_NAME = "USER"
-      
-      getter :Handle, 'HANDLE'
-      getter :Fullname, 'FULLNAME'
-      getter :Birthday,'BIRTHDAY' do |yyyymmdd|
-        (yyyymmdd =~ /(\d\d\d\d)(\d\d)(\d\d)/) ? Date.new($1.to_i,$2.to_i,$3.to_i) : nil
-      end
-      getter :Sex, 'SEX'
-      getter :Language, 'LANGUAGE' do |str|
-        str.empty? ? str : str.split(' ',2)[0]
-      end
-      getter :Country, 'COUNTRY' do |str|
-        str.empty? ? str : str.split(' ',2)[0]
-      end
-      getter :Province, 'PROVINCE'
-      getter :City, 'CITY'
-      getter :PhoneHome, 'PHONE_HOME'
-      getter :PhoneOffice, 'PHONE_OFFICE'
-      getter :PhoneMobile, 'PHONE_MOBILE'
-      getter :Homepage, 'HOMEPAGE'
-      getter :About, 'ABOUT'
-      getter :HasCallEquipment, 'HASCALLEQUIPMENT' do |str|
-        str._flag
-      end
-      getter :IsVideoCapable, 'IS_VIDEO_CAPABLE'  do |str|
-        str._flag
-      end
-      getter :IsVoicemailCapable, 'IS_VOICEMAIL_CAPABLE' do |str|
-        str._flag
-      end
-      getter :BuddyStatus, 'BUDDYSTATUS' do |str|
-        str.to_i
-      end
-      getter :IsAuthorized, 'ISAUTHORIZED' do |str|
-        str._flag
-      end
-      getter :IsBlocked, 'ISBLOCKED' do |str|
-        str._flag
-      end
-      getter :OnlineStatus, 'ONLINESTATUS'
-      #getter :skypeOut, 'SkypeOut'
-      #getter :skypeMe, 'SKYPEME'
-      getter :LastOnlineTimestamp, 'LASTONLINETIMESTAMP' do |str|
-        if str.empty? then nil else Time.at(str.to_i) end
-      end
-      getter :CanLeaveVM, 'CAN_LEAVE_VM' do |str|
-        str._flag
-      end
-      getter :SpeedDial, 'SPEEDDIAL' do |str|
-        str#._int
-      end
-      getter :ReceivedAuthRequest, 'RECEIVEDAUTHREQUEST'
-      getter :MoodText, 'MOOD_TEXT'
-      getter :RichMoodText, 'RICH_MOOD_TEXT'
-      getter :Aliases, 'ALIASES'
-      getter :Timezone, 'TIMEZONE' do |str|
-        str._int
-      end
-      getter :IsCFActive, 'IS_CF_ACTIVE' do |str|
-        str._flag
-      end
-      getter :NrofAuthedBuddies, 'NROF_AUTHED_BUDDIES' do |str|
-        str._int
-      end
-      getter :DisplayName, 'DISPLAYNAME'
-      
-      def getAvatar(filePath)
-        invoke("GET USER #{@id} AVATAR 1 #{filePath}") =~ /^USER #{@id} AVATAR \d+ (.+)$/
-        #if $1
-        #  return $1
-        #else
-          return nil
-        #end
-      end
-      notice :Avatar, 'AVATAR 1'
+  class User < AbstractObject
+    OBJECT_NAME = "USER"
+
+    def get_handle() invoke_get("HANDLE") end
+    def_parser(:handle)
+    alias getHandle get_handle
+
+    def get_fullname() invoke_get("FULLNAME") end
+    def_parser(:fullname)
+    alias getFullname get_fullname
+
+    def get_birthday() parse :birthday, invoke_get("BIRTHDAY") end
+    def_parser(:birthday){|yyyymmdd| (yyyymmdd =~ /(\d\d\d\d)(\d\d)(\d\d)/) ? Date.new($1.to_i,$2.to_i,$3.to_i) : nil}
+    alias getBirthday get_birthday
+
+    def get_sex() invoke_get("SEX") end
+    def_parser(:sex)
+    alias getSex get_sex
+
+    def get_language() parse :language, invoke_get("LANGUAGE") end
+    def_parser(:language){|str| str.empty? ? str : str.split(' ',2)[0]}
+    alias getLanguage get_language
+
+    def get_country() parse :country, invoke_get("COUNTRY") end
+    def_parser(:country){|str| str.empty? ? str : str.split(' ',2)[0]}
+    alias getCountry get_country
+
+    def get_province() invoke_get("PROVINCE") end
+    def_parser(:province)
+    alias getProvince get_province
+
+    def get_city() invoke_get("CITY") end
+    def_parser(:city)
+    alias getCity get_city
+
+    def get_phone_home() invoke_get("PHONE_HOME") end
+    def_parser(:phone_home)
+    alias getPhoneHome get_phone_home
+
+    def get_phone_office() invoke_get("PHONE_OFFICE") end
+    def_parser(:phone_office)
+    alias getPhoneOffice get_phone_office
+
+    def get_phone_mobile() invoke_get("PHONE_MOBILE") end
+    def_parser(:phone_mobile)
+    alias getPhoneMobile get_phone_mobile
+
+    def get_homepage() invoke_get("HOMEPAGE") end
+    def_parser(:homepage)
+    alias getHomepage get_homepage
+
+    def get_about() invoke_get("ABOUT") end
+    def_parser(:about)
+    alias getAbout get_about
+
+    def get_has_call_equipment?() parse :has_call_equipment, invoke_get("HASCALLEQUIPMENT") end
+    def_parser(:has_call_equipment, "HASCALLEQUIPMENT"){|str| str == 'TRUE' ? true : false}
+    alias getHasCallEquipment? get_has_call_equipment?
+
+    def get_is_video_capable?() parse :is_video_capable, invoke_get("IS_VIDEO_CAPABLE") end
+    def_parser(:is_video_capable){|str| str == 'TRUE' ? true : false}
+    alias getIsVideoCapable? get_is_video_capable?
+
+    def get_is_voicemail_capable?() parse :is_voicemail_capable, invoke_get("IS_VOICEMAIL_CAPABLE") end
+    def_parser(:is_voicemail_capable){|str| str == 'TRUE' ? true : false}
+    alias getIsVoicemailCapable? get_is_voicemail_capable?
+
+    def get_buddy_status() parse :buddy_status, invoke_get("BUDDYSTATUS") end
+    def_parser(:buddy_status, 'BUDDYSTATUS'){|str| str.to_i}
+    alias getBuddyStatus get_buddy_status
+
+    def get_is_authorized?() parse :is_authorized, invoke_get("ISAUTHORIZED") end
+    def_parser(:is_authorized, 'ISAUTHORIZED'){|str| str == 'TRUE' ? true : false}
+    alias getIsAuthorized? get_is_authorized?
+
+    def get_is_blocked?() parse :is_blocked, invoke_get("ISBLOCKED") end
+    def_parser(:is_blocked, 'ISBLOCKED'){|str| str == 'TRUE' ? true : false}
+    alias getIsBlocked? get_is_blocked?
+
+    def get_online_status() parse :online_status, invoke_get("ONLINESTATUS") end
+    def_parser(:online_status, 'ONLINESTATUS')
+    alias getOnlineStatus get_online_status
+
+    def get_last_online_timestamp() parse :last_online_timestamp, invoke_get("LASTONLINETIMESTAMP") end
+    def_parser(:last_online_timestamp, "LASTONLINETIMESTAMP"){|str| str.empty? ? nil : Time.at(str.to_i)}
+    alias getLastOnlineTimestamp get_last_online_timestamp
+
+    def get_can_leave_vm?() parse :can_leave_vm, invoke_get("CAN_LEAVE_VM") end
+    def_parser(:can_leave_vm){|str| str == 'TRUE' ? true : false}
+    alias getCanLeaveVM? get_can_leave_vm?
+
+    def get_speed_dial() invoke_get("SPEEDDIAL") end
+    def_parser(:speed_dial, 'SPEEDDIAL')
+    alias getSpeedDial get_speed_dial
+
+    def get_received_auth_request() invoke_get("RECEIVEDAUTHREQUEST") end
+    def_parser(:received_auth_request,"RECEIVEDAUTHREQUEST")
+    alias getReceivedAuthRequest get_received_auth_request
+
+    def get_mood_text() invoke_get("MOOD_TEXT") end
+    def_parser(:mood_text)
+    alias getMoodText get_mood_text
+
+    def get_rich_mood_text() invoke_get("RICH_MOOD_TEXT") end
+    def_parser(:rich_mood_text)
+    alias getRichMoodText get_rich_mood_text
+
+    def get_aliases() invoke_get("ALIASES") end
+    def_parser(:aliases)
+    alias getAliases get_aliases
+
+    def get_timezone() parse :timezone, invoke_get("TIMEZONE") end
+    def_parser(:timezone){|str| str.to_i}
+    alias getTimezone get_timezone
+
+    def get_is_cf_active?() parse :is_cf_active, invoke_get("IS_CF_ACTIVE") end
+    def_parser(:is_cf_active){|str| str == 'TRUE' ? true : false}
+    alias getIsCFActive? get_is_cf_active?
+
+    def get_nrof_authed_buddies() parse :nrof_authed_buddies, invoke_get("NROF_AUTHED_BUDDIES") end
+    def_parser(:nrof_authed_buddies){|str| str.to_i}
+    alias getNrofAuthedBuddies get_nrof_authed_buddies
+
+    def get_displayname() invoke_get("DISPLAYNAME") end
+    def_parser(:displayname)
+    alias getDisplayname get_displayname
       
-      def setBuddyStatus(statusCode, msg="")
-        raise ArgumentErorr unless statusCode.to_i == 1 or statusCode.to_i == 2
-        invoke_set('BUDDYSTATUS',"#{statusCode} #{msg}")
-      end
+    def get_avatar(file_path) invoke("GET USER #{@id} AVATAR 1 #{file_path}") =~ /^USER #{@id} AVATAR \d+ (.+)$/ end
+    def_parser :avatar, 'AVATAR 1'
+    alias getAvatar get_avatar
+
+    def set_buddy_status(statusCode, msg="")
+      raise ArgumentErorr unless statusCode.to_i == 1 or statusCode.to_i == 2
+      invoke_set('BUDDYSTATUS',"#{statusCode} #{msg}")
+    end
+    alias setBuddyStatus set_buddy_status
       
-      def setIsBlocked(flag) invoke_set('ISBLOCKED', flag._str); end
+    def set_is_blocked(flag) invoke_set('ISBLOCKED', flag ? 'TRUE' : 'FALSE') end
+    alias setIsBlocked set_is_blocked
       
-      def setIsAuthorized(flag) invoke_set('ISAUTHORIZED', flag._str); end
+    def set_is_authorized(flag) invoke_set('ISAUTHORIZED', flag ? 'TRUE' : 'FALSE') end
+    alias setIsAuthorized set_is_authorized
       
-      def setSpeedDial(numbers) invoke_set('SPEEDDIAL', numbers); end
+    def set_speed_dial(numbers) invoke_set('SPEEDDIAL', numbers) end
+    alias setSpeedDial set_speed_dial
       
-      def setDisplayName(name) invoke_set('DISPLAYNAME', name);end
-
-
-      def addContactList msg=""
-        val = invoke_set("BUDDYSTATUS","2 #{msg}")
-        val == 2 or val == 3
-      end
-            
-      def addedContactList?
-        val = getBuddyStatus
-        val == 3 or val == 2
-      end
+    def set_displayname(name) invoke_set('DISPLAYNAME', name);end
+    alias setDisplayname set_displayname
+
+
+    def add_contactlist msg=""
+      val = invoke_set("BUDDYSTATUS","2 #{msg}")
+      val == 2 or val == 3
+    end
+    alias addContactlist add_contactlist
+
+    def added_contactlist?
+      val = get_buddy_status
+      val == 3 or val == 2
+    end
+    alias addedContactlist? added_contactlist?
       
-      def delContactList
-        invoke_set("BUDDYSTATUS","1") == 1
-      end
+    def del_contactlist
+      invoke_set("BUDDYSTATUS","1") == 1
     end
+    alias delContactlist del_contactlist
   end
 end

data/lib/skypeapi/version.rb

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

data/lib/skypeapi/voicemail.rb

@@ -1,60 +1,67 @@
 module SkypeAPI
-  module Object
-    class VoiceMail < AbstractObject
-      OBJECT_NAME = "VOICEMAIL"
+  class VoiceMail < AbstractObject
+    OBJECT_NAME = "VOICEMAIL"
       
-      def self.create target
-        @@skypeApi.invoke "CALLVOICEMAIL #{target}"
-      end
-      
-      def self.open id
-        @@skypeApi.invoke "OPEN VOICEMAIL #{id}"
-      end
+    def self.create target
+      SkypeAPI.invoke "CALLVOICEMAIL #{target}"
+    end
       
-      getter :Type, 'TYPE'
-      getter :Partner, 'PARTNER_HANDLE' do |str|
-        @@skypeApi.user str
-      end
-      getter :PartnerDispname, 'PARTNER_DISPNAME'
-      getter :Status, 'STATUS'
-      getter :FailureReason, 'FAILUREREASON'
-      #getter :Subject, 'SUBJECT'
-      getter :Timestamp, 'TIMESTAMP' do |str|
-        if str.empty? then nil else Time.at(str.to_i) end
-      end
-      getter :Duration, 'DURATION' do |str|
-        str.to_i
-      end
-      getter :AllowedDuration, 'ALLOWED_DURATION' do |str|
-        str.to_i
-      end
+    def self.open id
+      SkypeAPI.invoke "OPEN VOICEMAIL #{id}"
+    end
       
-      #def alter action
-      #  @@skypeApi.invoke "ALTER VOICEMAIL #{id} #{action}"
-      #end
+    def get_type() invoke_get("TYPE") end
+    def_parser(:type)
+    alias getType get_type
+
+    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_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_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_duration() parse :duration, invoke_get("DURATION") end
+    def_parser(:duration){|str| str.to_i}
+    alias getDuration get_duration
+
+    def get_allowed_duration() parse :allowed_duration, invoke_get("ALLOWED_DURATION") end
+    def_parser(:allowed_duration){|str| str.to_i}
+    alias getAllowedDuration get_allowed_duration
+    #def alter action
+    #  @@skypeApi.invoke "ALTER VOICEMAIL #{id} #{action}"
+    #end
       
-      def startPlayback
-        invoke_alter "STARTPLAYBACK"
-      end
-      def stopPlayback
-        invoke_alter "STOPPLAYBACK"
-      end
-      def upload
-        invoke_alter "UPLOAD"
-      end
-      def download
-        invoke_alter "DOWNLOAD"
-      end
-      def startRecording
-        invoke_alter "STARTRECORDING"
-      end
-      def stopRecording
-        invoke_alter "STOPRECORDING"
-      end
-      def delete
-        invoke_alter "DELETE"
-      end
+    def start_playback() invoke_alter "STARTPLAYBACK" end
+    alias startPlayback start_playback
 
-    end
+    def stop_playback() invoke_alter "STOPPLAYBACK" end
+    alias stopPlayback stop_playback
+
+    def upload() invoke_alter "UPLOAD" end
+
+    def download() invoke_alter "DOWNLOAD" end
+        
+    def start_recording() invoke_alter "STARTRECORDING" end
+    alias startRecording start_recording
+
+    def stop_recording() invoke_alter "STOPRECORDING" end
+    alias stopRecording stop_recording
+
+    def delete() invoke_alter "DELETE" end
+      
   end
 end

data/spec/matcher_be_boolean.rb

@@ -0,0 +1,10 @@
+
+Spec::Matchers.define :be_boolean do
+  match do |actual|
+    actual == true or actual == false
+  end
+#  failure_message_for_should do |actual|
+#  end
+#  failure_message_for_should_not do |actual|
+#  end
+end

data/spec/skypeapi/application_spec.rb

@@ -0,0 +1,76 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'skypeapi'
+
+describe SkypeAPI::Application do
+  before(:all) do
+    SkypeAPI.init
+    SkypeAPI.start_messageloop
+    SkypeAPI.attach_wait
+  end
+
+  after :all do
+    SkypeAPI.close
+  end
+
+  before :each do
+    @app = SkypeAPI::Application.new('testApp')
+    @app.create
+  end
+
+  after :each do
+    @app.delete unless @app.nil?
+  end
+
+  it 'get_connectable each should be instance of User' do
+    pending 'connectable empty' if @app.get_connectable.empty?
+    @app.get_connectable.each{|user| user.should be_instance_of SkypeAPI::User}
+  end
+
+  it 'get_connecting each should be instance of User' do
+    pending 'connection empty' if @app.get_connecting.empty?
+    @app.get_connecting.each{|user| user.should be_instance_of SkypeAPI::User}
+  end
+
+  it 'get_streams each should be instance of Stream' do
+    pending 'streams empty' if @app.get_streams.empty?
+    @app.get_streams.each{|stream| stream.should be_instance_of SkypeAPI::Stream}
+  end
+
+  it 'get_sending each should {:stream,:bytes}' do
+    pending 'sending empty' if @app.get_sending.empty?
+    @app.get_sending.each{|hash|
+      hash[:stream].should be_instance_of SkypeAPI::Stream
+      hash[:bytes].should be_kind_of Integer
+    }
+  end
+
+  it 'get_received each should {:stream,:bytes}' do
+    pending 'received empty' if @app.get_received.empty?
+    @app.get_received.each{|hash|
+      hash[:stream].should be_instance_of SkypeAPI::Stream
+      hash[:bytes].should be_kind_of Integer
+    }
+  end
+
+  it 'connect should be true' do
+    @app.connect('echo123').should be_true
+  end
+
+  it 'write should be true' do
+    pending 'need connection stream'
+    @app.write(stream,msg).should be_true
+  end
+
+    #assert(app.datagram(stream,msg))
+    #assert_instance_of(String, app.read())
+    #assert(app.disconnect(stram))
+
+  it 'delete should be true' do
+    @app.delete.should be_true
+    @app = nil
+  end
+
+end
+