Ruby4Skype 0.3.1 → 0.4.1

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

@@ -1,4 +1,4 @@
-module SkypeAPI
+module Skype
   class Error < StandardError
     class Attach < Error; end
     class API < Error; end

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

@@ -1,10 +1,10 @@
-module SkypeAPI
+module Skype
   class Event  < AbstractObject
     OBJECT_NAME = "EVENT"
 
     class << self
       def create id, caption, hint, block=Proc.new
-        res = SkypeAPI.invoke "CREATE EVENT #{id} CAPTION #{caption} HINT #{hint}"
+        res = Skype.invoke "CREATE EVENT #{id} CAPTION #{caption} HINT #{hint}"
         res == "EVENT #{id} CREATED"
         instance = new id
         instance.setNotify block if block

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

@@ -1,4 +1,4 @@
-module SkypeAPI
+module Skype
   class FileTransfer < AbstractObject
     OBJECT_NAME = "FILETRANSFER"
 
@@ -15,7 +15,7 @@ module SkypeAPI
     alias getFailureReason get_failure_reason
 
     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/lib/{skypeapi → skype}/group.rb

@@ -1,27 +1,27 @@
-module SkypeAPI
+module Skype
   class Group < AbstractObject
     OBJECT_NAME = "GROUP"
 
     #FASdfklasjidfojsdlkjljfaslkdjf!!!!!!!!!!!!!!!!!!!!
     def self.create displayName
-      SkypeAPI.invoke("CREATE GROUP #{displayName}")
+      Skype.invoke("CREATE GROUP #{displayName}")
       group = nil
       tmp = nil
-      if SkypeAPI::Group.notify[:displayname] and SkypeAPI::Group.notify[:displayname][displayName]
-        tmp = SkypeAPI::Group.notify[:displayname][displayName]
+      if Skype::Group.notify[:displayname] and Skype::Group.notify[:displayname][displayName]
+        tmp = Skype::Group.notify[:displayname][displayName]
       end
-      SkypeAPI::Group.setNotify :DisplayName, displayName do |g|
+      Skype::Group.setNotify :DisplayName, displayName do |g|
         group = g
       end
       until group
-        SkypeAPI.polling
+        Skype.polling
         sleep 0.0123
       end
       if tmp
-        SkypeAPI::Group.setNotify :DisplayName, displayName, tmp
+        Skype::Group.setNotify :DisplayName, displayName, tmp
         tmp.call group
       else
-        SkypeAPI::Group.notify[:displayname][displayName] = nil
+        Skype::Group.notify[:displayname][displayName] = nil
       end
       group
       #ThreadSafe ����ς��낤�Ȃ��B�B�B

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

@@ -1,4 +1,4 @@
-module SkypeAPI
+module Skype
   class MenuItem < AbstractObject
     OBJECT_NAME = 'MENU_ITEM'
 
@@ -6,7 +6,7 @@ module SkypeAPI
       def create h, block=Proc.new
         raise ArgumentError unless h[:id] and h[:context] and h[:caption]
         #id, context, caption, hint=nil, icon=nil, enabled=nil, enableMultipleContacts=nil, &block
-        res = SkypeAPI.invoke "CREATE MENU_ITEM #{h[:id]} CONTEXT #{h[:context]} CAPTION #{h[:caption]}#{h[:hint].nil? ? '' : " HINT #{h[:hint]}"}#{h[:icon].nil? ? '' : " ICON #{h[:icon]}"}#{h[:enable].nil? ? '' : " ENABLED #{h[:enabled]}"}#{h[:enableMultipleContacts].nil? ? '' : " ENABLE_MULTIPLE_CONTACTS #{h[:enableMultipleContacts]}"}"
+        res = Skype.invoke "CREATE MENU_ITEM #{h[:id]} CONTEXT #{h[:context]} CAPTION #{h[:caption]}#{h[:hint].nil? ? '' : " HINT #{h[:hint]}"}#{h[:icon].nil? ? '' : " ICON #{h[:icon]}"}#{h[:enable].nil? ? '' : " ENABLED #{h[:enabled]}"}#{h[:enableMultipleContacts].nil? ? '' : " ENABLE_MULTIPLE_CONTACTS #{h[:enableMultipleContacts]}"}"
         res == "MENU_ITEM #{h[:id]} CREATED"
         instance = new h[:id]
         instance.setNotify block if block
