Ruby4Skype 0.3.1 → 0.4.1

data/lib/{skypeapi → skype}/os/windows.rb

@@ -1,11 +1,11 @@
 require 'swin'
 require 'Win32API'
 require 'timeout'
-require 'skypeapi/os/etc'
-require 'skypeapi/os/window_event_queue'
-require 'skypeapi/os/window_messagehandler'
+require 'skype/os/etc'
+require 'skype/os/window_event_queue'
+require 'skype/os/window_messagehandler'
 
-module SkypeAPI
+module Skype
   module OS
     WAIT_CMD_LIMIT = 30.0 #sec
     PING_CYCLE = 10.0 #sec
@@ -29,7 +29,7 @@ module SkypeAPI
 
     class Windows < Abstruct
       
-      def initialize
+      def initialize appname=nil
         @send_count = 0
         @queue = WindowsEventQueue.new(self)
 
@@ -43,7 +43,7 @@ module SkypeAPI
         @detached_mutex = Mutex.new
 
         add_hook :available do
-          SkypeAPI.attach
+          Skype.attach
         end
         
         @wmHandler = SWin::LWFactory.new(SWin::Application.hInstance).newwindow nil, MessageHandler
@@ -57,7 +57,7 @@ module SkypeAPI
       attr_reader :invoke_callback_mutex, :cv, :wmHandler
       attr_accessor :attached, :first_attached#,:received,:sent
 
-      #引数にmethodかブロックを渡しておくとSkypeAPIのNotification(コマンドのレスポンは除く)があった場合呼ばれる。
+      #引数にmethodかブロックを渡しておくとSkypeのNotification(コマンドのレスポンは除く)があった場合呼ばれる。
       #ブロックはNotificationの文字列を一つ与えられて呼ばれる。
       def set_notify_selector block=Proc.new
         @queue.set_notify_selector block
@@ -87,7 +87,7 @@ module SkypeAPI
       alias exist_event? exist_hook?
       alias get_event get_hook
 
-      #SkypeAPIにAttachする。ブロックはしないのでつながるまで待つならばadd_hookでイベントを追加するか,attach_waitを使う。
+      #SkypeにAttachする。ブロックはしないのでつながるまで待つならばadd_hookでイベントを追加するか,attach_waitを使う。
       def attach name = nil #,&block)
         @wmHandler.attach
       end
@@ -106,7 +106,7 @@ module SkypeAPI
       end
       private :detached?
 
-      #SkypeAPIにコマンドを発行する。Skypeから返り値が戻ってくるまでブロックする。
+      #Skypeにコマンドを発行する。Skypeから返り値が戻ってくるまでブロックする。
       def invoke cmd
         super cmd
       end
@@ -138,7 +138,7 @@ module SkypeAPI
         rescue Timeout::Error
           if detached?
             if @raise_when_detached
-              raise SkypeAPI::Error::Timeout.new("timeout #{send_count} #{cmd}")
+              raise Skype::Error::Timeout.new("timeout #{send_count} #{cmd}")
             else
               status2detache
               retry_flag = true

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

@@ -1,4 +1,4 @@
-module SkypeAPI
+module Skype
   class Profile < AbstractObject
     OBJECT_NAME = "PROFILE"
 
@@ -114,8 +114,8 @@ module SkypeAPI
       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]))]
+        cf[2] = Skype::User.new(cf[2]) unless cf[2] =~ /^\+/
+        [cf[0].to_i, cf[1].to_i, (cf[2] =~ /^\+/ ? cf[2] : Skype::User.new(cf[2]))]
       }
     }
     alias getCallForwardRules get_call_forward_rules

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

@@ -57,7 +57,7 @@ class FalseClass #:nodoc: all-
   end
 end
 
-module SkypeAPI
+module Skype
   
   module ShareFunctions #:nodoc: all
     #private
@@ -67,7 +67,7 @@ module SkypeAPI
     def invoke_echo cmd
       begin
         invoke(cmd) == cmd
-      rescue SkypeAPI::APIError => e
+      rescue Skype::APIError => e
         e.backtrace.shift
         e.backtrace.shift
         raise e
@@ -82,7 +82,7 @@ module SkypeAPI
       end
       begin
         invoke(cmd) =~ /^#{regExp} (.*)$/m
