SkypeR 0.0.5 → 0.0.6

data/lib/skyper/service.rb

@@ -0,0 +1,102 @@
+require 'rubygems'
+#require 'uuidtools.rb'
+require 'uuidtools'
+require 'rbus.rb'
+require 'thread.rb'
+require 'timeout.rb'
+
+
+module SkypeR
+  module Service
+    class Application
+      def initialize(name, protocol_num = 5)
+        remote_bus = ::RBus.session_bus
+        service_name = 'com.Skype.API'
+        object_path = "/com/Skype"
+        @api_object = remote_bus.get_object(service_name, object_path)
+        @api_object.interface!(service_name)
+        @application_name = name
+        @invoked_commands = Hash.new
+      end
+
+      def invoke(command, timeout = 60)
+        begin
+          ::Timeout.timeout(timeout) {
+            authenticate
+            @invoked_commands[command.command_id] = command.statement
+            @api_object.Invoke("##{command.command_id} #{command.statement}")
+          }
+        rescue ::Timeout::Error
+          puts "Connection timeout. Please try again."
+        end
+      end
+
+
+      def parse(message)
+        case message
+        when CommandMessage
+          command_parser = SkypeR::Parser::CommandStatement.new
+          command_parser.parse(message.statement)
+        when ResponseMessage
+          response_parser = SkypeR::Parser::ResponseCommandStatement.new
+          response_parser.parse(message.statement)
+        else
+          raise
+        end
+      end
+
+      def validate(command)
+        case result = parse(command)
+        when Yaparc::Result::OK
+          true
+        when Yaparc::Result::Fail
+          false
+        else
+          raise
+        end
+      end
+
+      private
+      def authenticate(protocol_num = 5)
+        result = nil
+        query = Thread.start do
+          name_command = SkypeR::Service::CommandMessage.new("NAME #{@application_name}")
+          result = @api_object.Invoke(name_command.statement)
+          puts result
+          protocol_command = SkypeR::Service::CommandMessage.new("PROTOCOL #{protocol_num}")
+          result = @api_object.Invoke(protocol_command.statement)
+          puts result
+        end
+        query.join
+      end
+    end # of Application
+
+
+    class MessageBase
+      attr_accessor :statement, :command_id
+    end
+
+    class CommandMessage < MessageBase
+
+      def initialize(statement)
+        @statement = statement
+        @command_id = UUID.timestamp_create.to_i
+      end
+    end # of Command
+
+
+    class ResponseMessage < MessageBase
+      attr_accessor :statement, :response_instance
+      def initialize(statement, response_instance)
+        @statement = statement
+        @response_instance = response_instance
+      end
+    end # Response
+
+#     class Result < Response
+#     end
+
+#     class Error < Response
+#     end
+  end
+end

data/lib/skyper.rb

@@ -0,0 +1,13 @@
+$:.unshift File.join(File.dirname(__FILE__))
+
+require 'rubygems'
+require 'rbus.rb'
+
+require 'skyper/service.rb'
+require 'skyper/object.rb'
+require 'skyper/parser.rb'
+require 'skyper/response.rb'
+require 'skyper/command.rb'
+
+
+

data/tests/test_parser.rb

