skype 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3aa1c4c74b77b558bdafa765fb9b103d8cb748f
-  data.tar.gz: d85482711127b14a939ace7d8e593f867bca0d88
+  metadata.gz: 9fb5dc7ad40243c4ed83700b041c4503829721d4
+  data.tar.gz: ce838b0e3a2ba45c67de7ee2fbd6b1f6b44c9434
 SHA512:
-  metadata.gz: 0301d08af03c2ec6a172ec367ee373326f14b21c9be663487b33e0384622c11a0ec93bf7ee7704d3e98229fe4c39cfdd8857d950ed028efd3bfe17c6d656c78d
-  data.tar.gz: f685779d51d96b3425175d6123b35a531ea0b69e20dd8d32f9b743b79625990fc78fa8e7ca60ef0f64a1c2a08ec24595132dc7f55507037e014064cc5d8136ed
+  metadata.gz: 841f2f1210196ea337119df90c678e5449d84511d06b3959503384711bdfe80da14c1b25a143e8a68159b1ab4973647d56ce0d4c172b359d523cfc188f78f153
+  data.tar.gz: 58c970aaf597ceae2d390c929c6b8f59a42446a8434b7312b75a9c09804d748d51b2b2a635344c5bbd5ae635a305c07cb7bad31f993627f1fc44206b5c531446

data/Gemfile.lock

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

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.2 2013-07-03
+
+* get properties of Skype::Chat::Message on access
+
 === 0.2.1 2013-06-30
 
 * add function Skype::Call#talking?

data/lib/skype/version.rb

@@ -1,3 +1,3 @@
 module Skype
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/skype/wrappers/chat.rb

@@ -11,8 +11,6 @@ module Skype
   end
 
   class Chat
-    @@message_cache = TmpCache::Cache.new
-
     attr_reader :id, :topic, :members
 
     def initialize(id)
@@ -25,9 +23,7 @@ module Skype
       ::Skype.exec("GET CHAT #{@id} RECENTCHATMESSAGES").
         split(/,? /).
         select{|i| i =~ /^\d+$/ }.
-        map{|i| i.to_i }.
-        map{|i| @@message_cache.get(i) || @@message_cache.set(i, Skype::Chat::Message.new(i), 3600*72) }.
-        sort{|a,b| b.time <=> a.time }
+        map{|i| Skype::Chat::Message.new i }
     end
 
     def post(message)
@@ -35,18 +31,49 @@ module Skype
     end
 
     class Message
+      @@cache = TmpCache::Cache.new
 
       attr_reader :id, :user, :body, :time
 
       def initialize(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
+        if cache = @@cache.get(@id)
+          @user = cache[:user]
+          @body = cache[:body]
+          @time = cache[:time]
+        end
+      end
+
+      def user
+        get_properties
+        @user
+      end
+
+      def body
+        get_properties
+        @body
+      end
+
+      def time
+        get_properties
+        @time
       end
 
       def to_s
-        "[#{@time}] <#{@user}> #{@body} "
+        "[#{time}] <#{user}> #{body} "
+      end
+
+      private
+      def get_properties
+        return if @user and @body and @time
+        @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
+        @@cache.set(@id, {
+                      :user => @user,
+                      :body => @body,
+                      :time => @time
+                    }, 3600*72)
       end
 
     end

data/samples/call.rb

@@ -8,9 +8,9 @@ print "> "
 to = STDIN.gets.strip
 call = Skype.call to
 
-loop do
+
+while !call.talking?
   puts call.status
-  break if call.talking?
   sleep 1
 end
 
@@ -19,6 +19,6 @@ end
   sleep 1
 end
 
-call.hangup
+call.hangup if call.talking?
 
 puts call.status

data/test/test_call.rb

@@ -3,14 +3,16 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 class TestSkypeCall < MiniTest::Test
 
   SKYPE_FROM = ENV["SKYPE_FROM"]
-  SKYPE_TO   = ENV["SKYPE_TO"] || "echo123"
+  SKYPE_TO   = "echo123"
 
   def test_call
     call = Skype.call SKYPE_TO
     STDERR.puts call if call.kind_of? String
     assert_equal call.class, Skype::Call
     assert_equal call.to, SKYPE_TO
-    sleep 1
+    while !call.talking?
+      sleep 2
+    end
     call.hangup
     assert [:finished, :missed, :cancelled].include? call.status
     assert_equal call.talking?, false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skype
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tmp_cache