-      rescue SkypeAPI::APIError => e
+      rescue Skype::APIError => e
         e.backtrace.shift
         e.backtrace.shift
         raise e
@@ -99,7 +99,7 @@ module SkypeAPI
       end
       begin
         invoke(cmd) =~ /^#{reg} (.*)$/m
-      rescue SkypeAPI::APIError => e
+      rescue Skype::APIError => e
         e.backtrace.shift
         e.backtrace.shift
         raise e
@@ -112,7 +112,7 @@ module SkypeAPI
       reg = "#{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{@id ? @id.to_s + ' ' : ''}#{prop}"
       begin
         str = invoke_one cmd, reg
-      rescue SkypeAPI::APIError => e
+      rescue Skype::APIError => e
         e.backtrace.shift
         e.backtrace.shift
         raise e
@@ -134,7 +134,7 @@ module SkypeAPI
       #res = "ALTER #{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{prop}"
       begin
         invoke(cmd)# == res
-      rescue SkypeAPI::APIError => e
+      rescue Skype::APIError => e
         e.backtrace.shift
         e.backtrace.shift
         raise e

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

@@ -1,9 +1,9 @@
-module SkypeAPI
+module Skype
   class SMS< AbstractObject
     OBJECT_NAME = "SMS"
     class << self
       def create target, type="OUTGOING"
-        res = SkypeAPI.invoke "CREATE SMS #{type} #{target}"
+        res = Skype.invoke "CREATE SMS #{type} #{target}"
         res =~ /^SMS (\d+) STATUS (.+)$/
         id, status = $1, $2
         return id, status
@@ -15,7 +15,7 @@ module SkypeAPI
       alias create_confirmation_code_request createConfirmationCodeRequest
         
       def delete id
-        SkypeAPI.invoke_echo "DELETE SMS #{id}"
+        Skype.invoke_echo "DELETE SMS #{id}"
       end
     end
 

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

@@ -1,4 +1,4 @@
-module SkypeAPI
+module Skype
   class User < AbstractObject
     OBJECT_NAME = "USER"
 

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

@@ -1,7 +1,7 @@
-module SkypeAPI
+module Skype
   module VERSION
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     TINY  = 1
     
     STRING = [MAJOR, MINOR, TINY].join('.')

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

@@ -1,13 +1,13 @@
-module SkypeAPI
+module Skype
   class VoiceMail < AbstractObject
     OBJECT_NAME = "VOICEMAIL"
       
     def self.create target
-      SkypeAPI.invoke "CALLVOICEMAIL #{target}"
+      Skype.invoke "CALLVOICEMAIL #{target}"
     end
       
     def self.open id
-      SkypeAPI.invoke "OPEN VOICEMAIL #{id}"
+      Skype.invoke "OPEN VOICEMAIL #{id}"
     end
       
     def get_type() invoke_get("TYPE") end
@@ -15,7 +15,7 @@ module SkypeAPI
     alias getType get_type
 
     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

data/spec/{skypeapi → skype}/application_spec.rb

@@ -1,21 +1,19 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
+$LOAD_PATH << 'lib'
+require 'skype'
 
-require 'skypeapi'
-
-describe SkypeAPI::Application do
+describe Skype::Application do
   before(:all) do
-    SkypeAPI.init
-    SkypeAPI.start_messageloop
-    SkypeAPI.attach_wait
+    Skype.init 'hogehogehoge'
+    Skype.start_messageloop
+    Skype.attach_wait
   end
 
   after :all do
-    SkypeAPI.close
+    Skype.close
   end
 
   before :each do
-    @app = SkypeAPI::Application.new('testApp')
+    @app = Skype::Application.new('testApp')
     @app.create
   end
 
@@ -25,23 +23,23 @@ describe SkypeAPI::Application do
 
   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}
+    @app.get_connectable.each{|user| user.should be_instance_of Skype::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}
+    @app.get_connecting.each{|user| user.should be_instance_of Skype::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}
+    @app.get_streams.each{|stream| stream.should be_instance_of Skype::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[:stream].should be_instance_of Skype::Stream
       hash[:bytes].should be_kind_of Integer
     }
   end
