qingting_api 0.1.4 → 0.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +21 -25
  3. data/lib/generators/qingting_api/templates/qingting_api_config.rb +1 -1
  4. data/lib/qingting_api/config.rb +1 -1
  5. data/lib/qingting_api/qing_ting.rb +12 -4
  6. data/lib/qingting_api/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 02b94e10995a03f072dd8e9ed19f56df307bff2b
4
- data.tar.gz: 7efef29f404b544afac68d9ab8430909be9424e2
3
+ metadata.gz: f6656001c6cf4598d4edf825161f4435c67ecaa0
4
+ data.tar.gz: c5d96d5f08dde055b5709afb12463330d2c1f5c0
5
5
  SHA512:
6
- metadata.gz: 45e1c7c2b71e1ac7195111b8bd4abee6567bbdd6a50f6251a2a65f969220d82daeed0ecfc0afa7f04c2be3db75ac36f2cf1f0d02013898c57f8335d5f3019e91
7
- data.tar.gz: 1610fdce4bac7d8286fb67a8de3351ab1092299337ca9f1f443bdb4969e0c2b7821e72c274707ccb2b10c3678ce8848506f85c30914fde17f1bac4d961769c89
6
+ metadata.gz: d1c72d1cb5fbdecd9d7a37b36549629ac4532eb947a3f023d863336793ecc14eef07e52fcf6c31ef84f80741a78c54115514cccb05ff95ebedbb6610c6b9a28c
7
+ data.tar.gz: 431c91bf58881e9545dad59c6a77c9f6281a50fec00acfe1a5dd34e8b7a0d1b6f629e54c34606aea3523249209cafb9f3830cf35247bcd694b7ec02b9ae1bd52
data/README.md CHANGED
@@ -30,7 +30,7 @@ SmartSMS.configure do |config|
30
30
  # config.client_secret = "OTdiNmI0MWEtYzhiZC0zYWE1LWExZmEtMDU0OWZhNTljZmRk" # 授权 API client_secret
31
31
  # config.api_version = :v6 # API 的版本,目前有v6
32
32
  # config.page_num = 1 # 获取信息时, 指定默认的页数
33
- # config.page_size = 20 # 获取信息时, 一页包含信息数量
33
+ # config.page_size = 30 # 获取信息时, 一页包含信息数量
34
34
  # config.company = 'Cheenwe' # 申请api公司名称
35
35
  # config.expires_in = 7200.second # 过期时间。当access_token过期时，API会返回token_expired错误。这时需要重新申请access token
36
36
  end
@@ -41,55 +41,51 @@ end
41
41
  #### 音频数据中心
42
42
  > |方法|API|说明
43
43
  |:----- |:-------|----- |
44
- |QingtingApi.mediacenterlist |
45
- /v6/media/mediacenterlist | 获取域名中心
44
+ |QingtingApi.mediacenterlist | /v6/media/mediacenterlist | 获取域名中心
46
45
 
47
46
  #### 分类(Category)
48
47
 
49
48
  > |方法|API|说明
50
49
  |:----- |:-------|----- |
51
- |QingtingApi.categories |
52
- /v6/media/categories | 获取点播所有分类
53
- |QingtingApi.get("categories/5") /QingtingApi.get_id("categories",5) |
54
- /v6/media/categories/5 |直播分类及获取直播属性
55
- |QingtingApi.get("categories/5") /QingtingApi.get_id("categories",5) |
56
- /v6/media/categories/#{category_id} |获取分类属性
57
- |QingtingApi.catrgory_channel(category_id, curpage) |
58
- /v6/media/categories/#{category_id}/channels/order/0/curpage/#{curpage}/pagesize/30 |获取分类下的所有电台或直播电台
50
+ |QingtingApi.categories | /v6/media/categories | 获取点播所有分类
51
+ |QingtingApi.get("categories/5") /QingtingApi.get_id("categories",5) | /v6/media/categories/5 |直播分类及获取直播属性
52
+ |QingtingApi.get("categories/5") /QingtingApi.get_id("categories",5) | /v6/media/categories/#{category_id} |获取分类属性
53
+ |QingtingApi.catrgory_channel(category_id, curpage, page_size) | /v6/media/categories/#{category_id}/channels/order/0/curpage/#{curpage}/pagesize/30 |获取分类下的所有电台或直播电台
59
54
 
60
55
  #### 点播(OnDemand)
61
56
 
62
57
  > |方法|API|说明
63
58
  |:----- |:-------|----- |
64
- |QingtingApi.get("channelondemands/35242") / QingtingApi.get_id("channelondemands",35242) |
65
- /v6/media/channelondemands/#{channel_id} | 获取点播电台
66
- |QingtingApi.ondemand_channel(35242,1) |
67
- /v6/media/channelondemands/#{channel_id}/programs/curpage/#{curpage}/pagesize/30 | 获取点播电台下的点播节目
68
- |QingtingApi.get("programs/3568700") / QingtingApi.get_id("programs",3568700) |
69
- /v6/media/programs/#{programid}| 获取点播节目
59
+ |QingtingApi.get("channelondemands/35242") / QingtingApi.get_id("channelondemands",35242) | /v6/media/channelondemands/#{channel_id} | 获取点播电台
60
+ |QingtingApi.ondemand_channel(35242,1,30) | /v6/media/channelondemands/#{channel_id}/programs/curpage/#{curpage}/pagesize/30 | 获取点播电台下的点播节目
61
+ |QingtingApi.get("programs/3568700") / QingtingApi.get_id("programs",3568700) | /v6/media/programs/#{programid}| 获取点播节目
70
62
 
71
63
  #### 直播(Live)
72
64
 
73
65
  > |方法|API|说明
