Ruby4Skype 0.2.2 → 0.2.3

data/lib/skypeapi/menuitem.rb

@@ -6,7 +6,7 @@ module SkypeAPI
       def self.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.sendCMD "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 = 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 == "MENU_ITEM #{h[:id]} CREATED"
         instance = new h[:id]
         instance.setNotify block if block
@@ -20,16 +20,16 @@ module SkypeAPI
       def self.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 ? SkypeAPI.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]
-          @@instance[self][id].notified context, user, contextID if @@instance[self][id]
+          @@instance[self][id].notified instance, context, user, contextID if @@instance[self][id]
         end
       end
       
-      def notified context, user, contextID
-        @notify.call context, user, contextID if @notify
+      def notified instance, context, user, contextID
+        @notify.call instance, context, user, contextID if @notify
       end
       
       def setNotify block=Proc.new
@@ -41,24 +41,30 @@ module SkypeAPI
       end
       
       def delete
-        res = @@skypeApi.sendCMD "DELETE MENU_ITEM #{@id}"
+        res = SkypeAPI.invoke "DELETE MENU_ITEM #{@id}"
         res == "DELETE MENU_ITEM #{@id}"
       end
       
       def setCaption caption
-        res = sendCMD "SET MENU_ITEM #{@id} CAPTION #{caption}"
+        res = invoke "SET MENU_ITEM #{@id} CAPTION #{caption}"
         res == "MENU_ITEM #{@id} CAPTION \"#{caption}\""
       end
       
       def setHint hint
-        res = sendCMD "SET MENU_ITEM #{@id} HINT #{hint}"
+        res = invoke "SET MENU_ITEM #{@id} HINT #{hint}"
         res == "MENU_ITEM #{@id} HINT \"#{hint}\""
       end
       
       def setEnabled flag
-        res = sendCMD "SET MENU_ITEM #{@id} ENABLED #{flag._str}"
+        res = invoke "SET MENU_ITEM #{@id} ENABLED #{flag._str}"
         res == "MENU_ITEM #{@id} ENABLED #{flag._str}"
       end
+      
+      alias set_notify setNotify
+      #alias del_notify delNotify
+      alias set_caption setCaption
+      alias set_hint setHint
+      alias set_enabled setEnabled
     end
   end
 end

data/lib/skypeapi/message.rb

@@ -21,7 +21,7 @@ module SkypeAPI
         else
           raise target
         end
-        res = @skypeApi.sendOne "MESSAGE #{target} #{text}","MESSAGE"
+        res = @skypeApi.invoke_one "MESSAGE #{target} #{text}","MESSAGE"
         if res =~ /^(\d+) STATUS (.+)$/
           return @skypeApi.getMessage($1),"getStatus",$2
         else
@@ -29,17 +29,17 @@ module SkypeAPI
         end
       end
       
-      def timestamp() sendGet('TIMESTAMP'); end
-      def partnerHandle() sendGet('PARTNER_HANDLE'); end
-      def partnerDispname() sendGet('PARTNER_DISPNAME'); end
-      def confIdD() sendGet('CONF_ID'); end
-      def type() sendGet('TYPE'); end
-      def status() sendGet('STATUS'); end
-      def failureReason() sendGet('FAILUREREASON'); end
-      def body() sendGet('BODY'); end
+      def timestamp() invoke_get('TIMESTAMP'); end
+      def partnerHandle() invoke_get('PARTNER_HANDLE'); end
+      def partnerDispname() invoke_get('PARTNER_DISPNAME'); end
+      def confIdD() invoke_get('CONF_ID'); end
+      def type() invoke_get('TYPE'); end
+      def status() invoke_get('STATUS'); end
+      def failureReason() invoke_get('FAILUREREASON'); end
+      def body() invoke_get('BODY'); end
       
       #def setSeen
-      #  str2object sendOne("SET MESSAGE #{@id} SEEN","SET MESSAGE #{@id} STATUS")
+      #  str2object invoke_one("SET MESSAGE #{@id} SEEN","SET MESSAGE #{@id} STATUS")
       #end
     end
   end

data/lib/skypeapi/object.rb

@@ -21,23 +21,25 @@ module SkypeAPI
         @notify
       end
       
-      def notified property,value
+      def notified instance, property,value
         if @notify[nil]