@@ -0,0 +1,192 @@
+
+require 'lib/skyper.rb'
+require 'test/unit'
+
+class SkypeYaparcTest < Test::Unit::TestCase
+  include ::Yaparc
+
+  def setup
+  end
+
+  def test_identifier
+    parser = SkypeR::Parser::Identifier.new
+    result = parser.parse("abc")
+    assert_equal "abc",  result.value
+  end
+
+  def test_command_id
+    parser = SkypeR::Parser::CommandID.new
+    result = parser.parse(" #ABC ")
+    assert_equal "#ABC",  result.value
+  end
+
+  def test_chat_id
+    parser = SkypeR::Parser::ChatID.new
+    result = parser.parse(' #me/$target;012345679012345 ')
+    assert_equal "#me/$target;012345679012345",  result.value
+  end
+
+  def test_user_property
+    parser = SkypeR::Parser::UserProperty.new
+    result = parser.parse("HANDLE")
+    assert_equal "HANDLE",  result.value
+    result = parser.parse(" IS_CF_ACTIVE ")
+    assert_equal "IS_CF_ACTIVE",  result.value
+  end
+
+  def test_profile_property
+    parser = SkypeR::Parser::ProfileProperty.new
+    result = parser.parse(" PSTN_BALANCE ")
+    assert_equal "PSTN_BALANCE",  result.value
+  end
+
+  def test_pstn
+    parser = SkypeR::Parser::PSTN.new
+    assert_equal "+18005551234",  parser.parse("+18005551234").value
+  end
+
+  def test_target
+    parser = SkypeR::Parser::Target.new
+    assert_equal "echo124",  parser.parse("echo124").value
+  end
+
+
+  def test_call_command
+    parser = SkypeR::Parser::CallCommand.new
+    assert_equal ["foo"],  parser.parse("CALL foo").value[:targets]
+    assert_equal ["foo", "bar"],  parser.parse("CALL foo, bar").value[:targets]
+    assert_equal ["foo", "bar", "bla"],  parser.parse("CALL foo, bar, bla").value[:targets]
+  end
+
+  def test_set_call_finished_command
+    parser = SkypeR::Parser::SetCallFinishedCommand.new
+    assert_equal 567,  parser.parse("SET CALL 567 STATUS FINISHED").value[:call_id]
+  end
+  
+
+   def test_set_call_inprogress_command
+     parser = SkypeR::Parser::SetCallInprogressCommand.new
+     assert_equal 234,  parser.parse("SET CALL 234 STATUS INPROGRESS").value[:call_id]
+   end
+
+  def test_set_command
+    parser = SkypeR::Parser::SetCommand.new
+    assert_equal 987,  parser.parse("SET CALL 987 STATUS FINISHED").value[:call_id]
+  end
+
+  def test_get_user
+    parser = SkypeR::Parser::GetUserCommand.new
+    assert_equal "foo",  parser.parse("GET USER foo FULLNAME ").value[:username]
+    assert_equal "FULLNAME",  parser.parse("GET USER foo FULLNAME ").value[:property]
+    parser.parse(" GET USER foo BUDDYSTATUS ") do |result|
+      {"#{parser.class}" => {:identifier => result.value[:identifier], :property => result.value[:property]}}
+    end
+    assert_equal "BUDDYSTATUS",  parser.tree["SkypeR::Parser::GetUserCommand"][:property]
+    assert_instance_of SkypeR::Parser::GetUserResponse, parser.response
+    parser.response.parse("USER foo BUDDYSTATUS 3  ")  do |result|
+      {"#{parser.response.class}" =>
+        {
+          :identifier => result.value[:identifier],
+          :property => result.value[:property],
+          :value => result.value[:value]
+        }
+      }
+    end
+    assert_equal "3",  parser.response.tree["SkypeR::Parser::GetUserResponse"][:value]
+  end
+
+  def test_get_call
+    parser = SkypeR::Parser::GetCallCommand.new
+    assert_instance_of Yaparc::Result::Fail,  parser.parse("GET CALL TIMEZONE ")
+    assert_equal "TIMESTAMP",  parser.parse("GET CALL 123 TIMESTAMP ").value[:property]
+    assert_equal 123,  parser.parse("GET CALL 123 TIMESTAMP ").value[:call_id]
+    parser.parse(" GET CALL 123 STATUS ") do |result|
+      {"#{parser.class}" => {:property => result.value[:property]}}
+    end
+    assert_equal "STATUS",  parser.tree["SkypeR::Parser::GetCallCommand"][:property]
+    assert_instance_of SkypeR::Parser::GetCallResponse, parser.response
+    parser.response.parse("CALL foo STATUS FAILED ")  do |result|
+      {"#{parser.response.class}" =>
+        {
+          :property => result.value[:property],
+          :value => result.value[:value]
+        }
+      }
+    end
+    assert_equal "FAILED",  parser.response.tree["SkypeR::Parser::GetCallResponse"][:value]
+  end
+
+  def test_get_profile
+    parser = SkypeR::Parser::GetProfileCommand.new
+    assert_equal "PSTN_BALANCE",  parser.parse("GET PROFILE PSTN_BALANCE ").value[:property]
+    parser.parse("GET PROFILE PSTN_BALANCE ") do |result|
+      {"#{parser.class}" =>
+        {:property => result.value[:property]}
+      }
+    end
+    assert_equal "PSTN_BALANCE",  parser.tree["SkypeR::Parser::GetProfileCommand"][:property]
+  end
+
+  def test_get_profile2
+    parser = SkypeR::Parser::GetProfileCommand.new
+    assert_instance_of Yaparc::Result::Fail,  parser.parse("GET PROFILE foo TIMEZONE ")
+    assert_equal "TIMEZONE",  parser.parse("GET PROFILE TIMEZONE ").value[:property]
+    parser.parse(" GET PROFILE FULLNAME ") do |result|
+      {"#{parser.class}" => {:property => result.value[:property]}}
+    end
+    assert_equal "FULLNAME",  parser.tree["SkypeR::Parser::GetProfileCommand"][:property]
+    assert_instance_of SkypeR::Parser::GetProfileResponse, parser.response
+    parser.response.parse("PROFILE SEX MALE ")  do |result|
+      {"#{parser.response.class}" =>
+        {
+          :property => result.value[:property],
+          :value => result.value[:value]
+        }
+      }
+    end
+    assert_equal "MALE",  parser.response.tree["SkypeR::Parser::GetProfileResponse"][:value]
+  end
+
+
+  def test_get_command
+    parser = SkypeR::Parser::GetCommand.new
+    assert_equal "PSTN_BALANCE",  parser.parse("GET PROFILE PSTN_BALANCE ").value[:property]
+  end
+
+
+  def test_search_users
+    parser = SkypeR::Parser::SearchUsersCommand.new
+    assert_equal "foo",  parser.parse("SEARCH USERS foo ").value[:target]
+  end
+
+  def test_search_friends
+    parser = SkypeR::Parser::SearchFriendsCommand.new
+    assert_instance_of SkypeR::Parser::SearchFriendsCommand,  parser.parse("SEARCH FRIENDS ").value[:command_instance]
+  end
+
+
+  def test_chat_get_chat_chatmessages
+    parser = SkypeR::Parser::GetChatChatmessagesCommand.new
+    assert_instance_of SkypeR::Parser::GetChatChatmessagesCommand,  parser.parse("GET CHAT #me/$target;012345679012345 CHATMESSAGES").value[:command_instance]
+  end
+
+  def test_chat
+    parser = SkypeR::Parser::ChatCommand.new
+    assert_equal ["foo", "bar", "bla"],  parser.parse("CHAT CREATE foo, bar, bla ").value[:targets]
+  end
+
+
+
+  def test_command
+    parser = SkypeR::Parser::Command.new
+    assert_equal "PSTN_BALANCE",  parser.parse("GET PROFILE PSTN_BALANCE ").value[:property]
+  end
+
+  def test_command_statement
+    parser = SkypeR::Parser::CommandStatement.new
+    assert_equal "PSTN_BALANCE",  parser.parse("GET PROFILE PSTN_BALANCE ").value[:property]
+    assert_equal "foo",  parser.parse("GET USER foo FULLNAME").value[:username]
+    assert_equal "FULLNAME",  parser.parse("GET USER foo FULLNAME").value[:property]
+  end
+end
+

