SkypeR 0.0.7 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/lib/skyper/command.rb +112 -113
  2. data/lib/skyper/parser.rb +11 -12
  3. data/lib/skyper/response.rb +49 -50
  4. metadata +3 -4
  5. data/lib/skyper/parser.rb.org +0 -95
data/lib/skyper/command.rb CHANGED
@@ -23,8 +23,8 @@ module SkypeR
23
23
 
24
24
  def initialize
25
25
  @parser = lambda do
26
- Yaparc::SeqParser.new(Yaparc::ZeroOneParser.new(CommandID.new),
27
- Command.new) do |command_id, command|
26
+ Yaparc::Seq.new(Yaparc::ZeroOne.new(CommandID.new),
27
+ Command.new) do |command_id, command|
28
28
  command
29
29
  # if command_id == []
30
30
  # {:command_id => nil, :command => command}
@@ -47,14 +47,14 @@ module SkypeR
47
47
  class Command < CommandBase
48
48
  def initialize
49
49
  @parser = lambda do
50
- Yaparc::AltParser.new(
51
- GetCommand.new,
52
- SearchCommand.new,
53
- SetCommand.new,
54
- CallCommand.new,
55
- VoicemailCommand.new,
56
- ChatCommand.new,
57
- HistoryCommand.new
50
+ Yaparc::Alt.new(
51
+ GetCommand.new,
52
+ SearchCommand.new,
53
+ SetCommand.new,
54
+ CallCommand.new,
55
+ VoicemailCommand.new,
56
+ ChatCommand.new,
57
+ HistoryCommand.new
58
58
  )
59
59
  end
60
60
  end
@@ -68,13 +68,13 @@ module SkypeR
68
68
  class GetCommand < CommandBase
69
69
  def initialize
70
70
  @parser = lambda do
71
- Yaparc::AltParser.new(
72
- GetUserCommand.new,
73
- GetUserstatusCommand.new,
74
- GetProfileCommand.new,
75
- GetCallCommand.new,
76
- GetChatChatmessagesCommand.new
77
- )
71
+ Yaparc::Alt.new(
72
+ GetUserCommand.new,
73
+ GetUserstatusCommand.new,
74
+ GetProfileCommand.new,
75
+ GetCallCommand.new,
76
+ GetChatChatmessagesCommand.new
77
+ )
78
78
  end
79
79
  end
80
80
  end
@@ -85,10 +85,10 @@ module SkypeR
85
85
  class GetChatChatmessagesCommand < CommandBase
86
86
  def initialize
87
87
  @parser = lambda do
88
- Yaparc::SeqParser.new(Yaparc::Symbol.new("GET"),
89
- Yaparc::Symbol.new("CHAT"),
90
- ChatID.new,
91
- Yaparc::Symbol.new("CHATMESSAGES")) do |_,_,chat_id,_|
88
+ Yaparc::Seq.new(Yaparc::Symbol.new("GET"),
89
+ Yaparc::Symbol.new("CHAT"),
90
+ ChatID.new,
91
+ Yaparc::Symbol.new("CHATMESSAGES")) do |_,_,chat_id,_|
92
92
  {:command_instance => self, :chat_id => chat_id}
93
93
  end
94
94
  end
@@ -102,10 +102,10 @@ module SkypeR
102
102
  class GetChatRecentmessagesCommand < CommandBase
103
103
  def initialize
104
104
  @parser = lambda do
105
- Yaparc::SeqParser.new(Yaparc::Symbol.new("GET"),
106
- Yaparc::Symbol.new("CHAT"),
107
- ChatID.new,
108
- Yaparc::Symbol.new("RECENTCHATMESSAGES")) do |_,_,chat_id,_|
105
+ Yaparc::Seq.new(Yaparc::Symbol.new("GET"),
106
+ Yaparc::Symbol.new("CHAT"),
107
+ ChatID.new,
108
+ Yaparc::Symbol.new("RECENTCHATMESSAGES")) do |_,_,chat_id,_|
109
109
  {:command_instance => self, :chat_id => chat_id}
110
110
  end
111
111
  end
@@ -118,10 +118,10 @@ module SkypeR
118
118
  class GetUserCommand < CommandBase
119
119
  def initialize
120
120
  @parser = lambda do
121
- Yaparc::SeqParser.new(Yaparc::Symbol.new("GET"),
122
- Yaparc::Symbol.new("USER"),
123
- Username.new,
124
- SkypeR::Parser::UserProperty.new) do |_,_,username,property|
121
+ Yaparc::Seq.new(Yaparc::Symbol.new("GET"),
122
+ Yaparc::Symbol.new("USER"),
123
+ Username.new,
124
+ SkypeR::Parser::UserProperty.new) do |_,_,username,property|
125
125
  {:command_instance => self, :username => username, :property => property}
126
126
  end
127
127
  end
@@ -134,7 +134,7 @@ module SkypeR
134
134
  class GetUserstatusCommand < CommandBase
135
135
  def initialize
136
136
  @parser = lambda do
137
- Yaparc::SeqParser.new(Yaparc::Symbol.new("GET"), Yaparc::Symbol.new("USERSTATUS"))
137
+ Yaparc::Seq.new(Yaparc::Symbol.new("GET"), Yaparc::Symbol.new("USERSTATUS"))
138
138
  end
139
139
  @response = GetUserstatusResponse.new
140
140
  end
@@ -144,9 +144,9 @@ module SkypeR
144
144
  class GetProfileCommand < CommandBase
145
145
  def initialize
146
146
  @parser = lambda do
147
- Yaparc::SeqParser.new(Yaparc::Symbol.new("GET"),
148
- Yaparc::Symbol.new("PROFILE"),
149
- ProfileProperty.new) do |_,_,property|
147
+ Yaparc::Seq.new(Yaparc::Symbol.new("GET"),
148
+ Yaparc::Symbol.new("PROFILE"),
149
+ ProfileProperty.new) do |_,_,property|
150
150
  {:command_instance => self, :property => property}
151
151
  end
152
152
  end
@@ -158,10 +158,10 @@ module SkypeR
158
158
  class GetCallCommand < CommandBase
159
159
  def initialize
160
160
  @parser = lambda do
161
- Yaparc::SeqParser.new(Yaparc::Symbol.new("GET"),
162
- Yaparc::Symbol.new("CALL"),
163
- CallId.new,
164
- SkypeR::Parser::CallProperty.new) do |_,_,call_id, property|
161
+ Yaparc::Seq.new(Yaparc::Symbol.new("GET"),
162
+ Yaparc::Symbol.new("CALL"),
163
+ CallId.new,
164
+ SkypeR::Parser::CallProperty.new) do |_,_,call_id, property|
165
165
  {:command_instance => self, :property => property, :call_id => call_id}
166
166
  end
167
167
  end
@@ -186,14 +186,14 @@ module SkypeR
186
186
  class SearchCommand < CommandBase
187
187
  def initialize
188
188
  @parser = lambda do
189
- Yaparc::AltParser.new(
190
- SearchUsersCommand.new,
191
- SearchFriendsCommand.new,
192
- SearchCallsCommand.new,
193
- SearchActivecallsCommand.new,
194
- SearchMissedcallsCommand.new,
195
- SearchUserswaitingmyauthorizationCommand.new
196
- )
189
+ Yaparc::Alt.new(
190
+ SearchUsersCommand.new,
191
+ SearchFriendsCommand.new,
192
+ SearchCallsCommand.new,
193
+ SearchActivecallsCommand.new,
194
+ SearchMissedcallsCommand.new,
195
+ SearchUserswaitingmyauthorizationCommand.new
196
+ )
197
197
  end
198
198
  end
199
199
  end
@@ -202,9 +202,9 @@ module SkypeR
202
202
  class SearchUsersCommand < CommandBase
203
203
  def initialize
204
204
  @parser = lambda do
205
- Yaparc::SeqParser.new(Yaparc::Symbol.new("SEARCH"),
206
- Yaparc::Symbol.new("USERS"),
207
- Target.new) do |_,_,target|
205
+ Yaparc::Seq.new(Yaparc::Symbol.new("SEARCH"),
206
+ Yaparc::Symbol.new("USERS"),
207
+ Target.new) do |_,_,target|
208
208
  {:command_instance => self, :target => target}
209
209
  end
210
210
  end
@@ -217,7 +217,7 @@ module SkypeR
217
217
  class SearchFriendsCommand < CommandBase
218
218
  def initialize
219
219
  @parser = lambda do
220
- Yaparc::SeqParser.new(Yaparc::Symbol.new("SEARCH"), Yaparc::Symbol.new("FRIENDS")) do |_,_|
220
+ Yaparc::Seq.new(Yaparc::Symbol.new("SEARCH"), Yaparc::Symbol.new("FRIENDS")) do |_,_|
221
221
  {:command_instance => self}
222
222
  end
223
223
  end
@@ -230,7 +230,7 @@ module SkypeR
230
230
  class SearchCallsCommand < CommandBase
231
231
  def initialize
232
232
  @parser = lambda do
233
- Yaparc::SeqParser.new(Yaparc::Symbol.new("SEARCH"), Yaparc::Symbol.new("CALLS")) do |_,_|
233
+ Yaparc::Seq.new(Yaparc::Symbol.new("SEARCH"), Yaparc::Symbol.new("CALLS")) do |_,_|
234
234
  {:command_instance => self}
235
235
  end
236
236
  end
@@ -243,7 +243,7 @@ module SkypeR
243
243
  class SearchActivecallsCommand < CommandBase
244
244
  def initialize
245
245
  @parser = lambda do
246
- Yaparc::SeqParser.new(Yaparc::Symbol.new("SEARCH"), Yaparc::Symbol.new("ACTIVECALLS")) do |_,_|
246
+ Yaparc::Seq.new(Yaparc::Symbol.new("SEARCH"), Yaparc::Symbol.new("ACTIVECALLS")) do |_,_|
247
247
  {:command_instance => self}
248
248
  end
249
249
  end
@@ -256,7 +256,7 @@ module SkypeR
256
256
  class SearchMissedcallsCommand < CommandBase
257
257
  def initialize
258
258
  @parser = lambda do
259
- Yaparc::SeqParser.new(Yaparc::Symbol.new("SEARCH"), Yaparc::Symbol.new("MISSEDCALLS")) do |_,_|
259
+ Yaparc::Seq.new(Yaparc::Symbol.new("SEARCH"), Yaparc::Symbol.new("MISSEDCALLS")) do |_,_|
260
260
  {:command_instance => self}
261
261
  end
262
262
  end
@@ -269,8 +269,8 @@ module SkypeR
269
269
  class SearchUserswaitingmyauthorizationCommand < CommandBase
270
270
  def initialize
271
271
  @parser = lambda do
272
- Yaparc::SeqParser.new(Yaparc::Symbol.new("SEARCH"),
273
- Yaparc::Symbol.new("USERSWATINGMYAUTHORIZATION")) do |_,_|
272
+ Yaparc::Seq.new(Yaparc::Symbol.new("SEARCH"),
273
+ Yaparc::Symbol.new("USERSWATINGMYAUTHORIZATION")) do |_,_|
274
274
  {:command_instance => self}
275
275
  end
276
276
  end
@@ -284,11 +284,11 @@ module SkypeR
284
284
  class SetCommand < CommandBase
285
285
  def initialize
286
286
  @parser = lambda do
287
- Yaparc::AltParser.new(
288
- SetCallInprogressCommand.new,
289
- SetCallFinishedCommand.new,
290
- SetCallOnholdCommand.new
291
- )
287
+ Yaparc::Alt.new(
288
+ SetCallInprogressCommand.new,
289
+ SetCallFinishedCommand.new,
290
+ SetCallOnholdCommand.new
291
+ )
292
292
  end
293
293
  end
294
294
  end
@@ -297,12 +297,12 @@ module SkypeR
297
297
  class SetCallOnholdCommand < CommandBase
298
298
  def initialize
299
299
  @parser = lambda do
300
- Yaparc::SeqParser.new(Yaparc::Symbol.new("SET"),
301
- Yaparc::Symbol.new("CALL"),
302
- CallId.new,
303
- Yaparc::Symbol.new("STATUS"),
304
- Yaparc::AltParser.new(Yaparc::Symbol.new("INPROGRESS"),Yaparc::Symbol.new("ONHOLD"))
305
- ) do |_,_,call_id,_,_|
300
+ Yaparc::Seq.new(Yaparc::Symbol.new("SET"),
301
+ Yaparc::Symbol.new("CALL"),
302
+ CallId.new,
303
+ Yaparc::Symbol.new("STATUS"),
304
+ Yaparc::Alt.new(Yaparc::Symbol.new("INPROGRESS"),Yaparc::Symbol.new("ONHOLD"))
305
+ ) do |_,_,call_id,_,_|
306
306
  {:command_instance => self, :call_id => call_id}
307
307
  end
308
308
  end
@@ -313,11 +313,11 @@ module SkypeR
313
313
  class SetCallInprogressCommand < CommandBase
314
314
  def initialize
315
315
  @parser = lambda do
316
- Yaparc::SeqParser.new(Yaparc::Symbol.new("SET"),
317
- Yaparc::Symbol.new("CALL"),
318
- CallId.new,
319
- Yaparc::Symbol.new("STATUS"),
320
- Yaparc::Symbol.new("INPROGRESS")) do |_,_,call_id,_,_|
316
+ Yaparc::Seq.new(Yaparc::Symbol.new("SET"),
317
+ Yaparc::Symbol.new("CALL"),
318
+ CallId.new,
319
+ Yaparc::Symbol.new("STATUS"),
320
+ Yaparc::Symbol.new("INPROGRESS")) do |_,_,call_id,_,_|
321
321
  {:command_instance => self, :call_id => call_id}
322
322
  end
323
323
  end
@@ -328,11 +328,11 @@ module SkypeR
328
328
  class SetCallFinishedCommand < CommandBase
329
329
  def initialize
330
330
  @parser = lambda do
331
- Yaparc::SeqParser.new(Yaparc::Symbol.new("SET"),
332
- Yaparc::Symbol.new("CALL"),
333
- CallId.new,
334
- Yaparc::Symbol.new("STATUS"),
335
- Yaparc::Symbol.new("FINISHED")) do |_,_,call_id,_,_|
331
+ Yaparc::Seq.new(Yaparc::Symbol.new("SET"),
332
+ Yaparc::Symbol.new("CALL"),
333
+ CallId.new,
334
+ Yaparc::Symbol.new("STATUS"),
335
+ Yaparc::Symbol.new("FINISHED")) do |_,_,call_id,_,_|
336
336
  {:command_instance => self, :call_id => call_id}
337
337
  end
338
338
  end
@@ -343,11 +343,11 @@ module SkypeR
343
343
  class CallCommand < CommandBase
344
344
  def initialize
345
345
  @parser = lambda do
346
- Yaparc::SeqParser.new(
347
- Yaparc::Symbol.new("CALL"),
348
- Target.new,
349
- Yaparc::ManyParser.new(
350
- Yaparc::SeqParser.new(
346
+ Yaparc::Seq.new(
347
+ Yaparc::Symbol.new("CALL"),
348
+ Target.new,
349
+ Yaparc::Many.new(
350
+ Yaparc::Seq.new(
351
351
  Yaparc::Symbol.new(','),
352
352
  Target.new) do |_, target|
353
353
  [target]
@@ -368,7 +368,7 @@ module SkypeR
368
368
  class VoicemailCommand < CommandBase
369
369
  def initialize
370
370
  @parser = lambda do
371
- Yaparc::SeqParser.new(
371
+ Yaparc::Seq.new(
372
372
  Yaparc::Symbol.new("VOICEMAIL"),
373
373
  Target.new
374
374
  ) do |_,target|
@@ -395,18 +395,18 @@ module SkypeR
395
395
  class ChatCreateCommand < CommandBase
396
396
  def initialize
397
397
  @parser = lambda do
398
- Yaparc::SeqParser.new(
398
+ Yaparc::Seq.new(
399
399
  Yaparc::Symbol.new("CHAT"),
400
400
  Yaparc::Symbol.new("CREATE"),
401
401
  Target.new,
402
- Yaparc::ManyParser.new(
403
- Yaparc::SeqParser.new(Yaparc::Symbol.new(','),
404
- Target.new) do |_, target|
405
- [target]
406
- end,
407
- []
408
- )
409
- ) do |_,_,target,targets|
402
+ Yaparc::Many.new(
403
+ Yaparc::Seq.new(Yaparc::Symbol.new(','),
404
+ Target.new) do |_, target|
405
+ [target]
406
+ end,
407
+ []
408
+ )
409
+ ) do |_,_,target,targets|
410
410
  {:command_instance => self, :targets => [target] + targets}
411
411
  end
412
412
  end
@@ -419,10 +419,10 @@ module SkypeR
419
419
  class HistoryCommand < CommandBase
420
420
  def initialize
421
421
  @parser = lambda do
422
- Yaparc::AltParser.new(
423
- ClearChathistoryCommand.new,
424
- ClearVoicemailhistoryCommand.new
425
- )
422
+ Yaparc::Alt.new(
423
+ ClearChathistoryCommand.new,
424
+ ClearVoicemailhistoryCommand.new
425
+ )
426
426
  end
427
427
  end
428
428
  end
@@ -431,10 +431,10 @@ module SkypeR
431
431
  class ClearChathistoryCommand < CommandBase
432
432
  def initialize
433
433
  @parser = lambda do
434
- Yaparc::SeqParser.new(
435
- Yaparc::Symbol.new('CLEAR'),
436
- Yaparc::Symbol.new('CHATHISTORY')
437
- ) do |_,_|
434
+ Yaparc::Seq.new(
435
+ Yaparc::Symbol.new('CLEAR'),
436
+ Yaparc::Symbol.new('CHATHISTORY')
437
+ ) do |_,_|
438
438
  {:command_instance => self}
439
439
  end
440
440
  end
@@ -445,10 +445,10 @@ module SkypeR
445
445
  class ClearVoicemailhistoryCommand < CommandBase
446
446
  def initialize
447
447
  @parser = lambda do
448
- Yaparc::SeqParser.new(
449
- Yaparc::Symbol.new('CLEAR'),
450
- Yaparc::Symbol.new('VOICEMAILHISTORY')
451
- ) do |_,_|
448
+ Yaparc::Seq.new(
449
+ Yaparc::Symbol.new('CLEAR'),
450
+ Yaparc::Symbol.new('VOICEMAILHISTORY')
451
+ ) do |_,_|
452
452
  {:command_instance => self}
453
453
  end
454
454
  end
@@ -459,10 +459,10 @@ module SkypeR
459
459
  class ClearCallhistoryCommand < CommandBase
460
460
  def initialize
461
461
  @parser = lambda do
462
- Yaparc::SeqParser.new(
463
- Yaparc::Symbol.new('CLEAR'),
464
- Yaparc::Symbol.new('CALLHISTORY')
465
- )do |_,_|
462
+ Yaparc::Seq.new(
463
+ Yaparc::Symbol.new('CLEAR'),
464
+ Yaparc::Symbol.new('CALLHISTORY')
465
+ )do |_,_|
466
466
  {:command_instance => self}
467
467
  end
468
468
  end
@@ -478,9 +478,9 @@ module SkypeR
478
478
  class Target < CommandBase
479
479
  def initialize
480
480
  @parser = lambda do
481
- Yaparc::AltParser.new(Username.new,
482
- PSTN.new,
483
- SpeedDialCode.new)
481
+ Yaparc::Alt.new(Username.new,
482
+ PSTN.new,
483
+ SpeedDialCode.new)
484
484
  end
485
485
  end
486
486
  end
@@ -488,7 +488,7 @@ module SkypeR
488
488
  class PSTN < CommandBase
489
489
  def initialize
490
490
  @parser = lambda do
491
- Yaparc::RegexParser.new(/\+[a-zA-Z0-9][a-zA-Z0-9\-]*/)
491
+ Yaparc::Regex.new(/\+[a-zA-Z0-9][a-zA-Z0-9\-]*/)
492
492
  end
493
493
  end
494
494
  end
@@ -496,7 +496,7 @@ module SkypeR
496
496
  class SpeedDialCode < CommandBase
497
497
  def initialize
498
498
  @parser = lambda do
499
- Yaparc::RegexParser.new(/[a-zA-Z][1-2]/)
499
+ Yaparc::Regex.new(/[a-zA-Z][1-2]/)
500
500
  end
501
501
  end
502
502
  end
@@ -504,8 +504,7 @@ module SkypeR
504
504
  class Username < CommandBase
505
505
  def initialize
506
506
  @parser = lambda do
507
- Yaparc::TokenizeParser.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
508
- # Yaparc::Token.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
507
+ Yaparc::Tokenize.new(Yaparc::Regex.new(/[a-zA-Z0-9]+/))
509
508
  end
510
509
  end
511
510
  end
data/lib/skyper/parser.rb CHANGED
@@ -14,8 +14,7 @@ module SkypeR
14
14
  class Identifier < Yaparc::AbstractParser
15
15
  def initialize
16
16
  @parser = lambda do
17
- Yaparc::TokenizeParser.new(Yaparc::Ident.new)
18
- # Yaparc::Token.new(Yaparc::Ident.new)
17
+ Yaparc::Tokenize.new(Yaparc::Ident.new)
19
18
  end
20
19
  end
21
20
  end
@@ -24,7 +23,7 @@ module SkypeR
24
23
 
25
24
  def initialize
26
25
  @parser = lambda do
27
- Yaparc::TokenizeParser.new(Yaparc::CharParser.new(','))
26
+ Yaparc::Tokenize.new(Yaparc::Char.new(','))
28
27
  # Yaparc::Token.new(Yaparc::Char.new(','))
29
28
  end
30
29
  end
@@ -33,7 +32,7 @@ module SkypeR
33
32
  class OpenParen < Yaparc::AbstractParser
34
33
  def initialize
35
34
  @parser = lambda do
36
- Yaparc::TokenizeParser.new(Yaparc::CharParser.new('('))
35
+ Yaparc::Tokenize.new(Yaparc::Char.new('('))
37
36
  # Token.new(Char.new('('))
38
37
  end
39
38
  end
@@ -42,7 +41,7 @@ module SkypeR
42
41
  class CloseParen < Yaparc::AbstractParser
43
42
  def initialize
44
43
  @parser = lambda do
45
- Yaparc::TokenizeParser.new(Yaparc::CharParser.new(')'))
44
+ Yaparc::Tokenize.new(Yaparc::Char.new(')'))
46
45
  # Yaparc::Token.new(Yaparc::Char.new(')'))
47
46
  end
48
47
  end
@@ -51,8 +50,8 @@ module SkypeR
51
50
  class CommandID < Yaparc::AbstractParser
52
51
  def initialize
53
52
  @parser = lambda do
54
- Yaparc::TokenizeParser.new(Yaparc::RegexParser.new(/#[A-Z0-9]+/))
55
- # Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Z0-9]+/))
53
+ Yaparc::Tokenize.new(Yaparc::Regex.new(/#[A-Z0-9]+/))
54
+ # Yaparc::Token.new(Yaparc::Regex.new(/#[A-Z0-9]+/))
56
55
  end
57
56
  end
58
57
  end
@@ -61,8 +60,8 @@ module SkypeR
61
60
  class ChatID < Yaparc::AbstractParser
62
61
  def initialize
63
62
  @parser = lambda do
64
- Yaparc::TokenizeParser.new(Yaparc::RegexParser.new(/#[A-Za-z]*\/\$[A-Za-z]*;[0-9]*/))
65
- # Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Za-z]*\/\$[A-Za-z]*;[0-9]*/))
63
+ Yaparc::Tokenize.new(Yaparc::Regex.new(/#[A-Za-z]*\/\$[A-Za-z]*;[0-9]*/))
64
+ # Yaparc::Token.new(Yaparc::Regex.new(/#[A-Za-z]*\/\$[A-Za-z]*;[0-9]*/))
66
65
  end
67
66
  end
68
67
  end
@@ -72,7 +71,7 @@ module SkypeR
72
71
  def initialize
73
72
  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)}
74
73
  @parser = lambda do
75
- Yaparc::AltParser.new(*properties)
74
+ Yaparc::Alt.new(*properties)
76
75
  end
77
76
  end
78
77
  end
@@ -82,7 +81,7 @@ module SkypeR
82
81
  def initialize
83
82
  properties = %w{PSTN_BALANCE FULLNAME BIRTHDAY SEX LANGUAGES TIMEZONE}.map {|item| Yaparc::Symbol.new(item)}
84
83
  @parser = lambda do
85
- Yaparc::AltParser.new(*properties)
84
+ Yaparc::Alt.new(*properties)
86
85
  end
87
86
  end
88
87
  end
@@ -92,7 +91,7 @@ module SkypeR
92
91
  def initialize
93
92
  properties = SkypeR::Object::Call::PROPERTIES.map {|item| Yaparc::Symbol.new(item)}
94
93
  @parser = lambda do
95
- Yaparc::AltParser.new(*properties)
94
+ Yaparc::Alt.new(*properties)
96
95
  end
97
96
  end
98
97
  end
data/lib/skyper/response.rb CHANGED
@@ -21,14 +21,14 @@ module SkypeR
21
21
  class ResponseStatement < ResponseBase
22
22
  def initialize
23
23
  @parser = lambda do
24
- Yaparc::AltParser.new(Yaparc::SeqParser.new(Yaparc::ZeroOneParser.new(CommandID.new),
25
- Response.new) do |command_id, response|
26
- response
27
- end,
28
- Yaparc::SeqParser.new(Yaparc::ZeroOneParser.new(CommandID.new),
29
- Error.new) do |command_id, error|
30
- error
31
- end)
24
+ Yaparc::Alt.new(Yaparc::Seq.new(Yaparc::ZeroOne.new(CommandID.new),
25
+ Response.new) do |command_id, response|
26
+ response
27
+ end,
28
+ Yaparc::Seq.new(Yaparc::ZeroOne.new(CommandID.new),
29
+ Error.new) do |command_id, error|
30
+ error
31
+ end)
32
32
  end
33
33
  end
34
34
  end
@@ -36,8 +36,7 @@ module SkypeR
36
36
  class AnyValue < ResponseBase
37
37
  def initialize
38
38
  @parser = lambda do
39
- Yaparc::TokenizeParser.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
40
- # Yaparc::Token.new(Yaparc::RegexParser.new(/[a-zA-Z0-9]+/))
39
+ Yaparc::Tokenize.new(Yaparc::Regex.new(/[a-zA-Z0-9]+/))
41
40
  end
42
41
  end
43
42
  end
@@ -46,7 +45,7 @@ module SkypeR
46
45
  class GetUserResponse < ResponseBase
47
46
  def initialize
48
47
  @parser = lambda do
49
- Yaparc::SeqParser.new(Yaparc::Symbol.new("USER"),
48
+ Yaparc::Seq.new(Yaparc::Symbol.new("USER"),
50
49
  Yaparc::Identifier.new,
51
50
  SkypeR::Parser::UserProperty.new,
52
51
  AnyValue.new) do |_,identifier,property, value|
@@ -60,7 +59,7 @@ module SkypeR
60
59
  class GetUserstatusResponse < ResponseBase
61
60
  def initialize
62
61
  @parser = lambda do
63
- Yaparc::SeqParser.new(Yaparc::Symbol.new("USERSTATUS"),
62
+ Yaparc::Seq.new(Yaparc::Symbol.new("USERSTATUS"),
64
63
  AnyValue.new) do |_,value|
65
64
  {:value => value}
66
65
  end
@@ -72,7 +71,7 @@ module SkypeR
72
71
  class GetProfileResponse < ResponseBase
73
72
  def initialize
74
73
  @parser = lambda do
75
- Yaparc::SeqParser.new(Yaparc::Symbol.new("PROFILE"),
74
+ Yaparc::Seq.new(Yaparc::Symbol.new("PROFILE"),
76
75
  ProfileProperty.new,
77
76
  AnyValue.new) do |_,property, value|
78
77
  {:property => property, :value => value}
@@ -85,7 +84,7 @@ module SkypeR
85
84
  class GetCallResponse < ResponseBase
86
85
  def initialize
87
86
  @parser = lambda do
88
- Yaparc::SeqParser.new(Yaparc::Symbol.new("CALL"),
87
+ Yaparc::Seq.new(Yaparc::Symbol.new("CALL"),
89
88
  Yaparc::Identifier.new,
90
89
  CallProperty.new,
91
90
  AnyValue.new) do |_,identifier, property, value|
@@ -99,11 +98,11 @@ module SkypeR
99
98
  class GetChatChatmessagesResponse < ResponseBase
100
99
  def initialize
101
100
  @parser = lambda do
102
- Yaparc::SeqParser.new(Yaparc::Symbol.new("CHAT"),
101
+ Yaparc::Seq.new(Yaparc::Symbol.new("CHAT"),
103
102
  ChatID.new,
104
103
  Yaparc::Symbol.new("CHATMESSAGES"),
105
- Yaparc::ManyParser.new(
106
- Yaparc::SeqParser.new(Yaparc::Symbol.new(','),
104
+ Yaparc::Many.new(
105
+ Yaparc::Seq.new(Yaparc::Symbol.new(','),
107
106
  Target.new) do |_, target|
108
107
  target
109
108
  end
@@ -118,10 +117,10 @@ module SkypeR
118
117
  class SearchUsersResponse < ResponseBase
119
118
  def initialize
120
119
  @parser = lambda do
121
- Yaparc::SeqParser.new(Yaparc::Symbol.new("USERS"),
120
+ Yaparc::Seq.new(Yaparc::Symbol.new("USERS"),
122
121
  Username.new,
123
- Yaparc::ManyParser.new(
124
- Yaparc::SeqParser.new(
122
+ Yaparc::Many.new(
123
+ Yaparc::Seq.new(
125
124
  Yaparc::Symbol.new(','),
126
125
  Username.new) do |_, username|
127
126
  [username]
@@ -139,10 +138,10 @@ module SkypeR
139
138
  class SearchFriendsResponse < ResponseBase
140
139
  def initialize
141
140
  @parser = lambda do
142
- Yaparc::SeqParser.new(Yaparc::Symbol.new("USERS"),
141
+ Yaparc::Seq.new(Yaparc::Symbol.new("USERS"),
143
142
  Username.new,
144
- Yaparc::ManyParser.new(
145
- Yaparc::SeqParser.new(
143
+ Yaparc::Many.new(
144
+ Yaparc::Seq.new(
146
145
  Yaparc::Symbol.new(','),
147
146
  Username.new) do |_, username|
148
147
  [username]
@@ -160,10 +159,10 @@ module SkypeR
160
159
  class SearchCallsResponse < ResponseBase
161
160
  def initialize
162
161
  @parser = lambda do
163
- Yaparc::SeqParser.new(Yaparc::Symbol.new("CALLS"),
162
+ Yaparc::Seq.new(Yaparc::Symbol.new("CALLS"),
164
163
  Yaparc::Identifier.new,
165
- Yaparc::ManyParser.new(
166
- Yaparc::SeqParser.new(
164
+ Yaparc::Many.new(
165
+ Yaparc::Seq.new(
167
166
  Yaparc::Symbol.new(','),
168
167
  Yaparc::Identifier.new) do |_, identifier|
169
168
  [identifier]
@@ -181,10 +180,10 @@ module SkypeR
181
180
  class SearchActivecallsResponse < ResponseBase
182
181
  def initialize
183
182
  @parser = lambda do
184
- Yaparc::SeqParser.new(Yaparc::Symbol.new("CALLS"),
183
+ Yaparc::Seq.new(Yaparc::Symbol.new("CALLS"),
185
184
  Yaparc::Identifier.new,
186
- Yaparc::ManyParser.new(
187
- Yaparc::SeqParser.new(
185
+ Yaparc::Many.new(
186
+ Yaparc::Seq.new(
188
187
  Yaparc::Symbol.new(','),
189
188
  Yaparc::Identifier.new) do |_, identifier|
190
189
  [identifier]
@@ -202,10 +201,10 @@ module SkypeR
202
201
  class SearchMissedcallsResponse < ResponseBase
203
202
  def initialize
204
203
  @parser = lambda do
205
- Yaparc::SeqParser.new(Yaparc::Symbol.new("CALLS"),
204
+ Yaparc::Seq.new(Yaparc::Symbol.new("CALLS"),
206
205
  Yaparc::Identifier.new,
207
- Yaparc::ManyParser.new(
208
- Yaparc::SeqParser.new(
206
+ Yaparc::Many.new(
207
+ Yaparc::Seq.new(
209
208
  Yaparc::Symbol.new(','),
210
209
  Yaparc::Identifier.new) do |_, identifier|
211
210
  [identifier]
@@ -224,17 +223,17 @@ module SkypeR
224
223
  class SearchUserswaitingmyauthorizationResponse < ResponseBase
225
224
  def initialize
226
225
  @parser = lambda do
227
- Yaparc::SeqParser.new(Yaparc::Symbol.new("USERS"),
228
- Yaparc::Identifier.new,
229
- Yaparc::ManyParser.new(
230
- Yaparc::SeqParser.new(
231
- Yaparc::Symbol.new(','),
232
- Yaparc::Identifier.new) do |_, identifier|
233
- [identifier]
234
- end,
235
- []
236
- )
237
- ) do |_,identifier,identifiers|
226
+ Yaparc::Seq.new(Yaparc::Symbol.new("USERS"),
227
+ Yaparc::Identifier.new,
228
+ Yaparc::Many.new(
229
+ Yaparc::Seq.new(
230
+ Yaparc::Symbol.new(','),
231
+ Yaparc::Identifier.new) do |_, identifier|
232
+ [identifier]
233
+ end,
234
+ []
235
+ )
236
+ ) do |_,identifier,identifiers|
238
237
  {:identifiers => [identifier] + identifiers}
239
238
  end
240
239
  end
@@ -245,7 +244,7 @@ module SkypeR
245
244
  class VoicemailResponse < ResponseBase
246
245
  def initialize
247
246
  @parser = lambda do
248
- Yaparc::SeqParser.new(
247
+ Yaparc::Seq.new(
249
248
  Yaparc::Symbol.new("VOICEMAIL"),
250
249
  CallId.new,
251
250
  Yaparc::Symbol.new("STATUS"),
@@ -261,12 +260,12 @@ module SkypeR
261
260
  class ChatCreateResponse < ResponseBase
262
261
  def initialize
263
262
  @parser = lambda do
264
- Yaparc::SeqParser.new(
265
- Yaparc::Symbol.new("CHAT"),
266
- CallId.new,
267
- Yaparc::Symbol.new("STATUS"),
268
- AnyValue.new
269
- ) do |_,call_id,_,value|
263
+ Yaparc::Seq.new(
264
+ Yaparc::Symbol.new("CHAT"),
265
+ CallId.new,
266
+ Yaparc::Symbol.new("STATUS"),
267
+ AnyValue.new
268
+ ) do |_,call_id,_,value|
270
269
  {:call_id => call_id, :value => value}
271
270
  end
272
271
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: SkypeR
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Akimichi Tatsukawa
@@ -9,7 +9,7 @@ autorequire: skyper
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-04-21 00:00:00 +09:00
12
+ date: 2008-04-26 00:00:00 +09:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -37,7 +37,7 @@ dependencies:
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: 0.1.6
40
+ version: 0.2.0
41
41
  version:
42
42
  description:
43
43
  email: akimichi_tatsukawa@nifty.com
@@ -60,7 +60,6 @@ files:
60
60
  - lib/skyper/error.obj
61
61
  - lib/skyper/error.csv
62
62
  - lib/skyper/response.rb
63
- - lib/skyper/parser.rb.org
64
63
  - lib/skyper/parser.rb
65
64
  - lib/skyper/command.rb
66
65
  - bin/iskype.rb
data/lib/skyper/parser.rb.org DELETED
@@ -1,95 +0,0 @@
1
- $:.unshift File.join(File.dirname(__FILE__))
2
- require 'rubygems'
3
- #require_gem 'yaparc'
4
- require 'yaparc'
5
- require "logger"
6
-
7
- =begin
8
- (insert-image-file "~/develop/ruby/skyper/docs/parser.png")
9
- =end
10
-
11
- module SkypeR
12
-
13
- module Parser
14
- class Identifier < Yaparc::AbstractParser
15
- def initialize
16
- @parser = lambda do
17
- Yaparc::Token.new(Yaparc::Ident.new)
18
- end
19
- end
20
- end
21
-
22
- class Comma < Yaparc::AbstractParser
23
-
24
- def initialize
25
- @parser = lambda do
26
- Yaparc::Token.new(Yaparc::Char.new(','))
27
- end
28
- end
29
- end
30
-
31
- class OpenParen < Yaparc::AbstractParser
32
- def initialize
33
- @parser = lambda do
34
- Token.new(Char.new('('))
35
- end
36
- end
37
- end
38
-
39
- class CloseParen < Yaparc::AbstractParser
40
- def initialize
41
- @parser = lambda do
42
- Yaparc::Token.new(Yaparc::Char.new(')'))
43
- end
44
- end
45
- end
46
-
47
- class CommandID < Yaparc::AbstractParser
48
- def initialize
49
- @parser = lambda do
50
- Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Z0-9]+/))
51
- end
52
- end
53
- end
54
-
55
- # <chat_id> # - chat identifier; string (usually looks like “#me/$target;012345679012345”)
56
- class ChatID < Yaparc::AbstractParser
57
- def initialize
58
- @parser = lambda do
59
- Yaparc::Token.new(Yaparc::RegexParser.new(/#[A-Za-z]*\/\$[A-Za-z]*;[0-9]*/))
60
- end
61
- end
62
- end
63
-
64
-
65
- class UserProperty < Yaparc::AbstractParser
66
- def initialize
67
- 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)}
68
- @parser = lambda do
69
- Yaparc::AltParser.new(*properties)
70
- end
71
- end
72
- end
73
-
74
- # <profile_property> := PSTN_BALANCE | FULLNAME | BIRTHDAY | SEX | LANGUAGES | TIMEZONE
75
- class ProfileProperty < Yaparc::AbstractParser
76
- def initialize
77
- properties = %w{PSTN_BALANCE FULLNAME BIRTHDAY SEX LANGUAGES TIMEZONE}.map {|item| Yaparc::Symbol.new(item)}
78
- @parser = lambda do
79
- Yaparc::AltParser.new(*properties)
80
- end
81
- end
82
- end
83
-
84
- # <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
85
- class CallProperty < Yaparc::AbstractParser
86
- def initialize
87
- properties = SkypeR::Object::Call::PROPERTIES.map {|item| Yaparc::Symbol.new(item)}
88
- @parser = lambda do
89
- Yaparc::AltParser.new(*properties)
90
- end
91
- end
92
- end
93
-
94
- end # of Parser
95
- end # of Skyper