Ruby4Skype 0.3.1 → 0.4.1

data/lib/{skypeapi → skype}/chat.rb

@@ -1,176 +1,176 @@
-
-module SkypeAPI
-  class Chat < AbstractObject
-    OBJECT_NAME =  "CHAT"
-
-    class << self
-      def create *users
-        SkypeAPI.invoke("CHAT CREATE #{users.join(', ')}") =~ /^CHAT ([^ ]+) STATUS (.+)$/
-        chatID, status = $1, $2
-        return SkypeAPI::Chat.new(chatID)#, status
-      end
-
-      def find_using_blob blob
-        SkypeAPI.invoke("CHAT FINDUSINGBLOB #{blob}") =~ /^CHAT ([^ ]+) STATUS (.+)$/
-        chatID, status = $1, $2
-        return SkypeAPI::Chat.new(chatID)#, status
-      end
-      alias findUsingBlob find_using_blob
-
-      def create_using_blob blob
-        SkypeAPI.invoke("CHAT CREATEUSINGBLOB #{blob}") =~ /^CHAT ([^ ]+) STATUS (.+)$/
-        chatID, status = $1, $2
-        return SkypeAPI::Chat.new(chatID)#, status
-      end
-      alias createUsingBlob create_using_blob
-    end
-
-    def get_name() invoke_get('NAME') end
-    def_parser(:name)
-    alias getName get_name
-
-    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_adder() parse :adder, invoke_get('ADDER') end
-    def_parser(:adder){|str| str.empty? ? nil : SkypeAPI::User.new(str) }
-    alias getAdder get_adder
-
-    def get_status() invoke_get 'STATUS' end
-    def_parser :status
-    alias getStatus get_status
-
-    def get_posters() parse :posters, invoke_get('POSTERS') end
-    def_parser(:posters){|str| str.split(', ').map{|handle| SkypeAPI::User.new handle}}
-    alias getPosters get_posters
-
-    def get_members() parse :members, invoke_get('MEMBERS') end
-    def_parser(:members){|str| str.split(' ').map{|handle| SkypeAPI::User.new handle}}
-    alias getMembers get_members
-
-    def get_topic() invoke_get('TOPIC') end
-    def_parser(:topic)
-    alias getTopic get_topic
-
-    def get_topic_xml() invoke_get('TOPICXML') end
-    def_parser(:topic_xml,'TOPICXML')
-    alias getTopicXML get_topic_xml
-
-    def get_chat_messages() parse :chat_messages, invoke_get('CHATMESSAGES') end
-    def_parser(:chat_messages, 'CHATMESSAGES'){|str| str.split(' ').map{|id| SkypeAPI::ChatMessage.new id}}
-    alias getChatMessages get_chat_messages
-
-    def get_active_members() parse :active_members, invoke_get('ACTIVEMEMBERS') end
-    def_parser(:active_members, 'ACTIVEMEMBERS'){|str| str.split(' ').map{|handle| SkypeAPI::User.new handle}}
-    alias getActiveMembers get_active_members
-
-    def get_friendly_name() invoke_get('FRIENDLYNAME') end
-    def_parser :friendly_name, 'FRIENDLYNAME'
-    alias getFriendlyName get_friendly_name
-
-    def get_recent_chat_messages() parse :recent_chat_messages, invoke_get('RECENTCHATMESSAGES') end
-    def_parser(:recent_chat_messages, 'RECENTCHATMESSAGES'){|str| str.split(' ').map{|handle| SkypeAPI::ChatMessage.new handle}}
-    alias getRecentChatMessages get_recent_chat_messages
-
-    def get_bookmarked() parse :bookmarked, invoke_get("BOOKMARKED") end
-    def_parser(:bookmarked){|str| str._flag}
-    alias getBookmarked get_bookmarked
-
-    def get_member_objects() parse :member_objects, invoke_get('MEMBEROBJECTS') end
-    def_parser(:member_objects, 'MEMBEROBJECTS'){|str| str.split(', ').map{|id| SkypeAPI::ChatMember.new id}}
-    alias getMemberObjects get_member_objects
-
-    def get_password_hint() invoke_get 'PASSWORDHINT' end
-    def_parser :password_hint, 'PASSWORDHINT'
-    alias getPasswordHint get_password_hint
-
-    def get_guidelines() invoke_get 'GUIDELINES' end
-    def_parser :guidelines
-    alias getGuidelines get_guidelines
-
-    def get_options() parse :options, invoke_get('OPTIONS') end
-    def_parser(:options){|str| str.to_i}
-    alias getOptions get_options
-
-    def get_description() invoke_get('DESCRIPTION') end
-    def_parser :description
-    alias getDescription get_description
-
-    def get_dialog_partner() parse :dialog_partner, invoke_get('DIALOG_PARTNER') end
-    def_parser(:dialog_partner){|str| str.empty? ? nil : SkypeAPI::User.new(str)}
-    alias getDialogPartner get_dialog_partner
-
-    def get_activity_timestamp() parse :activity_timestamp, invoke_get('ACTIVITY_TIMESTAMP') end
-    def_parser(:activity_timestamp){|str| str.empty? ? nil : Time.at(str.to_i)}
-    alias getActivityTimestamp get_activity_timestamp
-
-    def get_type() invoke_get 'TYPE' end
-    def_parser :type
-    alias getType get_type
-
-    def get_my_status() invoke_get 'MYSTATUS' end
-    def_parser :my_status, 'MYSTATUS'
-    alias getMyStatus get_my_status
-
-    def get_my_role() invoke_get 'MYROLE' end
-    def_parser :my_role, 'MYROLE'
-    alias getMyRole get_my_role
-
-    def get_blob() invoke_get 'BLOB' end
-    def_parser :blob
-    alias getBlob get_blob
-
-    def get_applicants() parse :applicants, invoke_get('APPLICANTS') end
-    def_parser(:applicants){|str| str.split(' ').map{|handle| SkypeAPI::User.new handle}}
-    alias getApplicants get_applicants
-
-    def set_topic(topic) invoke_alter "SETTOPIC", topic end
-    alias setTopic set_topic
-
-    def set_topic_xml(topic) invoke_alter "SETTOPICXML", topic end
-    alias setTopicXML set_topic_xml
-
-    def add_members(*members) invoke_alter "ADDMEMBERS",  members.join(', ') end
-    alias addMembers add_members
-
-    def leave() invoke_alter "LEAVE" end
-
-    def bookmarked() invoke_alter "BOOKMARK" end
-
-    def unbookmarked() invoke_alter "UNBOOKMARK" end
-
-    def join() invoke_alter "JOIN" end
-
-    def clear_recent_messages() invoke_alter "CLEARRECENTMESSAGES" end
-    alias clearRecentMessages clear_recent_messages
-
-    def set_alert_string(string) invoke_alter "SETALERTSTRING", string end
-    alias setAlertString set_alert_string
-
-    def acceptadd() invoke_alter "ACCEPTADD" end
-
-    def disband() invoke_alter "DISBAND" end
-
-    def set_password(password, passwordHint='') invoke_alter "SETPASSWORD", password + ' ' + passwordHint end
-    alias setPassword set_password
-
-    def enter_password(password) invoke_alter "ENTERPASSWORD", password end
-    alias enterPassword enter_password
-
-    def set_options(option) invoke_alter "SETOPTIONS", option.to_s end
-    alias setOptions set_options
-
-    def kick(*users) invoke_alter "KICK", users.join(', ') end
-
-    def kickban(*users) invoke_alter "KICKBAN", users.join(', ') end
-
-    def set_guidelines(guidlines) invoke_alter 'SETGUIDELINES', guidlines end
-    alias setGuideLines set_guidelines
-
-
-    def send_message(strings) SkypeAPI::ChatMessage.create self, strings end
-    alias sendMessage send_message
-
-  end
-end
+
+module Skype
+  class Chat < AbstractObject
+    OBJECT_NAME =  "CHAT"
+
+    class << self
+      def create *users
+        Skype.invoke("CHAT CREATE #{users.join(', ')}") =~ /^CHAT ([^ ]+) STATUS (.+)$/
+        chatID, status = $1, $2
+        return Skype::Chat.new(chatID)#, status
+      end
+
+      def find_using_blob blob
+        Skype.invoke("CHAT FINDUSINGBLOB #{blob}") =~ /^CHAT ([^ ]+) STATUS (.+)$/
+        chatID, status = $1, $2
+        return Skype::Chat.new(chatID)#, status
+      end
+      alias findUsingBlob find_using_blob
+
+      def create_using_blob blob
+        Skype.invoke("CHAT CREATEUSINGBLOB #{blob}") =~ /^CHAT ([^ ]+) STATUS (.+)$/
+        chatID, status = $1, $2
+        return Skype::Chat.new(chatID)#, status
+      end
+      alias createUsingBlob create_using_blob
+    end
+
+    def get_name() invoke_get('NAME') end
+    def_parser(:name)
+    alias getName get_name
+
+    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_adder() parse :adder, invoke_get('ADDER') end
+    def_parser(:adder){|str| str.empty? ? nil : Skype::User.new(str) }
+    alias getAdder get_adder
+
+    def get_status() invoke_get 'STATUS' end
+    def_parser :status
+    alias getStatus get_status
+
+    def get_posters() parse :posters, invoke_get('POSTERS') end
+    def_parser(:posters){|str| str.split(', ').map{|handle| Skype::User.new handle}}
+    alias getPosters get_posters
+
+    def get_members() parse :members, invoke_get('MEMBERS') end
+    def_parser(:members){|str| str.split(' ').map{|handle| Skype::User.new handle}}
+    alias getMembers get_members
+
+    def get_topic() invoke_get('TOPIC') end
+    def_parser(:topic)
+    alias getTopic get_topic
+
+    def get_topic_xml() invoke_get('TOPICXML') end
+    def_parser(:topic_xml,'TOPICXML')
+    alias getTopicXML get_topic_xml
+
+    def get_chat_messages() parse :chat_messages, invoke_get('CHATMESSAGES') end
+    def_parser(:chat_messages, 'CHATMESSAGES'){|str| str.split(' ').map{|id| Skype::ChatMessage.new id}}
+    alias getChatMessages get_chat_messages
+
+    def get_active_members() parse :active_members, invoke_get('ACTIVEMEMBERS') end
+    def_parser(:active_members, 'ACTIVEMEMBERS'){|str| str.split(' ').map{|handle| Skype::User.new handle}}
+    alias getActiveMembers get_active_members
+
+    def get_friendly_name() invoke_get('FRIENDLYNAME') end
+    def_parser :friendly_name, 'FRIENDLYNAME'
+    alias getFriendlyName get_friendly_name
+
+    def get_recent_chat_messages() parse :recent_chat_messages, invoke_get('RECENTCHATMESSAGES') end
+    def_parser(:recent_chat_messages, 'RECENTCHATMESSAGES'){|str| str.split(' ').map{|handle| Skype::ChatMessage.new handle}}
+    alias getRecentChatMessages get_recent_chat_messages
+
+    def get_bookmarked() parse :bookmarked, invoke_get("BOOKMARKED") end
+    def_parser(:bookmarked){|str| str._flag}
+    alias getBookmarked get_bookmarked
+
+    def get_member_objects() parse :member_objects, invoke_get('MEMBEROBJECTS') end
+    def_parser(:member_objects, 'MEMBEROBJECTS'){|str| str.split(' ').map{|id| id.chop! if id[-1,1] == ','; Skype::ChatMember.new id}}
+    alias getMemberObjects get_member_objects
+
+    def get_password_hint() invoke_get 'PASSWORDHINT' end
+    def_parser :password_hint, 'PASSWORDHINT'
+    alias getPasswordHint get_password_hint
+
+    def get_guidelines() invoke_get 'GUIDELINES' end
+    def_parser :guidelines
+    alias getGuidelines get_guidelines
+
+    def get_options() parse :options, invoke_get('OPTIONS') end
+    def_parser(:options){|str| str.to_i}
+    alias getOptions get_options
+
+    def get_description() invoke_get('DESCRIPTION') end
+    def_parser :description
+    alias getDescription get_description
+
+    def get_dialog_partner() parse :dialog_partner, invoke_get('DIALOG_PARTNER') end
+    def_parser(:dialog_partner){|str| str.empty? ? nil : Skype::User.new(str)}
+    alias getDialogPartner get_dialog_partner
+
+    def get_activity_timestamp() parse :activity_timestamp, invoke_get('ACTIVITY_TIMESTAMP') end
+    def_parser(:activity_timestamp){|str| str.empty? ? nil : Time.at(str.to_i)}
+    alias getActivityTimestamp get_activity_timestamp
+
+    def get_type() invoke_get 'TYPE' end
+    def_parser :type
+    alias getType get_type
+
+    def get_my_status() invoke_get 'MYSTATUS' end
+    def_parser :my_status, 'MYSTATUS'
+    alias getMyStatus get_my_status
+
+    def get_my_role() invoke_get 'MYROLE' end
+    def_parser :my_role, 'MYROLE'
+    alias getMyRole get_my_role
+
+    def get_blob() invoke_get 'BLOB' end
+    def_parser :blob
+    alias getBlob get_blob
+
+    def get_applicants() parse :applicants, invoke_get('APPLICANTS') end
+    def_parser(:applicants){|str| str.split(' ').map{|handle| Skype::User.new handle}}
+    alias getApplicants get_applicants
+
+    def set_topic(topic) invoke_alter "SETTOPIC", topic end
+    alias setTopic set_topic
+
+    def set_topic_xml(topic) invoke_alter "SETTOPICXML", topic end
+    alias setTopicXML set_topic_xml
+
+    def add_members(*members) invoke_alter "ADDMEMBERS",  members.join(', ') end
+    alias addMembers add_members
+
+    def leave() invoke_alter "LEAVE" end
+
+    def bookmarked() invoke_alter "BOOKMARK" end
+
+    def unbookmarked() invoke_alter "UNBOOKMARK" end
+
+    def join() invoke_alter "JOIN" end
+
+    def clear_recent_messages() invoke_alter "CLEARRECENTMESSAGES" end
+    alias clearRecentMessages clear_recent_messages
+
+    def set_alert_string(string) invoke_alter "SETALERTSTRING", string end
+    alias setAlertString set_alert_string
+
+    def acceptadd() invoke_alter "ACCEPTADD" end
+
+    def disband() invoke_alter "DISBAND" end
+
+    def set_password(password, passwordHint='') invoke_alter "SETPASSWORD", password + ' ' + passwordHint end
+    alias setPassword set_password
+
+    def enter_password(password) invoke_alter "ENTERPASSWORD", password end
+    alias enterPassword enter_password
+
+    def set_options(option) invoke_alter "SETOPTIONS", option.to_s end
+    alias setOptions set_options
+
+    def kick(*users) invoke_alter "KICK", users.join(', ') end
+
+    def kickban(*users) invoke_alter "KICKBAN", users.join(', ') end
+
+    def set_guidelines(guidlines) invoke_alter 'SETGUIDELINES', guidlines end
+    alias setGuideLines set_guidelines
+
+
+    def send_message(strings) Skype::ChatMessage.create self, strings end
+    alias sendMessage send_message
+
+  end
+end

data/lib/{skypeapi → skype}/chatmember.rb

@@ -1,31 +1,31 @@
-module SkypeAPI
-  class ChatMember < AbstractObject
-    OBJECT_NAME = "CHATMEMBER"
-
-    def get_chat() parse :chat, invoke_get('CHATNAME') end
-    def_parser(:chat, 'CHATNAME'){|str| SkypeAPI::Chat.new(str)}
-    alias getChat get_chat
-
-    def get_user() parse :user, invoke_get('IDENTITY') end
-    def_parser(:user, 'IDENTITY'){|str| SkypeAPI::User.new(str)}
-    alias getUser get_user
-
-    def get_role() invoke_get('ROLE') end
-    def_parser :role
-    alias getRole get_role
-
-    def get_is_active?() parse :is_active, invoke_get('IS_ACTIVE') end
-    def_parser(:is_active){|str| str == 'TRUE' ? true : false}
-    alias getIsActive? get_is_active?
-
-
-    def set_role_to(role) invoke_alter('SETROLETO', role) end
-    alias setRoleTo set_role_to
-
-    def can_set_role_to?(role)
-      invoke("ALTER CHATMEMBER #{@id} CANSETROLETO #{role}") =~ /ALTER CHATMEMBER CANSETROLETO (TRUE|FALSE)/
-      $1 == 'TRUE' ? true : false
-    end
-    alias canSetRoleTo? can_set_role_to?
-  end
-end
+module Skype
+  class ChatMember < AbstractObject
+    OBJECT_NAME = "CHATMEMBER"
+
+    def get_chat() parse :chat, invoke_get('CHATNAME') end
+    def_parser(:chat, 'CHATNAME'){|str| Skype::Chat.new(str)}
+    alias getChat get_chat
+
+    def get_user() parse :user, invoke_get('IDENTITY') end
+    def_parser(:user, 'IDENTITY'){|str| Skype::User.new(str)}
+    alias getUser get_user
+
+    def get_role() invoke_get('ROLE') end
+    def_parser :role
+    alias getRole get_role
+
+    def get_is_active?() parse :is_active, invoke_get('IS_ACTIVE') end
+    def_parser(:is_active){|str| str == 'TRUE' ? true : false}
+    alias getIsActive? get_is_active?
+
+
+    def set_role_to(role) invoke_alter('SETROLETO', role) end
+    alias setRoleTo set_role_to
+
+    def can_set_role_to?(role)
+      invoke("ALTER CHATMEMBER #{@id} CANSETROLETO #{role}") =~ /ALTER CHATMEMBER CANSETROLETO (TRUE|FALSE)/
+      $1 == 'TRUE' ? true : false
+    end
+    alias canSetRoleTo? can_set_role_to?
+  end
+end