data/tests/test_response.rb

@@ -0,0 +1,45 @@
+
+require 'lib/skyper.rb'
+require 'test/unit'
+
+class SkypeYaparcResponseTest < Test::Unit::TestCase
+  include ::Yaparc
+
+  def test_search_users
+    parser = SkypeR::Parser::SearchUsersResponse.new
+    assert_equal Hash[:usernames => ["foo", "bar", "bla"]],  parser.parse("USERS foo, bar, bla ").value
+  end
+
+  def test_search_friends
+    parser = SkypeR::Parser::SearchFriendsResponse.new
+    assert_equal Hash[:usernames => ["foo"]],  parser.parse("USERS foo").value
+    assert_equal Hash[:usernames => ["foo", "bar", "bla"]],  parser.parse("USERS foo, bar, bla ").value
+  end
+
+  def test_search_calls
+    parser = SkypeR::Parser::SearchCallsResponse.new
+    assert_equal Hash[:identifiers => ["foo"]],  parser.parse("CALLS foo").value
+    assert_equal Hash[:identifiers => ["foo", "bar", "bla"]],  parser.parse("CALLS foo, bar, bla ").value
+  end
+
+  def test_search_activecalls
+    parser = SkypeR::Parser::SearchActivecallsResponse.new
+    assert_equal Hash[:identifiers => ["foo"]],  parser.parse("CALLS foo").value
+    assert_equal Hash[:identifiers => ["foo", "bar", "bla"]],  parser.parse("CALLS foo, bar, bla ").value
+  end
+
+
+  def test_search_missedcalls
+    parser = SkypeR::Parser::SearchMissedcallsResponse.new
+    assert_equal Hash[:identifiers => ["foo"]],  parser.parse("CALLS foo").value
+    assert_equal Hash[:identifiers => ["foo", "bar", "bla"]],  parser.parse("CALLS foo, bar, bla ").value
+  end
+
+  def test_search_userswaitingmyauthorization
+    parser = SkypeR::Parser::SearchUserswaitingmyauthorizationResponse.new
+    assert_equal Hash[:identifiers => ["foo"]],  parser.parse("USERS foo").value
+    assert_equal Hash[:identifiers => ["foo", "bar", "bla"]],  parser.parse("USERS foo, bar, bla ").value
+  end
+
+end
+