@@ -20,7 +20,7 @@ module SkypeAPI
       def notified msg
         if msg =~ /^([^ ]+) CLICKED( ([^ ]+))? CONTEXT ([^ ]+)( CONTEXT_ID (.+))?$/m
           id = $1; context = $4; userID = $3; contextID = $6
-          user = userID ? SkypeAPI.user(userID) : nil
+          user = userID ? Skype.user(userID) : nil
           instance = new $1
           @notify[nil].call instance, context, user, contextID if @notify[nil]
           @notify[id].call instance, context, user, contextID if @notify[id]
@@ -44,7 +44,7 @@ module SkypeAPI
     alias setNotify set_notify
 
     def delete
-      res = SkypeAPI.invoke "DELETE MENU_ITEM #{@id}"
+      res = Skype.invoke "DELETE MENU_ITEM #{@id}"
       res == "DELETE MENU_ITEM #{@id}"
     end
 

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

@@ -1,4 +1,4 @@
-module SkypeAPI
+module Skype
   class Message < AbstractObject
     OBJECT_NAME = "MESSAGE"
 

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

@@ -1,7 +1,7 @@
 require 'date'
 require 'forwardable'
 
-module SkypeAPI    
+module Skype    
   class AbstractObject #:nodoc: all
     module Notify
       def setNotify property=nil,value=nil, block=Proc.new
@@ -37,8 +37,8 @@ module SkypeAPI
 
     module Get
 #      def getter method_name, skypeProperty=method_name.to_s.upcase, &callBack
-#        define_method = self == SkypeAPI ? self.class.method(:define_method) : method(:define_method)
-#        alias_method = self == SkypeAPI ? self.class.method(:alias_method) : method(:alias_method)
+#        define_method = self == Skype ? self.class.method(:define_method) : method(:define_method)
+#        alias_method = self == Skype ? self.class.method(:alias_method) : method(:alias_method)
 #
 #        define_method.call 'get' + method_name.to_s do
 #          str = invoke_get skypeProperty
@@ -52,9 +52,9 @@ module SkypeAPI
 #      end
 
       def notice methodName, skypeProperty, &callBack
-        if SkypeAPI.kind_of? self
-          SkypeAPI.property2symbol[skypeProperty] = methodName.to_sym
-          SkypeAPI.property2callback[skypeProperty] = callBack if callBack
+        if Skype.kind_of? self
+          Skype.property2symbol[skypeProperty] = methodName.to_sym
+          Skype.property2callback[skypeProperty] = callBack if callBack
         else
           property2symbol[skypeProperty] = methodName.to_sym
           property2callback[skypeProperty] = callBack if callBack
@@ -70,8 +70,8 @@ module SkypeAPI
 
     module Parser
       def parse sym, res
-        if self == SkypeAPI
-          SkypeAPI.property2callback[SkypeAPI.property2symbol.index(sym)].call(res)
+        if self == Skype
+          Skype.property2callback[Skype.property2symbol.index(sym)].call(res)
         else
           self.class.property2callback[self.class.property2symbol.index(sym)].call(res)
         end
@@ -87,7 +87,7 @@ module SkypeAPI
       def invoke_echo cmd
         begin
           invoke(cmd) == cmd
-        rescue SkypeAPI::Error::API => e
+        rescue Skype::Error::API => e
           e.backtrace.shift
           e.backtrace.shift
           raise e
@@ -102,7 +102,7 @@ module SkypeAPI
         end
         begin
           invoke(cmd) =~ /^#{regExp} (.*)$/m
-        rescue SkypeAPI::Error::API => e
+        rescue Skype::Error::API => e
           e.backtrace.shift
           e.backtrace.shift
           raise e
@@ -118,8 +118,9 @@ module SkypeAPI
           "\\" + char
         end
         begin
-          invoke(cmd) =~ /^#{reg} (.*)$/m
-        rescue SkypeAPI::Error::API => e
+          tmp = invoke(cmd)
+          tmp =~ /^#{reg} (.*)$/m
+        rescue Skype::Error::API => e
           e.backtrace.shift
           e.backtrace.shift
           raise e
@@ -132,7 +133,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::Error::API => e
+        rescue Skype::Error::API => e
           e.backtrace.shift
           e.backtrace.shift
           raise e