data/lib/{skypeapi → skype}/chatmessage.rb

@@ -1,11 +1,11 @@
-module SkypeAPI
+module Skype
   class ChatMessage < AbstractObject
     OBJECT_NAME = "CHATMESSAGE"
 
     class << self
       def create chat ,msg
-        SkypeAPI.invoke("CHATMESSAGE #{chat} #{msg}") =~ /^CHATMESSAGE (\d+) STATUS (.+)$/
-        SkypeAPI::ChatMessage.new($1)#, $2
+        Skype.invoke("CHATMESSAGE #{chat} #{msg}") =~ /^CHATMESSAGE (\d+) STATUS (.+)$/
+        Skype::ChatMessage.new($1)#, $2
       end
     end
 
@@ -19,7 +19,7 @@ module SkypeAPI
 
 #OBS
 #    def get_partner() parse :partner, invoke_get('PARTNER_HANDLE') end
-#    def_parser(:partner, 'PARTNER_HANDLE'){|str| SkypeAPI::User.new str}
+#    def_parser(:partner, 'PARTNER_HANDLE'){|str| Skype::User.new str}
 #    alias getPartner get_partner
 #
 #    def get_partner_dispname() invoke_get('PARTNER_DISPNAME') end
@@ -27,7 +27,7 @@ module SkypeAPI
 #    alias getPartnerDispname get_partner_dispname
 
     def get_from() parse :from, invoke_get('FROM_HANDLE') end