data/tests/test_service.rb

@@ -0,0 +1,36 @@
+require 'lib/skyper.rb'
+require 'test/unit'
+
+class SkypeApplicationTest < Test::Unit::TestCase
+  def setup
+    @application = SkypeR::Service::Application.new('test')
+  end
+
+  def test_init
+    assert_instance_of SkypeR::Service::Application, @application
+  end
+
+  def test_parse
+    result = @application.parse(SkypeR::Service::CommandMessage.new("GET PROFILE PSTN_BALANCE "))
+
+    assert_instance_of SkypeR::Parser::GetProfileCommand, result.value[:command_instance]
+    assert_equal "PSTN_BALANCE", result.value[:property]
+
+    result = @application.parse(SkypeR::Service::CommandMessage.new("GET USER bar FULLNAME"))
+    assert_equal "bar", result.value[:username]
+    assert_equal "FULLNAME", result.value[:property]
+  end
+
+  def test_validate_true
+    assert_equal true, @application.validate(SkypeR::Service::CommandMessage.new("GET PROFILE PSTN_BALANCE "))
+    assert_equal true, @application.validate(SkypeR::Service::CommandMessage.new("GET USERSTATUS "))
+  end
+end
+
+
+class SkypeCommandTest < Test::Unit::TestCase
+  def test_init
+    command = SkypeR::Service::CommandMessage.new('GET PROFILE PSTN_BALANCE')
+    assert_equal "GET PROFILE PSTN_BALANCE", command.statement
+  end
+end

metadata

@@ -1,56 +1,30 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.3
-specification_version: 1
 name: SkypeR
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
-date: 2008-01-16 00:00:00 +09:00
-summary: a SkypeAPI library for Ruby
-require_paths: 
-- lib
-email: akimichi_tatsukawa@nifty.com
-homepage: http://rubyforge.org/projects/skyper/
-rubyforge_project: 
-description: 
-autorequire: skyper
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.6
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Akimichi Tatsukawa
-files: 
-- bin/iskype.rb
-- bin/iskype.rb~
-- bin/rbus_skype.rb
-- bin/rbus_send
-- README
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
-requirements: []
+autorequire: skyper
+bindir: bin
+cert_chain: []
 
+date: 2008-01-31 00:00:00 +09:00
+default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rbus
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -59,9 +33,65 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: yaparc
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.1.0
     version: 
+description: 
+email: akimichi_tatsukawa@nifty.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- MIT-LICENSE
+files: 
+- tests/test_service.rb
+- tests/test_response.rb
+- tests/test_parser.rb
+- lib/skyper
+- lib/skyper/error.csv
+- lib/skyper/error.obj
+- lib/skyper/parser.rb
+- lib/skyper/error.rb
+- lib/skyper/object.rb
+- lib/skyper/response.rb
+- lib/skyper/service.rb
+- lib/skyper/command.rb
+- lib/skyper.rb
+- bin/iskype.rb
+- README
+- MIT-LICENSE
+has_rdoc: true
+homepage: http://rubyforge.org/projects/skyper/
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: a SkypeAPI library for Ruby
+test_files: 
+- tests/test_service.rb
+- tests/test_response.rb
+- tests/test_parser.rb

data/bin/iskype.rb~