@@ -49,7 +47,7 @@ describe SkypeAPI::Application do
   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[:stream].should be_instance_of Skype::Stream
       hash[:bytes].should be_kind_of Integer
     }
   end

data/spec/{skypeapi → skype}/chat_spec.rb

@@ -1,33 +1,31 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-require 'skypeapi'
+$LOAD_PATH << 'lib'
+require 'skype'
 
 Thread.abort_on_exception = true
 
-describe SkypeAPI::Chat do
+describe Skype::Chat do
   before :all do
-    SkypeAPI.init
-    SkypeAPI.start_messageloop
-    SkypeAPI.attach_wait
+    Skype.init 'hogehogehoge'
+    Skype.start_messageloop
+    Skype.attach_wait
   end
 
   after(:all) do
-    SkypeAPI.close
+    Skype.close
   end
 
   describe 'notify' do
     before do
       @f = false
-      SkypeAPI::ChatMessage.set_notify :status, 'RECEIVED' do |c|
+      Skype::ChatMessage.set_notify :status, 'RECEIVED' do |c|
         @f = true
       end
-      SkypeAPI::Chat.create('echo123').send_message('hoge')
+      Skype::Chat.create('echo123').send_message('hoge')
     end
 
     it "should" do
       begin
-        timeout(10){sleep 1 until @f}
+        timeout(10){sleep 1  until @f}
       rescue Timeout::Error
         violated
       end
@@ -36,7 +34,7 @@ describe SkypeAPI::Chat do
 
   describe '1on1' do
     before(:each) do
-      @chat = SkypeAPI::Chat.create 'echo123'#, 'hogehoge_002'
+      @chat = Skype::Chat.create 'echo123'#, 'hogehoge_002'
     end
 
     after(:each) do
@@ -44,22 +42,22 @@ describe SkypeAPI::Chat do
     end
 
 
-    it "SkypeAPI::Chat.create(string) should be instance of Chat" do
-      SkypeAPI::Chat.create('echo123').should be_instance_of SkypeAPI::Chat
+    it "Skype::Chat.create(string) should be instance of Chat" do
+      Skype::Chat.create('echo123').should be_instance_of Skype::Chat
     end
 
-    it "SkypeAPI::Chat.create(SkypeAPI::User) should be instance of Chat" do
-      SkypeAPI::Chat.create(SkypeAPI.user('echo123')).should be_instance_of SkypeAPI::Chat
+    it "Skype::Chat.create(Skype::User) should be instance of Chat" do
+      Skype::Chat.create(Skype.user('echo123')).should be_instance_of Skype::Chat
     end
     
-    it "SkypeAPI::Chat.findUsingBlob(@chat.get_blob) should raise error SkypeAPI::Error::API" do
-      lambda{SkypeAPI::Chat.findUsingBlob(@chat.get_blob)}.should raise_error SkypeAPI::Error::API
+    it "Skype::Chat.findUsingBlob(@chat.get_blob) should raise error Skype::Error::API" do
+      lambda{Skype::Chat.findUsingBlob(@chat.get_blob)}.should raise_error Skype::Error::API
       #ERROR 610 CHAT: FINDUSINGBLOB: No existing chat for given blob found or invalid blob
       #get_bolb = > ''
     end
 
-    it "SkypeAPI::Chat.createUsingBlob(@chat.get_blob) should raise error SkypeAPI::Error::API" do
-      lambda{SkypeAPI::Chat.createUsingBlob(@chat.get_blob)}.should raise_error SkypeAPI::Error::API
+    it "Skype::Chat.createUsingBlob(@chat.get_blob) should raise error Skype::Error::API" do
+      lambda{Skype::Chat.createUsingBlob(@chat.get_blob)}.should raise_error Skype::Error::API
       #ERROR 611 CHAT: CREATEUSINGBLOB: Unable to create chat, invalid blob
       #get_bolb = > ''
     end
@@ -90,14 +88,14 @@ describe SkypeAPI::Chat do
       @chat.sendMessage 'hoge'
       pending 'no posters' if @chat.get_posters.empty?
       @chat.get_posters.each do |user|
-        user.should be_instance_of SkypeAPI::User
+        user.should be_instance_of Skype::User
       end
     end
 
     it "get_members each should be instance of ChatMember" do
       pending 'no member'# if @chat.get_members.empty?
       @chat.getMembers.each do |chat_member|