-          @notify[nil][nil].call property, value if @notify[nil][nil]
-          @notify[nil][value].call property if @notify[nil][value]
+          @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 value if @notify[property][nil]
-          @notify[property][value].call if @notify[property][value]
+          @notify[property][nil].call instance, value if @notify[property][nil]
+          @notify[property][value].call instance if @notify[property][value]
         end
       end
+      alias set_notify setNotify
+      alias del_notify delNotify
     end
     
     module Get
       def getter methodName, skypeProperty=methodName.to_s.upcase, &callBack
         defineMethod = self == SkypeAPI ? self.class.method(:define_method) : method(:define_method)
         defineMethod.call 'get' + methodName.to_s do
-          str = sendGet skypeProperty
+          str = invoke_get skypeProperty
           callBack ? callBack.call(str) : str
         end
         
@@ -98,7 +100,7 @@ module SkypeAPI
             @notify[property][nil].call instance, value if @notify[property][nil]
             @notify[property][value].call instance if @notify[property][value]
           end
-          @@instance[self][id].notified property,value if @@instance[self][id]
+          @@instance[self][id].notified instance, property, value if @@instance[self][id]
         end
       end
       
@@ -123,8 +125,7 @@ module SkypeAPI
         @id.to_s
       end
       
-      #def_delegators :@@skypeApi, :sendCMD
-      def_delegators :@@skypeApi, :sendCMD
+      def_delegators :@@skypeApi, :invoke
     end
     
   end

data/lib/skypeapi/os/etc.rb

@@ -0,0 +1,132 @@
+module SkypeAPI
+  module OS
+    module Share
+      def invoke cmd, method=nil, &block
+        method = method ? method : block
+        if method
+          invoke_callback cmd do |res|
+            check_response res,cmd
+            method.call res
+          end
+          return true
+        else
+          begin
+            return check_response(invoke_block(cmd), cmd)
+          rescue SkypeAPIError
+            raise $!, caller(1)
+          end
+        end
+      end
+      
+      #����reg==nil�ŁA���̑��ƌ���㩁B
+      def add_notify reg, block=Proc.new
+        @notify[reg] = block
+      end
+      
+      def del_notify reg
+        @notify.delete reg
+      end
+      
+      def add_event sym, block=Proc.new
+        @event[sym].push block
+        block
+      end
+      
+      #def set_event sym, block=Proc.new
+      #  @event[sym] = Array.new
+      #  add_event sym, block
+      #end
+      
+      def del_event sym, block=nil
+        unless block
+          @event[sym] = Array.new
+        else
+          @event[sym].delete block
+        end
+      end
+      
+      def exist_event? sym
+        if @event[sym].length > 0
+          return true
+        else
+          return false
+        end
+      end
+      
+      def get_event sym
+        @event[sym]
+      end
+      
+      def do_event sym,*args
+        @event[sym].each do |e|
+          if e.arity == 1
+            e.call args[0]
+          else
+            e.call args
+          end
+        end
+      end
+      
+      private
+      
+      def check_response res,cmd
+        if res =~ /^ERROR /m
+          raise SkypeAPIError::API,res, caller
+        else
+          return res
+        end
+      end
+      
+    end
+    
+    class Abstruct
+      include Share
+      
+      def initialize
+        @send_count = 0
+        @queue = Queue.new
+        #@queue = Array.new
+        @notify = Hash.new
+        @event = Hash.new do |h,k|
+          h[k] = Array.new
+        end
+        @attached = false
+        @first_attached = true
+        @raise_when_detached = false
+      
+      end
+      
+      def invoke_callback cmd, callback = Proc.new
+      end
+      
+      def invoke_block cmd
+      end
+      
+      def attach name = nil
+      end
+            
+      def attach_wait name = nil
+      end
+      
+      def wait action = nil
+      end
+      
+      def polling
+      end
+      
+      def close
+      end
+      
+      private
+      def invoke_prototype cmd
+      end
+    end
+  end
+  
+  class Mac
+    #wiki like
+    def initialize
+      raise SkypeAPIError::NotImplement
+    end
+  end
+end

data/lib/skypeapi/os/linux.rb

