Ruby4Skype 0.2.3 → 0.3.1

data/lib/skypeapi/profile.rb

@@ -1,127 +1,197 @@
 module SkypeAPI
-  module Object
-    class Profile < AbstractObject
-      OBJECT_NAME = "PROFILE"
-      
-      def initialize(id=nil)
-        super nil
-      end
-      
-      def self.new
-        super nil
-      end
-      
-      def self.notified msg
-        if msg =~ /^([^ ]+) (.*)$/m
-          property = P2M[$1]
-          value = V2O[property] ? V2O[property].call($2) : $2
-          instance = new
-          instance.notified instance, property,value #if @@instance[self][id]
-          
-          #p [property,value,instance,@notify]
-          #if @notify[nil]
-          #  @notify[nil][nil].call instance, property, value if @notify[nil][nil]
-          #  @notify[nil][value].call instance, property if @notify[nil][value]
-          #end
-          #if @notify[property]
-          #  @notify[property][nil].call instance, value if @notify[property][nil]
-          #  @notify[property][value].call instance if @notify[property][value]
-          #end
-        end
-      end
-      
-      getter :PSTNBalance, 'PSTN_BALANCE' do |str|
-        str._int
-      end
-      getter :PSTNBalanceCurrency, 'PSTN_BALANCE_CURRENCY'
-      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 :Languages, 'LANGUAGES' do |str|
-        str.split(' ')
-      end
-      getter :Country, 'COUNTRY' do |str|
-        str.empty? ? str : str.split(' ', 2)[0]
-      end
-      getter :IPCountry, 'IPCOUNTRY'
-      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 :MoodText, 'MOOD_TEXT'
-      getter :RichMoodText, 'RICH_MOOD_TEXT'
-      getter :Timezone, 'TIMEZONE' do |str|
-        str._int
-      end
-      getter :CallApplyCF, 'CALL_APPLY_CF' do |str|
-        str._flag
-      end
-      getter :CallNoanswerTimeout, 'CALL_NOANSWER_TIMEOUT' do |str|
-        str._int
-      end
-      getter :CallForwardRules, 'CALL_FORWARD_RULES' do |str|
-        cfs = str.split ' '
-        cfs = cfs.map do |cf|
-          cf = cf.split ','
-          cf[2] = @@skypeApi.user(cf[2]) unless cf[2] =~ /^\+/
-          [cf[0].to_i, cf[1].to_i, (cf[2] =~ /^\+/ ? cf[2] : @@skypeApi.user(cf[2]))]
-        end
-      end
-      getter :CallSendToVM, 'CALL_SEND_TO_VM' do |str|
-        str._flag
-      end
-      getter :SMSValidatedNumbers, 'SMS_VALIDATED_NUMBERS' do |str|
-        str.split(', ')
-      end
-      
-      def setFullname(name) invoke_set('FULLNAME', name); end
-      def setBirthday(dateOrYear=nil, month=nil, day=nil)
-        if dateOrYear.nil?
-          val = ''
-        else
-          val = dateOrYear.class == Date ? dateOrYear.strftime('%Y%m%d') : sprintf("%04d%02d%02d",dateOrYear,month,day)
-        end
-        invoke_set('BIRTHDAY', val)
-      end
-      def setSex(sex) invoke_set('SEX', sex); end
-      def setLanguages(*langs)
-        invoke_set('LANGUAGES', langs.join(' '))
-      end
-      def setCountry(iso) invoke_set('COUNTRY', iso); end
-      #def setIpcountry(val) invoke_set('IPCOUNTRY', val); end
-      def setProvince(province) invoke_set('PROVINCE', province); end
-      def setCity(city) invoke_set('CITY', city); end
-      def setPhoneHome(numbers) invoke_set('PHONE_HOME', numbers); end
-      def setPhoneOffice(numbers) invoke_set('PHONE_OFFICE', numbers); end
-      def setPhoneMobile(numbers) invoke_set('PHONE_MOBILE', numbers); end
-      def setHomepage(url) invoke_set('HOMEPAGE', url); end
-      def setAbout(text) invoke_set('ABOUT', text); end
-      def setMoodText(text) invoke_set('MOOD_TEXT', text); end
-      def setRichMoodText(text) invoke_set('RICH_MOOD_TEXT', text); end
-      def setTimezone(timezone) invoke_set('TIMEZONE', timezone); end
-      def setCallApplyCF(flag)
-        invoke_set('CALL_APPLY_CF', flag._str)
+  class Profile < AbstractObject
+    OBJECT_NAME = "PROFILE"
+
+    def initialize(id=nil)
+      super nil
+    end
+
+    def self.new
+      super nil
+    end
+
+    def self.notified msg
+      if msg =~ /^([^ ]+) (.*)$/m
+        property = P2M[$1]
+        value = V2O[property] ? V2O[property].call($2) : $2
+        instance = new
+        instance.notified instance, property,value #if @@instance[self][id]
+
+        #p [property,value,instance,@notify]
+        #if @notify[nil]
+        #  @notify[nil][nil].call instance, property, value if @notify[nil][nil]
+        #  @notify[nil][value].call instance, property if @notify[nil][value]
+        #end
+        #if @notify[property]
+        #  @notify[property][nil].call instance, value if @notify[property][nil]
+        #  @notify[property][value].call instance if @notify[property][value]
+        #end
       end