74
66
  |:----- |:-------|----- |
75
- |QingtingApi.get("channellives/266") / QingtingApi.get_id("channellives",266) |
76
- /v6/media/channellives/#{channel_id} | 获取直播电台
77
- |QingtingApi.live_channel(266,4) |
78
- /v6/media/channellives/#{channel_id}/programs/day/#{day_1}/#{day_2}/.../ | 获取直播电台节目单
67
+ |QingtingApi.get("channellives/266") / QingtingApi.get_id("channellives",266) | /v6/media/channellives/#{channel_id} | 获取直播电台
68
+ |QingtingApi.live_channel(266,4) | /v6/media/channellives/#{channel_id}/programs/day/#{day_1}/#{day_2}/.../ | 获取直播电台节目单
79
69
  #### 排行榜
80
70
 
81
71
  > |方法|API|说明
82
72
  |:----- |:-------|----- |
83
- |QingtingApi.get("recommends/billboards/channellives") |
84
- /v6/media/recommends/billboards/channellives | 电台排行榜
85
- |QingtingApi.get("recommends/billboards/programondemands") |
86
- /v6/media/recommends/billboards/programondemands | 点播节目排行榜
73
+ |QingtingApi.get("recommends/billboards/channellives") | /v6/media/recommends/billboards/channellives | 电台排行榜
74
+ |QingtingApi.get("recommends/billboards/programondemands") | /v6/media/recommends/billboards/programondemands | 点播节目排行榜
87
75
 
88
76
  #### 搜索
89
77
  > |方法|API|说明
90
78
  |:----- |:-------|----- |
91
79
  |QingtingApi.search("上海") /QingtingApi.search("上海","channel_ondemand") | /search/#{keyword}/type/#{type}| 搜索
92
80
 
81
+
82
+
83
+ ## Change log
84
+
85
+ > |时间|版本|说明|
86
+ |:----- |:-------|----- |
87
+ |2015.12.08 | 0.1.5 |添加自定义分页参数 |
88
+
93
89
  ## Contributing
94
90
 
95
91
  Bug reports and pull requests are welcome on GitHub at https://github.com/cheenwe/qingting_api. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
data/lib/generators/qingting_api/templates/qingting_api_config.rb CHANGED
@@ -7,7 +7,7 @@ QingtingApi.configure do |config|
7
7
  # config.client_secret = "OTdiNmI0MWEtYzhiZC0zYWE1LWExZmEtMDU0OWZhNTljZmRk" # 授权 API client_secret
8
8
  # config.api_version = :v6 # API 的版本,目前有v6
9
9
  # config.page_num = 1 # 获取信息时, 指定默认的页数
10
- # config.page_size = 20 # 获取信息时, 一页包含信息数量
10
+ # config.page_size = 30 # 获取信息时, 一页包含信息数量
11
11
  # config.company = 'Cheenwe' # 申请api公司名称
12
12
  # config.expires_in = 7200.second # 过期时间。当access_token过期时，API会返回token_expired错误。这时需要重新申请access token
13
13
  end
data/lib/qingting_api/config.rb CHANGED
@@ -37,7 +37,7 @@ module QingtingApi
37
37
  config.client_secret = "OTdiNmI0MWEtYzhiZC0zYWE1LWExZmEtMDU0OWZhNTljZmRk"
38
38
  config.api_version = :v6
39
39
  config.page_num = 1
40
- config.page_size = 20
40
+ config.page_size = 30
41
41
  config.company = 'Cheenwe'
42
42
  config.expires_in = 7200.second
43
43
  end
data/lib/qingting_api/qing_ting.rb CHANGED
@@ -32,12 +32,20 @@ module QingtingApi
32
32
  Request.get "/#{QingtingApi.config.api_version}/media/#{name}/#{id}?access_token=#{token}"
33
33
  end
34
34
 
35
- def catrgory_channel(category_id, curpage)
36
- Request.get "/#{QingtingApi.config.api_version}/media/categories/#{category_id}/channels/order/0/curpage/#{curpage}/pagesize/30?access_token=#{token}"
35
+ def catrgory_channel(category_id, curpage, page_size={})
36
+ if page_size.present?
37
+ Request.get "/#{QingtingApi.config.api_version}/media/categories/#{category_id}/channels/order/0/curpage/#{curpage}/pagesize/#{page_size}?access_token=#{token}"
38
+ else
39
+ Request.get "/#{QingtingApi.config.api_version}/media/categories/#{category_id}/channels/order/0/curpage/#{curpage}/pagesize/#{QingtingApi.config.page_size}?access_token=#{token}"
40
+ end
37
41
  end
38
42
 
39
- def ondemand_channel(category_id, curpage)
40
- Request.get "/#{QingtingApi.config.api_version}/media/channelondemands/#{category_id}/programs/curpage/#{curpage}/pagesize/30?access_token=#{token}"
43
+ def ondemand_channel(category_id, curpage, page_size={})
44
+ if page_size.present?
45
+ Request.get "/#{QingtingApi.config.api_version}/media/channelondemands/#{category_id}/programs/curpage/#{curpage}/pagesize/#{page_size}?access_token=#{token}"
46
+ else
47
+ Request.get "/#{QingtingApi.config.api_version}/media/channelondemands/#{category_id}/programs/curpage/#{curpage}/pagesize/#{QingtingApi.config.page_size}?access_token=#{token}"
48
+ end
41
49
  end
42
50
 
43
51
  def live_channel(channel_id, day)
data/lib/qingting_api/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module QingtingApi
2
- VERSION = "0.1.4"
2
+ VERSION = "0.1.5"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: qingting_api
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - cheenwe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-25 00:00:00.000000000 Z
11
+ date: 2015-12-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord