baidu-cloud_push 0.1.1 → 0.1.2
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.
- checksums.yaml +4 -4
- data/lib/baidu/cloud_push.rb +9 -7
- data/lib/baidu/request.rb +6 -6
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b308226cfc046ce5391b706cc324fb8c426f342e
|
|
4
|
+
data.tar.gz: 016392dafa381c6d88938d727925c22f9005267b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9d595bb5d2216211a2c6045966c54197120852454d1bbc5f46c31eb1b04dcc4c68062e9bdcd2350e3e311cefde6ed5feb5f7b7738bb4ddf8a64938bf1eac1c4d
|
|
7
|
+
data.tar.gz: 579d1c5a1e2f8ff9e120f9d974a928e1290219c1e61b52c865490c2fbb58c72510c97cb5cdc597f6d01a06e72e025767029553a9759a3da6489f99aa88ac9116
|
data/lib/baidu/cloud_push.rb
CHANGED
|
@@ -15,7 +15,7 @@ module Baidu
|
|
|
15
15
|
class CloudPush
|
|
16
16
|
attr_reader :request,:apikey
|
|
17
17
|
attr_reader :resource_name,:method_name,:params
|
|
18
|
-
attr_accessor :
|
|
18
|
+
attr_accessor :device_type,:expires
|
|
19
19
|
# 构造函数
|
|
20
20
|
#
|
|
21
21
|
# @param apikey [String] 应用的key
|
|
@@ -250,15 +250,17 @@ module Baidu
|
|
|
250
250
|
|
|
251
251
|
private
|
|
252
252
|
def merge_params(args={})
|
|
253
|
-
|
|
254
|
-
params
|
|
253
|
+
now_time = Time.now.to_i
|
|
254
|
+
params = {
|
|
255
|
+
timestamp: now_time,
|
|
256
|
+
apikey: @apikey
|
|
257
|
+
}
|
|
258
|
+
params[:expires] = now_time + 60*@expires unless @expires.nil?
|
|
255
259
|
params[:device_type] = @device_type unless @device_type.nil?
|
|
256
|
-
params[:timestamp] = Time.now.to_i
|
|
257
|
-
params[:apikey] = @apikey
|
|
258
260
|
|
|
259
|
-
params = params.merge(args)
|
|
260
261
|
new_params = {}
|
|
261
|
-
|
|
262
|
+
|
|
263
|
+
params.merge(args).sort.each{|p| new_params[p[0]] = p[1]}
|
|
262
264
|
new_params
|
|
263
265
|
end
|
|
264
266
|
|
data/lib/baidu/request.rb
CHANGED
|
@@ -3,7 +3,7 @@ require 'digest'
|
|
|
3
3
|
require 'sysinfo'
|
|
4
4
|
|
|
5
5
|
module Baidu
|
|
6
|
-
# 百度云推送API
|
|
6
|
+
# 百度云推送API封装类
|
|
7
7
|
#
|
|
8
8
|
# @attr_reader apisecret [String] 应用的secret
|
|
9
9
|
# @attr_reader options [Hash] 配置参数
|
|
@@ -29,14 +29,14 @@ module Baidu
|
|
|
29
29
|
end
|
|
30
30
|
|
|
31
31
|
def start(resource,method,params={})
|
|
32
|
-
|
|
32
|
+
uri = get_uri(resource,method)
|
|
33
|
+
type = get_type(resource,method)
|
|
34
|
+
send_request(uri,type,params)
|
|
33
35
|
end
|
|
34
36
|
|
|
35
37
|
private
|
|
36
|
-
def send_request(
|
|
37
|
-
|
|
38
|
-
type = get_type(resource,method)
|
|
39
|
-
params = params.merge({sign:gen_sign(@apisecret,type,get_url(resource,method),params)})
|
|
38
|
+
def send_request(uri,type,params)
|
|
39
|
+
params = params.merge({sign:gen_sign(@apisecret,type,uri.to_s,params)})
|
|
40
40
|
req = nil
|
|
41
41
|
case type
|
|
42
42
|
when 'GET'
|