-      def setCallNoanswerTimeout(sec) invoke_set('CALL_NOANSWER_TIMEOUT', sec); end
-      def setCallForwardRules(*rules)
-        if rules[0] == nil
-          invoke_set('CALL_FORWARD_RULES', '')
-        else
-          rules.map! do |rule|
-            rule.join ','
-          end
-          rules = rules.join ' '
-          invoke_set('CALL_FORWARD_RULES', rules)
+    end
+
+    def get_pstn_balance() parse :pstn_balance, invoke_get("PSTN_BALANCE") end
+    def_parser(:pstn_balance){|str| str._int}
+    alias getPSTNBalance get_pstn_balance
+
+    def get_pstn_balance_currency() invoke_get("PSTN_BALANCE_CURRENCY") end
+    def_parser(:pstn_balance_currency)
+    alias getPSTNBalanceCurrency get_pstn_balance_currency
+
+    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_languages() parse :languages, invoke_get("LANGUAGES") end
+    def_parser(:languages){|str| str.split(' ')}
+    alias getLanguages get_languages
+
+    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_ip_country() invoke_get("IPCOUNTRY") end
+    def_parser(:ip_country,"IPCOUNTRY")
+    alias getIPCountry get_ip_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_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_timezone() parse :timezone, invoke_get("TIMEZONE") end
+    def_parser(:timezone){|str| str._int}
+    alias getTimezone get_timezone
+
+    def get_call_apply_cf() parse :call_apply_cf, invoke_get("CALL_APPLY_CF") end
+    def_parser(:call_apply_c_f){|str| str._flag}
+    alias getCallApplyCF get_call_apply_cf
+
+    def get_call_noanswer_timeout() parse :call_noanswer_timeout, invoke_get("CALL_NOANSWER_TIMEOUT") end
+    def_parser(:call_noanswer_timeout){|str| str._int}
+    alias getCallNoanswerTimeout get_call_noanswer_timeout
+
+    def get_call_forward_rules() parse :call_forward_rules, invoke_get("CALL_FORWARD_RULES") end
+    def_parser(:call_forward_rules){|str|
+      cfs = str.split ' '
+      cfs = cfs.map{ |cf|
+        cf = cf.split ','
+        cf[2] = SkypeAPI::User.new(cf[2]) unless cf[2] =~ /^\+/
+        [cf[0].to_i, cf[1].to_i, (cf[2] =~ /^\+/ ? cf[2] : SkypeAPI::User.new(cf[2]))]
+      }
+    }
+    alias getCallForwardRules get_call_forward_rules
+
+    def get_call_send_to_vm() parse :call_send_to_vm, invoke_get("CALL_SEND_TO_VM") end
+    def_parser(:call_send_to_vm,"CALL_SEND_TO_VM"){|str| str._flag}
+    alias getCallSendToVM get_call_send_to_vm
+
+    def get_sms_validated_numbers() parse :sms_validated_numbers, invoke_get("SMS_VALIDATED_NUMBERS") end
+    def_parser(:sms_validated_numbers){|str| str.split(', ')}
+    alias getSMSValidatedNumbers get_sms_validated_numbers
+
+    def setFullname(name) invoke_set('FULLNAME', name); end
+    def setBirthday(dateOrYear=nil, month=nil, day=nil)
+      if dateOrYear.nil?
+        val = ''
+      else
+        val = dateOrYear.class == Date ? dateOrYear.strftime('%Y%m%d') : sprintf("%04d%02d%02d",dateOrYear,month,day)
+      end
+      invoke_set('BIRTHDAY', val)
+    end
+    def setSex(sex) invoke_set('SEX', sex); end
+    def setLanguages(*langs)
+      invoke_set('LANGUAGES', langs.join(' '))
+    end
+    def setCountry(iso) invoke_set('COUNTRY', iso); end
+    #def setIpcountry(val) invoke_set('IPCOUNTRY', val); end
+    def setProvince(province) invoke_set('PROVINCE', province); end
+    def setCity(city) invoke_set('CITY', city); end
+    def setPhoneHome(numbers) invoke_set('PHONE_HOME', numbers); end
+    def setPhoneOffice(numbers) invoke_set('PHONE_OFFICE', numbers); end
+    def setPhoneMobile(numbers) invoke_set('PHONE_MOBILE', numbers); end
+    def setHomepage(url) invoke_set('HOMEPAGE', url); end
+    def setAbout(text) invoke_set('ABOUT', text); end
+    def setMoodText(text) invoke_set('MOOD_TEXT', text); end
+    def setRichMoodText(text) invoke_set('RICH_MOOD_TEXT', text); end
+    def setTimezone(timezone) invoke_set('TIMEZONE', timezone); end
+    def setCallApplyCF(flag)
+      invoke_set('CALL_APPLY_CF', flag._str)
+    end
+    def setCallNoanswerTimeout(sec) invoke_set('CALL_NOANSWER_TIMEOUT', sec); end
+    def setCallForwardRules(*rules)
+      if rules[0] == nil
+        invoke_set('CALL_FORWARD_RULES', '')
+      else
+        rules.map! do |rule|
+          rule.join ','
         end