@@ -155,7 +156,7 @@ module SkypeAPI
         #res = "ALTER #{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{prop}"
         begin
           invoke(cmd)# == res
-        rescue SkypeAPI::Error::API => e
+        rescue Skype::Error::API => e
           e.backtrace.shift
           e.backtrace.shift
           raise e
@@ -179,7 +180,7 @@ module SkypeAPI
     @@instance = Hash.new do |hash,key|
       hash[key] = Hash.new
     end
-    @@skypeApi = SkypeAPI
+    @@skypeApi = Skype
       
     def self.inherited sub
       if self == AbstractObject

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

@@ -1,10 +1,10 @@
-require 'skypeapi/error'
+require 'skype/error'
 
-module SkypeAPI
+module Skype
   module OS
     class Abstruct
       
-      def initialize
+      def initialize app_name
         @send_count = 0
         @hook = Hash.new do |h,k|
           h[k] = Array.new
@@ -47,7 +47,7 @@ module SkypeAPI
       def invoke cmd
         begin
           check_response(invoke_block(cmd), cmd)
-        rescue SkypeAPI::Error::API => e
+        rescue Skype::Error::API => e
           e.backtrace.shift
           e.backtrace.shift
           raise e
@@ -61,21 +61,47 @@ module SkypeAPI
       end
       
       def check_response res, cmd
-        if res =~ /^ERROR /m
-          raise SkypeAPI::Error::API.new("#{cmd} => #{res}")
+        case res
+        when /^ERROR /m
+          raise Skype::Error::API.new("#{cmd} => #{res}")
+        when /^((APPLICATION)|(CALL)|(CHAT)|(CHATMESSAGE)|(FILETRANSTER)|(GROUP)|(MENU_ITEM)|(MESSAGE)|(PROFILE)|(SMS)|(USER)|(VOICEMAIL)) [^ ]+? (ERROR .+)$/m
+          res = $14
+          raise Skype::Error::API.new("#{cmd} => #{res}")
+        when ''
+          raise Skype::Error::API.new("#{cmd} => no implement or ,,,")
+        when /^(((APPLICATION)|(CALL)|(CHAT)|(CHATMESSAGE)|(FILETRANSTER)|(GROUP)|(MENU_ITEM)|(MESSAGE)|(PROFILE)|(SMS)|(USER)|(VOICEMAIL)) [^ ]+? [^ ]+? )\(null\)$/m
+          res = $1
+          return res
         else
           return res
         end
       end
       private :check_response
 
-      def attach name = nil
+      def attach
       end
             
-      def attach_wait name = nil
+      def attach_wait
       end
-      
+
+      def set_notify_selector block=Proc.new
+        
+      end
+
+      def start_messageloop
+
+      end
+
+      def messageloop
+
+      end
+
+      def message_polling
+
+      end
+
       def close
+        
       end      
     end
   end

data/lib/skype/os/linux.rb

@@ -0,0 +1,115 @@
+require 'skype/os/etc.rb'
+require 'dbus'
+require "thread"
+
+module Skype
+  module OS
+    class Linux < Abstruct
+      class Notify < DBus::Object
+        dbus_interface "com.Skype.API.Client" do
+          dbus_method :Notify, "in data:s" do |res|
+            @os.push_queue res
+          end
+        end
+      end
+      
+      def initialize app_name, service_name="org.ruby.service"
+        super()
+        
+        @app_name = app_name
+        @queue = Queue.new
+        
+        @bus = DBus.session_bus
+        notify = Notify.new("/com/Skype/Client")
+        notify.instance_variable_set(:@os, self)
+        ex_service = @bus.request_service(service_name)
+        ex_service.export(notify)
+        service = @bus.service 'com.Skype.API'
+        @invoker = service.object '/com/Skype'
+        @invoker.default_iface = 'com.Skype.API'
+        @invoker.introspect
+      end
+      
+      attr_reader :queue
+      private :queue
+      
+      def set_notify_selector block=Proc.new
+        @notify_selector = block
+      end
+      attr_reader :notify_selector
+      private :notify_selector
+
+      def attach
+        invoke "NAME #{@app_name}"
+        invoke "PROTOCOL 9999"
+        if @first_attached
+          #@queue.push proc{do_hook :attached}
+        else
+          #@queue.push proc{do_hook :reattached}
+        end
+        Thread.new do
+          l = DBus::Main.new
+          l << @bus
+          l.run
+        end
+      end
+
+      alias attach_wait attach
+
+      def invoke_prototype(cmd)
+        #@queue.push proc{do_hook :sent, cmd}
+        res = @invoker.Invoke(cmd)[0]
+        #@queue.push proc{do_hook :received, res}
+        return res
+      end
+      
+      alias invoke_block invoke_prototype
+
+      def invoke_callback *args
+        raise Skype::Error::NotImprement
+      end
+      
+      def start_messageloop
+        Thread.new{messageloop}
+      end
+
+      def messageloop
+        while callback = queue.shift
+          break unless message_process callback
+        end
+      end
+
+      def messagepolling
+        return message_process(queue.shift) unless queue.empty?
+        return true
+      end
+
+      def message_process callback
+        #sleep 0.001 while paused?
+        return false  if callback == :exit
+        callback.call
+        return true
+      end
+      private :message_process
+
+      def push_queue res
+        p res
+        #queue.push(proc{do_hook(:received, res)})
+        
+        if res == 'CONNSTATUS LOGGEDOUT'
+          @attached = false
+          #queue.push(proc{do_hook(:detached)})
+          #Skype.attach
+        end
+            
+        queue.push(proc{notify_selector.call res}) if notify_selector
+      end
+
+      def close
+        queue.push :exit
+        
+      end
+
+    end
+  end
+end