-        chat_member.should be_instance_of SkypeAPI::ChatMember
+        chat_member.should be_instance_of Skype::ChatMember
       end
     end
 
@@ -106,8 +104,8 @@ describe SkypeAPI::Chat do
       @chat.getTopic.should be_empty
     end
 
-    it "set_topic(string) should raise_error SkypeAPI::Error::API" do
-      lambda{@chat.setTopic('TEST')}.should raise_error SkypeAPI::Error::API
+    it "set_topic(string) should raise_error Skype::Error::API" do
+      lambda{@chat.setTopic('TEST')}.should raise_error Skype::Error::API
     end
 
     it "get_topic_xml should be instance of String and empty" do
@@ -115,21 +113,21 @@ describe SkypeAPI::Chat do
       @chat.getTopicXML.should be_empty
     end
 
-    it "set_topic_xml(string) should raise error SkypeAPI::Error::API" do
-      lambda{@chat.setTopicXML('<BLINK>topic is blinking</BLINK>')}.should raise_error SkypeAPI::Error::API
+    it "set_topic_xml(string) should raise error Skype::Error::API" do
+      lambda{@chat.setTopicXML('<BLINK>topic is blinking</BLINK>')}.should raise_error Skype::Error::API
     end
 
     it "get_chat_messages each should be instance of ChatMessage" do
       @chat.send_message 'hoge'
       @chat.getChatMessages.each do |chat_message|
-        chat_message.should be_instance_of SkypeAPI::ChatMessage
+        chat_message.should be_instance_of Skype::ChatMessage
       end
     end
 
     it "get_active_members each should be instance of ChatMember" do
       pending 'user or member'
       @chat.getActiveMembers.each do |member|
-        member.should be_instance_of SkypeAPI::ChatMember
+        member.should be_instance_of Skype::ChatMember
       end
     end
 
@@ -140,7 +138,7 @@ describe SkypeAPI::Chat do
     it "get_recent_chat_messages each should be instance of Chat" do
       @chat.send_message 'hoge'
       @chat.getRecentChatMessages.each do |chat_message|
-        chat_message.should be_instance_of SkypeAPI::ChatMessage
+        chat_message.should be_instance_of Skype::ChatMessage
       end
     end
 
@@ -153,7 +151,7 @@ describe SkypeAPI::Chat do
 
     it "get_member_objects each should be instance of ChatMember" do
       @chat.getMemberObjects.each do |chat_member|
-        chat_member.should be_instance_of SkypeAPI::ChatMember
+        chat_member.should be_instance_of Skype::ChatMember
       end
     end
 
@@ -162,16 +160,16 @@ describe SkypeAPI::Chat do
       @chat.getPasswordHint.should be_empty
     end
 
-    it "set_guid_lines(string) should be raise error SkypeAPI::Error::API" do
-      lambda{@chat.setGuideLines('TEST')}.should raise_error SkypeAPI::Error::API
+    it "set_guid_lines(string) should be raise error Skype::Error::API" do
+      lambda{@chat.setGuideLines('TEST')}.should raise_error Skype::Error::API
     end
 
     it "get_options should be_kind_of" do
       @chat.getOptions.should be_kind_of Integer
     end
 
-    it "set_options(integer) should raise error SkypeAPI::Error::API" do
-      lambda{@chat.setOptions(1)}.should raise_error SkypeAPI::Error::API
+    it "set_options(integer) should raise error Skype::Error::API" do
+      lambda{@chat.setOptions(1)}.should raise_error Skype::Error::API
     end
 
     it "get_description should be instance of String" do
@@ -180,7 +178,7 @@ describe SkypeAPI::Chat do
 
     it "get_dialog_partner should be instance of User or nil" do
       pending 'nil' if @chat.getDialogPartner.nil?
-      @chat.getDialogPartner.should be_instance_of SkypeAPI::User
+      @chat.getDialogPartner.should be_instance_of Skype::User
     end
 
     it "get_activity_timestamp should be instance of Time" do
@@ -208,16 +206,16 @@ describe SkypeAPI::Chat do
     it "get_applicants each should be instance of User" do
       pending 'no,,,' if @chat.getApplicants.empty?
       @chat.getApplicants.each do |user|