+        rules = rules.join ' '
+        invoke_set('CALL_FORWARD_RULES', rules)
       end
-      def setCallSendToVM(flag)
-        invoke_set('CALL_SEND_TO_VM', flag._str)
-      end
     end
+    def setCallSendToVM(flag)
+      invoke_set('CALL_SEND_TO_VM', flag._str)
+    end
+
+    alias set_fullname setFullname
+    alias set_birthday setBirthday
+    alias set_sex setSex
+    alias set_languages setLanguages
+    alias set_country setCountry
+    #alias set_ipcountry setIpcountry
+    alias set_province setProvince
+    alias set_city setCity
+    alias set_phone_home setPhoneHome
+    alias set_phone_office setPhoneOffice
+    alias set_phone_mobile setPhoneMobile
+    alias set_homepage setHomepage
+    alias set_about setAbout
+    alias set_mood_text setMoodText
+    alias set_rich_mood_text setRichMoodText
+    alias set_timezone setTimezone
+    alias set_call_apply_cf setCallApplyCF
+    alias set_call_noanswer_timeout setCallNoanswerTimeout
+    alias set_call_forward_rules setCallForwardRules
+    alias set_call_send_to_vm setCallSendToVM
+
   end
 end

data/lib/skypeapi/sharefunctions.rb

@@ -1,4 +1,4 @@
-class NilClass
+class NilClass #:nodoc: all
   def _flag
     nil
   end
@@ -16,7 +16,7 @@ class NilClass
   end
 end
 
-class String
+class String #:nodoc: all
   def _flag
     case self
     when /^(TRUE)|(ON)$/i
@@ -37,7 +37,7 @@ class String
   end
 end
 
-class TrueClass
+class TrueClass #:nodoc: all
   def _swi
     "ON"
   end
@@ -47,7 +47,7 @@ class TrueClass
   end
 end
 
-class FalseClass
+class FalseClass #:nodoc: all-
   def _swi
     "OFF"
   end
@@ -59,21 +59,22 @@ end
 
 module SkypeAPI
   
-  module ShareFunctions
+  module ShareFunctions #:nodoc: all
     #private
     
-    #ex
     #invoke_echo "CREATE APPLICATION #{@appName}"
     #CREATE APPLICATION #{@appName} -> CREATE APPLICATION #{@appName}
     def invoke_echo cmd
       begin
         invoke(cmd) == cmd
-        rescue SkypeAPIError
-          raise $!, caller(1)
-        end
+      rescue SkypeAPI::APIError => e
+        e.backtrace.shift
+        e.backtrace.shift
+        raise e
       end
