skype 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 903e0cbc11719056bdfd2ed7c958998666da8e4e
-  data.tar.gz: 15c4de23bccc80e943f6e513168a06e4a23c5ce8
+  metadata.gz: f55fb6515dd62ebcf14675c0baea34a9a7a7d10e
+  data.tar.gz: ced58a4a2c91ec00dce90a431d24810312973c2c
 SHA512:
-  metadata.gz: e2969f9bc8c6402ecea6823225dc5f36bfbae5872d0e10f27f1552381a8a26453a408bea4f801b07896f9f9592d4b0ccfdfb2baa7b7e6211dfc622f34afe40ac
-  data.tar.gz: 978831a1c108f4411956e9dc981e11543263e3ace9b0b8d6a740137838cc8e4aa8c9798e111a3a7c41c42a3a023fd2afb15da8b44d54acb52bcd6da6d34fdf7e
+  metadata.gz: eeeb14ae23fb7791b40502dc73e2a41c3e18c660625410f747ef72f28547551a02bbd60993e12d1f2729febfe1c6d2493656554eb404b12dfdfda7dc449b1027
+  data.tar.gz: b541ab42b556bfb088dc2c1cefdf32154295e37e4ef9b650a67ef790dc7d2308d5efd66e5f2399d78c7d415e888c50ab71c59357cb3cda2ff7f4d50a15fa0a12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skype (0.1.2)
+    skype (0.1.3)
       tmp_cache
 
 GEM

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.3 2013-06-30
+
+* wrap the return value of chat message with Skype::Chat::Message
+* add tests
+
 === 0.1.2 2013-06-29
 
 * bugfix Chat API wrapper

data/README.md

@@ -1,6 +1,6 @@
 Skype
 =====
