SkypeR 0.0.6 → 0.0.7

data/bin/iskype.rb

@@ -121,6 +121,7 @@ Commands start with a . and are as follows:
               response_statement = @application.invoke(command_message, 30)
             end
             unless response_statement.empty?
+              puts response_statement
               response_id, response_statement = split_response(response_statement)
               puts "=> #{response_statement}"
               @logger.debug("OUTPUT> #{response_statement}")
@@ -135,7 +136,8 @@ Commands start with a . and are as follows:
 
     private
     def split_response(response_statement)
-      if match = Regexp.new(/(#[0-9]+) (.*)$/).match(response_statement)
+#      if match = Regexp.new(/(#[0-9]+) (.*)$/).match(response_statement)
+      if match = Regexp.new(/(#[0-9]+) (.*)$/).match(response_statement.to_s)
         [match[1], match[2]]
       else
         p "#{response_statement}"

data/lib/skyper/command.rb

@@ -504,7 +504,8 @@ module SkypeR
     class Username < CommandBase
       def initialize
         @parser = lambda do
-          Yaparc::Token.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
+          Yaparc::TokenizeParser.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
+#          Yaparc::Token.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
         end
       end
     end

data/lib/skyper/parser.rb

@@ -14,7 +14,8 @@ module SkypeR
     class Identifier < Yaparc::AbstractParser
       def initialize
         @parser = lambda do
-          Yaparc::Token.new(Yaparc::Ident.new)
+          Yaparc::TokenizeParser.new(Yaparc::Ident.new)
+#          Yaparc::Token.new(Yaparc::Ident.new)
         end
       end
     end
@@ -23,7 +24,8 @@ module SkypeR
 
       def initialize
         @parser = lambda do
-          Yaparc::Token.new(Yaparc::Char.new(','))
+          Yaparc::TokenizeParser.new(Yaparc::CharParser.new(','))
+#          Yaparc::Token.new(Yaparc::Char.new(','))
         end
       end
     end
@@ -31,7 +33,8 @@ module SkypeR
     class OpenParen < Yaparc::AbstractParser
       def initialize
         @parser = lambda do
-          Token.new(Char.new('('))
+          Yaparc::TokenizeParser.new(Yaparc::CharParser.new('('))
+#          Token.new(Char.new('('))
         end
       end
     end
@@ -39,7 +42,8 @@ module SkypeR
     class CloseParen < Yaparc::AbstractParser
       def initialize
         @parser = lambda do
-          Yaparc::Token.new(Yaparc::Char.new(')'))
+          Yaparc::TokenizeParser.new(Yaparc::CharParser.new(')'))
+#          Yaparc::Token.new(Yaparc::Char.new(')'))
         end
       end
     end
@@ -47,7 +51,8 @@ module SkypeR
     class CommandID < Yaparc::AbstractParser
       def initialize
         @parser = lambda do
-          Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Z0-9]+/))
+          Yaparc::TokenizeParser.new(Yaparc::RegexParser.new(/#[A-Z0-9]+/))
+#          Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Z0-9]+/))
         end
       end
     end
@@ -56,7 +61,8 @@ module SkypeR
     class ChatID < Yaparc::AbstractParser
       def initialize
         @parser = lambda do
-          Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Za-z]*\/\$[A-Za-z]*;[0-9]*/))
+          Yaparc::TokenizeParser.new(Yaparc::RegexParser.new(/#[A-Za-z]*\/\$[A-Za-z]*;[0-9]*/))
+#          Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Za-z]*\/\$[A-Za-z]*;[0-9]*/))
         end
       end
     end

data/lib/skyper/parser.rb.org

@@ -0,0 +1,95 @@
+$:.unshift File.join(File.dirname(__FILE__))
+require 'rubygems'
+#require_gem 'yaparc'
+require 'yaparc'
+require "logger"
+
+=begin
+(insert-image-file "~/develop/ruby/skyper/docs/parser.png")
+=end
+
+module SkypeR
+
+  module Parser
+    class Identifier < Yaparc::AbstractParser
+      def initialize
+        @parser = lambda do
+          Yaparc::Token.new(Yaparc::Ident.new)
+        end
+      end
+    end
+
+    class Comma < Yaparc::AbstractParser
+
+      def initialize
+        @parser = lambda do
+          Yaparc::Token.new(Yaparc::Char.new(','))
+        end
+      end
+    end
+
+    class OpenParen < Yaparc::AbstractParser
+      def initialize
+        @parser = lambda do
+          Token.new(Char.new('('))
+        end
+      end
+    end
+
+    class CloseParen < Yaparc::AbstractParser
+      def initialize
+        @parser = lambda do
+          Yaparc::Token.new(Yaparc::Char.new(')'))
+        end
+      end
+    end
+
+    class CommandID < Yaparc::AbstractParser
+      def initialize
+        @parser = lambda do
+          Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Z0-9]+/))
+        end
+      end
+    end
+
+    # <chat_id> # - chat identifier; string (usually looks like “#me/$target;012345679012345”)
+    class ChatID < Yaparc::AbstractParser
+      def initialize
+        @parser = lambda do
+          Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Za-z]*\/\$[A-Za-z]*;[0-9]*/))
+        end
+      end
+    end
+
+
+    class UserProperty < Yaparc::AbstractParser
+      def initialize
+        properties = %w{HANDLE  FULLNAME  BIRTHDAY  SEX  LANGUAGE  COUNTRY  PROVINCE  CITY  PHONE_HOME  PHONE_OFFICE  PHONE_MOBILE  HOMEPAGE  ABOUT  HASCALLEQUIPMENT  BUDDYSTATUS  ISAUTHORIZED  ISBLOCKED  DISPLAYNAME  ONLINESTATUS  LASTONLINETIMESTAMP  CAN_LEAVE_VM  SPEEDDIAL  RECEIVEDAUTHERREQUEST  TIMEZONE  IS_CF_ACTIVE}.map {|item| Yaparc::Symbol.new(item)}
+        @parser = lambda do
+          Yaparc::AltParser.new(*properties)
+        end
+      end
+    end
+
+    # <profile_property> := PSTN_BALANCE | FULLNAME | BIRTHDAY | SEX | LANGUAGES | TIMEZONE
+    class ProfileProperty < Yaparc::AbstractParser
+      def initialize
+        properties = %w{PSTN_BALANCE FULLNAME BIRTHDAY SEX LANGUAGES TIMEZONE}.map {|item| Yaparc::Symbol.new(item)}
+        @parser = lambda do
+          Yaparc::AltParser.new(*properties)
+        end
+      end
+    end
+
+    #  <call_property> := TIMESTAMP | PARTNER_HANDLE  | PARTNER_DISPNAME | TARGET_IDENTITY | CONF_ID | TYPE | STATUS | VIDEO_STATUS | VIDEO_SEND_STATUS | FAILUREREASON | SUBJECT | PSTN_NUMBER | DURATION | PSTN_STATUS | CONF_PARTICIPANTS_COUNT | CONF_PARTICIPANT | VM_DURATION | VM_ALLOWED_DURATION | RATE | RATE_CURRENCY | RATE_PRECISION | INPUT | OUTPUT | CAPTURE_MIC | VAA_INPUT_STATUS | FORWARDED_BY | TRANSFER_ACTIVE | TRANSFER_STATUS | TRANSFERRED_BY | TRANSFERRED_TO
+    class CallProperty < Yaparc::AbstractParser
+      def initialize
+        properties = SkypeR::Object::Call::PROPERTIES.map {|item| Yaparc::Symbol.new(item)}
+        @parser = lambda do
+          Yaparc::AltParser.new(*properties)
+        end
+      end
+    end
+
+  end # of Parser
+end # of Skyper