-    #ex
-    #invoke_one "GET CHATMESSAGE #{@id} BODY","CHATMESSAGE #{@id} BODY"
+    end
+
+    #invoke_one "GET CHATMESSAGE #{@id} BODY", "CHATMESSAGE #{@id} BODY"
     #GET CHATMESSAGE #{@id} BODY -> CHATMESSAGE #{@id} BODY (.+)
     def invoke_one cmd, regExp=cmd
       regExp.gsub!(/[\^$.\\\[\]*+{}?|()]/) do |char|
@@ -81,13 +82,14 @@ module SkypeAPI
       end
       begin
         invoke(cmd) =~ /^#{regExp} (.*)$/m
-        return $1
-      rescue SkypeAPIError => e
-        raise $!, caller
+      rescue SkypeAPI::APIError => e
+        e.backtrace.shift
+        e.backtrace.shift
+        raise e
       end
+      return $1
     end
     
-    #ex
     #invoke_get("GET USER #{@handle} SkypeOut")
     #GET USER #{@handle} SkypeOut -> USER #{@handle} SkypeOut (.+)
     def invoke_get prop, value=nil
@@ -97,10 +99,12 @@ module SkypeAPI
       end
       begin
         invoke(cmd) =~ /^#{reg} (.*)$/m
-        return $1
-      rescue SkypeAPIError
-        raise $!, caller
+      rescue SkypeAPI::APIError => e
+        e.backtrace.shift
+        e.backtrace.shift
+        raise e
       end
+      return $1
     end
     
     def invoke_set prop,value=nil
@@ -108,8 +112,10 @@ module SkypeAPI
       reg = "#{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{@id ? @id.to_s + ' ' : ''}#{prop}"
       begin
         str = invoke_one cmd, reg
-      rescue SkypeAPIError
-        raise $!, caller
+      rescue SkypeAPI::APIError => e
+        e.backtrace.shift
+        e.backtrace.shift
+        raise e
       end
       if self.class == Module
         self::V2O[prop] ? self::V2O[prop].call(str) : str
@@ -118,7 +124,7 @@ module SkypeAPI
       end
     end
     
-    #true�����Ԃ��Ȃ��B������ςȂ��B����ȊO�̕Ԃ茌������悤�Ȃ̂͂�invoke�Ŏ�������B
+    #true�����Ԃ��Ȃ��B������ςȂ��B����ȊO�̕Ԃ茌������悤�Ȃ̂͂�invoke�Ŏ�������B
     def invoke_alter prop, value=nil
       cmd = "ALTER #{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{@id ? @id.to_s + ' ' : ''}#{prop}#{value ? ' '+value.to_s : '' }"
       #res = "ALTER #{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{@id ? @id.to_s + ' ' : ''}#{prop}"
@@ -128,8 +134,10 @@ module SkypeAPI
       #res = "ALTER #{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{prop}"
       begin
         invoke(cmd)# == res
-      rescue SkypeAPIError
-        raise $!, caller
+      rescue SkypeAPI::APIError => e
+        e.backtrace.shift
+        e.backtrace.shift
+        raise e
       end
       true
     end

data/lib/skypeapi/sms.rb

@@ -1,84 +1,104 @@
 module SkypeAPI
-  module Object
-    class SMS< AbstractObject
-      OBJECT_NAME = "SMS"
-
-      def self.create target, type="OUTGOING"
-        res = @@skypeApi.invoke "CREATE SMS #{type} #{target}"
+  class SMS< AbstractObject
+    OBJECT_NAME = "SMS"
+    class << self
+      def create target, type="OUTGOING"
+        res = SkypeAPI.invoke "CREATE SMS #{type} #{target}"
         res =~ /^SMS (\d+) STATUS (.+)$/
         id, status = $1, $2
         return id, status
       end
-      
-      def self.createConfirmationCodeRequest target
+        
+      def createConfirmationCodeRequest target
         create target, 'CONFIRMATION_CODE_REQUEST'
       end
