Ruby4Skype 0.2.3 → 0.3.1

data/lib/skypeapi/object.rb

@@ -1,10 +1,8 @@
 require 'date'
+require 'forwardable'
 
-module SkypeAPI
-  module Object
-    
-   
-    #������R�s�y�U�݁B
+module SkypeAPI    
+  class AbstractObject #:nodoc: all
     module Notify
       def setNotify property=nil,value=nil, block=Proc.new
         property = property.to_s.downcase.to_sym if property
@@ -12,15 +10,17 @@ module SkypeAPI
         @notify[property] = Hash.new unless @notify[property]
         @notify[property][value] = block
       end
-      
+      alias set_notify setNotify
+
       def delNotify property=nil,value=nil
         @notify[property].delete value
       end
-      
+      alias del_notify delNotify
+
       def notify
         @notify
       end
-      
+
       def notified instance, property,value
         if @notify[nil]
           @notify[nil][nil].call instance, property, value if @notify[nil][nil]
@@ -34,99 +34,263 @@ module SkypeAPI
       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 = invoke_get skypeProperty
-          callBack ? callBack.call(str) : str
+#      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.call 'get' + method_name.to_s do
+#          str = invoke_get skypeProperty
+#          callBack ? callBack.call(str) : str
+#        end
+#
+#        understyle_method_name = 'get'+method_name.to_s.gsub(/[A-Z]+/){ |s| '_' + s.downcase}
+#        alias_method.call(understyle_method_name, 'get'+method_name.to_s)
+#
+#        notice method_name, skypeProperty, &callBack
+#      end
+
+      def notice methodName, skypeProperty, &callBack
+        if SkypeAPI.kind_of? self
+          SkypeAPI.property2symbol[skypeProperty] = methodName.to_sym
+          SkypeAPI.property2callback[skypeProperty] = callBack if callBack
+        else
+          property2symbol[skypeProperty] = methodName.to_sym
+          property2callback[skypeProperty] = callBack if callBack
         end
-        
-        #code4doc
-        #className = (defined? self::OBJECT_NAME) ? self::OBJECT_NAME : ''#'SkypeAPI'
-        #puts "'" + className + "::" + 'get' + methodName.to_s + "',"
-        
-        self::P2M[skypeProperty] = methodName.to_sym
-        self::V2O[skypeProperty] = callBack if callBack
       end
-      
-      def notice methodName,skypeProperty,&block
-        self::P2M[skypeProperty] = methodName.to_sym
-        self::V2O[methodName] = block if block
+
+      def def_parser sym, property=sym.to_s.upcase, &callback
+        notice sym, property, &callback
       end
+
+      attr_reader :property2symbol, :property2callback
     end
-    
-    class AbstractObject
-      extend SkypeAPI::Object::Notify
-      extend Forwardable
-      extend SkypeAPI::Object::Get
-      include SkypeAPI::Object::Notify
-      include SkypeAPI::ShareFunctions
-      
-      #�p�������ނ�S������B@@instance[class][id of instance]
-      @@instance = Hash.new do |hash,key|
-        hash[key] = Hash.new
+
+    module Parser
+      def parse sym, res
+        if self == SkypeAPI
+          SkypeAPI.property2callback[SkypeAPI.property2symbol.index(sym)].call(res)
+        else
+          self.class.property2callback[self.class.property2symbol.index(sym)].call(res)
+        end
       end
-      @@skypeApi = SkypeAPI
-      
-      #�萔�͌p�����Ăق����Ȃ��ׁA�•ʂɐ����B
-      #Module include self.class::P2M
-      #Module extend self::P2M
-      #Class  P2M
-      #Instance P2M �ŃA�N�Z�X�B
-      def self.inherited sub
-        if self == AbstractObject
-          sub.const_set :P2M, Hash.new{|hash,key| hash[key] = key}
-          sub.const_set :V2O, Hash.new
+      private :parse
+    end
+
+    module Invokers
+      #private
+
+      #invoke_echo "CREATE APPLICATION #{@appName}"
+      #CREATE APPLICATION #{@appName} -> CREATE APPLICATION #{@appName}
+      def invoke_echo cmd
+        begin
+          invoke(cmd) == cmd
+        rescue SkypeAPI::Error::API => e
+          e.backtrace.shift
+          e.backtrace.shift
+          raise e
         end