-    def_parser(:from, 'FROM_HANDLE'){|str| SkypeAPI::User.new str}
+    def_parser(:from, 'FROM_HANDLE'){|str| Skype::User.new str}
     alias getFrom get_from
 
     def get_from_dispname() invoke_get('FROM_DISPNAME') end
@@ -47,11 +47,11 @@ module SkypeAPI
     alias getLeaveReason get_leave_reason
 
     def get_chat() parse :chat, invoke_get('CHATNAME') end
-    def_parser(:chat, 'CHATNAME'){|str| SkypeAPI::Chat.new str}
+    def_parser(:chat, 'CHATNAME'){|str| Skype::Chat.new str}
     alias getChat get_chat
 
     def get_users() parse :users, invoke_get('USERS') end
-    def_parser(:users){|str| str.split(',').map{|handle| SkypeAPI::User.new handle}}
+    def_parser(:users){|str| str.split(',').map{|handle| Skype::User.new handle}}
     alias getUsers get_users
 
     def get_is_editable?() parse :is_editable, invoke_get('IS_EDITABLE') end
@@ -59,7 +59,7 @@ module SkypeAPI
     alias getIsEditable? get_is_editable?
 
     def get_edited_by() parse :edited_by, invoke_get("EDITED_BY") end
-    def_parser(:edited_by){|str| str.empty? ? nil : SkypeAPI::User.new(str)}
+    def_parser(:edited_by){|str| str.empty? ? nil : Skype::User.new(str)}
     alias getEditedBy get_edited_by
 
     def get_edited_timestamp() parse :edited_timestamp, invoke_get('EDITED_TIMESTAMP') end
@@ -75,7 +75,7 @@ module SkypeAPI
     alias getRole get_role
 
     def set_seen
-      return true if SkypeAPI.invoke("SET CHATMESSAGE #{@id} SEEN") =~ /^CHATMESSAGE #{@id} STATUS (.+)$/
+      return true if Skype.invoke("SET CHATMESSAGE #{@id} SEEN") =~ /^CHATMESSAGE #{@id} STATUS (.+)$/
       raise 'hogehoge'
     end
     alias setSeen set_seen