-      
-      def self.createConfirmationCodeSubmit target
-        create target, 'CONFIRMATION_CODE_SUBMIT'
-      end
-      
-      def self.delete id
-        @@skypeApi.invoke_echo "DELETE SMS #{id}"
-      end
-      
-      getter :Body, 'BODY'
-      getter :Type, 'TYPE'
-      getter :Status, 'STATUS'
-      getter :FailureReason, 'FAILUREREASON'
-      getter :FailedUnseen?, 'IS_FAILED_UNSEEN'
-      getter :Timestamp, 'TIMESTAMP' do |str|
-        if str.empty? then nil else Time.at(str.to_i) end
-      end
-      getter :Price, 'PRICE' do |str|
-        str.to_i
-      end
-      getter :PricePrecision, 'PRICE_PRECISION' do |str|
-        str.to_i
-      end
-      getter :PriceCurrency, 'PRICE_CURRENCY'
-      getter :ReplyToNumber, 'REPLY_TO_NUMBER'
-      getter :TargetNumbers, 'TARGET_NUMBERS' do |str|
-        str.split(', ')
-      end
-      getter :TargetStatuses, 'TARGET_STATUSES' do |str|
-        hash = Hash.new
-        str.split(', ').each do |lump|
-          pstn, status = lump.split('=')
-          hash[pstn] = status
-        end
-        hash
+      alias create_confirmation_code_request createConfirmationCodeRequest
+        
+      def delete id
+        SkypeAPI.invoke_echo "DELETE SMS #{id}"
       end
+    end
+
+    def get_body() invoke_get("BODY") end
+    def_parser(:body)
+    alias getBody get_body
+
+    def get_type() invoke_get("TYPE") end
+    def_parser(:type)
+    alias getType get_type
+
+    def get_status() invoke_get("STATUS") end
+    def_parser(:status)
+    alias getStatus get_status
+
+    def get_failure_reason() invoke_get("FAILUREREASON") end
+    def_parser(:failure_reason,"FAILUREREASON")
+    alias getFailureReason get_failure_reason
+
+    def get_is_failed_unseen?() invoke_get("IS_FAILED_UNSEEN") end
+    def_parser(:is_failed_unseen)
+    alias getIsFailedUnseen? get_is_failed_unseen?
+
+    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_price() parse :price, invoke_get("PRICE") end
+    def_parser(:price){|str| str.to_i}
+    alias getPrice get_price
+
+    def get_price_precision() parse :price_precision, invoke_get("PRICE_PRECISION") end
+    def_parser(:price_precision){|str| str.to_i}
+    alias getPricePrecision get_price_precision
+
+    def get_price_currency() invoke_get("PRICE_CURRENCY") end
+    def_parser(:price_currency)
+    alias getPriceCurrency get_price_currency
+
+    def get_reply_to_number() invoke_get("REPLY_TO_NUMBER") end
+    def_parser(:reply_to_number)
+    alias getReplyToNumber get_reply_to_number
+
+    def get_target_numbers() parse :target_numbers, invoke_get("TARGET_NUMBERS") end
+    def_parser(:target_numbers){|str| str.split(', ')}
+    alias getTargetNumbers get_target_numbers
+
+    def get_target_statuses() parse :target_statuses, invoke_get("TARGET_STATUSES") end
+    def_parser(:target_statuses){|str|
+      hash = Hash.new
+      str.split(', ').each{ |lump|
+        pstn, status = lump.split('=')
+        hash[pstn] = status
+      }
+      hash
+    }
+    alias getTargetStatuses get_target_statuses
+
+    #send?
+    def get_chunk noOfChunks
+      res = invoke "CHUNK #{noOfChunks}"
+      return noOfChunks, res
+    end
+    alias getChunk get_chunk
       
-      def getChunk noOfChunks
-        res = send"CHUNK #{noOfChunks}"
-        return noOfChunks, res
-      end
+    def set_body(text) invoke_set "BODY", text end
+    alias setBody set_body
       
-      def setBody text
-        invoke_set "BODY", text
-      end
+    def send() invoke_alter "SEND" end
       
-      def send
-        invoke_alter "SEND"
-      end
+    def delete() invoke_echo "DLETE SMS #{@id}" end
       
-      def delete
-        invoke_echo "DLETE SMS #{@id}"
-      end
+    def set_target_number *nums
+      nums = nums[0] if nums[0].class == Array
+      invoke_set "TARGET_NUMBERS", nums.join(', ')
+    end
+    alias setTargetNumber set_target_number
       
-      def setTargetNumber *nums
-        nums = nums[0] if nums[0].class == Array
-        invoke_set "TARGET_NUMBERS", nums.join(', ')
-      end
+    def set_seen() invoke_set "SEEN" end
+    alias setSeen set_seen
       
-      def setSeen
-        invoke_set "SEEN"
-      end
+    def set_reply_to_number(pstn) invoke_set "REPLY_TO_NUMBER", pstn end
+    alias setReplyToNumber set_reply_to_number
       
-      def setReplyToNumber pstn
-        invoke_set "REPLY_TO_NUMBER", pstn
-      end
-    end
   end
 end