-[Skype Desktop API](http://dev.skype.com/desktop-api-reference) wrapper for Ruby
+[Skype Desktop API](http://dev.skype.com/desktop-api-reference) Ruby wrapper for Mac/Linux.
 
 - https://github.com/shokai/skype-ruby
 - http://rubygems.org/gems/skype

data/lib/skype.rb

@@ -3,6 +3,7 @@ require "kconv"
 require "tmp_cache"
 
 require "skype/version"
+require "skype/register"
 require case RUBY_PLATFORM
         when /darwin/
           "skype/platforms/mac"

data/lib/skype/platforms/linux.rb

@@ -18,6 +18,12 @@ module Skype
   end
 
   def self.exec(command)
-    (@@connection||=Connection.new).invoke command
+    res = (@@connection||=Connection.new).invoke command
+    @@filters.each do |filter, block|
+      next unless res =~ filter
+      res = block.call(res)
+      break
+    end
+    res
   end
 end

data/lib/skype/platforms/mac.rb

@@ -3,9 +3,13 @@ module Skype
     script = %Q{tell application "Skype"
   send command "#{Utils.escape command}" script name "#{self.config[:app_name]}"
 end tell}
-    res = `unset LD_LIBRARY_PATH; unset DYLD_LIBRARY_PATH; /usr/bin/osascript -e '#{script}'`.split(/[\n\r]+/)
-    res.shift if res.size > 1 and res[0] =~ /^dyld: /
-    res[0]
+    res = `unset LD_LIBRARY_PATH; unset DYLD_LIBRARY_PATH; /usr/bin/osascript -e '#{script}'`.strip
+    @@filters.each do |filter, block|
+      next unless res =~ filter
+      res = block.call(res)
+      break
+    end
+    res
   end
 
   module Utils

data/lib/skype/register.rb

@@ -0,0 +1,9 @@
+module Skype
+  @@filters = {}
+
+  def self.response_filter(pattern, &block)
+    raise ArgumentError, "pattern must be instance of Regexp" unless pattern.kind_of? Regexp
+    raise ArgumentError, "block not given" unless block_given?
+    @@filters[pattern] = block
+  end
+end

data/lib/skype/version.rb

@@ -1,3 +1,3 @@
 module Skype
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/skype/wrappers/chat.rb

@@ -1,5 +1,9 @@
 module Skype
 
+  response_filter /^(CHAT)?MESSAGE (\d+) STATUS (SENT|SENDING)$/ do |res|
+    Skype::Chat::Message.new res.scan(/^(CHAT)?MESSAGE (\d+) STATUS (SENT|SENDING)$/)[0][1].to_i
+  end
+
   def self.chats
     search("recentchats").
       scan(/(#[^\s,]+)[\s,]/).
@@ -12,9 +16,9 @@ module Skype
     attr_reader :id, :topic, :members
 
     def initialize(id)
-      @id = id
-      @topic = ::Skype::exec("GET CHAT #{@id} TOPIC").scan(/TOPIC (.*)$/)[0][0].toutf8
-      @members = ::Skype::exec("GET CHAT #{@id} MEMBERS").scan(/MEMBERS (.+)$/)[0][0].split(/\s/)
+      @id = id.to_i
+      @topic = ::Skype.exec("GET CHAT #{@id} TOPIC").scan(/TOPIC (.*)$/)[0][0].toutf8 rescue @topic = ""
+      @members = ::Skype.exec("GET CHAT #{@id} MEMBERS").scan(/MEMBERS (.+)$/)[0][0].split(/\s/) rescue @members = []
     end
 
     def messages
@@ -35,7 +39,7 @@ module Skype
       attr_reader :id, :user, :body, :time
 
       def initialize(id)
-        @id = id
+        @id = id.to_i
         @user = ::Skype.exec("GET CHATMESSAGE #{@id} from_handle").split(/\s/).last rescue @user = ""
         @body = ::Skype.exec("GET CHATMESSAGE #{@id} body").scan(/^(CHAT)?MESSAGE #{@id} BODY (.+)$/)[0][1] rescue @body = ""
         @time = Time.at ::Skype.exec("GET CHATMESSAGE #{@id} timestamp").split(/\s/).last.to_i

data/samples/chat.rb

@@ -6,7 +6,7 @@ require 'skype'
 
 chats = Skype.chats
 puts "#{chats.length} chats found"
-chat = chats.find{|c| c.members.include? "shokaishokai" and c.topic =~ /test/}
+chat = chats.find{|c| c.members.include? "shokaishokai" and c.topic =~ /test/} || chats[0]
 
 p chat
 chat.post "test"

data/skype.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Skype::VERSION
   spec.authors       = ["Sho Hashimoto"]
   spec.email         = ["hashimoto@shokai.org"]
-  spec.description   = %q{Skype Desktop API wrapper for Ruby}
+  spec.description   = %q{Skype Desktop API Ruby wrapper for Mac/Linux.}
   spec.summary       = spec.description
   spec.homepage      = "https://github.com/shokai/skype-ruby"
   spec.license       = "MIT"

data/test/test_chat.rb

@@ -0,0 +1,38 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestSkype < MiniTest::Test
+
+  SKYPE_FROM = ENV["SKYPE_FROM"]
+  SKYPE_TO   = ENV["SKYPE_TO"] || "echo123"
+
+  def test_exec
+    body = "hello exec"
+    msg = Skype.exec "MESSAGE #{SKYPE_TO} #{body}"
+    assert_equal msg.body, body
+    assert_equal msg.time.class, Time
+    assert_equal msg.user, SKYPE_FROM
+  end
+
+  def test_message
+    body = "hello hello"
+    msg = Skype.message SKYPE_TO, body
+    assert_equal msg.body, body
+    assert_equal msg.time.class, Time
+    assert_equal msg.user, SKYPE_FROM
+  end
+
+  def test_message_escape
+    body = "hello \"'$@&()^![]{};*?<>`\\ world"
+    msg = Skype.message SKYPE_TO, body
+    assert_equal msg.body, body
+    assert_equal msg.time.class, Time
+    assert_equal msg.user, SKYPE_FROM
+  end
+
+  def test_chats
+    chat = Skype.chats[0]
+    assert_equal chat.class, Skype::Chat
+    assert_equal chat.topic.class, String
+    assert_equal chat.members.class, Array
+  end
+end

data/test/test_skype.rb

@@ -2,42 +2,9 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 
 class TestSkype < MiniTest::Test
 
-  SKYPE_FROM = ENV["SKYPE_FROM"]
-  SKYPE_TO   = ENV["SKYPE_TO"]
-
-  def test_exec
-    body = "hello exec"
-    res = Skype.exec "MESSAGE #{SKYPE_TO} #{body}"
-    assert res =~ /^(CHAT)?MESSAGE \d+ STATUS (SENT|SENDING)$/, "Skype API response error"
-    res_id = res.scan(/(CHAT)?MESSAGE (\d+) STATUS (SENT|SENDING)$/)[0][1].to_i
-    msg = Skype::Chat::Message.new res_id
-    assert_equal msg.id, res_id
-    assert_equal msg.body, body
-    assert_equal msg.time.class, Time
-    assert_equal msg.user, SKYPE_FROM
-  end
-
-  def test_message
-    body = "hello hello"
-    res = Skype.message SKYPE_TO, body
-    assert res =~ /^(CHAT)?MESSAGE \d+ STATUS (SENT|SENDING)$/, "Skype API response error"
-    res_id = res.scan(/(CHAT)?MESSAGE (\d+) STATUS (SENT|SENDING)$/)[0][1].to_i
-    msg = Skype::Chat::Message.new res_id
-    assert_equal msg.id, res_id
-    assert_equal msg.body, body
-    assert_equal msg.time.class, Time
-    assert_equal msg.user, SKYPE_FROM
+  def test_username
+    res = Skype.exec "GET USER echo123 FULLNAME"
+    assert res =~ /Sound Test Service/i, "API response error"
   end
 
-  def test_message_escape
-    body = "hello \"'$@&()^![]{};*?<>`\\ world"
-    res = Skype.message SKYPE_TO, body
-    assert res =~ /^(CHAT)?MESSAGE \d+ STATUS (SENT|SENDING)$/, "Skype API response error"
-    res_id = res.scan(/(CHAT)?MESSAGE (\d+) STATUS (SENT|SENDING)$/)[0][1].to_i
-    msg = Skype::Chat::Message.new res_id
-    assert_equal msg.id, res_id
-    assert_equal msg.body, body
-    assert_equal msg.time.class, Time
-    assert_equal msg.user, SKYPE_FROM
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skype
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sho Hashimoto
@@ -66,7 +66,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
-description: Skype Desktop API wrapper for Ruby
+description: Skype Desktop API Ruby wrapper for Mac/Linux.
 email:
 - hashimoto@shokai.org
 executables: []
@@ -84,12 +84,14 @@ files:
 - lib/skype/main.rb
 - lib/skype/platforms/linux.rb
 - lib/skype/platforms/mac.rb
+- lib/skype/register.rb
 - lib/skype/version.rb
 - lib/skype/wrappers/chat.rb
 - samples/call.rb
 - samples/chat.rb
 - samples/send_message.rb
 - skype.gemspec
+- test/test_chat.rb
 - test/test_helper.rb
 - test/test_skype.rb
 homepage: https://github.com/shokai/skype-ruby
@@ -115,7 +117,8 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Skype Desktop API wrapper for Ruby
+summary: Skype Desktop API Ruby wrapper for Mac/Linux.
 test_files:
+- test/test_chat.rb
 - test/test_helper.rb
 - test/test_skype.rb