webim 0.1.2 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d869afaf7806c888cbcdf4ae775d1d700a5f5fb1
-  data.tar.gz: 917265023d11fdc67637cb3bb8933b2237bc16bc
+  metadata.gz: 6a9f61021da60564de9cbce023429446b0fed302
+  data.tar.gz: 48f3c2fb09648060614bc0057fc9ac21fce43e1c
 SHA512:
-  metadata.gz: 1c26e31ecb35efac0254545963b94c6b7b3a668428142268590eb0fdce9490319e3349008ff4be421def09e6801fb7122320f0700578c08290792b4d3ba0399e
-  data.tar.gz: a4205b393e1b7ee5ac44af0b27ecddb5ae36317966dc32370f2c70dcf6602cf33449a3fa0303a1594a635a53326b9275f9609b62a9a8ed5579dc9284ac4597e1
+  metadata.gz: 9b33a72d4a793eafdf946db5fa9aa85491e011dde0f341c850c8de1d567cd1f7c3cf28b853200e851f2f50457944d938091afbdd076e404cea49ff7ea9711eba
+  data.tar.gz: c3f9ddfb06fd001a3be88b1efc8e7eaa6c5b520d0a15bad44b2101764d3680a9052a1a599a97db086d0d84ec3b1f5d6e0496cb8ce9d886f7b0fc4d067fe955d4

data/README.md

@@ -25,6 +25,12 @@ Once connected, you can forward requests or route messages to the server:
     # 向消息服务器转发用户状态，例如正在输入...
     client.status("uid2", "typing", "I am typing")
 
+	# 向消息服务器push即时消息
+	client.push("uid1", "uid2", "hahaha")
+
+	# 从消息服务器读取用户现场信息
+	client.presences(["uid1", "uid2"])
+
     # 从消息服务器读取当前群组在线用户
     client.members('g1')
 

data/lib/webim.rb

@@ -6,7 +6,7 @@ module Webim
 
   APIVSN = "v5"
 
-  VERSION = "0.1"
+  VERSION = "0.2"
 
   ##
   # A Ruby webim client library for NexTalk.im.
@@ -31,7 +31,7 @@ module Webim
 
     ##
     # 网站域名
-    #
+
     attr_reader :domain
 
     ##
@@ -54,6 +54,10 @@ module Webim
     #
     attr_reader :ticket
 
+	##
+	# HTTP Timeout
+	attr_reader :timeout
+
     ##
     # 创建Client对象
     #
@@ -73,6 +77,7 @@ module Webim
       @apikey = config[:apikey] || ""
       @host = config[:host] || "127.0.0.1"
       @port = (config[:port] || DEFAULT_PORT).to_i
+	  @timeout = (config[:timeout] || 10 ).to_i
     end
 
     ##
@@ -159,6 +164,30 @@ module Webim
       })
     end
 
+	##
+	# 向消息服务器推送消息
+	#  from: 发送者
+    #  to: 接收者 
+    #  body: 消息体
+	#  timestam: 时间戳
+    #  type: chat | grpchat
+    #  style: 消息CSS
+    #
+	def push(from, to, body, timestamp = nil, type = "chat", style = "")
+      http_post('/messages', {
+        :version => APIVSN,
+        :apikey => @apikey,
+        :domain => @domain,
+        :nick => @user[:nick],
+        :type => type,
+		:from => from,
+        :to => to,
+        :body => body,
+        :style => style,
+        :timestamp => timestamp ? timestamp : Time.now.to_f * 1000
+      })
+    end
+
     ##
     #  向消息服务器转发用户状态，例如正在输入...
     #
@@ -179,6 +208,26 @@ module Webim
       })
     end
 
+    ##
+    #  从消息服务器读取当前在线用户
+    #
+    #  ids: 用户id列表
+    #
+	def presences(ids)
+      res = http_get('/presences', {
+        :version => APIVSN,
+        :ticket => @ticket,
+        :apikey => @apikey,
+        :domain => @domain,
+        :ids => ids.join(",")
+      })
+      if res and (200 == res.code.to_i)
+        JSON.parse(res.body)
+	  else
+		nil
+	  end
+	end
+
     ##
     #  从消息服务器读取当前群组在线用户
     #
@@ -193,8 +242,7 @@ module Webim
         :group => gid
       })
       if res and (200 == res.code.to_i)
-        data = JSON.parse(res.body)
-        data[gid]
+        JSON.parse(res.body)
     else
      nil
       end
@@ -215,11 +263,7 @@ module Webim
         :group => gid 
       })
       if res and (200 == res.code.to_i)
-        data = JSON.parse(res.body)
-        {
-          :id => gid,
-          :count => data[gid]
-        }
+        JSON.parse(res.body)
       else 
         nil
       end
@@ -253,16 +297,16 @@ module Webim
     def http_get(path, params = {})
       params = params.map {|k,v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join("&")
       http = Net::HTTP.new(@host, @port)
-      http.open_timeout = 10
-      http.read_timeout = 10
+      http.open_timeout = @timeout
+      http.read_timeout = @timeout
       http.get('/' + APIVSN + path + "?" + params)
     end
 
     def http_post path, params = {}
       params = params.map {|k,v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join("&")
       http = Net::HTTP.new(@host, @port)
-      http.open_timeout = 10
-      http.read_timeout = 10
+      http.open_timeout = @timeout
+      http.read_timeout = @timeout
       http.post('/' + APIVSN + path, params)
     end
 

data/test/webim_test.rb

@@ -18,6 +18,10 @@ class WebimTest < Test::Unit::TestCase
     puts @client.message("uid2", "hahaha")
   end
 
+  def test_push
+	puts @client.push("uid1", "uid2", "ahbh")
+  end
+
   def test_presence
     puts @client.presence('busy', "Busy")
   end
@@ -26,6 +30,10 @@ class WebimTest < Test::Unit::TestCase
     puts @client.status("uid2", "typing", "I am typing")
   end
 
+  def test_presences
+	puts @client.presences(['uid1', 'ui2'])
+  end
+
   def test_members
     puts @client.members('g1')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webim
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '2.0'
 platform: ruby
 authors:
 - Ery Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies: []
 description: Ruby webim client library for NexTalk.IM
 email: ery.lee@gmail.com