-        sub.instance_variable_set :@notify, Hash.new
       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|
+          "\\" + char
+        end
+        begin
+          invoke(cmd) =~ /^#{regExp} (.*)$/m
+        rescue SkypeAPI::Error::API => e
+          e.backtrace.shift
+          e.backtrace.shift
+          raise e
+        end
+        return $1
+      end
+
+      #invoke_get("GET USER #{@handle} SkypeOut")
+      #GET USER #{@handle} SkypeOut -> USER #{@handle} SkypeOut (.+)
+      def invoke_get prop, value=nil
+        cmd = "GET #{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{@id ? @id.to_s+' ' : ''}#{prop}#{value ? ' ' + value : ''}"
+        reg = "#{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{@id ? @id.to_s+' ' : ''}#{prop}#{value ? ' ' + value : ''}".gsub(/[\^$.\\\[\]*+{}?|()]/) do |char|
+          "\\" + char
+        end
+        begin
+          invoke(cmd) =~ /^#{reg} (.*)$/m
+        rescue SkypeAPI::Error::API => e
+          e.backtrace.shift
+          e.backtrace.shift
+          raise e
+        end
+        return $1
+      end
+
+      def invoke_set prop,value=nil
+        cmd = "SET #{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{@id ? @id.to_s + ' ' : ''}#{prop}#{value ? ' '+value.to_s : '' }"
+        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
+          e.backtrace.shift
+          e.backtrace.shift
+          raise e
+        end
+        #p [self,self.class]
+        #if self.class == Module
+        #  @property2callcack[prop] ? @property2callback[prop].call(str) : str
+        #else
+        #  self[prop] ? self.class::V2O[prop].call(str) : str
+        #end
+        str
+      end
+
+      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}"
+        #reg.gsub!(/[\^$.\\\[\]*+{}?|()]/) do |char|
+        #  "\\" + char
+        #end
+        #res = "ALTER #{defined?(self.class::OBJECT_NAME) ? self.class::OBJECT_NAME + ' ' : ''}#{prop}"
+        begin
+          invoke(cmd)# == res
+        rescue SkypeAPI::Error::API => e
+          e.backtrace.shift
+          e.backtrace.shift
+          raise e
+        end
+        true
+      end
+
+      #def sendAlterWithID prop, value=nil
+      #  str = invoke_one "ALTER #{self.class::OBJECT_NAME} #{@id} #{prop}#{value ? ' '+value.to_s : '' }","ALTER #{self.class::OBJECT_NAME} #{@id} #{prop}"
+      #  self.class::V2O[self.class::P2M[prop]] ? self.class::V2O[self.class::P2M[prop]].call(str) : str
+      #end
+    end
+
+    extend Notify
+    extend Forwardable
+    extend Get
+    include Parser
+    include Notify
+    include Invokers
       
-      #extend����Notify���I�[�o�[���C�h�B
-      #����Ă�̂́A�l�̕ϊ��Ǝ�����notify�ƃC���X�^���X��notify�񂵁B
-      def self.notified msg
-        if msg =~ /^([^ ]+) ([^ ]+) (.*)$/m
-          id = $1; skypeProperty = $2; value = $3
-          instance = new id
-          property = self::P2M[skypeProperty].to_s.downcase.to_sym if self::P2M[skypeProperty].class == Symbol
-          value = self::V2O[skypeProperty].call value if self::V2O[skypeProperty]
+    @@instance = Hash.new do |hash,key|
+      hash[key] = Hash.new
+    end
+    @@skypeApi = SkypeAPI
+      
+    def self.inherited sub
+      if self == AbstractObject
+        sub.instance_variable_set :@property2symbol, Hash.new{|hash,key| hash[key] = key}
+        sub.instance_variable_set :@property2callback, Hash.new
+      end
+      sub.instance_variable_set :@notify, Hash.new
+    end
+
+    def self.notified msg
+      if msg =~ /^([^ ]+) ([^ ]+) (.*)$/m
+        id = $1; skypeProperty = $2; value = $3
+        instance = new id
+        property = @property2symbol[skypeProperty].to_s.downcase.to_sym if @property2symbol[skypeProperty].class == Symbol
+        value = @property2callback[skypeProperty].call value if @property2callback[skypeProperty]
+
           