-        user.should be_instance_of SkypeAPI::User
+        user.should be_instance_of Skype::User
       end
     end
 
-    it "leave should raise SkypeAPI::Error::API" do
-      lambda{@chat.leave}.should raise_error SkypeAPI::Error::API
+    it "leave should raise Skype::Error::API" do
+      lambda{@chat.leave}.should raise_error Skype::Error::API
     end
 
-    it "join should raise error SkypeAPI::Error::API" do
-      lambda{@chat.join}.should raise_error SkypeAPI::Error::API
+    it "join should raise error Skype::Error::API" do
+      lambda{@chat.join}.should raise_error Skype::Error::API
     end
 
     it "clearRecentMessages should be true" do
@@ -228,61 +226,61 @@ describe SkypeAPI::Chat do
       @chat.setAlertString('hoge').should be_true
     end
 
-    it "acceptadd should should raise error SkypeAPI::Error::API" do
-      lambda{@chat.acceptadd}.should raise_error SkypeAPI::Error::API
+    it "acceptadd should should raise error Skype::Error::API" do
+      lambda{@chat.acceptadd}.should raise_error Skype::Error::API
     end
 
-    it "disband should should raise error SkypeAPI::Error::API" do
-      lambda{@chat.disband}.should raise_error SkypeAPI::Error::API
+    it "disband should should raise error Skype::Error::API" do
+      lambda{@chat.disband}.should raise_error Skype::Error::API
     end
 
-    it "set_password(string) should raise enrror SkypeAPI::Error::API" do
-      lambda{@chat.setPassword('hogehoge')}.should raise_error SkypeAPI::Error::API
+    it "set_password(string) should raise enrror Skype::Error::API" do
+      lambda{@chat.setPassword('hogehoge')}.should raise_error Skype::Error::API
     end
 
-    it "enter_password(string) should raise error SkypeAPI::Error::API" do
-      lambda{@chat.enterPassword('hogehoge')}.should raise_error SkypeAPI::Error::API
+    it "enter_password(string) should raise error Skype::Error::API" do
+      lambda{@chat.enterPassword('hogehoge')}.should raise_error Skype::Error::API
     end
 
-    it "kick(string) should raise error SkypeAPI::Error::API" do
-      lambda{@chat.kick('echo123')}.should raise_error SkypeAPI::Error::API
+    it "kick(string) should raise error Skype::Error::API" do
+      lambda{@chat.kick('echo123')}.should raise_error Skype::Error::API
     end
 
-    it "kick(user) should raise error SkypeAPI::Error::API" do
-      lambda{@chat.kick(SkypeAPI.user('echo123'))}.should raise_error SkypeAPI::Error::API
+    it "kick(user) should raise error Skype::Error::API" do
+      lambda{@chat.kick(Skype.user('echo123'))}.should raise_error Skype::Error::API
     end
 
-    it "kick_ban(string) should raise error SkypeAPI::Error::API" do
-      lambda{@chat.kickban('echo123')}.should raise_error SkypeAPI::Error::API
+    it "kick_ban(string) should raise error Skype::Error::API" do
+      lambda{@chat.kickban('echo123')}.should raise_error Skype::Error::API
     end
 
-    it "kick_ban(user) should raise error SkypeAPI::Error::API" do
-      lambda{@chat.kickban(SkypeAPI.user('echo123'))}.should raise_error SkypeAPI::Error::API
+    it "kick_ban(user) should raise error Skype::Error::API" do
+      lambda{@chat.kickban(Skype.user('echo123'))}.should raise_error Skype::Error::API
     end
 
     it "send_message should be instance of" do
-      @chat.sendMessage('test').should be_instance_of SkypeAPI::ChatMessage
+      @chat.sendMessage('test').should be_instance_of Skype::ChatMessage
     end
   end
 
   describe 'in 3 people' do
     before :each do
       #pending 'hoge'
-      @chat = SkypeAPI::Chat.create 'echo123','hogehoge_001'
+      @chat = Skype::Chat.create 'echo123','hogehoge_001'
     end
 
     after :each do
       @chat.leave if @chat
     end
 