data/lib/skyper/response.rb

@@ -36,7 +36,8 @@ module SkypeR
     class AnyValue < ResponseBase
       def initialize
         @parser = lambda do
-          Yaparc::Token.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
+          Yaparc::TokenizeParser.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
+#          Yaparc::Token.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: SkypeR
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Akimichi Tatsukawa
@@ -9,7 +9,7 @@ autorequire: skyper
 bindir: bin
 cert_chain: []
 
-date: 2008-01-31 00:00:00 +09:00
+date: 2008-04-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +37,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.1.6
     version: 
 description: 
 email: akimichi_tatsukawa@nifty.com
@@ -49,19 +49,20 @@ extra_rdoc_files:
 - README
 - MIT-LICENSE
 files: 
-- tests/test_service.rb
-- tests/test_response.rb
 - tests/test_parser.rb
+- tests/test_response.rb
+- tests/test_service.rb
+- lib/skyper.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/error.obj
+- lib/skyper/error.csv
+- lib/skyper/response.rb
+- lib/skyper/parser.rb.org
+- lib/skyper/parser.rb
 - lib/skyper/command.rb
-- lib/skyper.rb
 - bin/iskype.rb
 - README
 - MIT-LICENSE
@@ -92,6 +93,6 @@ 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
+- tests/test_response.rb
+- tests/test_service.rb