-          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
-          @@instance[self][id].notified instance, property, value if @@instance[self][id]
+        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
+        @@instance[self][id].notified instance, property, value if @@instance[self][id]
       end
+    end
       
-      def self.new id
-        if @@instance[self][id]
-          return @@instance[self][id]
-        else
-          instance = super id
-          instance.instance_variable_set(:@notify, Hash.new do |h,k|
+    def self.new id
+      if @@instance[self][id]
+        return @@instance[self][id]
+      else
+        instance = super id
+        instance.instance_variable_set(:@notify, Hash.new do |h,k|
             h[k] = Hash.new
           end)
-          @@instance[self][id] = instance
-          return instance
-        end
+        @@instance[self][id] = instance
+        return instance
       end
+    end
       
-      def initialize id
-        @id = id
-      end
+    def initialize id
+      @id = id
+    end
       
-      def to_s
-        @id.to_s
-      end
+    def to_s
+      @id.to_s
+    end
       
-      def_delegators :@@skypeApi, :invoke
+    def_delegators :@@skypeApi, :invoke
+  end
+end
+
+
+class NilClass
+  def _flag
+    nil
+  end
+
+  def _swi
+    nil
+  end
+
+  def _str
+    ""
+  end
+
+  def _int
+    nil
+  end
+end
+
+class String
+  def _flag
+    case self
+    when /^(TRUE)|(ON)$/i
+      return true
+    when /^(FALSE)|(OFF)$/i
+      return false
+    else
+      self
     end
-    
+  end
+
+  def _int
+    self.empty? ? nil : self.to_i
+  end
+
+  def _str
+    self
   end
 end
+
+class TrueClass
+  def _swi
+    "ON"
+  end
+
+  def _str
+    "TRUE"
+  end
+end
+
+class FalseClass
+  def _swi
+    "OFF"
+  end
+
+  def _str
+    "FALSE"
+  end
+end
+

data/lib/skypeapi/os/etc.rb

@@ -1,132 +1,82 @@
+require 'skypeapi/error'
+
 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
+    class Abstruct
       
-      def del_notify reg
-        @notify.delete reg
+      def initialize
+        @send_count = 0
+        @hook = Hash.new do |h,k|
+          h[k] = Array.new
+        end
+        @attached = false
+        @first_attached = true
+        @raise_when_detached = false
       end
-      
-      def add_event sym, block=Proc.new
-        @event[sym].push block
+
+      def add_hook sym, block=Proc.new
+        @hook[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
+
+      def del_hook sym, block=nil
         unless block
-          @event[sym] = Array.new
+          @hook[sym] = Array.new
         else
-          @event[sym].delete block
+          @hook[sym].delete block
         end
       end
-      
-      def exist_event? sym
-        if @event[sym].length > 0
+
+      def exist_hook? sym
+        if @hook[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
+
+      def get_hook sym
+        @hook[sym]
+      end
+
+      def call_hook sym,*args
+        @hook[sym].each{ |h| h.call *args }
+      end
+      private :call_hook
+
+      def invoke cmd
+        begin
+          check_response(invoke_block(cmd), cmd)
+        rescue SkypeAPI::Error::API => e
+          e.backtrace.shift
+          e.backtrace.shift
+          raise e
         end
       end
+
+      def invoke_callback cmd, callback = Proc.new
+      end
       
-      private
+      def invoke_block cmd
+      end
       
-      def check_response res,cmd
+      def check_response res, cmd
         if res =~ /^ERROR /m
-          raise SkypeAPIError::API,res, caller
+          raise SkypeAPI::Error::API.new("#{cmd} => #{res}")
         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
-      
+      private :check_response
+
       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
 end