-    it "SkypeAPI::Chat.findUsingBlob(@chat.get_blob) should raise error SkypeAPI::Error::API" do
-      SkypeAPI::Chat.findUsingBlob(@chat.get_blob).should == @chat
+    it "Skype::Chat.findUsingBlob(@chat.get_blob) should raise error Skype::Error::API" do
+      Skype::Chat.findUsingBlob(@chat.get_blob).should == @chat
       #ERROR 610 CHAT: FINDUSINGBLOB: No existing chat for given blob found or invalid blob
       #get_bolb = > ''
     end
 
-    it "SkypeAPI::Chat.createUsingBlob(@chat.get_blob) should raise error SkypeAPI::Error::API" do
-      SkypeAPI::Chat.createUsingBlob(@chat.get_blob).should == @chat
+    it "Skype::Chat.createUsingBlob(@chat.get_blob) should raise error Skype::Error::API" do
+      Skype::Chat.createUsingBlob(@chat.get_blob).should == @chat
       #ERROR 611 CHAT: CREATEUSINGBLOB: Unable to create chat, invalid blob
       #get_bolb = > ''
     end
@@ -293,46 +291,46 @@ describe SkypeAPI::Chat do
       blob.should_not be_empty
     end
 
-    it "set_topic(string) should raise_error SkypeAPI::Error::API" do
+    it "set_topic(string) should raise_error Skype::Error::API" do
       @chat.setTopic('TEST').should be_true
     end
 
-    it "set_topic_xml(string) should raise error SkypeAPI::Error::API" do
+    it "set_topic_xml(string) should raise error Skype::Error::API" do
       @chat.setTopicXML('<BLINK>topic is blinking</BLINK>').should be_true
     end
 
     it "set_options(integer) should be true" do
-      lambda{@chat.setOptions(1)}.should raise_error SkypeAPI::Error::API
+      lambda{@chat.setOptions(1)}.should raise_error Skype::Error::API
     end
 
-    it "set_guid_lines(string) should be raise error SkypeAPI::Error::API" do
-      lambda{@chat.setGuideLines('TEST')}.should raise_error SkypeAPI::Error::API
+    it "set_guid_lines(string) should be raise error Skype::Error::API" do
+      lambda{@chat.setGuideLines('TEST')}.should raise_error Skype::Error::API
     end
 
-    it "leave should raise SkypeAPI::Error::API" do
+    it "leave should raise Skype::Error::API" do
       @chat.leave.should be_true
       @chat = nil
     end
 
-    it "join should raise error SkypeAPI::Error::API" do
+    it "join should raise error Skype::Error::API" do
       @chat.join.should be_true
     end
 
-    it "acceptadd should should raise error SkypeAPI::Error::API" do
+    it "acceptadd should should raise error Skype::Error::API" do
       @chat.acceptadd.should be_true
       #
     end
 
     it "disband should should be true" do
-      lambda{@chat.disband}.should raise_error SkypeAPI::Error::API
+      lambda{@chat.disband}.should raise_error Skype::Error::API
     end
 
-    it "set_password(string) should raise error SkypeAPI::Error::API" do
+    it "set_password(string) should raise error Skype::Error::API" do
       @chat.setPassword('hogehoge').should be_true
     end
 
-    it "enter_password(string) should raise error SkypeAPI::Error::API" do
-      lambda{@chat.enterPassword('hogehoge')}.should raise_error SkypeAPI::Error::API
+    it "enter_password(string) should raise error Skype::Error::API" do
+      lambda{@chat.enterPassword('hogehoge')}.should raise_error Skype::Error::API
     end
 
     it "kick(string) should be true" do
@@ -340,7 +338,7 @@ describe SkypeAPI::Chat do
     end
 
     it "kick(user) should be true" do
-      @chat.kick(SkypeAPI.user('echo123')).should be_true
+      @chat.kick(Skype.user('echo123')).should be_true
     end
 
     it "kick_ban(string) should be true" do
@@ -348,7 +346,7 @@ describe SkypeAPI::Chat do
     end
 
     it "kick_ban(user) should be true" do
-      @chat.kickban(SkypeAPI.user('echo123')).should be_true
+      @chat.kickban(Skype.user('echo123')).should be_true
     end
 
   end