data/lib/skype/os/linux.rb~

@@ -0,0 +1,117 @@
+require 'skypeapi/os/etc.rb'
+require 'dbus'
+require "thread"
+
+module SkypeAPI
+  module OS
+    class Linux < Abstruct
+      class Notify < DBus::Object
+        dbus_interface "com.Skype.API.Client" do
+          dbus_method :Notify, "in data:s" do |res|
+            @os.push_queue res
+          end
+        end
+      end
+      
+      @@suffix = 0
+      def initialize service_name="org.ruby.service"
+        super()
+        
+        @queue = Queue.new
+        
+        service_name += @@suffix.to_s
+        @@suffix+=1
+        @bus = DBus.session_bus
+        notify = Notify.new("/com/Skype/Client")
+        notify.instance_variable_set(:@os, self)
+        ex_service = @bus.request_service(service_name)
+        ex_service.export(notify)
+        service = @bus.service 'com.Skype.API'
+        @invoker = service.object '/com/Skype'
+        @invoker.default_iface = 'com.Skype.API'
+        @invoker.introspect
+      end
+      
+      attr_reader :queue
+      private :queue
+      
+      def set_notify_selector block=Proc.new
+        @notify_selector = block
+      end
+      attr_reader :notify_selector
+      private :notify_selector
+
+      def attach app_name
+        invoke "NAME #{app_name}"
+        invoke "PROTOCOL 9999"
+        if @first_attached
+          #@queue.push proc{do_hook :attached}
+        else
+          #@queue.push proc{do_hook :reattached}
+        end
+        Thread.new do
+          l = DBus::Main.new
+          l << @bus
+          l.run
+        end
+      end
+
+      alias attach_wait attach
+
+      def invoke_prototype(cmd)
+        #@queue.push proc{do_hook :sent, cmd}
+        res = @invoker.Invoke(cmd)[0]
+        #@queue.push proc{do_hook :received, res}
+        return res
+      end
+      
+      alias invoke_block invoke_prototype
+
+      def invoke_callback *args
+        raise SkypeAPI::Error::NotImprement
+      end
+      
+      def start_messageloop
+        Thread.new{messageloop}
+      end
+
+      def messageloop
+        while callback = queue.shift
+          break unless message_process callback
+        end
+      end
+
+      def messagepolling
+        return message_process(queue.shift) unless queue.empty?
+        return true
+      end
+
+      def message_process callback
+        #sleep 0.001 while paused?
+        return false  if callback == :exit
+        callback.call
+        return true
+      end
+      private :message_process
+
+      def push_queue res
+        p res
+        #queue.push(proc{do_hook(:received, res)})
+        
+        if res == 'CONNSTATUS LOGGEDOUT'
+          @attached = false
+          #queue.push(proc{do_hook(:detached)})
+          #SkypeAPI.attach
+        end
+            
+        queue.push(proc{notify_selector.call res}) if notify_selector
+      end
+
+      def close
+        queue.push :exit
+        
+      end
+
+    end
+  end
+end