@@ -1,169 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__))
-
-require 'rubygems'
-require_gem 'yaparc'
-require 'readline'
-require 'optparse'
-require 'logger'
-require "lib/skyper.rb"
-
-module SkypeR
-  LOGGER = nil
-  class Arguments < Hash
-    def initialize(args)
-      super()
-      # default values
-      opts = ::OptionParser.new do |opts|
-        opts.banner = "Usage: #$0 [options]"
-        opts.on('-n', '--name [STRING]', 'application name to access Skype') do |string|
-          self[:name] = string || '$'
-        end
-
-        opts.on('-l', '--log [STRING]', 'log file path') do |string|
-          self[:log] = string || '$'
-        end
-
-        opts.on('-p', '--parse', 'parsing enabled') do
-          self[:parse] = true
-        end
-
-        opts.on_tail('-h', '--help', 'display this help') do
-          puts opts
-          exit
-        end
-      end
-      opts.parse(args)
-    end
-  end
-
-  class REPL
-    def initialize(name, log = nil, parse = false)
-      @debug = false
-      @application = Service::Application.new(name)
-      @parse = parse
-      @headers = []
-      @logger = Logger.new(log ? log : $stderr)
-      @commands = {
-        'd' => ['toggle debug mode.',
-                proc { @debug = !@debug; puts "debug is #{@debug?'on':'off'}" }],
-        'logger' => ['"logger on": bring logger active.',
-                     proc {|args|
-                       @headers << args
-                     }],
-        'l' => ['"l m": bring in a C library.',
-                proc { |args| @libraries << args }],
-        'test' => ['test if the repl is ok by running a printf through it.',
-                   proc { xsb_command('printf("repl is ok\n");') }],
-        'help' => ['show help on commands.', proc { show_help }]
-      }
-    end
-
-
-    def skype_command(command_statement)
-      command_message = Service::CommandMessage.new(command_statement)
-    end
-
-    def skype_response(response_statement, response_instance)
-      response = Service::ResponseMessage.new(response_statement, response_instance)
-      result = @application.parse(response)
-    end
-
-    def skype_exit
-      raise
-    end
-
-
-    def show_help
-      puts <<-EOT
-Not in use, yet.
-Type C statements and declarations as you would in a normal program.
-Type a variable name by itself to see its value.
-
-Commands start with a . and are as follows:
-    EOT
-      cmds = @commands.keys.sort
-      len = cmds.map{|c|c.length}.max
-      @commands.keys.sort.each do |cmd|
-        printf("  %-#{len}s   %s\n", cmd, @commands[cmd][0])
-      end
-    end
-
-    def input_loop
-      loop do
-        line = Readline.readline('Skype> ')
-        break unless line
-        line.chomp!
-        if line.empty?
-          next
-        else
-          @logger.debug("INPUT> #{line}")
-          case line
-          when /^exit$/
-            puts "See you again."
-            @logger.debug("OUTPUT> See you again.")
-            return
-          else
-            response_statement = nil
-            command_message = SkypeR::Service::CommandMessage.new(line)
-            if @parse
-              case result = @application.parse(command_message)
-              when Yaparc::OK
-                response_statement = @application.invoke(command_message, 30)
-#                response_instance = result.value[:command_instance].response
-#                skype_response(response_statement, response_instance)
-              when Yaparc::Fail
-                response_statement = "##{command_message.command_id} Parse Error"
-              else
-                raise
-              end
-            else # in case of parse option disabled
-              response_statement = @application.invoke(command_message, 30)
-            end
-            unless response_statement.empty?
-              response_id, response_statement = split_response(response_statement)
-              puts "=> #{response_statement}"
-              @logger.debug("OUTPUT> #{response_statement}")
-            end
-          end
-        end
-        Readline::HISTORY.push(line)
-      end
-      @interpreter.close
-
-    end # of input_loop method
-
-    private
-    def split_response(response_statement)
-      if match = Regexp.new(/(#[0-9]+) (.*)$/).match(response_statement)
-        [match[1], match[2]]
-      else
-        p "#{response_statement}"
-        raise
-      end
-    end
-  end # of Service
-end # of SkypeR
-
-
-begin
-  arguments = SkypeR::Arguments.new(ARGV)
-  if name = arguments[:name]
-    repl = SkypeR::REPL.new(name, arguments[:log], arguments[:parse])
-  else
-    repl = SkypeR::REPL.new('test', 'log/iskype.log', arguments[:parse])
-  end
-  repl.input_loop
-# rescue Exception => e
-#   puts e.message
-#   puts "Backtrace:"
-#   e.backtrace.each {|line|
-#     puts line
-#   }
-end
-
-
-
-
-
-

data/bin/rbus_send

@@ -1,3 +0,0 @@
-rbus-send --dest=com.Skype.API --print-reply --session --type=method_call /com/Skype com.Skype.API.Invoke string:'NAME test'
-rbus-send --dest=com.Skype.API --print-reply --session --type=method_call /com/Skype com.Skype.API.Invoke string:'PROTOCOL 3'
-