@@ -0,0 +1,110 @@
+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
+      
+      def initialize service_name="org.ruby.service"
+        super()
+        bus = DBus.session_bus
+        exobj = Notify.new("/com/Skype/Client")
+        #exobj.instance_variable_set(:@queue, @queue)
+        exobj.instance_variable_set(:@os, self)
+        bus.request_service(service_name).export(exobj)
+        service = bus.service 'com.Skype.API'
+        @invoker = service.object '/com/Skype'
+        @invoker.default_iface = 'com.Skype.API'
+        @invoker.introspect
+        
+        #l = DBus::Main.new
+        #l << bus
+        #Thread.new do
+        #  l.run
+        #end
+      end
+      
+      def attach name
+        invoke "NAME #{name}"
+        invoke "PROTOCOL 9999"
+        if @first_attached
+          @queue.push proc{do_event :attached}
+        else
+          @queue.push proc{do_event :reattached}
+        end
+      end
+      
+      def invoke_prototype(cmd)
+        res = @invoker.Invoke('#' + @send_count.to_s + ' ' + cmd)[0]
+        old_count = @send_count.to_s
+        @send_count+=1
+        @queue.push proc{do_event :sent, '#' + old_count + ' ' + cmd}
+        @queue.push proc{do_event :received, res}
+        res =~ /^##{old_count} (.*)$/m
+        return $1
+      end
+      
+      alias :invoke_block :invoke_prototype
+
+      def invoke_callcack cmd,cb=Proc.new
+        res = send_prototype(cmd)
+        cb.call(res)
+      end
+      
+      def close
+      end
+      
+      def polling
+        flag = true
+        begin
+          while flag
+            proc = @queue.shift true
+            proc.call
+          end
+        rescue
+          flag = false
+        end  
+      end
+      
+      def push_queue res
+        @queue.push(proc{do_event(:received, res)})
+        
+        if res == 'CONNSTATUS LOGGEDOUT'
+          @attached = false
+          @queue.push(proc{do_event(:detached)})
+          SkypeAPI.attach
+        end
+            
+        flag = false
+        @notify.each do |reg,action|
+          if res =~ reg
+            tmp = $1
+            @queue.push(proc{action.call(tmp)})
+            flag = true
+          end
+        end
+        
+        unless flag
+          action = @notify[nil]
+          @queue.push(proc{action.call(cmd)})
+        end
+      end
+  
+      
+      def wait
+      end
+
+      def attach_wait(name)
+          @name = name
+          attach(name)
+      end
+    end
+  end
+end

data/lib/skypeapi/os/mac.rb

@@ -0,0 +1,10 @@
+module SkypeAPI
+  module OS
+    class Mac
+      #sorry...
+      def initialize
+        raise SkypeAPIError::NotImplement
+      end
+    end
+  end
+end

data/lib/skypeapi/os/timer.rb

@@ -0,0 +1,108 @@
+#module SkypeAPI
+#  module OS
+#    class Windows
+			class Timer
+			  class << self
+			    def interval term, block=Proc.new
+			      Interval.new term, block
+			    end
+			    
+			    def timeout term, block=Proc.new
+			      Timeout.new term, block
+			    end
+			    
+			    def delete instance
+			      case instance.class
+			      when Timeout
+			        instance.delete
+			      when Interval
+			        instance.delete
+			      else
+			        raise ArgumentError
+			      end
+			    end
+			    
+			    def polling
+			      now = Time.now.to_i
+			      Timeout.polling now
+			      Interval.polling now
+			    end
+			  end
+			  
+			  class Abstruct
+			    
+			    class << self
+			      
+			      def new term, block
+			        instance = super
+			        @stack << instance
+			        return instance
+			      end
+			      
+			      def delete instance
+			        @stack.delete instance
+			      end
+			      
+			    end
+			    
+			    
+			    def delete
+			      self.class.delete self
+			    end
+			    
+			    attr_reader :term, :block
+			    
+			  end
+			  
+			  class Timeout < Abstruct
+			    @stack = Array.new
+			    class << self
+			      
+			      def polling now
+			        @stack.delete_if do |timeout|
+			          if now >= timeout.term
+			            timeout.block.call
+			            true
+			          else
+			            false
+			          end
+			        end
+			      end
+			      
+			    end
+			    
+			    def initialize term, block
+			      @term = term + Time.now.to_i
+			      @block = block
+			    end
+			    
+			  end
+			  
+			  class Interval < Abstruct
+			    @stack = Array.new
+			    
+			    class << self
+			      
+			      def polling now
+			        @stack.each do |interval|
+			          if now >= interval.term + interval.old
+			            interval.old = now
+			            interval.block.call
+			          end
+			        end
+			      end
+			      
+			    end
+			    
+			    def initialize term, block
+			      @term = term
+			      @old = Time.now.to_i
+			      @block = block
+			    end
+			    
+			    attr_accessor :old
+			  end
+			end
+#		end
+#	end
+#end